Added ClientConfig.

A new ClientConfig class has been added to encapsulate client
configuration parameters. These parameters include server URI,
certificate database, certificate nickname, and password.

Ticket #107

1 files changed, 7 insertions, 3 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index 93de638eb..cc8808498 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
@@ -143,6 +143,7 @@ import com.netscape.certsrv.ocsp.IOCSPAuthority;
 import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
 import com.netscape.certsrv.usrgrp.IUser;
+import com.netscape.cms.client.cli.ClientConfig;
 import com.netscape.cms.servlet.csadmin.model.InstallToken;
 import com.netscape.cms.servlet.csadmin.model.InstallTokenRequest;
 import com.netscape.cmsutil.crypto.CryptoUtil;
@@ -294,9 +295,12 @@ public class ConfigurationUtils {
         String csType = cs.getString("cs.type");
 
         InstallTokenRequest data = new InstallTokenRequest(user, passwd, csType, CMS.getEEHost(), CMS.getAdminPort());
-        String baseUri = "https://" + sdhost + ":" + sdport + "/ca/pki";
-        ConfigurationRESTClient client = null;
-        client = new ConfigurationRESTClient(baseUri, null);
+
+        ClientConfig config = new ClientConfig();
+        config.setServerURI("https://" + sdhost + ":" + sdport + "/ca");
+
+        ConfigurationRESTClient client = new ConfigurationRESTClient(config);
+
         InstallToken token = client.getInstallToken(data);
 
         return token.getToken();