Renamed PKCS #12 options for consistency.

The pki CLI's --pkcs12 options has been renamed to --pkcs12-file
for consistency with pki-server CLI options.

https://fedorahosted.org/pki/ticket/1742

8 files changed, 16 insertions, 16 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertAddCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertAddCLI.java
index ce7b3dd79..c3c5ef489 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertAddCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertAddCLI.java
@@ -51,7 +51,7 @@ public class PKCS12CertAddCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -109,7 +109,7 @@ public class PKCS12CertAddCLI extends CLI {
 
         String nickname = cmdArgs[0];
 
-        String filename = cmd.getOptionValue("pkcs12");
+        String filename = cmd.getOptionValue("pkcs12-file");
 
         if (filename == null) {
             System.err.println("Error: Missing PKCS #12 file.");
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertExportCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertExportCLI.java
index c8ceab757..04e2b7b6f 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertExportCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertExportCLI.java
@@ -54,7 +54,7 @@ public class PKCS12CertExportCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -113,7 +113,7 @@ public class PKCS12CertExportCLI extends CLI {
 
         String nickname = cmdArgs[0];
 
-        String pkcs12File = cmd.getOptionValue("pkcs12");
+        String pkcs12File = cmd.getOptionValue("pkcs12-file");
 
         if (pkcs12File == null) {
             System.err.println("Error: Missing PKCS #12 file.");
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java
index 8c6fb8845..a97933188 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java
@@ -52,7 +52,7 @@ public class PKCS12CertFindCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -105,7 +105,7 @@ public class PKCS12CertFindCLI extends CLI {
             System.exit(-1);
         }
 
-        String filename = cmd.getOptionValue("pkcs12");
+        String filename = cmd.getOptionValue("pkcs12-file");
 
         if (filename == null) {
             System.err.println("Error: Missing PKCS #12 file.");
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertRemoveCLI.java
index 9dbf767ef..8f7f11398 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertRemoveCLI.java
@@ -50,7 +50,7 @@ public class PKCS12CertRemoveCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -105,7 +105,7 @@ public class PKCS12CertRemoveCLI extends CLI {
 
         String nickname = cmdArgs[0];
 
-        String filename = cmd.getOptionValue("pkcs12");
+        String filename = cmd.getOptionValue("pkcs12-file");
 
         if (filename == null) {
             System.err.println("Error: Missing PKCS #12 file.");
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ExportCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ExportCLI.java
index f17251284..52a993125 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ExportCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ExportCLI.java
@@ -48,7 +48,7 @@ public class PKCS12ExportCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -96,7 +96,7 @@ public class PKCS12ExportCLI extends CLI {
         }
 
         String[] nicknames = cmd.getArgs();
-        String filename = cmd.getOptionValue("pkcs12");
+        String filename = cmd.getOptionValue("pkcs12-file");
 
         if (filename == null) {
             System.err.println("Error: Missing PKCS #12 file.");
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ImportCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ImportCLI.java
index bdd8f52bc..ae574d387 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ImportCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12ImportCLI.java
@@ -48,7 +48,7 @@ public class PKCS12ImportCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -96,7 +96,7 @@ public class PKCS12ImportCLI extends CLI {
         }
 
         String[] nicknames = cmd.getArgs();
-        String filename = cmd.getOptionValue("pkcs12");
+        String filename = cmd.getOptionValue("pkcs12-file");
 
         if (filename == null) {
             System.err.println("Error: Missing PKCS #12 file.");
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java
index 92b9cf132..0dc39f470 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java
@@ -52,7 +52,7 @@ public class PKCS12KeyFindCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -105,7 +105,7 @@ public class PKCS12KeyFindCLI extends CLI {
             System.exit(-1);
         }
 
-        String filename = cmd.getOptionValue("pkcs12");
+        String filename = cmd.getOptionValue("pkcs12-file");
 
         if (filename == null) {
             System.err.println("Error: Missing PKCS #12 file.");
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyRemoveCLI.java
index d1bdbfa36..19b368765 100644
--- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyRemoveCLI.java
@@ -51,7 +51,7 @@ public class PKCS12KeyRemoveCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "pkcs12", true, "PKCS #12 file");
+        Option option = new Option(null, "pkcs12-file", true, "PKCS #12 file");
         option.setArgName("path");
         options.addOption(option);
 
@@ -106,7 +106,7 @@ public class PKCS12KeyRemoveCLI extends CLI {
 
         BigInteger keyID = new BigInteger(cmdArgs[0], 16);
 
-        String filename = cmd.getOptionValue("pkcs12");
+        String filename = cmd.getOptionValue("pkcs12-file");
 
         if (filename == null) {
             System.err.println("Error: Missing PKCS #12 file.");