diff options
Diffstat (limited to 'base/common')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/GroupMemberService.java (renamed from base/common/src/com/netscape/cms/servlet/admin/GroupMemberResourceService.java) | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/GroupService.java (renamed from base/common/src/com/netscape/cms/servlet/admin/GroupResourceService.java) | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java (renamed from base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java) | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/UserCertService.java (renamed from base/common/src/com/netscape/cms/servlet/admin/UserCertResourceService.java) | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/UserService.java (renamed from base/common/src/com/netscape/cms/servlet/admin/UserResourceService.java) | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/base/PKIService.java (renamed from base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java) | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/CertService.java (renamed from base/common/src/com/netscape/cms/servlet/cert/CertResourceService.java) | 6 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java (renamed from base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigurationResourceService.java) | 6 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/key/KeyService.java (renamed from base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java) | 6 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/profile/ProfileService.java (renamed from base/common/src/com/netscape/cms/servlet/profile/ProfileResourceService.java) | 4 | ||||
-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 |
18 files changed, 35 insertions, 35 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupMemberResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/GroupMemberService.java index c192815aa..2a7419d33 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/GroupMemberResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/GroupMemberService.java @@ -44,12 +44,12 @@ import com.netscape.certsrv.user.UserResource; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.cms.servlet.base.CMSException; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; /** * @author Endi S. Dewata */ -public class GroupMemberResourceService extends CMSResourceService implements GroupMemberResource { +public class GroupMemberService extends PKIService implements GroupMemberResource { public final static int DEFAULT_SIZE = 20; diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/GroupService.java index ce665ae3e..868f142c8 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/GroupResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/GroupService.java @@ -41,13 +41,13 @@ import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.cms.servlet.base.CMSException; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cmsutil.ldap.LDAPUtil; /** * @author Endi S. Dewata */ -public class GroupResourceService extends CMSResourceService implements GroupResource { +public class GroupService extends PKIService implements GroupResource { public final static int DEFAULT_SIZE = 20; diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java index 72106a903..2d86d71ea 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java @@ -26,7 +26,7 @@ import javax.ws.rs.core.Response; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.security.ITransportKeyUnit; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cms.servlet.cert.model.CertificateData; /** @@ -35,7 +35,7 @@ import com.netscape.cms.servlet.cert.model.CertificateData; * @author alee * */ -public class SystemCertificateResourceService extends CMSResourceService implements SystemCertificateResource { +public class SystemCertService extends PKIService implements SystemCertificateResource { /** * Used to retrieve the transport certificate diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserCertResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/UserCertService.java index e0e2ddfde..4f2304a97 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UserCertResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UserCertService.java @@ -51,14 +51,14 @@ import com.netscape.certsrv.user.UserCertResource; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; import com.netscape.cms.servlet.base.CMSException; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cmsutil.util.Cert; import com.netscape.cmsutil.util.Utils; /** * @author Endi S. Dewata */ -public class UserCertResourceService extends CMSResourceService implements UserCertResource { +public class UserCertService extends PKIService implements UserCertResource { public final static int DEFAULT_SIZE = 20; diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/UserService.java index 1639c5912..1128e09e7 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UserResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UserService.java @@ -46,13 +46,13 @@ import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; import com.netscape.cms.servlet.base.CMSException; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cmsutil.ldap.LDAPUtil; /** * @author Endi S. Dewata */ -public class UserResourceService extends CMSResourceService implements UserResource { +public class UserService extends PKIService implements UserResource { public final static int DEFAULT_SIZE = 20; diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java b/base/common/src/com/netscape/cms/servlet/base/PKIService.java index 48daeca6e..de92d290a 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/base/PKIService.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.cert.model.CertificateData; * @author alee * */ -public class CMSResourceService { +public class PKIService { public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----"; public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----"; diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertResourceService.java b/base/common/src/com/netscape/cms/servlet/cert/CertService.java index 6a3f0d79a..08a621529 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CertResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CertService.java @@ -55,7 +55,7 @@ import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; 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.base.UnauthorizedException; import com.netscape.cms.servlet.cert.model.CertDataInfo; import com.netscape.cms.servlet.cert.model.CertDataInfos; @@ -74,14 +74,14 @@ import com.netscape.cmsutil.util.Utils; * @author alee * */ -public class CertResourceService extends CMSResourceService implements CertResource { +public class CertService extends PKIService implements CertResource { ICertificateAuthority authority; ICertificateRepository repo; public final static int DEFAULT_SIZE = 20; - public CertResourceService() { + public CertService() { authority = (ICertificateAuthority) CMS.getSubsystem("ca"); repo = authority.getCertificateRepository(); } diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java index 8b48f0d73..c1841051b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.profile.SSLClientCertProvider; import com.netscape.cms.servlet.profile.model.ProfileInput; import com.netscape.cms.servlet.request.model.EnrollmentRequestData; -import com.netscape.cms.servlet.request.model.EnrollmentRequestDataFactory; +import com.netscape.cms.servlet.request.model.CertEnrollmentRequestFactory; public class EnrollmentProcessor extends CertProcessor { @@ -97,7 +97,7 @@ public class EnrollmentProcessor extends CertProcessor { throw new BadRequestDataException(CMS.getUserMessage(locale, "CMS_PROFILE_NOT_FOUND", profileId)); } - EnrollmentRequestData data = EnrollmentRequestDataFactory.create(cmsReq, profile, locale); + EnrollmentRequestData data = CertEnrollmentRequestFactory.create(cmsReq, profile, locale); return processEnrollment(data, cmsReq.getHttpReq()); } diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java index cc4dd12ae..3e6c77fbf 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.profile.SSLClientCertProvider; import com.netscape.cms.servlet.request.model.EnrollmentRequestData; -import com.netscape.cms.servlet.request.model.EnrollmentRequestDataFactory; +import com.netscape.cms.servlet.request.model.CertEnrollmentRequestFactory; public class RenewalProcessor extends CertProcessor { @@ -61,7 +61,7 @@ public class RenewalProcessor extends CertProcessor { throw new BadRequestDataException(CMS.getUserMessage(locale, "CMS_PROFILE_NOT_FOUND", profileId)); } - EnrollmentRequestData data = EnrollmentRequestDataFactory.create(cmsReq, profile, locale); + EnrollmentRequestData data = CertEnrollmentRequestFactory.create(cmsReq, profile, locale); //only used in renewal data.setSerialNum(req.getParameter("serial_num")); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java index 57e33f3a5..8822be2b2 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.profile.model.ProfileOutput; import com.netscape.cms.servlet.profile.model.ProfileOutputFactory; import com.netscape.cms.servlet.profile.model.ProfilePolicySet; import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData; -import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestDataFactory; +import com.netscape.cms.servlet.request.model.CertReviewResponseFactory; public class RequestProcessor extends CertProcessor { @@ -72,7 +72,7 @@ public class RequestProcessor extends CertProcessor { String profileId = ireq.getExtDataInString("profileId"); IProfile profile = ps.getProfile(profileId); - AgentEnrollmentRequestData data = AgentEnrollmentRequestDataFactory.create(cmsReq, profile, nonces, locale); + AgentEnrollmentRequestData data = CertReviewResponseFactory.create(cmsReq, profile, nonces, locale); processRequest(req, data, request, op); return data; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigurationResourceService.java b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java index 9747eb12c..cee8e86e3 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigurationResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java @@ -53,7 +53,7 @@ import com.netscape.certsrv.ocsp.IOCSPAuthority; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; 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.csadmin.model.CertData; import com.netscape.cms.servlet.csadmin.model.ConfigurationData; import com.netscape.cms.servlet.csadmin.model.ConfigurationResponseData; @@ -67,7 +67,7 @@ import com.netscape.cmsutil.util.Utils; * @author alee * */ -public class SystemConfigurationResourceService extends CMSResourceService implements SystemConfigurationResource { +public class SystemConfigService extends PKIService implements SystemConfigurationResource { IConfigStore cs; String csType; String csState; @@ -79,7 +79,7 @@ public class SystemConfigurationResourceService extends CMSResourceService imple "restart_server_after_configuration"; private Random random = null; - public SystemConfigurationResourceService() throws EPropertyNotFound, EBaseException { + public SystemConfigService() throws EPropertyNotFound, EBaseException { cs = CMS.getConfigStore(); csType = cs.getString("cs.type"); csState = cs.getString("cs.state"); diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeyService.java index 560d7f9f8..59847da1c 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyService.java @@ -41,7 +41,7 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cms.servlet.key.model.KeyData; import com.netscape.cms.servlet.key.model.KeyDataInfo; import com.netscape.cms.servlet.key.model.KeyDataInfos; @@ -54,13 +54,13 @@ import com.netscape.cmsutil.ldap.LDAPUtil; * @author alee * */ -public class KeyResourceService extends CMSResourceService implements KeyResource{ +public class KeyService extends PKIService implements KeyResource{ private IKeyRepository repo; private IKeyRecoveryAuthority kra; private IRequestQueue queue; - public KeyResourceService() { + public KeyService() { kra = ( IKeyRecoveryAuthority ) CMS.getSubsystem( "kra" ); repo = kra.getKeyRepository(); queue = kra.getRequestQueue(); diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileResourceService.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileService.java index c39125876..0c13b8bba 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileService.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileInput; import com.netscape.certsrv.profile.IProfileSubsystem; -import com.netscape.cms.servlet.base.CMSResourceService; +import com.netscape.cms.servlet.base.PKIService; import com.netscape.cms.servlet.profile.model.ProfileData; import com.netscape.cms.servlet.profile.model.ProfileDataInfo; import com.netscape.cms.servlet.profile.model.ProfileDataInfos; @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.profile.model.ProfileInput; * @author alee * */ -public class ProfileResourceService extends CMSResourceService implements ProfileResource { +public class ProfileService extends PKIService implements ProfileResource { private IProfileSubsystem ps = (IProfileSubsystem) CMS.getSubsystem(IProfileSubsystem.ID); 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(); |