Bugzilla Bug #491517 - pkisilent Configure RA and TPS fail

(port separation changes only)
Bugzilla Bug #495676 -  pkisilent ConfigureCA failure on AdminCertImportPanel
Bugzilla Bug #500748 -  pki-silent : issues due to port separation changes
(only addressed CA, KRA, OCSP, and TKS)


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

7 files changed, 277 insertions, 144 deletions

diff --git a/pki/base/silent/src/ca/ConfigureCA.java b/pki/base/silent/src/ca/ConfigureCA.java
index 1dacffefa..0f0d5112e 100644
--- a/pki/base/silent/src/ca/ConfigureCA.java
+++ b/pki/base/silent/src/ca/ConfigureCA.java
@@ -58,8 +58,7 @@ public class ConfigureCA {
 	
     public static String login_uri = "/ca/admin/console/config/login";
     public static String wizard_uri = "/ca/admin/console/config/wizard";
-    public static String domain_uri = "/ca/ee/ca/domain";
-    public static String ee_uri = "/ca/ee/ca/getBySerial";
+    public static String admin_uri = "/ca/admin/ca/getBySerial";
     public static String pkcs12_uri = "/ca/admin/console/config/savepkcs12";
     public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
     public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
@@ -71,6 +70,8 @@ public class ConfigureCA {
 
     public static String sd_hostname = null;
     public static String sd_ssl_port = null;
+    public static String sd_agent_port = null;
+    public static String sd_admin_port = null;
     public static String sd_admin_name = null;
     public static String sd_admin_password = null;
 
@@ -220,7 +221,7 @@ public class ConfigureCA {
                     + "&sdomainName=" + URLEncoder.encode(domain_name)
                     + "&choice=newdomain" + "&p=1" + "&op=next" + "&xml=true";
             } else {
-                domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+                domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
                 query_string = "sdomainURL=" + URLEncoder.encode(domain_url)
                     + "&sdomainName="
                     + "&choice=existingdomain" + "&p=1" + "&op=next" + "&xml=true";
@@ -269,12 +270,12 @@ public class ConfigureCA {
 
             String query_string = "url=" + URLEncoder.encode(subca_url);
 
-            hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+            hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
             String query_string_1 = "uid=" + sd_admin_name + "&pwd=" + sd_admin_password +
                                     "&url=" + URLEncoder.encode(subca_url) ;
 
-            hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+            hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
                                                 query_string_1);
 
             // get session id from security domain
@@ -985,8 +986,10 @@ public class ConfigureCA {
                 + "&__admin_password_again=" + admin_password + "&profileId="
                 + "caAdminCert" + "&email=" + URLEncoder.encode(admin_email)
                 + "&cert_request=" + URLEncoder.encode(admin_cert_request)
-                + "&subject=" + agent_cert_subject + "&clone=new"
-                + "&import=true" + "&securitydomain=" + domain_name + ""; 
+                + "&subject=" + URLEncoder.encode(agent_cert_subject)
+				+ "&clone=new"
+                + "&import=true" + "&securitydomain="
+                + URLEncoder.encode(domain_name) + ""; 
 
             hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string);
 
@@ -1017,7 +1020,7 @@ public class ConfigureCA {
             String query_string = "&serialNumber=" + admin_serial_number
                 + "&importCert=true" + "";
 
-            hr = hc.sslConnect(cs_hostname, cs_port, ee_uri, query_string);
+            hr = hc.sslConnect(cs_hostname, cs_port, admin_uri, query_string);
 		
             try {
                 // get response data
@@ -1418,6 +1421,8 @@ public class ConfigureCA {
         //security domain
         StringHolder x_sd_hostname = new StringHolder();
         StringHolder x_sd_ssl_port = new StringHolder();
+        StringHolder x_sd_agent_port = new StringHolder();
+        StringHolder x_sd_admin_port = new StringHolder();
         StringHolder x_sd_admin_name = new StringHolder();
         StringHolder x_sd_admin_password = new StringHolder();
 
@@ -1426,7 +1431,7 @@ public class ConfigureCA {
         ArgParser parser = new ArgParser("ConfigureCA");
 
         parser.addOption("-cs_hostname %s #CS Hostname", x_cs_hostname); 
-        parser.addOption("-cs_port %s #CS SSL port", x_cs_port); 
+        parser.addOption("-cs_port %s #CS SSL Admin port", x_cs_port); 
         parser.addOption("-client_certdb_dir %s #Client CertDB dir",
                 x_client_certdb_dir); 
         parser.addOption("-client_certdb_pwd %s #client certdb password",
@@ -1496,7 +1501,9 @@ public class ConfigureCA {
         parser.addOption("-clone_p12_password %s #Password for pk12 file", x_clone_p12_passwd);
 
         parser.addOption ("-sd_hostname %s #Security Domain Hostname", x_sd_hostname);
-        parser.addOption ("-sd_ssl_port %s #Security Domain SSL port", x_sd_ssl_port);
+        parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port", x_sd_ssl_port);
+        parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port", x_sd_agent_port);
+        parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port", x_sd_admin_port);
         parser.addOption ("-sd_admin_name %s #Security Domain admin name",
             x_sd_admin_name);
         parser.addOption ("-sd_admin_password %s #Security Domain admin password",
@@ -1578,6 +1585,8 @@ public class ConfigureCA {
 
         sd_hostname = x_sd_hostname.value;
         sd_ssl_port = x_sd_ssl_port.value;
+        sd_agent_port = x_sd_agent_port.value;
+        sd_admin_port = x_sd_admin_port.value;
         sd_admin_name = x_sd_admin_name.value;
         sd_admin_password = x_sd_admin_password.value;
 
diff --git a/pki/base/silent/src/drm/ConfigureDRM.java b/pki/base/silent/src/drm/ConfigureDRM.java
index ae0130a62..a0bd3f67b 100644
--- a/pki/base/silent/src/drm/ConfigureDRM.java
+++ b/pki/base/silent/src/drm/ConfigureDRM.java
@@ -55,8 +55,7 @@ public class ConfigureDRM
 	
 	public static String login_uri = "/kra/admin/console/config/login";
 	public static String wizard_uri = "/kra/admin/console/config/wizard";
-	public static String domain_uri = "/kra/ee/ca/domain";
-	public static String ee_uri = "/ca/ee/ca/getBySerial";
+	public static String admin_uri = "/ca/admin/ca/getBySerial";
 
 	public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
 	public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
@@ -67,14 +66,14 @@ public class ConfigureDRM
 
 	public static String sd_hostname = null;
 	public static String sd_ssl_port = null;
+	public static String sd_agent_port = null;
+	public static String sd_admin_port = null;
 	public static String sd_admin_name = null;
 	public static String sd_admin_password = null;
 
 	public static String ca_hostname = null;
 	public static String ca_port = null;
 	public static String ca_ssl_port = null;
-	public static String ca_agent_name = null;
-	public static String ca_agent_password = null;
 
 	public static String client_certdb_dir = null;
 	public static String client_certdb_pwd = null;
@@ -209,7 +208,7 @@ public class ConfigureDRM
 		ParseXML px = new ParseXML();
 
 
-		String domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
 		String query_string = "sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -240,9 +239,9 @@ public class ConfigureDRM
 		query_string = "p=2" + "&op=next" + "&xml=true"; 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
-		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
-		px.parse(bais);
-		px.prettyprintxml();
+		// bais = new ByteArrayInputStream(hr.getHTML().getBytes());
+		// px.parse(bais);
+		// px.prettyprintxml();
 
 		return true;
 
@@ -262,13 +261,13 @@ public class ConfigureDRM
 
 		String query_string = "url=" + URLEncoder.encode(kra_url); 
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
 		String query_string_1 = "uid=" + sd_admin_name +
 								"&pwd=" + sd_admin_password +
 								"&url=" + URLEncoder.encode(kra_url) ;
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
 						query_string_1);
 
 		// get session id from security domain
@@ -713,10 +712,12 @@ public class ConfigureDRM
 							URLEncoder.encode(admin_email) +
 							"&cert_request=" + 
 							URLEncoder.encode(admin_cert_request) +
-							"&subject=" + URLEncoder.encode(agent_cert_subject) +
+							"&subject=" +
+							URLEncoder.encode(agent_cert_subject) +
 							"&clone=new" +
 							"&import=true" +
-							"&securitydomain=" + domain_name +
+							"&securitydomain=" +
+							URLEncoder.encode(domain_name) +
 							""; 
 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
@@ -742,7 +743,7 @@ public class ConfigureDRM
 							"&importCert=" + "true" +
 							""; 
 
-		hr = hc.sslConnect(ca_hostname,ca_ssl_port,ee_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string);
 		
 		// get response data
 		String cert_to_import = 
@@ -780,8 +781,8 @@ public class ConfigureDRM
 		ParseXML px = new ParseXML();
 
 		String query_string = "p=14" + "&op=next" + 
-							"&caHost=" + URLEncoder.encode(ca_hostname) +
-							"&caPort=" + URLEncoder.encode(ca_ssl_port) +
+							"&caHost=" + URLEncoder.encode(sd_hostname) +
+							"&caPort=" + URLEncoder.encode(sd_agent_port) +
 							"&pkcs7=" + URLEncoder.encode("/") +
 							"&serialNumber=" + URLEncoder.encode(admin_serial_number) +
 							""; 
@@ -961,6 +962,8 @@ public class ConfigureDRM
 
 		StringHolder x_sd_hostname = new StringHolder();
 		StringHolder x_sd_ssl_port = new StringHolder();
+		StringHolder x_sd_agent_port = new StringHolder();
+		StringHolder x_sd_admin_port = new StringHolder();
 		StringHolder x_sd_admin_name = new StringHolder();
 		StringHolder x_sd_admin_password = new StringHolder();
 
@@ -1015,13 +1018,17 @@ public class ConfigureDRM
 
 		parser.addOption ("-cs_hostname %s #CS Hostname",
 							x_cs_hostname); 
-		parser.addOption ("-cs_port %s #CS SSL port",
+		parser.addOption ("-cs_port %s #CS SSL Admin port",
 							x_cs_port); 
 
 		parser.addOption ("-sd_hostname %s #Security Domain Hostname",
 							x_sd_hostname); 
-		parser.addOption ("-sd_ssl_port %s #Security Domain SSL port",
+		parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port",
 							x_sd_ssl_port); 
+		parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port",
+							x_sd_agent_port); 
+		parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port",
+							x_sd_admin_port); 
 		parser.addOption ("-sd_admin_name %s #Security Domain username",
 							x_sd_admin_name); 
 		parser.addOption ("-sd_admin_password %s #Security Domain password",
@@ -1029,9 +1036,9 @@ public class ConfigureDRM
 
 		parser.addOption ("-ca_hostname %s #CA Hostname",
 							x_ca_hostname); 
-		parser.addOption ("-ca_port %s #CA non SSL port",
+		parser.addOption ("-ca_port %s #CA non-SSL EE port",
 							x_ca_port); 
-		parser.addOption ("-ca_ssl_port %s #CA SSL port",
+		parser.addOption ("-ca_ssl_port %s #CA SSL EE port",
 							x_ca_ssl_port); 
 
 		parser.addOption ("-client_certdb_dir %s #Client CertDB dir",
@@ -1120,6 +1127,8 @@ public class ConfigureDRM
 
 		sd_hostname = x_sd_hostname.value;
 		sd_ssl_port = x_sd_ssl_port.value;
+		sd_agent_port = x_sd_agent_port.value;
+		sd_admin_port = x_sd_admin_port.value;
 		sd_admin_name = x_sd_admin_name.value;
 		sd_admin_password = x_sd_admin_password.value;
 
diff --git a/pki/base/silent/src/ocsp/ConfigureOCSP.java b/pki/base/silent/src/ocsp/ConfigureOCSP.java
index f0ab09abc..db2fa8f68 100644
--- a/pki/base/silent/src/ocsp/ConfigureOCSP.java
+++ b/pki/base/silent/src/ocsp/ConfigureOCSP.java
@@ -55,7 +55,7 @@ public class ConfigureOCSP
 	
 	public static String login_uri = "/ocsp/admin/console/config/login";
 	public static String wizard_uri = "/ocsp/admin/console/config/wizard";
-	public static String ee_uri = "/ca/ee/ca/getBySerial";
+	public static String admin_uri = "/ca/admin/ca/getBySerial";
 
 	public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
 	public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
@@ -66,6 +66,8 @@ public class ConfigureOCSP
 
 	public static String sd_hostname = null;
 	public static String sd_ssl_port = null;
+	public static String sd_agent_port = null;
+	public static String sd_admin_port = null;
 	public static String sd_admin_name = null;
 	public static String sd_admin_password = null;
 
@@ -198,7 +200,7 @@ public class ConfigureOCSP
 		ParseXML px = new ParseXML();
 
 
-		String domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
 		String query_string = "sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -229,9 +231,9 @@ public class ConfigureOCSP
 		query_string = "p=2" + "&op=next" + "&xml=true"; 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
-		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
-		px.parse(bais);
-		px.prettyprintxml();
+		// bais = new ByteArrayInputStream(hr.getHTML().getBytes());
+		// px.parse(bais);
+		// px.prettyprintxml();
 
 		return true;
 
@@ -251,13 +253,13 @@ public class ConfigureOCSP
 
 		String query_string = "url=" + URLEncoder.encode(ocsp_url); 
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
 		String query_string_1 = "uid=" + sd_admin_name +
 								"&pwd=" + sd_admin_password +
 								"&url=" + URLEncoder.encode(ocsp_url) ;
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
 						query_string_1);
 
 		// get session id from security domain
@@ -680,10 +682,12 @@ public class ConfigureOCSP
 							URLEncoder.encode(admin_email) +
 							"&cert_request=" + 
 							URLEncoder.encode(admin_cert_request) +
-							"&subject=" + agent_cert_subject +
+							"&subject=" +
+							URLEncoder.encode(agent_cert_subject) +
 							"&clone=new" +
 							"&import=true" +
-							"&securitydomain=" + domain_name +
+							"&securitydomain=" +
+							URLEncoder.encode(domain_name) +
 							""; 
 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
@@ -709,7 +713,7 @@ public class ConfigureOCSP
 							"&importCert=" + "true" +
 							""; 
 
-		hr = hc.sslConnect(ca_hostname,ca_ssl_port,ee_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string);
 		
 		// get response data
 		String cert_to_import = 
@@ -747,8 +751,8 @@ public class ConfigureOCSP
 		ParseXML px = new ParseXML();
 
 		String query_string = "p=14" + "&op=next" + "&xml=true" +
-							"&caHost=" + URLEncoder.encode(ca_hostname) +
-							"&caPort=" + URLEncoder.encode(ca_port) +
+							"&caHost=" + URLEncoder.encode(sd_hostname) +
+							"&caPort=" + URLEncoder.encode(sd_agent_port) +
 							""; 
 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
@@ -926,6 +930,8 @@ public class ConfigureOCSP
 
 		StringHolder x_sd_hostname = new StringHolder();
 		StringHolder x_sd_ssl_port = new StringHolder();
+		StringHolder x_sd_agent_port = new StringHolder();
+		StringHolder x_sd_admin_port = new StringHolder();
 		StringHolder x_sd_admin_name = new StringHolder();
 		StringHolder x_sd_admin_password = new StringHolder();
 
@@ -979,13 +985,17 @@ public class ConfigureOCSP
 
 		parser.addOption ("-cs_hostname %s #CS Hostname",
 							x_cs_hostname); 
-		parser.addOption ("-cs_port %s #CS SSL port",
+		parser.addOption ("-cs_port %s #CS SSL Admin port",
 							x_cs_port); 
 
 		parser.addOption ("-sd_hostname %s #Security Domain Hostname",
 							x_sd_hostname); 
-		parser.addOption ("-sd_ssl_port %s #Security Domain SSL port",
+		parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port",
 							x_sd_ssl_port); 
+		parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port",
+							x_sd_agent_port); 
+		parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port",
+							x_sd_admin_port); 
 		parser.addOption ("-sd_admin_name %s #Security Domain Admin Name",
 							x_sd_admin_name); 
 		parser.addOption ("-sd_admin_password %s #Security Domain Admin password",
@@ -993,9 +1003,9 @@ public class ConfigureOCSP
 
 		parser.addOption ("-ca_hostname %s #CA Hostname",
 							x_ca_hostname); 
-		parser.addOption ("-ca_port %s #CA non SSL port",
+		parser.addOption ("-ca_port %s #CA non-SSL EE port",
 							x_ca_port); 
-		parser.addOption ("-ca_ssl_port %s #CA SSL port",
+		parser.addOption ("-ca_ssl_port %s #CA SSL EE port",
 							x_ca_ssl_port); 
 
 		parser.addOption ("-client_certdb_dir %s #Client CertDB dir",
@@ -1081,6 +1091,8 @@ public class ConfigureOCSP
 
 		sd_hostname = x_sd_hostname.value;
 		sd_ssl_port = x_sd_ssl_port.value;
+		sd_agent_port = x_sd_agent_port.value;
+		sd_admin_port = x_sd_admin_port.value;
 		sd_admin_name = x_sd_admin_name.value;
 		sd_admin_password = x_sd_admin_password.value;
 
diff --git a/pki/base/silent/src/ra/ConfigureRA.java b/pki/base/silent/src/ra/ConfigureRA.java
index a4a1ba803..7b14e252f 100644
--- a/pki/base/silent/src/ra/ConfigureRA.java
+++ b/pki/base/silent/src/ra/ConfigureRA.java
@@ -55,24 +55,28 @@ public class ConfigureRA
 	
 	public static String login_uri = "/ra/admin/console/config/login";
 	public static String wizard_uri = "/ra/admin/console/config/wizard";
-	public static String domain_uri = "/ra/ee/ca/domain";
-	public static String ee_uri = "/ca/ee/ca/getBySerial";
+	public static String admin_uri = "/ca/admin/ca/getBySerial";
 
 	public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
 	public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
+	public static String sd_update_domain_uri = "/ca/agent/ca/updateDomainXML";
 	public static String pkcs12_uri = "/ra/admin/console/config/savepkcs12";
 
 	public static String cs_hostname = null;
 	public static String cs_port = null;
+	public static String cs_clientauth_port = null;
 
 	public static String sd_hostname = null;
 	public static String sd_ssl_port = null;
+	public static String sd_agent_port = null;
+	public static String sd_admin_port = null;
 	public static String sd_admin_name = null;
 	public static String sd_admin_password = null;
 
 	public static String ca_hostname = null;
 	public static String ca_port = null;
 	public static String ca_ssl_port = null;
+	public static String ca_admin_port = null;
 
 	public static String client_certdb_dir = null;
 	public static String client_certdb_pwd = null;
@@ -112,6 +116,11 @@ public class ConfigureRA
 	public static String ra_server_cert_subject_name = null;
 	public static String subsystem_name = null;
 
+	// Security Domain Login Panel
+	public static String ra_session_id = null;
+
+	// Admin Certificate Request Panel
+	public static String requestor_name = null;
 
 	public ConfigureRA ()
 	{
@@ -141,7 +150,7 @@ public class ConfigureRA
 
 		String query_string = "pin=" + pin + "&xml=true"; 
 	
-		hr = hc.nonsslConnect(cs_hostname,cs_port,login_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,login_uri,query_string);
 		System.out.println("xml returned: " + hr.getHTML());
 
 		// parse xml here - nothing to parse
@@ -158,7 +167,7 @@ public class ConfigureRA
 		}
 
 		hr = null;
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,
 						"p=0&op=next&xml=true");
 
 		// parse xml here
@@ -180,7 +189,7 @@ public class ConfigureRA
 		ParseXML px = new ParseXML();
 
 
-		String domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
 		String query_string = "sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -189,7 +198,7 @@ public class ConfigureRA
 							"&op=next" +
 							"&xml=true"; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -209,7 +218,7 @@ public class ConfigureRA
 		String query_string = null;
 
 		query_string = "p=2" + "&op=next" + "&xml=true"; 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		return true;
 
@@ -229,19 +238,19 @@ public class ConfigureRA
 
 		String query_string = "url=" + URLEncoder.encode(ra_url); 
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
 		String query_string_1 = "uid=" + sd_admin_name +
 								"&pwd=" + sd_admin_password +
 								"&url=" + URLEncoder.encode(ra_url) ;
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
 						query_string_1);
 
 		// get session id from security domain
 		sleep_time();
 
-		String ra_session_id = hr.getContentValue("header.session_id");
+		ra_session_id = hr.getContentValue("header.session_id");
 		String ra_url_1 = hr.getContentValue("header.url");
 
 		System.out.println("RA_SESSION_ID=" + ra_session_id );
@@ -254,7 +263,7 @@ public class ConfigureRA
 								"&subsystem=RA" +
 								"&xml=true" ;
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,
 						query_string_2);
 
 		// parse xml - no parsing
@@ -276,7 +285,7 @@ public class ConfigureRA
 						URLEncoder.encode(subsystem_name) + 
 						"&choice=newsubsystem" ; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 		px.parse(bais);
@@ -290,7 +299,7 @@ public class ConfigureRA
 							"&urls=" +
 							URLEncoder.encode(ca_url) ;
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 		px.parse(bais);
@@ -311,7 +320,7 @@ public class ConfigureRA
 
 		String query_string = "p=5" + "&op=next" + "&xml=true" ;
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -338,7 +347,7 @@ public class ConfigureRA
 							"&choice=" + 
 					URLEncoder.encode("NSS Certificate DB") +
 								""; 
-			hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 			// parse xml
 			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 			px.parse(bais);
@@ -354,7 +363,7 @@ public class ConfigureRA
 							"&__uPasswd=" + 
 							URLEncoder.encode(token_pwd) +
 							""; 
-			hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 			// parse xml
 			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 			px.parse(bais);
@@ -365,7 +374,7 @@ public class ConfigureRA
 							"&choice=" + 
 							URLEncoder.encode(token_name) +
 							""; 
-			hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 			// parse xml
 			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 			px.parse(bais);
@@ -399,7 +408,7 @@ public class ConfigureRA
 							"&choice=custom"+
 							""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -431,7 +440,7 @@ public class ConfigureRA
 					URLEncoder.encode(ca_url) +
 					""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -462,7 +471,7 @@ public class ConfigureRA
 							"&sslserver_cc=" + 
 							""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -480,8 +489,7 @@ public class ConfigureRA
 		ParseXML px = new ParseXML();
 		String admin_cert_request = null;
 
-		// not used
-		String cert_subject = "CN=" + "ra-" + admin_user;
+		requestor_name = "RA-" + cs_hostname + "-" + cs_clientauth_port;
 
 		ComCrypto cCrypt = new ComCrypto(client_certdb_dir,
 										client_certdb_pwd,
@@ -511,17 +519,23 @@ public class ConfigureRA
 							"&__pwd=" + admin_password +
 							"&__admin_password_again=" + admin_password +
 							"&profileId=" + "caAdminCert" +
+							"&requestor_name=" + requestor_name +
 							"&email=" + 
 							URLEncoder.encode(admin_email) +
 							"&cert_request=" + 
 							URLEncoder.encode(admin_cert_request) +
-							"&subject=" + agent_cert_subject +
-							"&clone=0" +
+							"&subject=" +
+							URLEncoder.encode(agent_cert_subject) +
+							"&clone=new" +
 							"&import=true" +
-							"&securitydomain=" + domain_name +
+							"&securitydomain=" +
+							URLEncoder.encode(domain_name) +
+							"&sessionID=" + ra_session_id +
+							"&auth_hostname=" + ca_hostname +
+							"&auth_port=" + ca_ssl_port +
 							""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -539,13 +553,18 @@ public class ConfigureRA
 		HTTPResponse hr = null;
 		ByteArrayInputStream bais = null;
 		ParseXML px = new ParseXML();
+		String cert_to_import = null;
 
 		String query_string = "serialNumber=" + admin_serial_number +
 							"&importCert=" + "true" +
 							""; 
 
-		hr = hc.sslConnect(ca_hostname,ca_ssl_port,ee_uri,query_string);
-		String cert_to_import = null;
+		// NOTE:  CA, DRM, OCSP, and TKS use the Security Domain Admin Port;
+		//        whereas RA and TPS use the CA Admin Port associated with
+		//        the 'CA choice panel' as invoked from the SubsystemPanel()
+		//        which MAY or MAY NOT be the same CA as the CA specified
+		//        by the Security Domain.
+		hr = hc.sslConnect(ca_hostname,ca_admin_port,admin_uri,query_string);
 
 		try
 		{
@@ -591,11 +610,16 @@ public class ConfigureRA
 		ParseXML px = new ParseXML();
 
 		String query_string = "p=12" + "&op=next" + "&xml=true" +
-							"&caHost=" + URLEncoder.encode(ca_hostname) +
-							"&caPort=" + URLEncoder.encode(ca_ssl_port) +
-							""; 
+							"&list=" + "RAList" +
+							"&type=" + "RA" +
+							"&host=" + URLEncoder.encode(cs_hostname) +
+							"&name=" + URLEncoder.encode(subsystem_name) + 
+							"&sport=" + cs_clientauth_port +
+							"&dm=false" +
+							"";
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect( sd_hostname, sd_agent_port,
+                            sd_update_domain_uri, query_string );
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -748,15 +772,19 @@ public class ConfigureRA
 		// set variables
 		StringHolder x_cs_hostname = new StringHolder();
 		StringHolder x_cs_port = new StringHolder();
+		StringHolder x_cs_clientauth_port = new StringHolder();
 
 		StringHolder x_sd_hostname = new StringHolder();
 		StringHolder x_sd_ssl_port = new StringHolder();
+		StringHolder x_sd_agent_port = new StringHolder();
+		StringHolder x_sd_admin_port = new StringHolder();
 		StringHolder x_sd_admin_name = new StringHolder();
 		StringHolder x_sd_admin_password = new StringHolder();
 
 		StringHolder x_ca_hostname = new StringHolder();
 		StringHolder x_ca_port = new StringHolder();
 		StringHolder x_ca_ssl_port = new StringHolder();
+		StringHolder x_ca_admin_port = new StringHolder();
 
 		StringHolder x_client_certdb_dir = new StringHolder();
 		StringHolder x_client_certdb_pwd = new StringHolder();
@@ -795,11 +823,17 @@ public class ConfigureRA
 							x_cs_hostname); 
 		parser.addOption ("-cs_port %s #CS SSL port",
 							x_cs_port); 
+		parser.addOption ("-cs_clientauth_port %s #CS SSL port",
+							x_cs_clientauth_port); 
 
 		parser.addOption ("-sd_hostname %s #Security Domain Hostname",
 							x_sd_hostname); 
-		parser.addOption ("-sd_ssl_port %s #Security Domain SSL port",
+		parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port",
 							x_sd_ssl_port); 
+		parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port",
+							x_sd_agent_port); 
+		parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port",
+							x_sd_admin_port); 
 		parser.addOption ("-sd_admin_name %s #Security Domain username",
 							x_sd_admin_name); 
 		parser.addOption ("-sd_admin_password %s #Security Domain password",
@@ -807,10 +841,12 @@ public class ConfigureRA
 
 		parser.addOption ("-ca_hostname %s #CA Hostname",
 							x_ca_hostname); 
-		parser.addOption ("-ca_port %s #CA non SSL port",
+		parser.addOption ("-ca_port %s #CA non-SSL port",
 							x_ca_port); 
 		parser.addOption ("-ca_ssl_port %s #CA SSL port",
 							x_ca_ssl_port); 
+		parser.addOption ("-ca_admin_port %s #CA SSL Admin port",
+							x_ca_admin_port); 
 
 		parser.addOption ("-client_certdb_dir %s #Client CertDB dir",
 							x_client_certdb_dir); 
@@ -869,15 +905,19 @@ public class ConfigureRA
 		// set variables
 		cs_hostname = x_cs_hostname.value;
 		cs_port = x_cs_port.value;
+		cs_clientauth_port = x_cs_clientauth_port.value;
 
 		sd_hostname = x_sd_hostname.value;
 		sd_ssl_port = x_sd_ssl_port.value;
+		sd_agent_port = x_sd_agent_port.value;
+		sd_admin_port = x_sd_admin_port.value;
 		sd_admin_name = x_sd_admin_name.value;
 		sd_admin_password = x_sd_admin_password.value;
 
 		ca_hostname = x_ca_hostname.value;
 		ca_port = x_ca_port.value;
 		ca_ssl_port = x_ca_ssl_port.value;
+		ca_admin_port = x_ca_admin_port.value;
 
 		client_certdb_dir = x_client_certdb_dir.value;
 		client_certdb_pwd = x_client_certdb_pwd.value;
diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/pki/base/silent/src/subca/ConfigureSubCA.java
index fa7737a3e..c061f9f4d 100644
--- a/pki/base/silent/src/subca/ConfigureSubCA.java
+++ b/pki/base/silent/src/subca/ConfigureSubCA.java
@@ -55,8 +55,7 @@ public class ConfigureSubCA
 	
 	public static String login_uri = "/ca/admin/console/config/login";
 	public static String wizard_uri = "/ca/admin/console/config/wizard";
-	public static String domain_uri = "/ca/ee/ca/domain";
-	public static String ee_uri = "/ca/ee/ca/getBySerial";
+	public static String admin_uri = "/ca/admin/ca/getBySerial";
 	public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
 	public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
 	public static String pkcs12_uri = "/ca/admin/console/config/savepkcs12";
@@ -66,6 +65,8 @@ public class ConfigureSubCA
 
 	public static String sd_hostname = null;
 	public static String sd_ssl_port = null;
+	public static String sd_agent_port = null;
+	public static String sd_admin_port = null;
 	public static String sd_admin_name = null;
 	public static String sd_admin_password = null;
 
@@ -204,7 +205,7 @@ public class ConfigureSubCA
 		ParseXML px = new ParseXML();
 
 
-		String domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
 		String query_string = "sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -245,13 +246,13 @@ public class ConfigureSubCA
 
 		String query_string = "url=" + URLEncoder.encode(subca_url); 
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
 		String query_string_1 = "uid=" + sd_admin_name +
 								"&pwd=" + sd_admin_password +
 								"&url=" + URLEncoder.encode(subca_url) ;
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
 						query_string_1);
 
 		// get session id from security domain
@@ -736,7 +737,8 @@ public class ConfigureSubCA
 							URLEncoder.encode(admin_email) +
 							"&cert_request=" + 
 							URLEncoder.encode(admin_cert_request) +
-							"&subject=" + agent_cert_subject +
+							"&subject=" +
+							URLEncoder.encode(agent_cert_subject) +
 							"&clone=new" +
 							"&import=true" +
 							"&securitydomain=" + domain_name +
@@ -765,7 +767,7 @@ public class ConfigureSubCA
 							"&importCert=" + "true" +
 							""; 
 
-		hr = hc.sslConnect(cs_hostname,cs_port,ee_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,admin_uri,query_string);
 		
 		// get response data
 		String cert_to_import = 
@@ -988,6 +990,8 @@ public class ConfigureSubCA
 
 		StringHolder x_sd_hostname = new StringHolder();
 		StringHolder x_sd_ssl_port = new StringHolder();
+		StringHolder x_sd_agent_port = new StringHolder();
+		StringHolder x_sd_admin_port = new StringHolder();
 		StringHolder x_sd_admin_name = new StringHolder();
 		StringHolder x_sd_admin_password = new StringHolder();
 
@@ -1046,8 +1050,12 @@ public class ConfigureSubCA
 
 		parser.addOption ("-sd_hostname %s #Security Domain Hostname",
 							x_sd_hostname); 
-		parser.addOption ("-sd_ssl_port %s #Security Domain SSL port",
+		parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port",
 							x_sd_ssl_port); 
+		parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port",
+							x_sd_agent_port); 
+		parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port",
+							x_sd_admin_port); 
 		parser.addOption ("-sd_admin_name %s #Security Domain admin name",
 							x_sd_admin_name); 
 		parser.addOption ("-sd_admin_password %s #Security Domain admin password",
@@ -1055,7 +1063,7 @@ public class ConfigureSubCA
 
 		parser.addOption ("-ca_hostname %s #CA Hostname",
 							x_ca_hostname); 
-		parser.addOption ("-ca_port %s #CA non SSL port",
+		parser.addOption ("-ca_port %s #CA non-SSL port",
 							x_ca_port); 
 		parser.addOption ("-ca_ssl_port %s #CA SSL port",
 							x_ca_ssl_port); 
@@ -1144,6 +1152,8 @@ public class ConfigureSubCA
 
 		sd_hostname = x_sd_hostname.value;
 		sd_ssl_port = x_sd_ssl_port.value;
+		sd_agent_port = x_sd_agent_port.value;
+		sd_admin_port = x_sd_admin_port.value;
 		sd_admin_name = x_sd_admin_name.value;
 		sd_admin_password = x_sd_admin_password.value;
 
diff --git a/pki/base/silent/src/tks/ConfigureTKS.java b/pki/base/silent/src/tks/ConfigureTKS.java
index 0b6ae2ebe..c9f678648 100644
--- a/pki/base/silent/src/tks/ConfigureTKS.java
+++ b/pki/base/silent/src/tks/ConfigureTKS.java
@@ -55,7 +55,7 @@ public class ConfigureTKS
 	
 	public static String login_uri = "/tks/admin/console/config/login";
 	public static String wizard_uri = "/tks/admin/console/config/wizard";
-	public static String ee_uri = "/ca/ee/ca/getBySerial";
+	public static String admin_uri = "/ca/admin/ca/getBySerial";
 
 	public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
 	public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
@@ -66,12 +66,14 @@ public class ConfigureTKS
 
 	public static String sd_hostname = null;
 	public static String sd_ssl_port = null;
+	public static String sd_agent_port = null;
+	public static String sd_admin_port = null;
+	public static String sd_admin_name = null;
+	public static String sd_admin_password = null;
 
 	public static String ca_hostname = null;
 	public static String ca_port = null;
 	public static String ca_ssl_port = null;
-	public static String sd_admin_name = null;
-	public static String sd_admin_password = null;
 
 	public static String client_certdb_dir = null;
 	public static String client_certdb_pwd = null;
@@ -191,7 +193,7 @@ public class ConfigureTKS
 		ParseXML px = new ParseXML();
 
 
-		String domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
 		String query_string = "sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -222,9 +224,9 @@ public class ConfigureTKS
 		query_string = "p=2" + "&op=next" + "&xml=true"; 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
-		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
-		px.parse(bais);
-		px.prettyprintxml();
+		// bais = new ByteArrayInputStream(hr.getHTML().getBytes());
+		// px.parse(bais);
+		// px.prettyprintxml();
 
 		return true;
 
@@ -244,13 +246,13 @@ public class ConfigureTKS
 
 		String query_string = "url=" + URLEncoder.encode(tks_url); 
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
 		String query_string_1 = "uid=" + sd_admin_name +
 								"&pwd=" + sd_admin_password +
 								"&url=" + URLEncoder.encode(tks_url) ;
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
 						query_string_1);
 
 		// get session id from security domain
@@ -654,10 +656,12 @@ public class ConfigureTKS
 							URLEncoder.encode(admin_email) +
 							"&cert_request=" + 
 							URLEncoder.encode(admin_cert_request) +
-							"&subject=" + agent_cert_subject +
+							"&subject=" +
+							URLEncoder.encode(agent_cert_subject) +
 							"&clone=new" +
 							"&import=true" +
-							"&securitydomain=" + domain_name +
+							"&securitydomain=" +
+							URLEncoder.encode(domain_name) +
 							""; 
 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
@@ -683,7 +687,7 @@ public class ConfigureTKS
 							"&importCert=" + "true" +
 							""; 
 
-		hr = hc.sslConnect(ca_hostname,ca_ssl_port,ee_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string);
 		
 		// get response data
 		String cert_to_import = 
@@ -721,8 +725,8 @@ public class ConfigureTKS
 		ParseXML px = new ParseXML();
 
 		String query_string = "p=14" + "&op=next" + "&xml=true" +
-							"&caHost=" + URLEncoder.encode(ca_hostname) +
-							"&caPort=" + URLEncoder.encode(ca_port) +
+							"&caHost=" + URLEncoder.encode(sd_hostname) +
+							"&caPort=" + URLEncoder.encode(sd_agent_port) +
 							""; 
 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
@@ -901,6 +905,8 @@ public class ConfigureTKS
 
 		StringHolder x_sd_hostname = new StringHolder();
 		StringHolder x_sd_ssl_port = new StringHolder();
+		StringHolder x_sd_agent_port = new StringHolder();
+		StringHolder x_sd_admin_port = new StringHolder();
 		StringHolder x_sd_admin_name = new StringHolder();
 		StringHolder x_sd_admin_password = new StringHolder();
 
@@ -953,13 +959,17 @@ public class ConfigureTKS
 
 		parser.addOption ("-cs_hostname %s #CS Hostname",
 							x_cs_hostname); 
-		parser.addOption ("-cs_port %s #CS SSL port",
+		parser.addOption ("-cs_port %s #CS SSL Admin port",
 							x_cs_port); 
 
 		parser.addOption ("-sd_hostname %s #Security Domain Hostname",
 							x_sd_hostname); 
-		parser.addOption ("-sd_ssl_port %s #Security Domain SSL port",
+		parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port",
 							x_sd_ssl_port); 
+		parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port",
+							x_sd_agent_port); 
+		parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port",
+							x_sd_admin_port); 
 		parser.addOption ("-sd_admin_name %s #Security Domain Admin Name",
 							x_sd_admin_name); 
 		parser.addOption ("-sd_admin_password %s #Security Domain Admin password",
@@ -967,9 +977,9 @@ public class ConfigureTKS
 
 		parser.addOption ("-ca_hostname %s #CA Hostname",
 							x_ca_hostname); 
-		parser.addOption ("-ca_port %s #CA non SSL port",
+		parser.addOption ("-ca_port %s #CA non-SSL EE port",
 							x_ca_port); 
-		parser.addOption ("-ca_ssl_port %s #CA SSL port",
+		parser.addOption ("-ca_ssl_port %s #CA SSL EE port",
 							x_ca_ssl_port); 
 
 		parser.addOption ("-client_certdb_dir %s #Client CertDB dir",
@@ -1052,12 +1062,14 @@ public class ConfigureTKS
 
 		sd_hostname = x_sd_hostname.value;
 		sd_ssl_port = x_sd_ssl_port.value;
+		sd_agent_port = x_sd_agent_port.value;
+		sd_admin_port = x_sd_admin_port.value;
+		sd_admin_name = x_sd_admin_name.value;
+		sd_admin_password = x_sd_admin_password.value;
 
 		ca_hostname = x_ca_hostname.value;
 		ca_port = x_ca_port.value;
 		ca_ssl_port = x_ca_ssl_port.value;
-		sd_admin_name = x_sd_admin_name.value;
-		sd_admin_password = x_sd_admin_password.value;
 
 		client_certdb_dir = x_client_certdb_dir.value;
 		client_certdb_pwd = x_client_certdb_pwd.value;
diff --git a/pki/base/silent/src/tps/ConfigureTPS.java b/pki/base/silent/src/tps/ConfigureTPS.java
index 753caa5f3..3d2c0ad4c 100644
--- a/pki/base/silent/src/tps/ConfigureTPS.java
+++ b/pki/base/silent/src/tps/ConfigureTPS.java
@@ -55,24 +55,28 @@ public class ConfigureTPS
 	
 	public static String login_uri = "/tps/admin/console/config/login";
 	public static String wizard_uri = "/tps/admin/console/config/wizard";
-	public static String domain_uri = "/tps/ee/ca/domain";
-	public static String ee_uri = "/ca/ee/ca/getBySerial";
+	public static String admin_uri = "/ca/admin/ca/getBySerial";
 
 	public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
 	public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
+	public static String sd_update_domain_uri = "/ca/agent/ca/updateDomainXML";
 	public static String pkcs12_uri = "/tps/admin/console/config/savepkcs12";
 
 	public static String cs_hostname = null;
 	public static String cs_port = null;
+	public static String cs_clientauth_port = null;
 
 	public static String sd_hostname = null;
 	public static String sd_ssl_port = null;
+	public static String sd_agent_port = null;
+	public static String sd_admin_port = null;
 	public static String sd_admin_name = null;
 	public static String sd_admin_password = null;
 
 	public static String ca_hostname = null;
 	public static String ca_port = null;
 	public static String ca_ssl_port = null;
+	public static String ca_admin_port = null;
 
 	public static String drm_hostname = null;
 	public static String drm_ssl_port = null;
@@ -147,6 +151,11 @@ public class ConfigureTPS
 	public static String subsystem_name = null;
 	public static String tps_audit_signing_cert_subject_name = null;
 
+	// Security Domain Login Panel
+	public static String tps_session_id = null;
+
+	// Admin Certificate Request Panel
+	public static String requestor_name = null;
 
 	public ConfigureTPS ()
 	{
@@ -176,7 +185,7 @@ public class ConfigureTPS
 
 		String query_string = "pin=" + pin + "&xml=true"; 
 	
-		hr = hc.nonsslConnect(cs_hostname,cs_port,login_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,login_uri,query_string);
 		System.out.println("xml returned: " + hr.getHTML());
 
 		// parse xml here - nothing to parse
@@ -193,7 +202,7 @@ public class ConfigureTPS
 		}
 
 		hr = null;
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,
 						"p=0&op=next&xml=true");
 
 		// parse xml here
@@ -215,7 +224,7 @@ public class ConfigureTPS
 		ParseXML px = new ParseXML();
 
 
-		String domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
 		String query_string = "sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -224,7 +233,7 @@ public class ConfigureTPS
 							"&op=next" +
 							"&xml=true"; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -244,7 +253,7 @@ public class ConfigureTPS
 		String query_string = null;
 
 		query_string = "p=2" + "&op=next" + "&xml=true"; 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		return true;
 
@@ -264,19 +273,19 @@ public class ConfigureTPS
 
 		String query_string = "url=" + URLEncoder.encode(tps_url); 
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
 		String query_string_1 = "uid=" + sd_admin_name +
 								"&pwd=" + sd_admin_password +
 								"&url=" + URLEncoder.encode(tps_url) ;
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
 						query_string_1);
 
 		// get session id from security domain
 		sleep_time();
 
-		String tps_session_id = hr.getContentValue("header.session_id");
+		tps_session_id = hr.getContentValue("header.session_id");
 		String tps_url_1 = hr.getContentValue("header.url");
 
 		System.out.println("TPS_SESSION_ID=" + tps_session_id );
@@ -289,7 +298,7 @@ public class ConfigureTPS
 								"&subsystem=TPS" +
 								"&xml=true" ;
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,
 						query_string_2);
 
 		// parse xml - no parsing
@@ -311,7 +320,7 @@ public class ConfigureTPS
 						URLEncoder.encode(subsystem_name) + 
 						"&choice=newsubsystem" ; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 		px.parse(bais);
@@ -325,7 +334,7 @@ public class ConfigureTPS
 							"&urls=" +
 							URLEncoder.encode(ca_url) ;
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 		px.parse(bais);
@@ -339,7 +348,7 @@ public class ConfigureTPS
 							URLEncoder.encode(tks_url) ;
 						
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 		px.parse(bais);
@@ -360,7 +369,7 @@ public class ConfigureTPS
 							URLEncoder.encode(drm_url) +
 							"&choice=" + ss_keygen ;
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 		px.parse(bais);
@@ -384,7 +393,7 @@ public class ConfigureTPS
 						"&basedn=" + URLEncoder.encode(ldap_auth_base_dn) +
 						""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -412,7 +421,7 @@ public class ConfigureTPS
 						"&display=" + URLEncoder.encode("") +
 						""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -439,7 +448,7 @@ public class ConfigureTPS
 							"&choice=" + 
 					URLEncoder.encode("NSS Certificate DB") +
 								""; 
-			hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 			// parse xml
 			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 			px.parse(bais);
@@ -455,7 +464,7 @@ public class ConfigureTPS
 							"&__uPasswd=" + 
 							URLEncoder.encode(token_pwd) +
 							""; 
-			hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 			// parse xml
 			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 			px.parse(bais);
@@ -466,7 +475,7 @@ public class ConfigureTPS
 							"&choice=" + 
 							URLEncoder.encode(token_name) +
 							""; 
-			hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+			hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 			// parse xml
 			bais = new ByteArrayInputStream(hr.getHTML().getBytes());
 			px.parse(bais);
@@ -503,7 +512,7 @@ public class ConfigureTPS
 							"&choice=custom"+
 							""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -537,7 +546,7 @@ public class ConfigureTPS
 					URLEncoder.encode(ca_url) +
 					""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -570,7 +579,7 @@ public class ConfigureTPS
                                                         "&audit_signing_cc=" +
 							""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -588,7 +597,7 @@ public class ConfigureTPS
 		ParseXML px = new ParseXML();
 		String admin_cert_request = null;
 
-		String cert_subject = "CN=" + "tps-" + admin_user;
+		requestor_name = "TPS-" + cs_hostname + "-" + cs_clientauth_port;
 
 		ComCrypto cCrypt = new ComCrypto(client_certdb_dir,
 										client_certdb_pwd,
@@ -618,17 +627,23 @@ public class ConfigureTPS
 							"&__pwd=" + admin_password +
 							"&__admin_password_again=" + admin_password +
 							"&profileId=" + "caAdminCert" +
+							"&requestor_name=" + requestor_name +
 							"&email=" + 
 							URLEncoder.encode(admin_email) +
 							"&cert_request=" + 
 							URLEncoder.encode(admin_cert_request) +
-							"&subject=" + agent_cert_subject +
-							"&clone=0" +
+							"&subject=" +
+							URLEncoder.encode(agent_cert_subject) +
+							"&clone=new" +
 							"&import=true" +
-							"&securitydomain=" + domain_name +
+							"&securitydomain=" +
+							URLEncoder.encode(domain_name) +
+							"&sessionID=" + tps_session_id +
+							"&auth_hostname=" + ca_hostname +
+							"&auth_port=" + ca_ssl_port +
 							""; 
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -646,13 +661,18 @@ public class ConfigureTPS
 		HTTPResponse hr = null;
 		ByteArrayInputStream bais = null;
 		ParseXML px = new ParseXML();
+		String cert_to_import = null;
 
 		String query_string = "serialNumber=" + admin_serial_number +
 							"&importCert=" + "true" +
 							""; 
 
-		hr = hc.sslConnect(ca_hostname,ca_ssl_port,ee_uri,query_string);
-		String cert_to_import = null;
+		// NOTE:  CA, DRM, OCSP, and TKS use the Security Domain Admin Port;
+		//        whereas RA and TPS use the CA Admin Port associated with
+		//        the 'CA choice panel' as invoked from the SubsystemPanel()
+		//        which MAY or MAY NOT be the same CA as the CA specified
+		//        by the Security Domain.
+		hr = hc.sslConnect(ca_hostname,ca_admin_port,admin_uri,query_string);
 
 		try
 		{
@@ -698,11 +718,16 @@ public class ConfigureTPS
 		ParseXML px = new ParseXML();
 
 		String query_string = "p=15" + "&op=next" + "&xml=true" +
-							"&caHost=" + URLEncoder.encode(ca_hostname) +
-							"&caPort=" + URLEncoder.encode(ca_ssl_port) +
-							""; 
+							"&list=" + "TPSList" +
+							"&type=" + "TPS" +
+							"&host=" + URLEncoder.encode(cs_hostname) +
+							"&name=" + URLEncoder.encode(subsystem_name) + 
+							"&sport=" + URLEncoder.encode(cs_clientauth_port) +
+							"&dm=false" +
+							"";
 
-		hr = hc.nonsslConnect(cs_hostname,cs_port,wizard_uri,query_string);
+		hr = hc.sslConnect( sd_hostname, sd_agent_port,
+                            sd_update_domain_uri, query_string );
 
 		// parse xml
 		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
@@ -864,15 +889,19 @@ public class ConfigureTPS
 		// set variables
 		StringHolder x_cs_hostname = new StringHolder();
 		StringHolder x_cs_port = new StringHolder();
+		StringHolder x_cs_clientauth_port = new StringHolder();
 
 		StringHolder x_sd_hostname = new StringHolder();
 		StringHolder x_sd_ssl_port = new StringHolder();
+		StringHolder x_sd_agent_port = new StringHolder();
+		StringHolder x_sd_admin_port = new StringHolder();
 		StringHolder x_sd_admin_name = new StringHolder();
 		StringHolder x_sd_admin_password = new StringHolder();
 
 		StringHolder x_ca_hostname = new StringHolder();
 		StringHolder x_ca_port = new StringHolder();
 		StringHolder x_ca_ssl_port = new StringHolder();
+		StringHolder x_ca_admin_port = new StringHolder();
 
 		StringHolder x_drm_hostname = new StringHolder();
 		StringHolder x_drm_ssl_port = new StringHolder();
@@ -934,11 +963,17 @@ public class ConfigureTPS
 							x_cs_hostname); 
 		parser.addOption ("-cs_port %s #CS SSL port",
 							x_cs_port); 
+		parser.addOption ("-cs_clientauth_port %s #CS SSL port",
+							x_cs_clientauth_port); 
 
 		parser.addOption ("-sd_hostname %s #Security Domain Hostname",
 							x_sd_hostname); 
-		parser.addOption ("-sd_ssl_port %s #Security Domain SSL port",
+		parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port",
 							x_sd_ssl_port); 
+		parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port",
+							x_sd_agent_port); 
+		parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port",
+							x_sd_admin_port); 
 		parser.addOption ("-sd_admin_name %s #Security Domain username",
 							x_sd_admin_name); 
 		parser.addOption ("-sd_admin_password %s #Security Domain password",
@@ -946,10 +981,12 @@ public class ConfigureTPS
 
 		parser.addOption ("-ca_hostname %s #CA Hostname",
 							x_ca_hostname); 
-		parser.addOption ("-ca_port %s #CA non SSL port",
+		parser.addOption ("-ca_port %s #CA non-SSL port",
 							x_ca_port); 
 		parser.addOption ("-ca_ssl_port %s #CA SSL port",
 							x_ca_ssl_port); 
+		parser.addOption ("-ca_admin_port %s #CA SSL Admin port",
+							x_ca_admin_port); 
 
 		parser.addOption ("-drm_hostname %s #DRM Hostname",
 							x_drm_hostname); 
@@ -1045,15 +1082,19 @@ public class ConfigureTPS
 		// set variables
 		cs_hostname = x_cs_hostname.value;
 		cs_port = x_cs_port.value;
+		cs_clientauth_port = x_cs_clientauth_port.value;
 
 		sd_hostname = x_sd_hostname.value;
 		sd_ssl_port = x_sd_ssl_port.value;
+		sd_agent_port = x_sd_agent_port.value;
+		sd_admin_port = x_sd_admin_port.value;
 		sd_admin_name = x_sd_admin_name.value;
 		sd_admin_password = x_sd_admin_password.value;
 
 		ca_hostname = x_ca_hostname.value;
 		ca_port = x_ca_port.value;
 		ca_ssl_port = x_ca_ssl_port.value;
+		ca_admin_port = x_ca_admin_port.value;
 
 		tks_hostname = x_tks_hostname.value;
 		tks_ssl_port = x_tks_ssl_port.value;