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

4 files changed, 34 insertions, 15 deletions

diff --git a/base/common/src/com/netscape/cms/client/cert/CertCLI.java b/base/common/src/com/netscape/cms/client/cert/CertCLI.java
index 9340752b9..70ad9021e 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertCLI.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertCLI.java
@@ -75,9 +75,14 @@ public class CertCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
-        client = new CertRestClient(parent.url + "/pki", parent.certNickname);
+        client = new CertRestClient(parent.config);
         client.setVerbose(verbose);
 
+        if (args.length == 0) {
+            printHelp();
+            System.exit(1);
+        }
+
         String command = args[0];
         String[] commandArgs = Arrays.copyOfRange(args, 1, args.length);
 
diff --git a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java b/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
index 32457d6df..921419733 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
@@ -18,11 +18,13 @@
 
 package com.netscape.cms.client.cert;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+
 import com.netscape.cms.client.cli.CLI;
 import com.netscape.cms.client.cli.MainCLI;
 import com.netscape.cms.servlet.cert.model.CertDataInfo;
 import com.netscape.cms.servlet.cert.model.CertDataInfos;
-import com.netscape.cms.servlet.cert.model.CertSearchData;
 
 /**
  * @author Endi S. Dewata
@@ -42,10 +44,23 @@ public class CertFindCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
-        CertSearchData searchData = new CertSearchData();
-        searchData.setSerialNumberRangeInUse(true);
+        Option option = new Option(null, "status", true, "Certificate status");
+        option.setArgName("status");
+        options.addOption(option);
+
+        CommandLine cmd = null;
+
+        try {
+            cmd = parser.parse(options, args);
+
+        } catch (Exception e) {
+            System.err.println("Error: " + e.getMessage());
+            printHelp();
+            System.exit(1);
+        }
 
-        CertDataInfos certs = parent.client.findCerts(searchData);
+        String status = cmd.getOptionValue("status");
+        CertDataInfos certs = parent.client.findCerts(status);
 
         MainCLI.printMessage(certs.getCertInfos().size() + " certificate(s) matched");
 
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRestClient.java b/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
index b83912fae..44249523f 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
@@ -21,10 +21,10 @@ import java.net.URISyntaxException;
 
 import com.netscape.certsrv.dbs.certdb.CertId;
 import com.netscape.certsrv.request.RequestId;
+import com.netscape.cms.client.cli.ClientConfig;
 import com.netscape.cms.servlet.cert.CertResource;
 import com.netscape.cms.servlet.cert.model.CertDataInfos;
 import com.netscape.cms.servlet.cert.model.CertRevokeRequest;
-import com.netscape.cms.servlet.cert.model.CertSearchData;
 import com.netscape.cms.servlet.cert.model.CertUnrevokeRequest;
 import com.netscape.cms.servlet.cert.model.CertificateData;
 import com.netscape.cms.servlet.csadmin.CMSRestClient;
@@ -42,12 +42,8 @@ public class CertRestClient extends CMSRestClient {
     public CertResource certClient;
     public CertRequestResource certRequestResource;
 
-    public CertRestClient(String baseUri) throws URISyntaxException {
-        this(baseUri, null);
-    }
-
-    public CertRestClient(String baseUri, String nickname) throws URISyntaxException {
-        super(baseUri, nickname);
+    public CertRestClient(ClientConfig config) throws URISyntaxException {
+        super(config);
 
         certClient = createProxy(CertResource.class);
         certRequestResource = createProxy(CertRequestResource.class);
@@ -57,9 +53,9 @@ public class CertRestClient extends CMSRestClient {
         return certClient.getCert(id);
     }
 
-    public CertDataInfos findCerts(CertSearchData searchData) {
-        return certClient.searchCerts(
-                searchData,
+    public CertDataInfos findCerts(String status) {
+        return certClient.listCerts(
+                status,
                 CertResource.DEFAULT_MAXRESULTS,
                 CertResource.DEFAULT_MAXTIME);
     }
diff --git a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java b/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java
index b050459c4..1389a0a42 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java
@@ -26,6 +26,7 @@ import org.apache.commons.cli.Option;
 
 import com.netscape.certsrv.dbs.certdb.CertId;
 import com.netscape.cms.client.cli.CLI;
+import com.netscape.cms.client.cli.MainCLI;
 import com.netscape.cms.servlet.cert.model.CertificateData;
 
 /**
@@ -87,6 +88,8 @@ public class CertShowCLI extends CLI {
             out.close();
         }
 
+        MainCLI.printMessage("Certificate \"" + certID.toHexString() + "\"");
+
         CertCLI.printCertData(certData, showPrettyPrint, showEncoded);
     }
 }