diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/client/user')
4 files changed, 15 insertions, 7 deletions
diff --git a/base/common/src/com/netscape/cms/client/user/UserCLI.java b/base/common/src/com/netscape/cms/client/user/UserCLI.java index 0e18d0692..a5104135b 100644 --- a/base/common/src/com/netscape/cms/client/user/UserCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserCLI.java @@ -75,9 +75,14 @@ public class UserCLI extends CLI { public void execute(String[] args) throws Exception { - client = new UserRestClient(parent.url + "/pki", parent.certNickname); + client = new UserRestClient(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/user/UserRestClient.java b/base/common/src/com/netscape/cms/client/user/UserRestClient.java index 8bbdefe26..54c1e3fa1 100644 --- a/base/common/src/com/netscape/cms/client/user/UserRestClient.java +++ b/base/common/src/com/netscape/cms/client/user/UserRestClient.java @@ -27,6 +27,7 @@ import com.netscape.certsrv.user.UserCertResource; import com.netscape.certsrv.user.UserCollection; import com.netscape.certsrv.user.UserData; import com.netscape.certsrv.user.UserResource; +import com.netscape.cms.client.cli.ClientConfig; import com.netscape.cms.servlet.csadmin.CMSRestClient; /** @@ -37,12 +38,8 @@ public class UserRestClient extends CMSRestClient { public UserResource userClient; public UserCertResource userCertClient; - public UserRestClient(String baseUri) throws URISyntaxException { - this(baseUri, null); - } - - public UserRestClient(String baseUri, String nickname) throws URISyntaxException { - super(baseUri, nickname); + public UserRestClient(ClientConfig config) throws URISyntaxException { + super(config); userClient = createProxy(UserResource.class); userCertClient = createProxy(UserCertResource.class); diff --git a/base/common/src/com/netscape/cms/client/user/UserShowCLI.java b/base/common/src/com/netscape/cms/client/user/UserShowCLI.java index 9549c0505..d46c5578c 100644 --- a/base/common/src/com/netscape/cms/client/user/UserShowCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserShowCLI.java @@ -20,6 +20,7 @@ package com.netscape.cms.client.user; import com.netscape.certsrv.user.UserData; import com.netscape.cms.client.cli.CLI; +import com.netscape.cms.client.cli.MainCLI; /** * @author Endi S. Dewata @@ -48,6 +49,8 @@ public class UserShowCLI extends CLI { UserData userData = parent.client.getUser(userId); + MainCLI.printMessage("User \"" + userId + "\""); + UserCLI.printUser(userData); } } diff --git a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java index 71e14b4fc..99bc55af0 100644 --- a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java @@ -27,6 +27,7 @@ import org.apache.commons.cli.Option; import com.netscape.certsrv.user.UserCertData; import com.netscape.cms.client.cli.CLI; +import com.netscape.cms.client.cli.MainCLI; /** * @author Endi S. Dewata @@ -88,6 +89,8 @@ public class UserShowCertCLI extends CLI { out.close(); } + MainCLI.printMessage("Certificate \"" + userCertData.getID() + "\""); + UserCLI.printCert(userCertData, showPrettyPrint, showEncoded); } } |