Added existing database parameter.

1 files changed, 18 insertions, 10 deletions

diff --git a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
index 890f7d01f..426e904f2 100644
--- a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
+++ b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
@@ -94,7 +94,10 @@ public class ConfigurationRequest {
     protected String baseDN;
 
     @XmlElement
-    protected String createNewDB;
+    protected boolean createNewDB = true;
+
+    @XmlElement
+    protected boolean existingDatabase;
 
     @XmlElement
     protected String bindDN;
@@ -109,7 +112,7 @@ public class ConfigurationRequest {
     protected String secureConn;
 
     @XmlElement
-    protected String removeData;
+    protected boolean removeData = true;
 
     @XmlElement
     protected String masterReplicationPort;
@@ -461,14 +464,14 @@ public class ConfigurationRequest {
     /**
      * @return the removeData
      */
-    public String getRemoveData() {
+    public boolean getRemoveData() {
         return removeData;
     }
 
     /**
      * @param removeData the removeData to set
      */
-    public void setRemoveData(String removeData) {
+    public void setRemoveData(boolean removeData) {
         this.removeData = removeData;
     }
 
@@ -912,15 +915,19 @@ public class ConfigurationRequest {
         this.sharedDBUserDN = sharedDBUserDN;
     }
 
+    public boolean getExistingDatabase() {
+        return existingDatabase;
+    }
+
+    public void setExistingDatabase(boolean existingDatabase) {
+        this.existingDatabase = existingDatabase;
+    }
+
     public boolean getCreateNewDB() {
-        // default to true
-        if (createNewDB == null) {
-            return true;
-        }
-        return createNewDB.equalsIgnoreCase("true");
+        return createNewDB;
     }
 
-    public void setCreateNewDB(String createNewDB) {
+    public void setCreateNewDB(boolean createNewDB) {
         this.createNewDB = createNewDB;
     }
 
@@ -991,6 +998,7 @@ public class ConfigurationRequest {
                ", generateSubsystemCert=" + generateSubsystemCert +
                ", sharedDB=" +  sharedDB +
                ", sharedDBUserDN=" + sharedDBUserDN +
+               ", existingDatabase=" + existingDatabase +
                ", createNewDB=" + createNewDB +
                ", setupReplication=" + setupReplication +
                ", subordinateSecurityDomainName=" + subordinateSecurityDomainName +