diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-11 08:37:52 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-15 12:07:26 -0500 |
commit | f554dc2aa0478aa23f7e986b6779091f7d520bf5 (patch) | |
tree | 415cbb56096e0f5d1b0383acfbf30917317f9680 /base/common/src/com/netscape/cms/client/cert/CertFindCLI.java | |
parent | d41848a5881db3d12f65e078b945829f1fe296a5 (diff) | |
download | pki-f554dc2aa0478aa23f7e986b6779091f7d520bf5.tar.gz pki-f554dc2aa0478aa23f7e986b6779091f7d520bf5.tar.xz pki-f554dc2aa0478aa23f7e986b6779091f7d520bf5.zip |
Cleaned up REST common class names.
The REST common classes have been renamed for better clarity
and consistency.
Ticket #259
Diffstat (limited to 'base/common/src/com/netscape/cms/client/cert/CertFindCLI.java')
-rw-r--r-- | base/common/src/com/netscape/cms/client/cert/CertFindCLI.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java b/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java index ea88c46cd..e67276ac3 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java @@ -30,10 +30,10 @@ import org.apache.commons.cli.ParseException; import com.netscape.cms.client.cli.CLI; import com.netscape.cms.client.cli.MainCLI; -import com.netscape.cms.servlet.base.CMSException; +import com.netscape.cms.servlet.base.PKIException; import com.netscape.cms.servlet.cert.model.CertDataInfo; import com.netscape.cms.servlet.cert.model.CertDataInfos; -import com.netscape.cms.servlet.cert.model.CertSearchData; +import com.netscape.cms.servlet.cert.model.CertSearchRequest; /** * @author Endi S. Dewata @@ -56,7 +56,7 @@ public class CertFindCLI extends CLI { addOptions(); CommandLine cmd = null; - CertSearchData searchData = null; + CertSearchRequest searchData = null; try { cmd = parser.parse(options, args); } catch (ParseException e) { @@ -84,7 +84,7 @@ public class CertFindCLI extends CLI { FileReader reader = null; try { reader = new FileReader(fileName); - searchData = CertSearchData.valueOf(reader); + searchData = CertSearchRequest.valueOf(reader); } catch (FileNotFoundException e) { System.err.println("Error: " + e.getMessage()); System.exit(-1); @@ -100,7 +100,7 @@ public class CertFindCLI extends CLI { } } } else { - searchData = new CertSearchData(); + searchData = new CertSearchRequest(); searchData.setSerialNumberRangeInUse(true); } String s = cmd.getOptionValue("start"); @@ -113,7 +113,7 @@ public class CertFindCLI extends CLI { CertDataInfos certs = null; try { certs = parent.client.findCerts(searchData, start, size); - } catch (CMSException e) { + } catch (PKIException e) { System.err.println("Error: Cannot list certificates. " + e.getMessage()); System.exit(-1); } @@ -267,7 +267,7 @@ public class CertFindCLI extends CLI { options.addOption(option); } - public void addSearchAttribute(CommandLine cmd, CertSearchData csd) { + public void addSearchAttribute(CommandLine cmd, CertSearchRequest csd) { if (cmd.hasOption("minSerialNumber")) { csd.setSerialNumberRangeInUse(true); csd.setSerialFrom(cmd.getOptionValue("minSerialNumber")); |