Added help option for all Key CLIs

12 files changed, 90 insertions, 1 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyArchiveCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyArchiveCLI.java
index 209231c2c..c057a9e0f 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyArchiveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyArchiveCLI.java
@@ -53,7 +53,10 @@ public class KeyArchiveCLI extends CLI {
             printHelp();
             System.exit(1);
         }
-
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
         String requestFile = cmd.getOptionValue("input");
 
         KeyRequestResponse response = null;
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java
index 53e9bccc9..e2b8ef8c2 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java
@@ -81,6 +81,10 @@ public class KeyFindCLI extends CLI {
             printHelp();
             System.exit(1);
         }
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
 
         String clientKeyID = cmd.getOptionValue("client");
         String status = cmd.getOptionValue("status");
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyGenerateCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyGenerateCLI.java
index 0a07ebabd..0ec02d519 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyGenerateCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyGenerateCLI.java
@@ -55,6 +55,11 @@ public class KeyGenerateCLI extends CLI {
             System.exit(1);
         }
 
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
+
         String[] cmdArgs = cmd.getArgs();
         if (cmdArgs.length < 1) {
             System.err.println("Error: Missing the Client Key Id");
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java
index 6ae49ce5d..483cc23ab 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java
@@ -55,6 +55,11 @@ public class KeyModifyCLI extends CLI {
             System.exit(1);
         }
 
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
+
         String status = cmd.getOptionValue("status");
         if (status == null) {
             System.out.println("No status:: " + status);
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRecoverCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRecoverCLI.java
index baed8a8df..d12e76a08 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyRecoverCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRecoverCLI.java
@@ -50,6 +50,10 @@ public class KeyRecoverCLI extends CLI {
             System.exit(1);
         }
 
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
         String requestFile = cmd.getOptionValue("input");
 
         KeyRequestResponse response = null;
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java
index bc4efb411..96a4dfab4 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java
@@ -87,6 +87,11 @@ public class KeyRequestFindCLI extends CLI {
             System.exit(1);
         }
 
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
+
         String status = cmd.getOptionValue("status");
         String type = cmd.getOptionValue("type");
         String clientKeyID = cmd.getOptionValue("client");
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java
index ef4e6c823..bf17fb21e 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java
@@ -38,6 +38,11 @@ public class KeyRequestReviewCLI extends CLI {
             System.exit(1);
         }
 
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
+
         String[] cmdArgs = cmd.getArgs();
         if (cmdArgs.length != 1) {
             System.err.println("Error: Invalid arguments provided.");
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java
index f360d86f3..7f615eb03 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java
@@ -18,6 +18,9 @@
 
 package com.netscape.cmstools.key;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+
 import com.netscape.certsrv.key.KeyRequestInfo;
 import com.netscape.certsrv.request.RequestId;
 import com.netscape.cmstools.cli.CLI;
@@ -41,6 +44,19 @@ public class KeyRequestShowCLI extends CLI {
             printHelp();
             System.exit(-1);
         }
+        CommandLine cmd = null;
+        try {
+            cmd = parser.parse(options, args);
+
+        } catch (ParseException e) {
+            System.err.println("Error: " + e.getMessage());
+            printHelp();
+            System.exit(1);
+        }
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
 
         RequestId requestId = new RequestId(args[0].trim());
 
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java
index 9a8a75a5e..0621c3cef 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java
@@ -60,6 +60,10 @@ public class KeyRetrieveCLI extends CLI {
             printHelp();
             System.exit(1);
         }
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
 
         if(cmd.getOptions().length==0){
             System.err.println("Error: Insufficient parameters provided.");
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java
index cef3864d0..a3d918e47 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java
@@ -18,6 +18,9 @@
 
 package com.netscape.cmstools.key;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+
 import com.netscape.certsrv.dbs.keydb.KeyId;
 import com.netscape.certsrv.key.KeyInfo;
 import com.netscape.cmstools.cli.CLI;
@@ -41,6 +44,19 @@ public class KeyShowCLI extends CLI {
             printHelp();
             System.exit(-1);
         }
+        CommandLine cmd = null;
+        try {
+            cmd = parser.parse(options, args);
+
+        } catch (ParseException e) {
+            System.err.println("Error: " + e.getMessage());
+            printHelp();
+            System.exit(1);
+        }
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
 
         KeyId keyId = new KeyId(args[0].trim());
 
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateFindCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateFindCLI.java
index 2d66943b6..18fd53cdd 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateFindCLI.java
@@ -6,6 +6,9 @@ import java.util.ArrayList;
 
 import javax.xml.bind.JAXBException;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+
 import com.netscape.certsrv.base.ResourceMessage;
 import com.netscape.certsrv.key.KeyTemplate;
 import com.netscape.certsrv.key.SymKeyGenerationRequest;
@@ -28,6 +31,20 @@ public class KeyTemplateFindCLI extends CLI {
 
     public void execute(String[] args) {
 
+        CommandLine cmd = null;
+        try {
+            cmd = parser.parse(options, args);
+
+        } catch (ParseException e) {
+            System.err.println("Error: " + e.getMessage());
+            printHelp();
+            System.exit(1);
+        }
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
+
         try {
             createTemplateList();
         } catch (FileNotFoundException | JAXBException e) {
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateShowCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateShowCLI.java
index 872053afe..2ce8afe83 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyTemplateShowCLI.java
@@ -49,6 +49,11 @@ public class KeyTemplateShowCLI extends CLI {
             System.exit(-1);
         }
 
+        if (cmd.hasOption("help")) {
+            printHelp();
+            System.exit(1);
+        }
+
         String templateId = cmdArgs[0];
         String writeToFile = cmd.getOptionValue("output-file");
         String templateDir = "/usr/share/pki/key/templates/";