diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/request')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/CertRequestService.java (renamed from base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java) | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java (renamed from base/common/src/com/netscape/cms/servlet/request/KeyRequestResourceService.java) | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequestFactory.java (renamed from base/common/src/com/netscape/cms/servlet/request/model/EnrollmentRequestDataFactory.java) | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/model/CertRequestDAO.java | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponseFactory.java (renamed from base/common/src/com/netscape/cms/servlet/request/model/AgentEnrollmentRequestDataFactory.java) | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java b/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java index d107e2191..9178d4c9e 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.property.EPropertyException; import com.netscape.certsrv.request.RequestId; import com.netscape.cms.servlet.base.BadRequestException; import com.netscape.cms.servlet.base.CMSException; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData; import com.netscape.cms.servlet.request.model.CertRequestDAO; import com.netscape.cms.servlet.request.model.CertRequestInfo; @@ -46,7 +46,7 @@ import com.netscape.cmsutil.ldap.LDAPUtil; * @author alee * */ -public class CertRequestResourceService extends CMSResourceService implements CertRequestResource { +public class CertRequestService extends PKIService implements CertRequestResource { /** * Used to retrieve key request info for a specific request diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestResourceService.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java index d98938b7a..ebe6062c8 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyRequestResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.request.RequestId; import com.netscape.cms.servlet.base.CMSException; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cms.servlet.request.model.ArchivalRequestData; import com.netscape.cms.servlet.request.model.KeyRequestDAO; import com.netscape.cms.servlet.request.model.KeyRequestInfo; @@ -38,7 +38,7 @@ import com.netscape.cmsutil.ldap.LDAPUtil; * @author alee * */ -public class KeyRequestResourceService extends CMSResourceService implements KeyRequestResource { +public class KeyRequestService extends PKIService implements KeyRequestResource { /** * Used to retrieve key request info for a specific request diff --git a/base/common/src/com/netscape/cms/servlet/request/model/EnrollmentRequestDataFactory.java b/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequestFactory.java index 3a09b7608..51582d13c 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/EnrollmentRequestDataFactory.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertEnrollmentRequestFactory.java @@ -28,7 +28,7 @@ import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.profile.model.ProfileInput; import com.netscape.cms.servlet.profile.model.ProfileInputFactory; -public class EnrollmentRequestDataFactory { +public class CertEnrollmentRequestFactory { public static EnrollmentRequestData create(CMSRequest cmsReq, IProfile profile, Locale locale) throws EProfileException { 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 4ebfc251f..f662a6c89 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 @@ -146,7 +146,7 @@ public class CertRequestDAO extends CMSRequestDAO { } String profileId = request.getExtDataInString("profileId"); IProfile profile = ps.getProfile(profileId); - AgentEnrollmentRequestData info = AgentEnrollmentRequestDataFactory.create(request, profile, uriInfo, locale); + AgentEnrollmentRequestData info = CertReviewResponseFactory.create(request, profile, uriInfo, locale); if (ca.noncesEnabled()) { addNonce(info, servletRequest); } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/AgentEnrollmentRequestDataFactory.java b/base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponseFactory.java index fff1a59df..5c2106802 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/AgentEnrollmentRequestDataFactory.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/CertReviewResponseFactory.java @@ -45,7 +45,7 @@ import com.netscape.cms.servlet.profile.model.ProfileInputFactory; import com.netscape.cms.servlet.profile.model.ProfilePolicy; import com.netscape.cms.servlet.profile.model.ProfilePolicySet; -public class AgentEnrollmentRequestDataFactory { +public class CertReviewResponseFactory { public static AgentEnrollmentRequestData create(IRequest request, IProfile profile, UriInfo uriInfo, Locale locale) throws EBaseException { AgentEnrollmentRequestData ret = new AgentEnrollmentRequestData(); |