From d6d197d1a4513a3262a59c3989845f69285a38ad Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 20 Feb 2014 16:58:34 -0500 Subject: Reorganized REST service classes. The REST service classes have been moved into org.dogtagpki.server namespace. A new upgrade script has been added to update existing instances. Ticket #114 --- base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml | 2 +- base/ocsp/src/CMakeLists.txt | 2 + .../src/com/netscape/ocsp/OCSPApplication.java | 76 --------------------- .../server/ocsp/rest/OCSPApplication.java | 77 ++++++++++++++++++++++ 4 files changed, 80 insertions(+), 77 deletions(-) delete mode 100644 base/ocsp/src/com/netscape/ocsp/OCSPApplication.java create mode 100644 base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java (limited to 'base/ocsp') 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 @@ org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher javax.ws.rs.Application - com.netscape.ocsp.OCSPApplication + org.dogtagpki.server.ocsp.rest.OCSPApplication 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/com/netscape/ocsp/OCSPApplication.java deleted file mode 100644 index 21b81f47f..000000000 --- a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.netscape.ocsp; - -import java.util.LinkedHashSet; -import java.util.Set; - -import javax.ws.rs.core.Application; - -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 { - - private Set singletons = new LinkedHashSet(); - private Set> classes = new LinkedHashSet>(); - - public OCSPApplication() { - - // account - classes.add(AccountService.class); - - // audit - classes.add(AuditService.class); - - // installer - classes.add(SystemConfigService.class); - - // security domain - IConfigStore cs = CMS.getConfigStore(); - try { - boolean standalone = cs.getBoolean("ocsp.standalone", false); - if (standalone) { - classes.add(SecurityDomainService.class); - } - } catch (EBaseException e) { - CMS.debug(e); - throw new RuntimeException(e); - } - - // selftests - classes.add(SelfTestService.class); - - // user and group management - classes.add(GroupService.class); - classes.add(UserService.class); - - // system certs - classes.add(SystemCertService.class); - - // exception mapper - classes.add(PKIException.Mapper.class); - - // interceptors - singletons.add(new AuthMethodInterceptor()); - singletons.add(new ACLInterceptor()); - } - - public Set> getClasses() { - return classes; - } - - public Set getSingletons() { - return singletons; - } -} diff --git a/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java new file mode 100644 index 000000000..1be534978 --- /dev/null +++ b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java @@ -0,0 +1,77 @@ +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; + +public class OCSPApplication extends Application { + + private Set singletons = new LinkedHashSet(); + private Set> classes = new LinkedHashSet>(); + + public OCSPApplication() { + + // account + classes.add(AccountService.class); + + // audit + classes.add(AuditService.class); + + // installer + classes.add(SystemConfigService.class); + + // security domain + IConfigStore cs = CMS.getConfigStore(); + try { + boolean standalone = cs.getBoolean("ocsp.standalone", false); + if (standalone) { + classes.add(SecurityDomainService.class); + } + } catch (EBaseException e) { + CMS.debug(e); + throw new RuntimeException(e); + } + + // selftests + classes.add(SelfTestService.class); + + // user and group management + classes.add(GroupService.class); + classes.add(UserService.class); + + // system certs + classes.add(SystemCertService.class); + + // exception mapper + classes.add(PKIException.Mapper.class); + + // interceptors + singletons.add(new AuthMethodInterceptor()); + singletons.add(new ACLInterceptor()); + } + + public Set> getClasses() { + return classes; + } + + public Set getSingletons() { + return singletons; + } +} -- cgit