From cf425dfa25bccb467c63b9a966adf3a7eec791df Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Mon, 3 Feb 2014 13:19:46 -0500 Subject: Address review comments 1. Remove Link attribute from ResourceMessage, 2. Rename KeyDataInfo and KeyDataInfoCollection. 3. Move KEYGEN_ALGORITHMS 4. Fix missing space in PKIException 5. Move properties to attributes in ResourceMessage 6. Add missing code to update the request and set IRequest.RESULT --- base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java | 4 ++-- base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'base/java-tools/src/com/netscape/cmstools/key') diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java index e93cc32f0..f205506aa 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java @@ -19,7 +19,7 @@ package com.netscape.cmstools.key; import com.netscape.certsrv.key.KeyClient; -import com.netscape.certsrv.key.KeyDataInfo; +import com.netscape.certsrv.key.KeyInfo; import com.netscape.certsrv.key.KeyRequestInfo; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -61,7 +61,7 @@ public class KeyCLI extends CLI { super.execute(args); } - public static void printKeyInfo(KeyDataInfo info) { + public static void printKeyInfo(KeyInfo info) { System.out.println(" Key ID: "+info.getKeyId().toHexString()); if (info.getClientID() != null) System.out.println(" Client ID: "+info.getClientID()); if (info.getStatus() != null) System.out.println(" Status: "+info.getStatus()); diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java index b2eb0ce38..f3c9badbd 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java @@ -24,8 +24,8 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.ParseException; -import com.netscape.certsrv.key.KeyDataInfo; -import com.netscape.certsrv.key.KeyDataInfoCollection; +import com.netscape.certsrv.key.KeyInfo; +import com.netscape.certsrv.key.KeyInfoCollection; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -97,15 +97,15 @@ public class KeyFindCLI extends CLI { s = cmd.getOptionValue("size"); Integer size = s == null ? null : Integer.valueOf(s); - KeyDataInfoCollection keys = keyCLI.keyClient.findKeys(clientID, status, maxResults, maxTime, start, size); + KeyInfoCollection keys = keyCLI.keyClient.findKeys(clientID, status, maxResults, maxTime, start, size); - Collection entries = keys.getEntries(); + Collection entries = keys.getEntries(); MainCLI.printMessage(entries.size() + " key(s) matched"); boolean first = true; - for (KeyDataInfo info : entries) { + for (KeyInfo info : entries) { if (first) { first = false; -- cgit