diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/client/group')
4 files changed, 15 insertions, 7 deletions
diff --git a/base/common/src/com/netscape/cms/client/group/GroupCLI.java b/base/common/src/com/netscape/cms/client/group/GroupCLI.java index 7ea449426..fefc1b0c9 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupCLI.java +++ b/base/common/src/com/netscape/cms/client/group/GroupCLI.java @@ -74,9 +74,14 @@ public class GroupCLI extends CLI { public void execute(String[] args) throws Exception { - client = new GroupRestClient(parent.url + "/pki", parent.certNickname); + client = new GroupRestClient(parent.config); client.setVerbose(verbose); + if (args.length == 0) { + printHelp(); + System.exit(1); + } + String command = args[0]; String[] commandArgs = Arrays.copyOfRange(args, 1, args.length); diff --git a/base/common/src/com/netscape/cms/client/group/GroupRestClient.java b/base/common/src/com/netscape/cms/client/group/GroupRestClient.java index 54b31fef6..1b98035ea 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupRestClient.java +++ b/base/common/src/com/netscape/cms/client/group/GroupRestClient.java @@ -27,6 +27,7 @@ import com.netscape.certsrv.group.GroupMemberCollection; import com.netscape.certsrv.group.GroupMemberData; import com.netscape.certsrv.group.GroupMemberResource; import com.netscape.certsrv.group.GroupResource; +import com.netscape.cms.client.cli.ClientConfig; import com.netscape.cms.servlet.csadmin.CMSRestClient; /** @@ -37,12 +38,8 @@ public class GroupRestClient extends CMSRestClient { public GroupResource groupClient; public GroupMemberResource groupMemberClient; - public GroupRestClient(String baseUri) throws URISyntaxException { - this(baseUri, null); - } - - public GroupRestClient(String baseUri, String nickname) throws URISyntaxException { - super(baseUri, nickname); + public GroupRestClient(ClientConfig config) throws URISyntaxException { + super(config); groupClient = createProxy(GroupResource.class); groupMemberClient = createProxy(GroupMemberResource.class); diff --git a/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java b/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java index 59a4a07de..3e24f3e5d 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java +++ b/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java @@ -20,6 +20,7 @@ package com.netscape.cms.client.group; import com.netscape.certsrv.group.GroupData; import com.netscape.cms.client.cli.CLI; +import com.netscape.cms.client.cli.MainCLI; /** * @author Endi S. Dewata @@ -48,6 +49,8 @@ public class GroupShowCLI extends CLI { GroupData groupData = parent.client.getGroup(groupID); + MainCLI.printMessage("Group \""+groupID+"\""); + GroupCLI.printGroup(groupData); } } diff --git a/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java b/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java index 7490799bd..9d828416f 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java +++ b/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java @@ -20,6 +20,7 @@ package com.netscape.cms.client.group; import com.netscape.certsrv.group.GroupMemberData; import com.netscape.cms.client.cli.CLI; +import com.netscape.cms.client.cli.MainCLI; /** * @author Endi S. Dewata @@ -49,6 +50,8 @@ public class GroupShowMemberCLI extends CLI { GroupMemberData groupMemberData = parent.client.getGroupMember(groupID, memberID); + MainCLI.printMessage("Group member \""+memberID+"\""); + GroupCLI.printGroupMember(groupMemberData); } } |