diff options
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/group')
9 files changed, 80 insertions, 0 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupAddCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupAddCLI.java index 47153cd3f..4fd78089f 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupAddCLI.java @@ -18,6 +18,8 @@ package com.netscape.cmstools.group; +import java.util.Arrays; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; @@ -43,6 +45,13 @@ public class GroupAddCLI extends CLI { public void execute(String[] args) throws Exception { + // Check for "--help" prior to parsing due to required option + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + Option option = new Option(null, "description", true, "Description"); option.setArgName("description"); option.setRequired(true); diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java index b7bc81d90..8cb54b1e7 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java @@ -65,6 +65,12 @@ public class GroupFindCLI extends CLI { System.exit(1); } + if (cmd.hasOption("help")) { + // Display usage + printHelp(); + System.exit(0); + } + String[] cmdArgs = cmd.getArgs(); String filter = cmdArgs.length > 0 ? cmdArgs[0] : null; diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.java index 94d1a1161..ec01cbb6e 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.java @@ -18,6 +18,8 @@ package com.netscape.cmstools.group; +import java.util.Arrays; + import com.netscape.certsrv.group.GroupMemberData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -40,6 +42,13 @@ public class GroupMemberAddCLI extends CLI { public void execute(String[] args) throws Exception { + // Check for "--help" prior to parsing due to required option + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + if (args.length != 2) { printHelp(); System.exit(1); diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java index 841a0f8c4..b5100e340 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java @@ -18,6 +18,7 @@ package com.netscape.cmstools.group; +import java.util.Arrays; import java.util.Collection; import org.apache.commons.cli.CommandLine; @@ -46,6 +47,13 @@ public class GroupMemberFindCLI extends CLI { public void execute(String[] args) throws Exception { + // Check for "--help" prior to parsing due to required option + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + Option option = new Option(null, "start", true, "Page start"); option.setArgName("start"); options.addOption(option); @@ -65,6 +73,12 @@ public class GroupMemberFindCLI extends CLI { System.exit(1); } + if (cmd.hasOption("help")) { + // Display usage + printHelp(); + System.exit(0); + } + String[] cmdArgs = cmd.getArgs(); if (cmdArgs.length != 1) { diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java index 3165aa08d..8947b5f7e 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java @@ -18,6 +18,8 @@ package com.netscape.cmstools.group; +import java.util.Arrays; + import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -39,6 +41,13 @@ public class GroupMemberRemoveCLI extends CLI { public void execute(String[] args) throws Exception { + // Check for "--help" prior to parsing due to required option + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + if (args.length != 2) { printHelp(); System.exit(1); diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.java index 26a096f72..4e10c3303 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.java @@ -18,6 +18,8 @@ package com.netscape.cmstools.group; +import java.util.Arrays; + import com.netscape.certsrv.group.GroupMemberData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -40,6 +42,13 @@ public class GroupMemberShowCLI extends CLI { public void execute(String[] args) throws Exception { + // Check for "--help" prior to parsing due to required option + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + if (args.length != 2) { printHelp(); System.exit(1); diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupModifyCLI.java index b0974d325..f7c522b52 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupModifyCLI.java @@ -58,6 +58,12 @@ public class GroupModifyCLI extends CLI { System.exit(1); } + if (cmd.hasOption("help")) { + // Display usage + printHelp(); + System.exit(0); + } + String[] cmdArgs = cmd.getArgs(); if (cmdArgs.length != 1) { diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveCLI.java index cc64ed841..e27f8d5c5 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveCLI.java @@ -18,6 +18,8 @@ package com.netscape.cmstools.group; +import java.util.Arrays; + import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -40,6 +42,13 @@ public class GroupRemoveCLI extends CLI { public void execute(String[] args) throws Exception { + // Check for "--help" + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + if (args.length != 1) { printHelp(); System.exit(1); diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupShowCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupShowCLI.java index c25306a27..9f617661d 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupShowCLI.java @@ -18,6 +18,8 @@ package com.netscape.cmstools.group; +import java.util.Arrays; + import com.netscape.certsrv.group.GroupData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -40,6 +42,13 @@ public class GroupShowCLI extends CLI { public void execute(String[] args) throws Exception { + // Check for "--help" + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + if (args.length != 1) { printHelp(); System.exit(1); |