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 | |
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')
10 files changed, 46 insertions, 46 deletions
diff --git a/base/common/src/com/netscape/cms/client/cert/CertCLI.java b/base/common/src/com/netscape/cms/client/cert/CertCLI.java index 2f7ab668e..ced2560ec 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertCLI.java @@ -26,7 +26,7 @@ import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.cms.client.cli.CLI; import com.netscape.cms.client.cli.MainCLI; import com.netscape.cms.servlet.cert.model.CertDataInfo; -import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.cert.model.CertData; import com.netscape.cms.servlet.request.model.CertRequestInfo; /** @@ -114,7 +114,7 @@ public class CertCLI extends CLI { } public static void printCertData( - CertificateData certData, + CertData certData, boolean showPrettyPrint, boolean showEncoded) { diff --git a/base/common/src/com/netscape/cms/client/cert/CertClient.java b/base/common/src/com/netscape/cms/client/cert/CertClient.java index b8fdde703..fb2f61c75 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertClient.java +++ b/base/common/src/com/netscape/cms/client/cert/CertClient.java @@ -25,15 +25,15 @@ import com.netscape.cms.client.cli.ClientConfig; import com.netscape.cms.servlet.cert.CertResource; import com.netscape.cms.servlet.cert.model.CertDataInfos; import com.netscape.cms.servlet.cert.model.CertRevokeRequest; -import com.netscape.cms.servlet.cert.model.CertSearchData; +import com.netscape.cms.servlet.cert.model.CertSearchRequest; import com.netscape.cms.servlet.cert.model.CertUnrevokeRequest; -import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.cert.model.CertData; import com.netscape.cms.servlet.csadmin.PKIClient; import com.netscape.cms.servlet.request.CertRequestResource; -import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData; +import com.netscape.cms.servlet.request.model.CertReviewResponse; import com.netscape.cms.servlet.request.model.CertRequestInfo; import com.netscape.cms.servlet.request.model.CertRequestInfos; -import com.netscape.cms.servlet.request.model.EnrollmentRequestData; +import com.netscape.cms.servlet.request.model.CertEnrollmentRequest; /** * @author Endi S. Dewata @@ -50,11 +50,11 @@ public class CertClient extends PKIClient { certRequestResource = createProxy(CertRequestResource.class); } - public CertificateData getCert(CertId id) { + public CertData getCert(CertId id) { return certClient.getCert(id); } - public CertDataInfos findCerts(CertSearchData data, Integer start, Integer size) { + public CertDataInfos findCerts(CertSearchRequest data, Integer start, Integer size) { return certClient.searchCerts(data, start, size); } @@ -70,15 +70,15 @@ public class CertClient extends PKIClient { return certClient.unrevokeCert(id, request); } - public CertRequestInfos enrollRequest(EnrollmentRequestData data){ + public CertRequestInfos enrollRequest(CertEnrollmentRequest data){ return certRequestResource.enrollCert(data); } - public AgentEnrollmentRequestData reviewRequest(RequestId id){ + public CertReviewResponse reviewRequest(RequestId id){ return certRequestResource.reviewRequest(id); } - public void approveRequest(RequestId id, AgentEnrollmentRequestData data) { + public void approveRequest(RequestId id, CertReviewResponse data) { certRequestResource.approveRequest(id, data); } } 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")); diff --git a/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java b/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java index 598c1e664..1e283b722 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.client.cli.CLI; import com.netscape.cms.client.cli.MainCLI; import com.netscape.cms.servlet.cert.model.CertRevokeRequest; -import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.cert.model.CertData; import com.netscape.cms.servlet.request.model.CertRequestInfo; /** @@ -80,7 +80,7 @@ public class CertHoldCLI extends CLI { if (!cmd.hasOption("force")) { - CertificateData certData = parent.client.getCert(certID); + CertData certData = parent.client.getCert(certID); System.out.println("Placing certificate on-hold:"); @@ -108,7 +108,7 @@ public class CertHoldCLI extends CLI { if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) { MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" on-hold"); - CertificateData certData = parent.client.getCert(certID); + CertData certData = parent.client.getCert(certID); CertCLI.printCertData(certData, false, false); } else { diff --git a/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java b/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java index 0d39aff88..920c642e5 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.client.cli.CLI; import com.netscape.cms.client.cli.MainCLI; import com.netscape.cms.servlet.cert.model.CertUnrevokeRequest; -import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.cert.model.CertData; import com.netscape.cms.servlet.request.model.CertRequestInfo; /** @@ -73,7 +73,7 @@ public class CertReleaseHoldCLI extends CLI { if (!cmd.hasOption("force")) { - CertificateData certData = parent.client.getCert(certID); + CertData certData = parent.client.getCert(certID); System.out.println("Placing certificate off-hold:"); @@ -99,7 +99,7 @@ public class CertReleaseHoldCLI extends CLI { if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) { MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" off-hold"); - CertificateData certData = parent.client.getCert(certID); + CertData certData = parent.client.getCert(certID); CertCLI.printCertData(certData, false, false); } else { diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java index 3d729424f..91cb26e14 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java @@ -12,8 +12,8 @@ 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.request.model.AgentEnrollmentRequestData; +import com.netscape.cms.servlet.base.PKIException; +import com.netscape.cms.servlet.request.model.CertReviewResponse; public class CertRequestApproveCLI extends CLI { CertCLI parent; @@ -42,14 +42,14 @@ public class CertRequestApproveCLI extends CLI { printHelp(); System.exit(-1); } - AgentEnrollmentRequestData reviewInfo = null; + CertReviewResponse reviewInfo = null; try { - JAXBContext context = JAXBContext.newInstance(AgentEnrollmentRequestData.class); + JAXBContext context = JAXBContext.newInstance(CertReviewResponse.class); Unmarshaller unmarshaller = context.createUnmarshaller(); FileInputStream fis = new FileInputStream(cLineArgs[0].trim()); - reviewInfo = (AgentEnrollmentRequestData) unmarshaller.unmarshal(fis); + reviewInfo = (CertReviewResponse) unmarshaller.unmarshal(fis); parent.client.approveRequest(reviewInfo.getRequestId(), reviewInfo); - } catch (CMSException e) { + } catch (PKIException e) { System.err.println(e.getMessage()); System.exit(-1); } catch (JAXBException e) { diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java index 10c0e40fc..61c8506e7 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java @@ -14,8 +14,8 @@ import org.apache.commons.cli.ParseException; import com.netscape.certsrv.request.RequestId; 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.request.model.AgentEnrollmentRequestData; +import com.netscape.cms.servlet.base.PKIException; +import com.netscape.cms.servlet.request.model.CertReviewResponse; public class CertRequestReviewCLI extends CLI { @@ -71,16 +71,16 @@ public class CertRequestReviewCLI extends CLI { System.exit(-1); } - AgentEnrollmentRequestData reviewInfo = null; + CertReviewResponse reviewInfo = null; try { reviewInfo = parent.client.reviewRequest(reqId); - } catch (CMSException e) { + } catch (PKIException e) { System.err.println(e.getMessage()); System.exit(-1); } try { - JAXBContext context = JAXBContext.newInstance(AgentEnrollmentRequestData.class); + JAXBContext context = JAXBContext.newInstance(CertReviewResponse.class); Marshaller marshaller = context.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java index e09f8be5b..021400f75 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java @@ -15,7 +15,7 @@ import com.netscape.cms.client.cli.CLI; import com.netscape.cms.client.cli.MainCLI; import com.netscape.cms.servlet.request.model.CertRequestInfo; import com.netscape.cms.servlet.request.model.CertRequestInfos; -import com.netscape.cms.servlet.request.model.EnrollmentRequestData; +import com.netscape.cms.servlet.request.model.CertEnrollmentRequest; public class CertRequestSubmitCLI extends CLI { @@ -46,7 +46,7 @@ public class CertRequestSubmitCLI extends CLI { System.exit(-1); } - EnrollmentRequestData erd = null; + CertEnrollmentRequest erd = null; try { erd = getEnrollmentRequest(cLineArgs[0]); @@ -62,12 +62,12 @@ public class CertRequestSubmitCLI extends CLI { } } - private EnrollmentRequestData getEnrollmentRequest(String fileName) throws JAXBException, FileNotFoundException { - EnrollmentRequestData erd = null; - JAXBContext context = JAXBContext.newInstance(EnrollmentRequestData.class); + private CertEnrollmentRequest getEnrollmentRequest(String fileName) throws JAXBException, FileNotFoundException { + CertEnrollmentRequest erd = null; + JAXBContext context = JAXBContext.newInstance(CertEnrollmentRequest.class); Unmarshaller unmarshaller = context.createUnmarshaller(); FileInputStream fis = new FileInputStream(fileName); - erd = (EnrollmentRequestData) unmarshaller.unmarshal(fis); + erd = (CertEnrollmentRequest) unmarshaller.unmarshal(fis); return erd; } diff --git a/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java index ad3276c52..611e50c37 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.client.cli.CLI; import com.netscape.cms.client.cli.MainCLI; import com.netscape.cms.servlet.cert.model.CertRevokeRequest; -import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.cert.model.CertData; import com.netscape.cms.servlet.request.model.CertRequestInfo; /** @@ -107,7 +107,7 @@ public class CertRevokeCLI extends CLI { if (!cmd.hasOption("force")) { - CertificateData certData = parent.client.getCert(certID); + CertData certData = parent.client.getCert(certID); if (reason == RevocationReason.CERTIFICATE_HOLD) { System.out.println("Placing certificate on-hold:"); @@ -154,7 +154,7 @@ public class CertRevokeCLI extends CLI { MainCLI.printMessage("Revoked certificate \"" + certID.toHexString() + "\""); } - CertificateData certData = parent.client.getCert(certID); + CertData certData = parent.client.getCert(certID); CertCLI.printCertData(certData, false, false); } else { diff --git a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java b/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java index 1389a0a42..a16e36f3f 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java +++ b/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java @@ -27,7 +27,7 @@ import org.apache.commons.cli.Option; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.cms.client.cli.CLI; import com.netscape.cms.client.cli.MainCLI; -import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.cert.model.CertData; /** * @author Endi S. Dewata @@ -78,7 +78,7 @@ public class CertShowCLI extends CLI { CertId certID = new CertId(cmdArgs[0]); String file = cmd.getOptionValue("output"); - CertificateData certData = parent.client.getCert(certID); + CertData certData = parent.client.getCert(certID); String encoded = certData.getEncoded(); if (encoded != null && file != null) { |