diff options
Diffstat (limited to 'base')
-rw-r--r-- | base/ca/shared/webapps/ca/WEB-INF/web.xml | 2 | ||||
-rw-r--r-- | base/ca/src/CMakeLists.txt | 39 | ||||
-rw-r--r-- | base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java (renamed from base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java) | 33 | ||||
-rw-r--r-- | base/ca/src/org/dogtagpki/server/ca/rest/CertRequestService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/request/CertRequestService.java) | 3 | ||||
-rw-r--r-- | base/ca/src/org/dogtagpki/server/ca/rest/CertService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/cert/CertService.java) | 5 | ||||
-rw-r--r-- | base/ca/src/org/dogtagpki/server/ca/rest/KRAConnectorService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java) | 3 | ||||
-rw-r--r-- | base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java) | 4 | ||||
-rw-r--r-- | base/kra/shared/webapps/kra/WEB-INF/web.xml | 2 | ||||
-rw-r--r-- | base/kra/src/CMakeLists.txt | 45 | ||||
-rw-r--r-- | base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java | 2 | ||||
-rw-r--r-- | base/kra/src/com/netscape/kra/SecurityDataService.java | 2 | ||||
-rw-r--r-- | base/kra/src/com/netscape/kra/SymKeyGenService.java | 4 | ||||
-rw-r--r-- | base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java (renamed from base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java) | 31 | ||||
-rw-r--r-- | base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java) | 15 | ||||
-rw-r--r-- | base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java) | 3 | ||||
-rw-r--r-- | base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml | 2 | ||||
-rw-r--r-- | base/ocsp/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java (renamed from base/ocsp/src/com/netscape/ocsp/OCSPApplication.java) | 23 | ||||
-rw-r--r-- | base/server/cms/src/CMakeLists.txt | 19 | ||||
-rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 4 | ||||
-rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java | 17 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/ACLInterceptor.java (renamed from base/server/cms/src/com/netscape/cms/authorization/ACLInterceptor.java) | 2 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/AccountService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/account/AccountService.java) | 2 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/AuditService.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java) | 2 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/AuthMethodInterceptor.java (renamed from base/server/cms/src/com/netscape/cms/authorization/AuthMethodInterceptor.java) | 2 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/GroupService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java) | 3 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/SecurityDomainService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java) | 3 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java (renamed from base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java) | 2 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/SystemCertService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/admin/SystemCertService.java) | 2 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java) | 5 | ||||
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/UserService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java) | 3 | ||||
-rw-r--r-- | base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java | 6 | ||||
-rwxr-xr-x | base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass | 74 | ||||
-rw-r--r-- | base/tks/shared/webapps/tks/WEB-INF/web.xml | 2 | ||||
-rw-r--r-- | base/tks/src/CMakeLists.txt | 61 | ||||
-rw-r--r-- | base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java (renamed from base/tks/src/com/netscape/tks/TKSApplication.java) | 22 | ||||
-rw-r--r-- | base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java (renamed from base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/CMakeLists.txt | 44 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java | 14 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionDatabase.java) | 5 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileDatabase.java) | 5 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingDatabase.java) | 5 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectionService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java) | 27 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java) | 4 |
62 files changed, 400 insertions, 205 deletions
diff --git a/base/ca/shared/webapps/ca/WEB-INF/web.xml b/base/ca/shared/webapps/ca/WEB-INF/web.xml index 6bf137ca7..5f20ed194 100644 --- a/base/ca/shared/webapps/ca/WEB-INF/web.xml +++ b/base/ca/shared/webapps/ca/WEB-INF/web.xml @@ -1860,7 +1860,7 @@ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class> <init-param> <param-name>javax.ws.rs.Application</param-name> - <param-value>com.netscape.ca.CertificateAuthorityApplication</param-value> + <param-value>org.dogtagpki.server.ca.rest.CAApplication</param-value> </init-param> </servlet> diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt index 74533814a..5b805e1b3 100644 --- a/base/ca/src/CMakeLists.txt +++ b/base/ca/src/CMakeLists.txt @@ -24,6 +24,13 @@ find_file(COMMONS_CODEC_JAR /usr/share/java ) +find_file(COMMONS_LANG_JAR + NAMES + commons-lang.jar + PATHS + /usr/share/java +) + find_file(JAXRS_API_JAR NAMES jaxrs-api.jar @@ -31,6 +38,20 @@ find_file(JAXRS_API_JAR ${RESTEASY_LIB} ) +find_file(RESTEASY_JAXRS_JAR + NAMES + resteasy-jaxrs.jar + PATHS + ${RESTEASY_LIB} +) + +find_file(RESTEASY_ATOM_PROVIDER_JAR + NAMES + resteasy-atom-provider.jar + PATHS + ${RESTEASY_LIB} +) + find_file(SERVLET_JAR NAMES servlet.jar @@ -39,15 +60,26 @@ find_file(SERVLET_JAR /usr/share/java ) +find_file(TOMCAT_CATALINA_JAR + NAMES + catalina.jar + PATHS + /usr/share/java/tomcat +) + # build pki-ca javac(pki-ca-classes SOURCES com/netscape/ca/*.java + org/dogtagpki/server/ca/*.java CLASSPATH - ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} + ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR} + ${JSS_JAR} ${SYMKEY_JAR} + ${LDAPJDK_JAR} + ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} + ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} - ${LDAPJDK_JAR} ${JAXRS_API_JAR} - ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} ${SERVLET_JAR} + ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS @@ -70,6 +102,7 @@ jar(pki-ca-jar ${CMAKE_BINARY_DIR}/classes FILES com/netscape/ca/*.class + org/dogtagpki/server/ca/*.class DEPENDS pki-ca-classes ) diff --git a/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java b/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java index b20a544f5..78f3da941 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java @@ -1,35 +1,32 @@ -package com.netscape.ca; +package org.dogtagpki.server.ca.rest; import java.util.LinkedHashSet; import java.util.Set; import javax.ws.rs.core.Application; +import org.dogtagpki.server.rest.ACLInterceptor; +import org.dogtagpki.server.rest.AccountService; +import org.dogtagpki.server.rest.AuditService; +import org.dogtagpki.server.rest.AuthMethodInterceptor; +import org.dogtagpki.server.rest.GroupService; +import org.dogtagpki.server.rest.SecurityDomainService; +import org.dogtagpki.server.rest.SelfTestService; +import org.dogtagpki.server.rest.SystemCertService; +import org.dogtagpki.server.rest.SystemConfigService; +import org.dogtagpki.server.rest.UserService; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.PKIException; -import com.netscape.cms.authorization.ACLInterceptor; -import com.netscape.cms.authorization.AuthMethodInterceptor; -import com.netscape.cms.servlet.account.AccountService; -import com.netscape.cms.servlet.admin.GroupService; -import com.netscape.cms.servlet.admin.KRAConnectorService; -import com.netscape.cms.servlet.admin.SystemCertService; -import com.netscape.cms.servlet.admin.UserService; -import com.netscape.cms.servlet.cert.CertService; -import com.netscape.cms.servlet.csadmin.SecurityDomainService; -import com.netscape.cms.servlet.csadmin.SystemConfigService; -import com.netscape.cms.servlet.profile.ProfileService; -import com.netscape.cms.servlet.request.CertRequestService; -import com.netscape.cmscore.logging.AuditService; -import com.netscape.cmscore.selftests.SelfTestService; - -public class CertificateAuthorityApplication extends Application { + +public class CAApplication extends Application { private Set<Object> singletons = new LinkedHashSet<Object>(); private Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); - public CertificateAuthorityApplication() { + public CAApplication() { // account classes.add(AccountService.class); diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/CertRequestService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CertRequestService.java index df50a007e..74f7b52f6 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/request/CertRequestService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/CertRequestService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.request; +package org.dogtagpki.server.ca.rest; import java.net.URI; import java.util.ArrayList; @@ -61,7 +61,6 @@ import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestNotFoundException; import com.netscape.cms.servlet.base.PKIService; import com.netscape.cms.servlet.cert.CertRequestDAO; -import com.netscape.cms.servlet.profile.ProfileService; import com.netscape.cmsutil.ldap.LDAPUtil; /** diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/CertService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java index e8e735e46..e8d0f2d88 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/CertService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.cert; +package org.dogtagpki.server.ca.rest; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -77,6 +77,9 @@ import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.cms.realm.PKIPrincipal; import com.netscape.cms.servlet.base.PKIService; +import com.netscape.cms.servlet.cert.CertRequestDAO; +import com.netscape.cms.servlet.cert.FilterBuilder; +import com.netscape.cms.servlet.cert.RevocationProcessor; import com.netscape.cms.servlet.processors.CAProcessor; import com.netscape.cmsutil.ldap.LDAPUtil; import com.netscape.cmsutil.util.Utils; diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java b/base/ca/src/org/dogtagpki/server/ca/rest/KRAConnectorService.java index 310e08206..b488e5381 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/KRAConnectorService.java @@ -15,7 +15,7 @@ // (C) 2013 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.admin; +package org.dogtagpki.server.ca.rest; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; @@ -29,6 +29,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.system.KRAConnectorInfo; import com.netscape.certsrv.system.KRAConnectorResource; +import com.netscape.cms.servlet.admin.KRAConnectorProcessor; import com.netscape.cms.servlet.base.PKIService; /** diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java index eb9dc83df..4c2b259b2 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java @@ -16,7 +16,7 @@ //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.profile; +package org.dogtagpki.server.ca.rest; import java.io.File; import java.io.IOException; @@ -76,6 +76,8 @@ import com.netscape.certsrv.registry.IPluginInfo; import com.netscape.certsrv.registry.IPluginRegistry; import com.netscape.cms.realm.PKIPrincipal; import com.netscape.cms.servlet.base.PKIService; +import com.netscape.cms.servlet.profile.PolicyConstraintFactory; +import com.netscape.cms.servlet.profile.PolicyDefaultFactory; /** * @author alee diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml index d27d88d71..0a5f92ae2 100644 --- a/base/kra/shared/webapps/kra/WEB-INF/web.xml +++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml @@ -830,7 +830,7 @@ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class> <init-param> <param-name>javax.ws.rs.Application</param-name> - <param-value>com.netscape.kra.KeyRecoveryAuthorityApplication</param-value> + <param-value>org.dogtagpki.server.kra.rest.KRAApplication</param-value> </init-param> </servlet> diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt index ccbc6a6c3..bcac9704c 100644 --- a/base/kra/src/CMakeLists.txt +++ b/base/kra/src/CMakeLists.txt @@ -46,6 +46,21 @@ find_file(LDAPJDK_JAR /usr/share/java ) +# '${JAVA_LIB_INSTALL_DIR}' jars +find_file(JSS_JAR + NAMES + jss4.jar + PATHS + ${JAVA_LIB_INSTALL_DIR} +) + +find_file(COMMONS_CODEC_JAR + NAMES + commons-codec.jar + PATHS + /usr/share/java +) + find_file(JAXRS_API_JAR NAMES jaxrs-api.jar @@ -53,18 +68,25 @@ find_file(JAXRS_API_JAR ${RESTEASY_LIB} ) -# '${JAVA_LIB_INSTALL_DIR}' jars -find_file(JSS_JAR +find_file(RESTEASY_JAXRS_JAR NAMES - jss4.jar + resteasy-jaxrs.jar PATHS - ${JAVA_LIB_INSTALL_DIR} + ${RESTEASY_LIB} ) -find_file(COMMONS_CODEC_JAR +find_file(RESTEASY_ATOM_PROVIDER_JAR NAMES - commons-codec.jar + resteasy-atom-provider.jar PATHS + ${RESTEASY_LIB} +) + +find_file(SERVLET_JAR + NAMES + servlet.jar + PATHS + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -87,11 +109,15 @@ find_file(COMMONS_LANG_JAR javac(pki-kra-classes SOURCES com/netscape/kra/*.java + org/dogtagpki/server/kra/*.java CLASSPATH - ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} + ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR} + ${JSS_JAR} ${SYMKEY_JAR} + ${LDAPJDK_JAR} + ${SERVLET_JAR} + ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} - ${LDAPJDK_JAR} ${JAXRS_API_JAR} - ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR} ${SYMKEY_JAR} + ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS @@ -114,6 +140,7 @@ jar(pki-kra-jar ${CMAKE_BINARY_DIR}/classes FILES com/netscape/kra/*.class + org/dogtagpki/server/kra/*.class DEPENDS pki-kra-classes ) diff --git a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java index f3b7709e7..269fa8df4 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java @@ -30,6 +30,7 @@ import java.util.Random; import javax.crypto.spec.RC2ParameterSpec; +import org.dogtagpki.server.kra.rest.KeyRequestService; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.asn1.OCTET_STRING; import org.mozilla.jss.crypto.Cipher; @@ -64,7 +65,6 @@ import com.netscape.certsrv.request.IService; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.security.IStorageKeyUnit; import com.netscape.certsrv.security.ITransportKeyUnit; -import com.netscape.cms.servlet.request.KeyRequestService; import com.netscape.cmscore.dbs.KeyRecord; import com.netscape.cmsutil.util.Utils; diff --git a/base/kra/src/com/netscape/kra/SecurityDataService.java b/base/kra/src/com/netscape/kra/SecurityDataService.java index b9620f5d2..8201414db 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataService.java @@ -19,6 +19,7 @@ package com.netscape.kra; import java.math.BigInteger; +import org.dogtagpki.server.kra.rest.KeyRequestService; import org.mozilla.jss.crypto.SymmetricKey; import com.netscape.certsrv.apps.CMS; @@ -35,7 +36,6 @@ import com.netscape.certsrv.request.IService; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.security.IStorageKeyUnit; import com.netscape.certsrv.security.ITransportKeyUnit; -import com.netscape.cms.servlet.request.KeyRequestService; import com.netscape.cmscore.dbs.KeyRecord; import com.netscape.cmsutil.util.Utils; diff --git a/base/kra/src/com/netscape/kra/SymKeyGenService.java b/base/kra/src/com/netscape/kra/SymKeyGenService.java index d1e60fa70..774bbcda9 100644 --- a/base/kra/src/com/netscape/kra/SymKeyGenService.java +++ b/base/kra/src/com/netscape/kra/SymKeyGenService.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IService; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.security.IStorageKeyUnit; -import com.netscape.cms.servlet.request.KeyRequestService; +import com.netscape.cms.servlet.key.KeyRequestDAO; import com.netscape.cmscore.dbs.KeyRecord; /** @@ -113,7 +113,7 @@ public class SymKeyGenService implements IService { } CryptoToken token = mStorageUnit.getToken(); - KeyGenAlgorithm kgAlg = KeyRequestService.KEYGEN_ALGORITHMS.get(algorithm); + KeyGenAlgorithm kgAlg = KeyRequestDAO.KEYGEN_ALGORITHMS.get(algorithm); if (kgAlg == null) { throw new EBaseException("Invalid algorithm"); } diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java b/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java index 0b311427f..ea8a6c038 100644 --- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java +++ b/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java @@ -1,33 +1,32 @@ -package com.netscape.kra; +package org.dogtagpki.server.kra.rest; import java.util.LinkedHashSet; import java.util.Set; import javax.ws.rs.core.Application; +import org.dogtagpki.server.rest.ACLInterceptor; +import org.dogtagpki.server.rest.AccountService; +import org.dogtagpki.server.rest.AuditService; +import org.dogtagpki.server.rest.AuthMethodInterceptor; +import org.dogtagpki.server.rest.GroupService; +import org.dogtagpki.server.rest.SecurityDomainService; +import org.dogtagpki.server.rest.SelfTestService; +import org.dogtagpki.server.rest.SystemCertService; +import org.dogtagpki.server.rest.SystemConfigService; +import org.dogtagpki.server.rest.UserService; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.PKIException; -import com.netscape.cms.authorization.ACLInterceptor; -import com.netscape.cms.authorization.AuthMethodInterceptor; -import com.netscape.cms.servlet.account.AccountService; -import com.netscape.cms.servlet.admin.GroupService; -import com.netscape.cms.servlet.admin.SystemCertService; -import com.netscape.cms.servlet.admin.UserService; -import com.netscape.cms.servlet.csadmin.SecurityDomainService; -import com.netscape.cms.servlet.csadmin.SystemConfigService; -import com.netscape.cms.servlet.key.KeyService; -import com.netscape.cms.servlet.request.KeyRequestService; -import com.netscape.cmscore.logging.AuditService; -import com.netscape.cmscore.selftests.SelfTestService; - -public class KeyRecoveryAuthorityApplication extends Application { + +public class KRAApplication extends Application { private Set<Object> singletons = new LinkedHashSet<Object>(); private Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); - public KeyRecoveryAuthorityApplication() { + public KRAApplication() { // account classes.add(AccountService.class); diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java b/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java index e2253b6e8..4f3ef57af 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java +++ b/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.request; +package org.dogtagpki.server.kra.rest; import java.lang.reflect.InvocationTargetException; import java.math.BigInteger; @@ -36,7 +36,6 @@ import javax.ws.rs.core.UriInfo; import netscape.security.x509.X509CertImpl; -import org.mozilla.jss.crypto.KeyGenAlgorithm; import org.mozilla.jss.crypto.SymmetricKey; import com.netscape.certsrv.apps.CMS; @@ -103,18 +102,6 @@ public class KeyRequestService extends PKIService implements KeyRequestResource private IRequestQueue queue; private IKeyService service; - public static final Map<String, KeyGenAlgorithm> KEYGEN_ALGORITHMS; - - static { - KEYGEN_ALGORITHMS = new HashMap<String, KeyGenAlgorithm>(); - KEYGEN_ALGORITHMS.put(KeyRequestResource.DES_ALGORITHM, KeyGenAlgorithm.DES); - KEYGEN_ALGORITHMS.put(KeyRequestResource.DESEDE_ALGORITHM, KeyGenAlgorithm.DESede); - KEYGEN_ALGORITHMS.put(KeyRequestResource.DES3_ALGORITHM, KeyGenAlgorithm.DES3); - KEYGEN_ALGORITHMS.put(KeyRequestResource.RC2_ALGORITHM, KeyGenAlgorithm.RC2); - KEYGEN_ALGORITHMS.put(KeyRequestResource.RC4_ALGORITHM, KeyGenAlgorithm.RC4); - KEYGEN_ALGORITHMS.put(KeyRequestResource.AES_ALGORITHM, KeyGenAlgorithm.AES); - } - public static final Map<String, SymmetricKey.Type> SYMKEY_TYPES; static { SYMKEY_TYPES = new HashMap<String, SymmetricKey.Type>(); diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java b/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java index 520ae4c5a..93fc53b12 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java +++ b/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.key; +package org.dogtagpki.server.kra.rest; import java.math.BigInteger; @@ -68,6 +68,7 @@ import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.base.PKIService; +import com.netscape.cms.servlet.key.KeyRequestDAO; import com.netscape.cmsutil.ldap.LDAPUtil; import com.netscape.cmsutil.util.Utils; diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml index 8002f749b..249f1eb1b 100644 --- a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml +++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml @@ -540,7 +540,7 @@ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class> <init-param> <param-name>javax.ws.rs.Application</param-name> - <param-value>com.netscape.ocsp.OCSPApplication</param-value> + <param-value>org.dogtagpki.server.ocsp.rest.OCSPApplication</param-value> </init-param> </servlet> diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt index d3bdf0ed2..d4a2009a9 100644 --- a/base/ocsp/src/CMakeLists.txt +++ b/base/ocsp/src/CMakeLists.txt @@ -80,6 +80,7 @@ find_file(SYMKEY_JAR javac(pki-ocsp-classes SOURCES com/netscape/ocsp/*.java + org/dogtagpki/server/ocsp/*.java CLASSPATH ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} @@ -107,6 +108,7 @@ jar(pki-ocsp-jar ${CMAKE_BINARY_DIR}/classes FILES com/netscape/ocsp/*.class + org/dogtagpki/server/ocsp/*.class DEPENDS pki-ocsp-classes ) diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java index 21b81f47f..1be534978 100644 --- a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java +++ b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java @@ -1,24 +1,25 @@ -package com.netscape.ocsp; +package org.dogtagpki.server.ocsp.rest; import java.util.LinkedHashSet; import java.util.Set; import javax.ws.rs.core.Application; +import org.dogtagpki.server.rest.ACLInterceptor; +import org.dogtagpki.server.rest.AccountService; +import org.dogtagpki.server.rest.AuditService; +import org.dogtagpki.server.rest.AuthMethodInterceptor; +import org.dogtagpki.server.rest.GroupService; +import org.dogtagpki.server.rest.SecurityDomainService; +import org.dogtagpki.server.rest.SelfTestService; +import org.dogtagpki.server.rest.SystemCertService; +import org.dogtagpki.server.rest.SystemConfigService; +import org.dogtagpki.server.rest.UserService; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.PKIException; -import com.netscape.cms.authorization.ACLInterceptor; -import com.netscape.cms.authorization.AuthMethodInterceptor; -import com.netscape.cms.servlet.account.AccountService; -import com.netscape.cms.servlet.admin.GroupService; -import com.netscape.cms.servlet.admin.SystemCertService; -import com.netscape.cms.servlet.admin.UserService; -import com.netscape.cms.servlet.csadmin.SecurityDomainService; -import com.netscape.cms.servlet.csadmin.SystemConfigService; -import com.netscape.cmscore.logging.AuditService; -import com.netscape.cmscore.selftests.SelfTestService; public class OCSPApplication extends Application { diff --git a/base/server/cms/src/CMakeLists.txt b/base/server/cms/src/CMakeLists.txt index 16fa1fe8a..d414d2859 100644 --- a/base/server/cms/src/CMakeLists.txt +++ b/base/server/cms/src/CMakeLists.txt @@ -30,9 +30,9 @@ find_file(COMMONS_HTTPCLIENT_JAR /usr/share/java ) -find_file(APACHE_COMMONS_LANG_JAR +find_file(COMMONS_LANG_JAR NAMES - apache-commons-lang.jar + commons-lang.jar PATHS /usr/share/java ) @@ -122,14 +122,16 @@ find_file(HTTPCORE_JAR javac(pki-cms-classes SOURCES com/netscape/cms/*.java + org/dogtagpki/server/*.java CLASSPATH - ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_TOMCAT_JAR} - ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR} - ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR} - ${APACHE_COMMONS_LANG_JAR} - ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR} - ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} + ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR} ${COMMONS_HTTPCLIENT_JAR} ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} + ${XALAN_JAR} ${XERCES_JAR} + ${JSS_JAR} ${SYMKEY_JAR} + ${LDAPJDK_JAR} + ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${VELOCITY_JAR} + ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} + ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_TOMCAT_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS @@ -152,6 +154,7 @@ jar(pki-cms-jar ${CMAKE_BINARY_DIR}/classes FILES com/netscape/cms/*.class + org/dogtagpki/server/*.class EXCLUDE com/netscape/cms/tomcat/*.class DEPENDS diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index ded7c1eed..2ef7090f6 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -158,11 +158,11 @@ import com.netscape.certsrv.system.InstallToken; import com.netscape.certsrv.system.SecurityDomainClient; import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.certsrv.system.TPSConnectorData; +import com.netscape.certsrv.user.UserResource; import com.netscape.certsrv.usrgrp.EUsrGrpException; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; -import com.netscape.cms.servlet.admin.UserService; import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.http.HttpClient; import com.netscape.cmsutil.http.HttpRequest; @@ -3759,7 +3759,7 @@ public class ConfigurationUtils { IUser user = system.getUser(adminID); List<String> profiles = new ArrayList<String>(); - profiles.add(UserService.ALL_PROFILES); + profiles.add(UserResource.ALL_PROFILES); user.setTpsProfiles(profiles); system.modifyUser(user); diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java index 93e0018c4..f72c4c78b 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java +++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java @@ -19,8 +19,10 @@ package com.netscape.cms.servlet.key; import java.util.Collection; import java.util.Enumeration; +import java.util.HashMap; import java.util.Hashtable; import java.util.List; +import java.util.Map; import javax.ws.rs.Path; import javax.ws.rs.core.UriBuilder; @@ -54,7 +56,6 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.request.CMSRequestDAO; -import com.netscape.cms.servlet.request.KeyRequestService; /** * @author alee @@ -62,6 +63,18 @@ import com.netscape.cms.servlet.request.KeyRequestService; */ public class KeyRequestDAO extends CMSRequestDAO { + public static final Map<String, KeyGenAlgorithm> KEYGEN_ALGORITHMS; + + static { + KEYGEN_ALGORITHMS = new HashMap<String, KeyGenAlgorithm>(); + KEYGEN_ALGORITHMS.put(KeyRequestResource.DES_ALGORITHM, KeyGenAlgorithm.DES); + KEYGEN_ALGORITHMS.put(KeyRequestResource.DESEDE_ALGORITHM, KeyGenAlgorithm.DESede); + KEYGEN_ALGORITHMS.put(KeyRequestResource.DES3_ALGORITHM, KeyGenAlgorithm.DES3); + KEYGEN_ALGORITHMS.put(KeyRequestResource.RC2_ALGORITHM, KeyGenAlgorithm.RC2); + KEYGEN_ALGORITHMS.put(KeyRequestResource.RC4_ALGORITHM, KeyGenAlgorithm.RC4); + KEYGEN_ALGORITHMS.put(KeyRequestResource.AES_ALGORITHM, KeyGenAlgorithm.AES); + } + private static String REQUEST_ARCHIVE_OPTIONS = IEnrollProfile.REQUEST_ARCHIVE_OPTIONS; private static String REQUEST_SECURITY_DATA = IEnrollProfile.REQUEST_SECURITY_DATA; private static String REQUEST_SESSION_KEY = IEnrollProfile.REQUEST_SESSION_KEY; @@ -266,7 +279,7 @@ public class KeyRequestDAO extends CMSRequestDAO { keySize = new Integer(128); } - KeyGenAlgorithm alg = KeyRequestService.KEYGEN_ALGORITHMS.get(algName); + KeyGenAlgorithm alg = KEYGEN_ALGORITHMS.get(algName); if (alg == null) { throw new BadRequestException("Invalid Algorithm"); } diff --git a/base/server/cms/src/com/netscape/cms/authorization/ACLInterceptor.java b/base/server/cms/src/org/dogtagpki/server/rest/ACLInterceptor.java index c4b890e12..7ea5d74aa 100644 --- a/base/server/cms/src/com/netscape/cms/authorization/ACLInterceptor.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/ACLInterceptor.java @@ -15,7 +15,7 @@ //(C) 2012 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.authorization; +package org.dogtagpki.server.rest; import java.io.File; import java.io.FileReader; diff --git a/base/server/cms/src/com/netscape/cms/servlet/account/AccountService.java b/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java index 1a07a3a23..a016bda69 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/account/AccountService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.account; +package org.dogtagpki.server.rest; import java.security.Principal; diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java index 284d8a639..26fd0c0d7 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cmscore.logging; +package org.dogtagpki.server.rest; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/base/server/cms/src/com/netscape/cms/authorization/AuthMethodInterceptor.java b/base/server/cms/src/org/dogtagpki/server/rest/AuthMethodInterceptor.java index 6d26840b6..ac0b2518c 100644 --- a/base/server/cms/src/com/netscape/cms/authorization/AuthMethodInterceptor.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/AuthMethodInterceptor.java @@ -15,7 +15,7 @@ //(C) 2013 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.authorization; +package org.dogtagpki.server.rest; import java.io.File; import java.io.FileReader; diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java index 3af4bae43..2c3c0011a 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.admin; +package org.dogtagpki.server.rest; import java.net.URI; import java.net.URLEncoder; @@ -49,6 +49,7 @@ import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cms.servlet.admin.GroupMemberProcessor; import com.netscape.cms.servlet.base.PKIService; import com.netscape.cmsutil.ldap.LDAPUtil; diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java b/base/server/cms/src/org/dogtagpki/server/rest/SecurityDomainService.java index 399c28a35..27a0fde11 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SecurityDomainService.java @@ -15,7 +15,7 @@ // (C) 2012 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.csadmin; +package org.dogtagpki.server.rest; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; @@ -29,6 +29,7 @@ import com.netscape.certsrv.system.DomainInfo; import com.netscape.certsrv.system.InstallToken; import com.netscape.certsrv.system.SecurityDomainResource; import com.netscape.cms.servlet.base.PKIService; +import com.netscape.cms.servlet.csadmin.SecurityDomainProcessor; /** * @author alee diff --git a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java b/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java index bc632fee1..652875fe8 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cmscore.selftests; +package org.dogtagpki.server.rest; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/SystemCertService.java b/base/server/cms/src/org/dogtagpki/server/rest/SystemCertService.java index 50df221f9..c4f26f829 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/SystemCertService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemCertService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.admin; +package org.dogtagpki.server.rest; import java.security.cert.CertificateEncodingException; diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java index a2c7b525b..901d51769 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java @@ -15,7 +15,7 @@ // (C) 2012 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.csadmin; +package org.dogtagpki.server.rest; import java.math.BigInteger; import java.net.MalformedURLException; @@ -62,6 +62,9 @@ import com.netscape.certsrv.system.SystemConfigResource; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; import com.netscape.cms.servlet.base.PKIService; +import com.netscape.cms.servlet.csadmin.Cert; +import com.netscape.cms.servlet.csadmin.ConfigurationUtils; +import com.netscape.cms.servlet.csadmin.SystemCertDataFactory; import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.util.Utils; diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java index 70124b4f4..ac1f0617f 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.admin; +package org.dogtagpki.server.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -74,6 +74,7 @@ import com.netscape.certsrv.usrgrp.EUsrGrpException; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.admin.GroupMemberProcessor; import com.netscape.cms.servlet.base.PKIService; import com.netscape.cmsutil.ldap.LDAPUtil; import com.netscape.cmsutil.util.Cert; diff --git a/base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java index ef09a1ab5..dd59335bd 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java +++ b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java @@ -25,9 +25,9 @@ import java.util.Vector; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.user.UserResource; import com.netscape.certsrv.usrgrp.IUser; import com.netscape.certsrv.usrgrp.IUsrGrp; -import com.netscape.cms.servlet.admin.UserService; /** * A class represents a user. @@ -77,7 +77,7 @@ public class User implements IUser { public void setTpsProfiles(List<String> tpsProfiles) { boolean setAll = false; for (String profile: tpsProfiles) { - if (profile.equals(UserService.ALL_PROFILES)) { + if (profile.equals(UserResource.ALL_PROFILES)) { setAll = true; break; } @@ -86,7 +86,7 @@ public class User implements IUser { this.tpsProfiles = tpsProfiles; } else { List<String> list = new ArrayList<String>(); - list.add(UserService.ALL_PROFILES); + list.add(UserResource.ALL_PROFILES); this.tpsProfiles = list; } } diff --git a/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass b/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass new file mode 100755 index 000000000..bd10b09fe --- /dev/null +++ b/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass @@ -0,0 +1,74 @@ +#!/usr/bin/python +# Authors: +# Endi S. Dewata <edewata@redhat.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Copyright (C) 2014 Red Hat, Inc. +# All rights reserved. +# + +import os +import sys +from lxml import etree as ET + +import pki +import pki.server.upgrade + +class ReplaceRESTEasyApplicationClass(pki.server.upgrade.PKIServerUpgradeScriptlet): + + def __init__(self): + + self.message = 'Replace RESTEasy application class' + self.class_names = { + 'ca': 'org.dogtagpki.server.ca.rest.CAApplication', + 'kra': 'org.dogtagpki.server.kra.rest.KRAApplication', + 'ocsp': 'org.dogtagpki.server.ocsp.rest.OCSPApplication', + 'tks': 'org.dogtagpki.server.tks.rest.TKSApplication', + 'tps': 'org.dogtagpki.server.tps.rest.TPSApplication' + } + + def upgrade_subsystem(self, instance, subsystem): + + if subsystem.name not in self.class_names: + return + + web_xml = os.path.join( + instance.base_dir, + 'webapps', subsystem.name, + 'WEB-INF', 'web.xml') + + self.backup(web_xml) + + doc = ET.parse(web_xml) + root = doc.getroot() + + servlet = root.find('servlet[servlet-name="Resteasy"]') + + if servlet is None: + raise Exception('Resteasy servlet not found in ' + web_xml) + + param = servlet.find('init-param[param-name="javax.ws.rs.Application"]') + + if param is None: + raise Exception('Resteasy application parameter not found in ' + web_xml) + + value = param.find('param-value') + + if value is None: + raise Exception('Resteasy application value not found in ' + web_xml) + + value.text = self.class_names[subsystem.name] + + doc.write(web_xml) diff --git a/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml index 652736217..e4650475d 100644 --- a/base/tks/shared/webapps/tks/WEB-INF/web.xml +++ b/base/tks/shared/webapps/tks/WEB-INF/web.xml @@ -295,7 +295,7 @@ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class> <init-param> <param-name>javax.ws.rs.Application</param-name> - <param-value>com.netscape.tks.TKSApplication</param-value> + <param-value>org.dogtagpki.server.tks.rest.TKSApplication</param-value> </init-param> </servlet> diff --git a/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt index 9d0d3a70a..d1ebbb13d 100644 --- a/base/tks/src/CMakeLists.txt +++ b/base/tks/src/CMakeLists.txt @@ -46,14 +46,6 @@ find_file(LDAPJDK_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - - # '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES @@ -69,6 +61,34 @@ find_file(COMMONS_CODEC_JAR /usr/share/java ) +find_file(COMMONS_LANG_JAR + NAMES + commons-lang.jar + PATHS + /usr/share/java +) + +find_file(JAXRS_API_JAR + NAMES + jaxrs-api.jar + PATHS + ${RESTEASY_LIB} +) + +find_file(RESTEASY_JAXRS_JAR + NAMES + resteasy-jaxrs.jar + PATHS + ${RESTEASY_LIB} +) + +find_file(RESTEASY_ATOM_PROVIDER_JAR + NAMES + resteasy-atom-provider.jar + PATHS + ${RESTEASY_LIB} +) + find_file(SYMKEY_JAR NAMES symkey.jar @@ -76,16 +96,34 @@ find_file(SYMKEY_JAR ${JAVA_LIB_INSTALL_DIR} ) +find_file(SERVLET_JAR + NAMES + servlet.jar + PATHS + ${JAVA_LIB_INSTALL_DIR} + /usr/share/java +) + +find_file(TOMCAT_CATALINA_JAR + NAMES + catalina.jar + PATHS + /usr/share/java/tomcat +) # build pki-tks javac(pki-tks-classes SOURCES com/netscape/tks/*.java + org/dogtagpki/server/tks/*.java CLASSPATH - ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} + ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR} + ${LDAPJDK_JAR} + ${JSS_JAR} ${SYMKEY_JAR} + ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} + ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} - ${LDAPJDK_JAR} ${JAXRS_API_JAR} - ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} + ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS @@ -108,6 +146,7 @@ jar(pki-tks-jar ${CMAKE_BINARY_DIR}/classes FILES com/netscape/tks/*.class + org/dogtagpki/server/tks/*.class DEPENDS pki-tks-classes ) diff --git a/base/tks/src/com/netscape/tks/TKSApplication.java b/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java index f4a8730d9..976b9bd9f 100644 --- a/base/tks/src/com/netscape/tks/TKSApplication.java +++ b/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java @@ -1,21 +1,21 @@ -package com.netscape.tks; +package org.dogtagpki.server.tks.rest; import java.util.LinkedHashSet; import java.util.Set; import javax.ws.rs.core.Application; +import org.dogtagpki.server.rest.ACLInterceptor; +import org.dogtagpki.server.rest.AccountService; +import org.dogtagpki.server.rest.AuditService; +import org.dogtagpki.server.rest.AuthMethodInterceptor; +import org.dogtagpki.server.rest.GroupService; +import org.dogtagpki.server.rest.SelfTestService; +import org.dogtagpki.server.rest.SystemCertService; +import org.dogtagpki.server.rest.SystemConfigService; +import org.dogtagpki.server.rest.UserService; + import com.netscape.certsrv.base.PKIException; -import com.netscape.cms.authorization.ACLInterceptor; -import com.netscape.cms.authorization.AuthMethodInterceptor; -import com.netscape.cms.servlet.account.AccountService; -import com.netscape.cms.servlet.admin.GroupService; -import com.netscape.cms.servlet.admin.SystemCertService; -import com.netscape.cms.servlet.admin.UserService; -import com.netscape.cms.servlet.csadmin.SystemConfigService; -import com.netscape.cms.servlet.tks.TPSConnectorService; -import com.netscape.cmscore.logging.AuditService; -import com.netscape.cmscore.selftests.SelfTestService; public class TKSApplication extends Application { diff --git a/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java b/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java index c11f1239f..36512690a 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java +++ b/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java @@ -1,4 +1,4 @@ -package com.netscape.cms.servlet.tks; +package org.dogtagpki.server.tks.rest; import java.io.IOException; import java.net.URI; diff --git a/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml b/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml index 6f83271cc..0fe3df4dc 100644 --- a/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml +++ b/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml @@ -119,7 +119,7 @@ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class> <init-param> <param-name>javax.ws.rs.Application</param-name> - <param-value>org.dogtagpki.server.tps.TPSApplication</param-value> + <param-value>org.dogtagpki.server.tps.rest.TPSApplication</param-value> </init-param> </servlet> diff --git a/base/tps-tomcat/src/CMakeLists.txt b/base/tps-tomcat/src/CMakeLists.txt index 837587f63..0070a3c34 100644 --- a/base/tps-tomcat/src/CMakeLists.txt +++ b/base/tps-tomcat/src/CMakeLists.txt @@ -1,12 +1,5 @@ project(pki-tps_java NONE) -find_file(APACHE_COMMONS_LANG_JAR - NAMES - apache-commons-lang.jar - PATHS - /usr/share/java -) - find_file(LDAPJDK_JAR NAMES ldapjdk.jar @@ -14,13 +7,6 @@ find_file(LDAPJDK_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(JSS_JAR NAMES jss4.jar @@ -35,6 +21,13 @@ find_file(COMMONS_CODEC_JAR /usr/share/java ) +find_file(COMMONS_LANG_JAR + NAMES + commons-lang.jar + PATHS + /usr/share/java +) + find_file(JAXRS_API_JAR NAMES jaxrs-api.jar @@ -84,6 +77,20 @@ find_file(PKI_NSUTIL_JAR /usr/share/java/pki ) +find_file(JAXRS_API_JAR + NAMES + jaxrs-api.jar + PATHS + ${RESTEASY_LIB} +) + +find_file(RESTEASY_JAXRS_JAR + NAMES + resteasy-jaxrs.jar + PATHS + ${RESTEASY_LIB} +) + find_file(RESTEASY_ATOM_PROVIDER_JAR NAMES resteasy-atom-provider.jar @@ -112,10 +119,13 @@ javac(pki-tps-classes SOURCES org/dogtagpki/server/tps/*.java CLASSPATH - ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} + ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR} + ${LDAPJDK_JAR} + ${JSS_JAR} ${SYMKEY_JAR} + ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} + ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} - ${APACHE_COMMONS_LANG_JAR} ${LDAPJDK_JAR} ${JAXRS_API_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} - ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} + ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java index e17d37d10..eb279d819 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.tps; -import org.dogtagpki.server.tps.authenticator.AuthenticatorDatabase; -import org.dogtagpki.server.tps.cert.TPSCertDatabase; import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.connection.ConnectionDatabase; -import org.dogtagpki.server.tps.logging.ActivityDatabase; -import org.dogtagpki.server.tps.profile.ProfileDatabase; -import org.dogtagpki.server.tps.profile.ProfileMappingDatabase; -import org.dogtagpki.server.tps.token.TokenDatabase; +import org.dogtagpki.server.tps.config.ConnectionDatabase; +import org.dogtagpki.server.tps.config.ProfileDatabase; +import org.dogtagpki.server.tps.config.ProfileMappingDatabase; +import org.dogtagpki.server.tps.dbs.ActivityDatabase; +import org.dogtagpki.server.tps.dbs.AuthenticatorDatabase; +import org.dogtagpki.server.tps.dbs.TPSCertDatabase; +import org.dogtagpki.server.tps.dbs.TokenDatabase; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.NotInitializedException; import org.mozilla.jss.crypto.ObjectNotFoundException; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionDatabase.java index 1aadc7a07..35eb382ea 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionDatabase.java @@ -16,15 +16,12 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.connection; +package org.dogtagpki.server.tps.config; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.config.ConfigRecord; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionRecord.java index 71aac3139..3a2f78037 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.connection; +package org.dogtagpki.server.tps.config; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java index 794661281..6054bf38d 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java @@ -16,15 +16,12 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.config.ConfigRecord; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.cmscore.dbs.CSCfgDatabase; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java index febb71857..dca0beb02 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java @@ -16,15 +16,12 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.config.ConfigRecord; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.cmscore.dbs.CSCfgDatabase; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java index e44acd24a..92793ce5e 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java index 20c254d03..a84b7f5ba 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java index aecfcad2a..d48d31489 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.logging; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java index 4794ecb8b..815d5ee08 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.logging; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorDatabase.java index a4f735b73..f6425bc8d 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.authenticator; +package org.dogtagpki.server.tps.dbs; import java.util.ArrayList; import java.util.Collection; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorRecord.java index a07c05aaa..7586dbb05 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.authenticator; +package org.dogtagpki.server.tps.dbs; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java index d07a11f6d..9922c4d50 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.cert; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java index 6a55e60d6..958913953 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.cert; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java index d16e4fc25..517d3151e 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.token; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java index bf0d1b120..bab61ac19 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.token; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java index 0bed20311..1c331f150 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.logging; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,6 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.ActivityDatabase; +import org.dogtagpki.server.tps.dbs.ActivityRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java index 282ee4c0e..21d15cc10 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.authenticator; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.AuthenticatorDatabase; +import org.dogtagpki.server.tps.dbs.AuthenticatorRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectionService.java index a78420eda..2cd6f2bfd 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectionService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.connection; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.config.ConnectionDatabase; +import org.dogtagpki.server.tps.config.ConnectionRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java index bcb169578..8336bff7f 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.config.ProfileMappingDatabase; +import org.dogtagpki.server.tps.config.ProfileMappingRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java index edc7df1cd..866a1dc7f 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.config.ProfileDatabase; +import org.dogtagpki.server.tps.config.ProfileRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java index 2571e2604..0dfd2b7c0 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java @@ -15,32 +15,25 @@ // (C) 2013 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps; +package org.dogtagpki.server.tps.rest; import java.util.LinkedHashSet; import java.util.Set; import javax.ws.rs.core.Application; -import org.dogtagpki.server.tps.authenticator.AuthenticatorService; -import org.dogtagpki.server.tps.cert.TPSCertService; +import org.dogtagpki.server.rest.ACLInterceptor; +import org.dogtagpki.server.rest.AccountService; +import org.dogtagpki.server.rest.AuditService; +import org.dogtagpki.server.rest.AuthMethodInterceptor; +import org.dogtagpki.server.rest.GroupService; +import org.dogtagpki.server.rest.SelfTestService; +import org.dogtagpki.server.rest.SystemCertService; +import org.dogtagpki.server.rest.SystemConfigService; +import org.dogtagpki.server.rest.UserService; import org.dogtagpki.server.tps.config.ConfigService; -import org.dogtagpki.server.tps.connection.ConnectionService; -import org.dogtagpki.server.tps.logging.ActivityService; -import org.dogtagpki.server.tps.profile.ProfileMappingService; -import org.dogtagpki.server.tps.profile.ProfileService; -import org.dogtagpki.server.tps.token.TokenService; import com.netscape.certsrv.base.PKIException; -import com.netscape.cms.authorization.ACLInterceptor; -import com.netscape.cms.authorization.AuthMethodInterceptor; -import com.netscape.cms.servlet.account.AccountService; -import com.netscape.cms.servlet.admin.GroupService; -import com.netscape.cms.servlet.admin.SystemCertService; -import com.netscape.cms.servlet.admin.UserService; -import com.netscape.cms.servlet.csadmin.SystemConfigService; -import com.netscape.cmscore.logging.AuditService; -import com.netscape.cmscore.selftests.SelfTestService; /** * @author Endi S. Dewata <edewata@redhat.com> diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java index 0397f5cc1..45e5db6b8 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.cert; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,6 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.TPSCertDatabase; +import org.dogtagpki.server.tps.dbs.TPSCertRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java index 548c797b7..3f30e973b 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.token; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,6 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.TokenDatabase; +import org.dogtagpki.server.tps.dbs.TokenRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; |