1 files changed, 22 insertions, 5 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java
index c9e1df985..7a5f19412 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java
@@ -17,6 +17,9 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cmstools.system;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -27,22 +30,36 @@ public class TPSConnectorAddCLI extends CLI {
     public TPSConnectorCLI tpsConnectorCLI;
 
     public TPSConnectorAddCLI(TPSConnectorCLI tpsConnectorCLI) {
-        super("add", "Add TPS Connector to TKS", tpsConnectorCLI);
+        super("add", "Add TPS connector to TKS", tpsConnectorCLI);
         this.tpsConnectorCLI = tpsConnectorCLI;
     }
 
     public void printHelp() {
-        formatter.printHelp(getFullName() + " <TPS Host> <TPS Port>", options);
+        formatter.printHelp(getFullName() + " [OPTIONS...]", options);
     }
 
     public void execute(String[] args) throws Exception {
-        if (args.length != 2) {
+        Option option = new Option(null, "host", true, "TPS host");
+        option.setArgName("host");
+        options.addOption(option);
+
+        option = new Option(null, "port", true, "TPS port");
+        option.setArgName("port");
+        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);
         }
 
-        String tpsHost = args[0];
-        String tpsPort = args[1];
+        String tpsHost = cmd.getOptionValue("host");
+        String tpsPort = cmd.getOptionValue("port");
 
         tpsConnectorCLI.tpsConnectorClient.createConnector(tpsHost, tpsPort);