Added client-cert-request CLI.

A new CLI has been added to simplify the process to request
a user certificate for client certificate authentication.

Ticket #1148

2 files changed, 14 insertions, 16 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
index 30a808b06..9ffa3ad45 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
@@ -26,6 +26,7 @@ import com.netscape.certsrv.cert.CertClient;
 import com.netscape.certsrv.cert.CertData;
 import com.netscape.certsrv.cert.CertDataInfo;
 import com.netscape.certsrv.cert.CertRequestInfo;
+import com.netscape.certsrv.cert.CertRequestInfos;
 import com.netscape.certsrv.cert.CertReviewResponse;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
@@ -158,6 +159,18 @@ public class CertCLI extends CLI {
         }
     }
 
+    public static void printCertRequestInfos(CertRequestInfos infos) {
+        boolean first = true;
+        for (CertRequestInfo info : infos.getEntries()) {
+            if (first) {
+                first = false;
+            } else {
+                System.out.println();
+            }
+            printCertRequestInfo(info);
+        }
+    }
+
     public static void printCertRequestInfo(CertRequestInfo info) {
         System.out.println("  Request ID: " + info.getRequestId());
         System.out.println("  Type: " + info.getRequestType());
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
index fe2b806b0..608490bb7 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
@@ -3,7 +3,6 @@ package com.netscape.cmstools.cert;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Scanner;
 
 import javax.xml.bind.JAXBException;
@@ -12,7 +11,6 @@ import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
 
 import com.netscape.certsrv.cert.CertEnrollmentRequest;
-import com.netscape.certsrv.cert.CertRequestInfo;
 import com.netscape.certsrv.cert.CertRequestInfos;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
@@ -61,7 +59,7 @@ public class CertRequestSubmitCLI extends CLI {
             CertEnrollmentRequest erd = getEnrollmentRequest(cmdArgs[0]);
             CertRequestInfos cri = certCLI.certClient.enrollRequest(erd);
             MainCLI.printMessage("Submitted certificate request");
-            printRequestInformation(cri);
+            CertCLI.printCertRequestInfos(cri);
 
         } catch (FileNotFoundException e) {
             System.err.println("Error: " + e.getMessage());
@@ -79,17 +77,4 @@ public class CertRequestSubmitCLI extends CLI {
             return CertEnrollmentRequest.fromXML(xml);
         }
     }
-
-    private void printRequestInformation(CertRequestInfos cri) {
-        Collection<CertRequestInfo> allRequests = cri.getEntries();
-        boolean first = true;
-        for (CertRequestInfo x : allRequests) {
-            if (first) {
-                first = false;
-            } else {
-                System.out.println();
-            }
-            CertCLI.printCertRequestInfo(x);
-        }
-    }
 }