diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/request/model')
10 files changed, 37 insertions, 37 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/model/EnrollmentRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequest.java index caff0261d..a249d657d 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/EnrollmentRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequest.java @@ -47,9 +47,9 @@ import com.netscape.cms.servlet.profile.model.ProfileOutput; * */ -@XmlRootElement(name = "EnrollmentRequest") +@XmlRootElement(name = "CertEnrollmentRequest") @XmlAccessorType(XmlAccessType.FIELD) -public class EnrollmentRequestData { +public class CertEnrollmentRequest { private static final String PROFILE_ID = "profileId"; private static final String RENEWAL = "renewal"; @@ -76,11 +76,11 @@ public class EnrollmentRequestData { @XmlElement(name = "Output") protected List<ProfileOutput> outputs = new ArrayList<ProfileOutput>(); - public EnrollmentRequestData() { + public CertEnrollmentRequest() { // required for jaxb } - public EnrollmentRequestData(MultivaluedMap<String, String> form) { + public CertEnrollmentRequest(MultivaluedMap<String, String> form) { profileId = form.getFirst(PROFILE_ID); String renewalStr = form.getFirst(RENEWAL); serialNum = form.getFirst(SERIAL_NUM); @@ -211,7 +211,7 @@ public class EnrollmentRequestData { } public static void main(String args[]) throws Exception { - EnrollmentRequestData data = new EnrollmentRequestData(); + CertEnrollmentRequest data = new CertEnrollmentRequest(); data.setProfileId("caUserCert"); data.setIsRenewal(false); @@ -240,7 +240,7 @@ public class EnrollmentRequestData { submitter.setInputAttr("requestor_phone", "650-555-5555"); try { - JAXBContext context = JAXBContext.newInstance(EnrollmentRequestData.class); + JAXBContext context = JAXBContext.newInstance(CertEnrollmentRequest.class); Marshaller marshaller = context.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequestFactory.java b/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequestFactory.java index 51582d13c..36c4adfca 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequestFactory.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequestFactory.java @@ -30,11 +30,11 @@ import com.netscape.cms.servlet.profile.model.ProfileInputFactory; public class CertEnrollmentRequestFactory { - public static EnrollmentRequestData create(CMSRequest cmsReq, IProfile profile, Locale locale) + public static CertEnrollmentRequest create(CMSRequest cmsReq, IProfile profile, Locale locale) throws EProfileException { IArgBlock params = cmsReq.getHttpParams(); - EnrollmentRequestData ret = new EnrollmentRequestData(); + CertEnrollmentRequest ret = new CertEnrollmentRequest(); ret.setProfileId(profile.getId()); // populate profile inputs diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java index f662a6c89..3aacf1b88 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java @@ -138,7 +138,7 @@ public class CertRequestDAO extends CMSRequestDAO { * @return info for specific request * @throws EBaseException */ - public AgentEnrollmentRequestData reviewRequest(HttpServletRequest servletRequest, RequestId id, + public CertReviewResponse reviewRequest(HttpServletRequest servletRequest, RequestId id, UriInfo uriInfo, Locale locale) throws EBaseException { IRequest request = queue.findRequest(id); if (request == null) { @@ -146,14 +146,14 @@ public class CertRequestDAO extends CMSRequestDAO { } String profileId = request.getExtDataInString("profileId"); IProfile profile = ps.getProfile(profileId); - AgentEnrollmentRequestData info = CertReviewResponseFactory.create(request, profile, uriInfo, locale); + CertReviewResponse info = CertReviewResponseFactory.create(request, profile, uriInfo, locale); if (ca.noncesEnabled()) { addNonce(info, servletRequest); } return info; } - private void addNonce(AgentEnrollmentRequestData info, HttpServletRequest servletRequest) throws EBaseException { + private void addNonce(CertReviewResponse info, HttpServletRequest servletRequest) throws EBaseException { if (nonces != null) { long n = random.nextLong(); long m = nonces.addNonce(n, Processor.getSSLClientCertificate(servletRequest)); @@ -171,7 +171,7 @@ public class CertRequestDAO extends CMSRequestDAO { * @throws EBaseException * @throws ServletException */ - public CertRequestInfos submitRequest(EnrollmentRequestData data, HttpServletRequest request, UriInfo uriInfo, + public CertRequestInfos submitRequest(CertEnrollmentRequest data, HttpServletRequest request, UriInfo uriInfo, Locale locale) throws EBaseException { HashMap<String, Object> results = null; if (data.getIsRenewal()) { @@ -196,7 +196,7 @@ public class CertRequestDAO extends CMSRequestDAO { return ret; } - public void changeRequestState(RequestId id, HttpServletRequest request, AgentEnrollmentRequestData data, + public void changeRequestState(RequestId id, HttpServletRequest request, CertReviewResponse data, Locale locale, String op) throws EBaseException { IRequest ireq = queue.findRequest(id); if (ireq == null) { diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CertRetrievalRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/CertRetrievalRequest.java index 72e437c17..9b8caacd9 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CertRetrievalRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertRetrievalRequest.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.request.RequestIdAdapter; */ @XmlRootElement(name = "CertRetrievalRequest") @XmlAccessorType(XmlAccessType.FIELD) -public class CertRetrievalRequestData { +public class CertRetrievalRequest { private static final String CERT_ID = "certId"; @@ -51,11 +51,11 @@ public class CertRetrievalRequestData { @XmlJavaTypeAdapter(RequestIdAdapter.class) protected RequestId requestId; - public CertRetrievalRequestData() { + public CertRetrievalRequest() { // required for JAXB (defaults) } - public CertRetrievalRequestData(MultivaluedMap<String, String> form) { + public CertRetrievalRequest(MultivaluedMap<String, String> form) { if (form.containsKey(CERT_ID)) { certId = new CertId(form.getFirst(CERT_ID)); } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/AgentEnrollmentRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponse.java index fb0874353..3bec6bada 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/AgentEnrollmentRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponse.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.profile.model.ProfilePolicySet; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) -public class AgentEnrollmentRequestData extends EnrollmentRequestData { +public class CertReviewResponse extends CertEnrollmentRequest { @XmlElement(name="ProfilePolicySet") protected List<ProfilePolicySet> policySets = new ArrayList<ProfilePolicySet>(); @@ -198,7 +198,7 @@ public class AgentEnrollmentRequestData extends EnrollmentRequestData { public String toString() { 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/servlet/request/model/CertReviewResponseFactory.java b/base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponseFactory.java index 5c2106802..a27437d0f 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponseFactory.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponseFactory.java @@ -47,8 +47,8 @@ import com.netscape.cms.servlet.profile.model.ProfilePolicySet; public class CertReviewResponseFactory { - public static AgentEnrollmentRequestData create(IRequest request, IProfile profile, UriInfo uriInfo, Locale locale) throws EBaseException { - AgentEnrollmentRequestData ret = new AgentEnrollmentRequestData(); + public static CertReviewResponse create(IRequest request, IProfile profile, UriInfo uriInfo, Locale locale) throws EBaseException { + CertReviewResponse ret = new CertReviewResponse(); if (request.getRequestType().equals("renewal")) { ret.setIsRenewal(true); @@ -127,13 +127,13 @@ public class CertReviewResponseFactory { return ret; } - public static AgentEnrollmentRequestData create(CMSRequest cmsReq, IProfile profile, Nonces nonces, Locale locale) + public static CertReviewResponse create(CMSRequest cmsReq, IProfile profile, Nonces nonces, Locale locale) throws EPropertyException, EProfileException { HttpServletRequest req = cmsReq.getHttpReq(); IRequest ireq = cmsReq.getIRequest(); IArgBlock params = cmsReq.getHttpParams(); - AgentEnrollmentRequestData ret = new AgentEnrollmentRequestData(); + CertReviewResponse ret = new CertReviewResponse(); ret.setProfileId(profile.getId()); ret.setRequestNotes(req.getParameter("requestNotes")); ret.setRequestId(ireq.getRequestId()); diff --git a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyArchivalRequest.java index bcc51bf96..9cd544ff8 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyArchivalRequest.java @@ -23,17 +23,17 @@ package com.netscape.cms.servlet.request.model; import javax.ws.rs.core.MultivaluedMap; import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; /** * @author alee * */ -@XmlRootElement(name="SecurityDataArchivalRequest") +@XmlRootElement(name="KeyArchivalRequest") @XmlAccessorType(XmlAccessType.FIELD) -public class ArchivalRequestData { +public class KeyArchivalRequest { private static final String CLIENT_ID = "clientID"; private static final String TRANS_WRAPPED_SESSION_KEY = "transWrappedSessionKey"; @@ -52,11 +52,11 @@ public class ArchivalRequestData { @XmlElement protected String wrappedPrivateData; - public ArchivalRequestData() { + public KeyArchivalRequest() { // required for JAXB (defaults) } - public ArchivalRequestData(MultivaluedMap<String, String> form) { + public KeyArchivalRequest(MultivaluedMap<String, String> form) { clientId = form.getFirst(CLIENT_ID); transWrappedSessionKey = form.getFirst(TRANS_WRAPPED_SESSION_KEY); dataType = form.getFirst(DATA_TYPE); diff --git a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRecoveryRequest.java index 335414792..3cb17d283 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRecoveryRequest.java @@ -23,9 +23,9 @@ package com.netscape.cms.servlet.request.model; import javax.ws.rs.core.MultivaluedMap; import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.netscape.certsrv.dbs.keydb.KeyId; @@ -37,9 +37,9 @@ import com.netscape.certsrv.request.RequestIdAdapter; * @author alee * */ -@XmlRootElement(name="SecurityDataRecoveryRequest") +@XmlRootElement(name="KeyRecoveryRequest") @XmlAccessorType(XmlAccessType.FIELD) -public class RecoveryRequestData { +public class KeyRecoveryRequest { private static final String KEY_ID = "keyId"; private static final String REQUEST_ID = "requestId"; @@ -64,11 +64,11 @@ public class RecoveryRequestData { @XmlElement protected String nonceData; - public RecoveryRequestData() { + public KeyRecoveryRequest() { // required for JAXB (defaults) } - public RecoveryRequestData(MultivaluedMap<String, String> form) { + public KeyRecoveryRequest(MultivaluedMap<String, String> form) { if (form.containsKey(KEY_ID)) { keyId = new KeyId(form.getFirst(KEY_ID)); } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java index 36a869aaf..6e9de9290 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java @@ -127,7 +127,7 @@ public class KeyRequestDAO extends CMSRequestDAO { * @return info for the request submitted. * @throws EBaseException */ - public KeyRequestInfo submitRequest(ArchivalRequestData data, UriInfo uriInfo) throws EBaseException { + public KeyRequestInfo submitRequest(KeyArchivalRequest data, UriInfo uriInfo) throws EBaseException { String clientId = data.getClientId(); String wrappedSecurityData = data.getWrappedPrivateData(); String dataType = data.getDataType(); @@ -158,7 +158,7 @@ public class KeyRequestDAO extends CMSRequestDAO { * @return info on the recovery request created * @throws EBaseException */ - public KeyRequestInfo submitRequest(RecoveryRequestData data, UriInfo uriInfo) throws EBaseException { + public KeyRequestInfo submitRequest(KeyRecoveryRequest data, UriInfo uriInfo) throws EBaseException { // set data using request.setExtData(field, data) String wrappedSessionKeyStr = data.getTransWrappedSessionKey(); diff --git a/base/common/src/com/netscape/cms/servlet/request/model/ProfileRetrievalRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/ProfileRetrievalRequest.java index 7a0359587..8670605fc 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/ProfileRetrievalRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/ProfileRetrievalRequest.java @@ -33,18 +33,18 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement(name = "ProfileRetrievalRequest") @XmlAccessorType(XmlAccessType.FIELD) -public class ProfileRetrievalRequestData { +public class ProfileRetrievalRequest { private static final String PROFILE_ID = "profileId"; @XmlElement protected String profileId; - public ProfileRetrievalRequestData() { + public ProfileRetrievalRequest() { // required for JAXB (defaults) } - public ProfileRetrievalRequestData(MultivaluedMap<String, String> form) { + public ProfileRetrievalRequest(MultivaluedMap<String, String> form) { if (form.containsKey(PROFILE_ID)) { profileId = form.getFirst(PROFILE_ID); } |