diff options
Diffstat (limited to 'base/common')
3 files changed, 31 insertions, 23 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 69994fa38..0f0b5ac6e 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 @@ -28,8 +28,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import netscape.security.x509.X500Name; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.HelpFormatter; @@ -64,6 +62,8 @@ import com.netscape.certsrv.system.SystemCertData; import com.netscape.certsrv.system.SystemConfigClient; import com.netscape.cmsutil.util.Utils; +import netscape.security.x509.X500Name; + /** * @author alee * @@ -260,7 +260,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testca2"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("true"); @@ -362,7 +362,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testsubca"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("true"); @@ -464,7 +464,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testexternalca"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("true"); @@ -566,7 +566,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testexternalca"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("true"); @@ -690,7 +690,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testca2"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("false"); @@ -733,7 +733,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testkra"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("true"); @@ -836,7 +836,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testocsp22"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("true"); @@ -928,7 +928,7 @@ public class ConfigurationTest { data.setBindDN("cn=Directory Manager"); data.setDatabase("o=testtks22"); data.setBindpwd("redhat123"); - data.setRemoveData("true"); + data.setRemoveData(true); data.setSecureConn("false"); data.setBackupKeys("true"); diff --git a/base/common/python/pki/system.py b/base/common/python/pki/system.py index 65ca32183..1151c78fa 100644 --- a/base/common/python/pki/system.py +++ b/base/common/python/pki/system.py @@ -283,7 +283,7 @@ class SystemConfigClient(object): headers = {'Content-type': 'application/json', 'Accept': 'application/json'} self.connection.post('/rest/installer/finalize', None, - headers) + headers) def configureSecurityDomain(self): """ @@ -292,8 +292,8 @@ class SystemConfigClient(object): """ headers = {'Content-type': 'application/json', 'Accept': 'application/json'} - response = self.connection.post('/rest/installer/finalize', None, - headers) + self.connection.post('/rest/installer/finalize', None, + headers) def finalize(self): """ 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 + |