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

2 files changed, 10 insertions, 12 deletions

diff --git a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
index 217f84b90..170e1c031 100644
--- a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
+++ b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
@@ -17,13 +17,12 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.system;
 
-import java.util.Collection;
+import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
@@ -158,8 +157,8 @@ public class ConfigurationRequest {
     @XmlElement
     protected String replicationSecurity;
 
-    @XmlElementRef
-    protected Collection<SystemCertData> systemCerts;
+    @XmlElement
+    protected List<SystemCertData> systemCerts;
 
     @XmlElement
     protected String issuingCA;
@@ -553,7 +552,7 @@ public class ConfigurationRequest {
      *
      * @return systemCerts
      */
-    public Collection<SystemCertData> getSystemCerts() {
+    public List<SystemCertData> getSystemCerts() {
         return systemCerts;
     }
 
@@ -561,7 +560,7 @@ public class ConfigurationRequest {
      *
      * @param systemCerts
      */
-    public void setSystemCerts(Collection<SystemCertData> systemCerts) {
+    public void setSystemCerts(List<SystemCertData> systemCerts) {
         this.systemCerts = systemCerts;
     }
 
diff --git a/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java b/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java
index 6d3275a51..e967914ce 100644
--- a/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java
+++ b/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java
@@ -19,12 +19,11 @@ package com.netscape.certsrv.system;
 
 import java.security.cert.CertificateEncodingException;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import netscape.security.x509.X509CertImpl;
@@ -39,8 +38,8 @@ import com.netscape.certsrv.apps.CMS;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ConfigurationResponse {
 
-    @XmlElementRef
-    protected Collection<SystemCertData> systemCerts;
+    @XmlElement
+    protected List<SystemCertData> systemCerts;
 
     @XmlElement
     protected SystemCertData adminCert;
@@ -56,14 +55,14 @@ public class ConfigurationResponse {
     /**
      * @return the systemCerts
      */
-    public Collection<SystemCertData> getSystemCerts() {
+    public List<SystemCertData> getSystemCerts() {
         return systemCerts;
     }
 
     /**
      * @param systemCerts the systemCerts to set
      */
-    public void setSystemCerts(Collection<SystemCertData> systemCerts) {
+    public void setSystemCerts(List<SystemCertData> systemCerts) {
         this.systemCerts = systemCerts;
     }