Bugzilla BZ640091 pkisilent panels need to match with changed java subsystems

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1333 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 74 insertions, 73 deletions

diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/pki/base/silent/src/subca/ConfigureSubCA.java
index 25ea43ed5..38e39bf62 100644
--- a/pki/base/silent/src/subca/ConfigureSubCA.java
+++ b/pki/base/silent/src/subca/ConfigureSubCA.java
@@ -199,6 +199,61 @@ public class ConfigureSubCA
 		return st;
 	}
 
+	public boolean TokenChoicePanel()
+	{
+		boolean st = false;
+		HTTPResponse hr = null;
+		ByteArrayInputStream bais = null;
+		ParseXML px = new ParseXML();
+
+		///////////////////////////////////////////////////////
+		String query_string = null;
+
+		// Software Token
+		if(token_name.equalsIgnoreCase("internal"))
+		{
+			query_string = "p=1" + "&op=next" + "&xml=true" +
+							"&choice=" + 
+					URLEncoder.encode("Internal Key Storage Token") +
+								""; 
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			// parse xml
+			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
+			px.parse(bais);
+			px.prettyprintxml();
+		}
+		// HSM
+		else
+		{
+			// login to hsm first
+			query_string = "p=2" + "&op=next" + "&xml=true" +
+							"&uTokName=" + 
+							URLEncoder.encode(token_name) +
+							"&__uPasswd=" + 
+							URLEncoder.encode(token_pwd) +
+							""; 
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			// parse xml
+			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
+			px.parse(bais);
+			px.prettyprintxml();
+		
+			// choice with token name now
+			query_string = "p=1" + "&op=next" + "&xml=true" +
+							"&choice=" + 
+							URLEncoder.encode(token_name) +
+							""; 
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			// parse xml
+			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
+			px.parse(bais);
+			px.prettyprintxml();
+
+		}
+
+		return true;
+	}
+
 	public boolean DomainPanel()
 	{
 		boolean st = false;
@@ -214,7 +269,7 @@ public class ConfigureSubCA
 							"&sdomainName="+
 							URLEncoder.encode(domain_name) +
 							"&choice=existingdomain"+ 
-							"&p=1" +
+							"&p=3" +
 							"&op=next" +
 							"&xml=true"; 
 
@@ -225,7 +280,7 @@ public class ConfigureSubCA
 		px.parse(bais);
 		px.prettyprintxml();
 
-		String query_string_1 = "p=2" +
+		String query_string_1 = "p=4" +
 							"&op=next" +
 							"&xml=true"; 
 
@@ -245,7 +300,7 @@ public class ConfigureSubCA
 
 		String subca_url = "https://" + cs_hostname + ":" + cs_port +
 							"/ca/admin/console/config/wizard" +
-							"?p=3&subsystem=CA" ;
+							"?p=5&subsystem=CA" ;
 
 		String query_string = "url=" + URLEncoder.encode(subca_url); 
 
@@ -268,7 +323,7 @@ public class ConfigureSubCA
 
 		// use session id to connect back to subCA
 
-		String query_string_2 = "p=3" +
+		String query_string_2 = "p=5" +
 								"&subsystem=CA" +
 								"&session_id=" + subca_session_id +
 								"&xml=true" ;
@@ -288,7 +343,7 @@ public class ConfigureSubCA
 		ParseXML px = new ParseXML();
 		String query_string = null;
 
-		query_string = "p=3" + "&op=next" + "&xml=true" +
+		query_string = "p=5" + "&op=next" + "&xml=true" +
 						"&choice=newsubsystem" +
 						"&subsystemName=" +
 						URLEncoder.encode(subsystem_name) +
@@ -312,7 +367,7 @@ public class ConfigureSubCA
 		ParseXML px = new ParseXML();
 
 
-		String query_string = "p=6" + "&op=next" + "&xml=true" +
+		String query_string = "p=8" + "&op=next" + "&xml=true" +
 								"&choice=join" ; 
 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
@@ -335,7 +390,7 @@ public class ConfigureSubCA
 		ParseXML px = new ParseXML();
 
 
-		String query_string = "p=7" + "&op=next" + "&xml=true" +
+		String query_string = "p=9" + "&op=next" + "&xml=true" +
 								"&host=" + URLEncoder.encode(ldap_host) + 
 								"&port=" + URLEncoder.encode(ldap_port) +
 								"&basedn=" + URLEncoder.encode(base_dn) +
@@ -355,61 +410,6 @@ public class ConfigureSubCA
 		return true;
 	}
 
-	public boolean TokenChoicePanel()
-	{
-		boolean st = false;
-		HTTPResponse hr = null;
-		ByteArrayInputStream bais = null;
-		ParseXML px = new ParseXML();
-
-		///////////////////////////////////////////////////////
-		String query_string = null;
-
-		// Software Token
-		if(token_name.equalsIgnoreCase("internal"))
-		{
-			query_string = "p=8" + "&op=next" + "&xml=true" +
-							"&choice=" + 
-					URLEncoder.encode("Internal Key Storage Token") +
-								""; 
-			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
-			// parse xml
-			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
-			px.parse(bais);
-			px.prettyprintxml();
-		}
-		// HSM
-		else
-		{
-			// login to hsm first
-			query_string = "p=9" + "&op=next" + "&xml=true" +
-							"&uTokName=" + 
-							URLEncoder.encode(token_name) +
-							"&__uPasswd=" + 
-							URLEncoder.encode(token_pwd) +
-							""; 
-			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
-			// parse xml
-			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
-			px.parse(bais);
-			px.prettyprintxml();
-		
-			// choice with token name now
-			query_string = "p=8" + "&op=next" + "&xml=true" +
-							"&choice=" + 
-							URLEncoder.encode(token_name) +
-							""; 
-			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
-			// parse xml
-			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
-			px.parse(bais);
-			px.prettyprintxml();
-
-		}
-
-		return true;
-	}
-
 	public boolean KeyPanel()
 	{
 		boolean st = false;
@@ -822,7 +822,16 @@ public class ConfigureSubCA
 		}
 
 		sleep_time();
-		// 1. domain panel
+		// 1. Token Choice Panel
+		boolean disp_token = TokenChoicePanel();
+		if(!disp_token)
+		{
+		System.out.println("ERROR: ConfigureSubCA: TokenChoicePanel() failure");
+			return false;
+		}
+
+		sleep_time();
+		// 2. domain panel
 		boolean dom_st = DomainPanel();
 		if(!dom_st)
 		{
@@ -831,7 +840,7 @@ public class ConfigureSubCA
 		}
 
 		sleep_time();
-		// 2. domain panel
+		// 3. domain panel
 		boolean sd_st = SecurityDomainLoginPanel();
 		if(!sd_st)
 		{
@@ -840,7 +849,7 @@ public class ConfigureSubCA
 		}
 
 		sleep_time();
-		// 3. display cert chain panel
+		// 4. display cert chain panel
 		boolean disp_st = DisplayChainPanel();
 		if(!disp_st)
 		{
@@ -867,14 +876,6 @@ public class ConfigureSubCA
 		}
 
 		sleep_time();
-		// 8. Token Choice Panel
-		boolean disp_token = TokenChoicePanel();
-		if(!disp_token)
-		{
-		System.out.println("ERROR: ConfigureSubCA: TokenChoicePanel() failure");
-			return false;
-		}
-
 		sleep_time();
 		// 10. Key Panel
 		boolean disp_key = KeyPanel();