Bugzilla BZ640042: TPS Installlation Wizard: need to move Module Panel up to before Security Domain Panel

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

3 files changed, 29 insertions, 29 deletions

diff --git a/pki/base/silent/src/tps/ConfigureTPS.java b/pki/base/silent/src/tps/ConfigureTPS.java
index 7b997d51f..880b0dd0c 100644
--- a/pki/base/silent/src/tps/ConfigureTPS.java
+++ b/pki/base/silent/src/tps/ConfigureTPS.java
@@ -229,7 +229,7 @@ public class ConfigureTPS
 
 		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
-		String query_string = "p=1" +
+		String query_string = "p=3" +
 							"&choice=existingdomain" +
 							"&sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -255,7 +255,7 @@ public class ConfigureTPS
 		ParseXML px = new ParseXML();
 		String query_string = null;
 
-		query_string = "p=2" + "&op=next" + "&xml=true";
+		query_string = "p=4" + "&op=next" + "&xml=true";
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		return true;
@@ -297,7 +297,7 @@ public class ConfigureTPS
 
 		// use session id to connect back to TPS
 
-		String query_string_2 = "p=3" +
+		String query_string_2 = "p=5" +
 								"&subsystem=TPS" +
 								"&session_id=" + tps_session_id +
 								"&xml=true" ;
@@ -319,7 +319,7 @@ public class ConfigureTPS
 		ParseXML px = new ParseXML();
 
 		sleep_time();
-		String query_string = "p=3" +
+		String query_string = "p=5" +
 						"&choice=newsubsystem" +
 						"&subsystemName=" +
 						URLEncoder.encode(subsystem_name) +
@@ -336,7 +336,7 @@ public class ConfigureTPS
 		String ca_url = "https://" + ca_hostname + ":" + ca_ssl_port ;
 
 		// CA choice panel
-		query_string = "p=4" +
+		query_string = "p=6" +
 						"&urls=0" +
 						"&op=next" +
 						"&xml=true" ;
@@ -350,7 +350,7 @@ public class ConfigureTPS
 		sleep_time();
 		// TKS choice panel
 		String tks_url = "https://" + tks_hostname + ":" + tks_ssl_port ;
-		query_string = "p=5" +
+		query_string = "p=7" +
 						"&urls=0" +
 						"&op=next" +
 						"&xml=true" ;
@@ -371,7 +371,7 @@ public class ConfigureTPS
 
 		String drm_url = "https://" + drm_hostname + ":" + drm_ssl_port ;
 
-		query_string = "p=6" +
+		query_string = "p=8" +
 						"&choice=" + ss_keygen +
 						"&urls=0" +
 						"&op=next" +
@@ -395,7 +395,7 @@ public class ConfigureTPS
 		ParseXML px = new ParseXML();
 
 
-		String query_string = "p=7" +
+		String query_string = "p=9" +
 						"&host=" +
 						URLEncoder.encode(ldap_auth_host) +
 						"&port=" +
@@ -423,7 +423,7 @@ public class ConfigureTPS
 		ParseXML px = new ParseXML();
 
 
-		String query_string = "p=8" +
+		String query_string = "p=10" +
 						"&host=" +
 						URLEncoder.encode(ldap_host) +
 						"&port=" +
@@ -464,7 +464,7 @@ public class ConfigureTPS
 		// Software Token
 		if(token_name.equalsIgnoreCase("internal"))
 		{
-			query_string =	"p=9" +
+			query_string =	"p=1" +
 							"&choice=" +
 							URLEncoder.encode("NSS Certificate DB") +
 							"&op=next" +
@@ -480,7 +480,7 @@ public class ConfigureTPS
 		else
 		{
 			// login to hsm first
-			query_string =	"p=10" +
+			query_string =	"p=2" +
 							"&uTokName=" +
 							URLEncoder.encode(token_name) +
 							"&__uPasswd=" +
@@ -495,7 +495,7 @@ public class ConfigureTPS
 			px.prettyprintxml();
 		
 			// choice with token name now
-			query_string =	"p=9" +
+			query_string =	"p=1" +
 							"&choice=" +
 							URLEncoder.encode(token_name) +
 							"&op=next" +
@@ -791,7 +791,16 @@ public class ConfigureTPS
 		}
 
 		sleep_time();
-		// 2. domain panel
+		// 2. Token Choice Panel
+		boolean disp_token = TokenChoicePanel();
+		if(!disp_token)
+		{
+		System.out.println("ERROR: ConfigureTPS: TokenChoicePanel() failure");
+			return false;
+		}
+
+		sleep_time();
+		// 3. domain panel
 		boolean dom_st = DomainPanel();
 		if(!dom_st)
 		{
@@ -800,7 +809,7 @@ public class ConfigureTPS
 		}
 
 		sleep_time();
-		// 3. display cert chain panel
+		// 4. display cert chain panel
 		boolean disp_st = DisplayChainPanel();
 		if(!disp_st)
 		{
@@ -809,7 +818,7 @@ public class ConfigureTPS
 		}
 
 		sleep_time();
-		// security domain login panel
+		// 5. security domain login panel
 		boolean disp_sd = SecurityDomainLoginPanel();
 		if(!disp_sd)
 		{
@@ -818,7 +827,7 @@ public class ConfigureTPS
 		}
 
 		sleep_time();
-		// 4. subsystem panel
+		// 6. subsystem panel
 		boolean disp_ss = SubsystemPanel();
 		if(!disp_ss)
 		{
@@ -845,15 +854,6 @@ public class ConfigureTPS
 		}
 
 		sleep_time();
-		// 9. Token Choice Panel
-		boolean disp_token = TokenChoicePanel();
-		if(!disp_token)
-		{
-		System.out.println("ERROR: ConfigureTPS: TokenChoicePanel() failure");
-			return false;
-		}
-
-		sleep_time();
 		// 11. Key Panel
 		boolean disp_key = KeyPanel();
 		if(!disp_key)
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
index 8b6a6ed67..91e07ed2b 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
@@ -114,9 +114,9 @@ sub update
     # check if url is accessible
     # redirect to the security domain authentication
     if ($ENV{'SERVER_PORT'} eq $unsecurePort) {
-       $::symbol{redirect} = $sdomainAdminURL . "/ca/admin/ca/securityDomainLogin?url=http%3A%2F%2F" . $machineName . "%3A" . $unsecurePort . "%2Ftps%2Fadmin%2Fconsole%2Fconfig%2Fwizard%3Fp%3D3%26subsystem%3DTPS";
+       $::symbol{redirect} = $sdomainAdminURL . "/ca/admin/ca/securityDomainLogin?url=http%3A%2F%2F" . $machineName . "%3A" . $unsecurePort . "%2Ftps%2Fadmin%2Fconsole%2Fconfig%2Fwizard%3Fp%3D5%26subsystem%3DTPS";
     } else {
-       $::symbol{redirect} = $sdomainAdminURL . "/ca/admin/ca/securityDomainLogin?url=https%3A%2F%2F" . $machineName . "%3A" . $non_clientauth_securePort . "%2Ftps%2Fadmin%2Fconsole%2Fconfig%2Fwizard%3Fp%3D3%26subsystem%3DTPS";
+       $::symbol{redirect} = $sdomainAdminURL . "/ca/admin/ca/securityDomainLogin?url=https%3A%2F%2F" . $machineName . "%3A" . $non_clientauth_securePort . "%2Ftps%2Fadmin%2Fconsole%2Fconfig%2Fwizard%3Fp%3D5%26subsystem%3DTPS";
     }
 
     get_domain_xml($sdomainAdminURL);
diff --git a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
index 5b2035f73..db8b26526 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
@@ -174,6 +174,8 @@ sub makepanels
 
     $symbol{panels}  = [ 
         $welcome,           # com.netscape.cms.servlet.csadmin.WelcomePanel
+        $modulepanel,       # com.netscape.cms.servlet.csadmin.ModulePanel
+        $confighsmloginpanel,        # com.netscape.cms.servlet.csadmin.ConfigHSMLoginPanel
         $securitydomain,    # com.netscape.cms.servlet.csadmin.SecurityDomainPanel
         $displaycertchain,  # com.netscape.cms.servlet.csadmin.DisplayCertChainPanel
         $subsystem,         # com.netscape.cms.servlet.csadmin.CreateSubsystemPanel
@@ -183,8 +185,6 @@ sub makepanels
         $drminfopanel,       # com.netscape.cms.servlet.csadmin.DRMInfoPanel
         $authdbpanel,     # com.netscape.cms.servlet.csadmin.DatabasePanel
         $databasepanel,     # com.netscape.cms.servlet.csadmin.DatabasePanel
-        $modulepanel,       # com.netscape.cms.servlet.csadmin.ModulePanel
-        $confighsmloginpanel,        # com.netscape.cms.servlet.csadmin.ConfigHSMLoginPanel
         $sizepanel,         # com.netscape.cms.servlet.csadmin.SizePanel
         $namepanel,         # com.netscape.cms.servlet.csadmin.NamePanel
         $certrequestpanel,  # com.netscape.cms.servlet.csadmin.CertRequestPanel