Refactor installation code to remove dependency on jython

Connection is now made to the installation servlet through a python
client using JSON.  The code to construct the ConfgurationRequest and
parse the results has been moved to pkihelper.py, and configuration.py
no longer calls a separate jython process to create the Configuration
object and parse the results.  The jython code has therefore been removed.

Also added status servlet to other java subsystems, to be tested prior
to starting configuration.

Trac Ticket 532

1 files changed, 10 insertions, 10 deletions

diff --git a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
index c23081513..e0110b5c8 100644
--- a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
+++ b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
@@ -25,8 +25,8 @@ import java.net.URISyntaxException;
 import java.security.KeyPair;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 import netscape.security.x509.X500Name;
 
@@ -230,7 +230,7 @@ public class ConfigurationTest {
 
         System.out.println("status: " + response.getStatus());
         System.out.println("adminCert: " + response.getAdminCert().getCert());
-        Collection<SystemCertData> certs = response.getSystemCerts();
+        List<SystemCertData> certs = response.getSystemCerts();
         Iterator<SystemCertData> iterator = certs.iterator();
         while (iterator.hasNext()) {
             SystemCertData cdata = iterator.next();
@@ -279,7 +279,7 @@ public class ConfigurationTest {
         data.setAdminCertRequestType("crmf");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
         SystemCertData cert1 = new SystemCertData();
         cert1.setTag("signing");
         cert1.setKeyAlgorithm("SHA256withRSA");
@@ -383,7 +383,7 @@ public class ConfigurationTest {
         data.setIssuingCA("https://" + host + ":9224");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
         SystemCertData cert1 = new SystemCertData();
         cert1.setTag("signing");
         cert1.setKeyAlgorithm("SHA256withRSA");
@@ -485,7 +485,7 @@ public class ConfigurationTest {
         data.setIssuingCA("External CA");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
         SystemCertData cert1 = new SystemCertData();
         cert1.setTag("signing");
         cert1.setKeyAlgorithm("SHA256withRSA");
@@ -588,7 +588,7 @@ public class ConfigurationTest {
         data.setStepTwo("true");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
         SystemCertData cert1 = new SystemCertData();
         cert1.setTag("signing");
         cert1.setKeyAlgorithm("SHA256withRSA");
@@ -695,7 +695,7 @@ public class ConfigurationTest {
         data.setBackupKeys("false");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
         SystemCertData cert3 = new SystemCertData();
         cert3.setTag("sslserver");
         cert3.setKeyAlgorithm("SHA256withRSA");
@@ -754,7 +754,7 @@ public class ConfigurationTest {
         data.setIssuingCA("https://" + host + ":9224");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
         SystemCertData cert1 = new SystemCertData();
         cert1.setTag("transport");
         cert1.setKeyAlgorithm("SHA256withRSA");
@@ -857,7 +857,7 @@ public class ConfigurationTest {
         data.setIssuingCA("https://" + host + ":9224");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
         SystemCertData cert1 = new SystemCertData();
         cert1.setTag("signing");
         cert1.setKeyAlgorithm("SHA256withRSA");
@@ -949,7 +949,7 @@ public class ConfigurationTest {
         data.setIssuingCA("https://" + host + ":9224");
 
         // create system certs
-        Collection<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
+        List<SystemCertData> systemCerts = new ArrayList<SystemCertData>();
 
         SystemCertData cert3 = new SystemCertData();
         cert3.setTag("sslserver");