Add Application files to list REST resources

8 files changed, 226 insertions, 4 deletions

diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
index 12436f301..cd0c352a8 100644
--- a/base/ca/src/CMakeLists.txt
+++ b/base/ca/src/CMakeLists.txt
@@ -24,6 +24,12 @@ find_file(COMMONS_CODEC_JAR
         /usr/share/java
 )
 
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        /usr/share/java/resteasy
+)
 
 # identify java sources
 set(pki-ca_java_SRCS
@@ -34,6 +40,7 @@ set(pki-ca_java_SRCS
     com/netscape/ca/CRLIssuingPoint.java
     com/netscape/ca/CAPolicy.java
     com/netscape/ca/CertificateAuthority.java
+    com/netscape/ca/CertificateAuthorityApplication.java
 )
 
 
@@ -41,7 +48,7 @@ set(pki-ca_java_SRCS
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
-    ${LDAPJDK_JAR}
+    ${LDAPJDK_JAR} ${JAXRS_API_JAR}
     ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
diff --git a/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java b/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java
new file mode 100644
index 000000000..a70a3600d
--- /dev/null
+++ b/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java
@@ -0,0 +1,57 @@
+package com.netscape.ca;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.core.Application;
+
+import com.netscape.cms.servlet.admin.GroupMemberResourceService;
+import com.netscape.cms.servlet.admin.GroupResourceService;
+import com.netscape.cms.servlet.admin.SystemCertificateResourceService;
+import com.netscape.cms.servlet.admin.UserCertResourceService;
+import com.netscape.cms.servlet.admin.UserResourceService;
+import com.netscape.cms.servlet.cert.CertResourceService;
+import com.netscape.cms.servlet.cert.CertsResourceService;
+import com.netscape.cms.servlet.csadmin.SystemConfigurationResourceService;
+import com.netscape.cms.servlet.profile.ProfileResourceService;
+import com.netscape.cms.servlet.profile.ProfilesResourceService;
+import com.netscape.cms.servlet.request.CertRequestResourceService;
+import com.netscape.cms.servlet.request.CertRequestsResourceService;
+
+public class CertificateAuthorityApplication extends Application {
+    private Set<Object> singletons = new HashSet<Object>();
+    private Set<Class<?>> classes = new HashSet<Class<?>>();
+
+    public CertificateAuthorityApplication() {
+        // installer
+        classes.add(SystemConfigurationResourceService.class);
+
+        // certs and requests
+        classes.add(CertsResourceService.class);
+        classes.add(CertResourceService.class);
+        classes.add(CertRequestsResourceService.class);
+        classes.add(CertRequestResourceService.class);
+
+        // profile management
+        classes.add(ProfileResourceService.class);
+        classes.add(ProfilesResourceService.class);
+
+        // user and group management
+        classes.add(GroupMemberResourceService.class);
+        classes.add(GroupResourceService.class);
+        classes.add(UserCertResourceService.class);
+        classes.add(UserResourceService.class);
+
+        // system certs
+        classes.add(SystemCertificateResourceService.class);
+    }
+
+    public Set<Class<?>> getClasses() {
+        return classes;
+    }
+
+    public Set<Object> getSingletons() {
+        return singletons;
+    }
+
+}
diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt
index df7e1929b..71056ffa6 100644
--- a/base/kra/src/CMakeLists.txt
+++ b/base/kra/src/CMakeLists.txt
@@ -46,6 +46,12 @@ find_file(LDAPJDK_JAR
         /usr/share/java
 )
 
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        /usr/share/java/resteasy
+)
 
 # '${JAVA_LIB_INSTALL_DIR}' jars
 find_file(JSS_JAR
@@ -73,6 +79,7 @@ find_file(SYMKEY_JAR
 # identify java sources
 set(pki-kra_java_SRCS
     com/netscape/kra/KeyRecoveryAuthority.java
+    com/netscape/kra/KeyRecoveryAuthorityApplication.java
     com/netscape/kra/EnrollmentService.java
     com/netscape/kra/RecoveryService.java
     com/netscape/kra/SecurityDataRecoveryService.java
@@ -93,7 +100,7 @@ set(pki-kra_java_SRCS
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
-    ${LDAPJDK_JAR}
+    ${LDAPJDK_JAR} ${JAXRS_API_JAR}
     ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
new file mode 100644
index 000000000..c3c3e4f50
--- /dev/null
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
@@ -0,0 +1,52 @@
+package com.netscape.kra;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.core.Application;
+
+import com.netscape.cms.servlet.admin.GroupMemberResourceService;
+import com.netscape.cms.servlet.admin.GroupResourceService;
+import com.netscape.cms.servlet.admin.SystemCertificateResourceService;
+import com.netscape.cms.servlet.admin.UserCertResourceService;
+import com.netscape.cms.servlet.admin.UserResourceService;
+import com.netscape.cms.servlet.csadmin.SystemConfigurationResourceService;
+import com.netscape.cms.servlet.key.KeyResourceService;
+import com.netscape.cms.servlet.key.KeysResourceService;
+import com.netscape.cms.servlet.request.KeyRequestResourceService;
+import com.netscape.cms.servlet.request.KeyRequestsResourceService;
+
+public class KeyRecoveryAuthorityApplication extends Application {
+
+    private Set<Object> singletons = new HashSet<Object>();
+    private Set<Class<?>> classes = new HashSet<Class<?>>();
+
+    public KeyRecoveryAuthorityApplication() {
+        // installer
+        classes.add(SystemConfigurationResourceService.class);
+
+        // keys and keyrequests
+        classes.add(KeysResourceService.class);
+        classes.add(KeyResourceService.class);
+        classes.add(KeyRequestsResourceService.class);
+        classes.add(KeyRequestResourceService.class);
+
+        // user and group management
+        classes.add(GroupMemberResourceService.class);
+        classes.add(GroupResourceService.class);
+        classes.add(UserCertResourceService.class);
+        classes.add(UserResourceService.class);
+
+        // system certs
+        classes.add(SystemCertificateResourceService.class);
+    }
+
+    public Set<Class<?>> getClasses() {
+        return classes;
+    }
+
+    public Set<Object> getSingletons() {
+        return singletons;
+    }
+
+}
diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt
index 0992eeaee..932b4d234 100644
--- a/base/ocsp/src/CMakeLists.txt
+++ b/base/ocsp/src/CMakeLists.txt
@@ -46,6 +46,12 @@ find_file(LDAPJDK_JAR
         /usr/share/java
 )
 
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        /usr/share/java/resteasy
+)
 
 # '${JAVA_LIB_INSTALL_DIR}' jars
 find_file(JSS_JAR
@@ -74,6 +80,7 @@ find_file(SYMKEY_JAR
 set(pki-ocsp_java_SRCS
     com/netscape/ocsp/OCSPResources.java
     com/netscape/ocsp/OCSPAuthority.java
+    com/netscape/ocsp/OCSPApplication.java
     com/netscape/ocsp/SigningUnit.java
     com/netscape/ocsp/EOCSPException.java
 )
@@ -83,7 +90,7 @@ set(pki-ocsp_java_SRCS
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
-    ${LDAPJDK_JAR}
+    ${LDAPJDK_JAR} ${JAXRS_API_JAR}
     ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java
new file mode 100644
index 000000000..1e3c6e0fc
--- /dev/null
+++ b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java
@@ -0,0 +1,41 @@
+package com.netscape.ocsp;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.core.Application;
+
+import com.netscape.cms.servlet.admin.GroupMemberResourceService;
+import com.netscape.cms.servlet.admin.GroupResourceService;
+import com.netscape.cms.servlet.admin.SystemCertificateResourceService;
+import com.netscape.cms.servlet.admin.UserCertResourceService;
+import com.netscape.cms.servlet.admin.UserResourceService;
+import com.netscape.cms.servlet.csadmin.SystemConfigurationResourceService;
+
+public class OCSPApplication extends Application {
+
+    private Set<Object> singletons = new HashSet<Object>();
+    private Set<Class<?>> classes = new HashSet<Class<?>>();
+
+    public OCSPApplication() {
+        // installer
+        classes.add(SystemConfigurationResourceService.class);
+
+        // user and group management
+        classes.add(GroupMemberResourceService.class);
+        classes.add(GroupResourceService.class);
+        classes.add(UserCertResourceService.class);
+        classes.add(UserResourceService.class);
+
+        // system certs
+        classes.add(SystemCertificateResourceService.class);
+    }
+
+    public Set<Class<?>> getClasses() {
+        return classes;
+    }
+
+    public Set<Object> getSingletons() {
+        return singletons;
+    }
+}
diff --git a/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt
index 852ad7bf4..dfd3d5668 100644
--- a/base/tks/src/CMakeLists.txt
+++ b/base/tks/src/CMakeLists.txt
@@ -46,6 +46,13 @@ find_file(LDAPJDK_JAR
         /usr/share/java
 )
 
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        /usr/share/java/resteasy
+)
+
 
 # '${JAVA_LIB_INSTALL_DIR}' jars
 find_file(JSS_JAR
@@ -73,6 +80,7 @@ find_file(SYMKEY_JAR
 # identify java sources
 set(pki-tks_java_SRCS
     com/netscape/tks/TKSAuthority.java
+    com/netscape/tks/TKSApplication.java
 )
 
 
@@ -80,7 +88,7 @@ set(pki-tks_java_SRCS
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
-    ${LDAPJDK_JAR}
+    ${LDAPJDK_JAR} ${JAXRS_API_JAR}
     ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
diff --git a/base/tks/src/com/netscape/tks/TKSApplication.java b/base/tks/src/com/netscape/tks/TKSApplication.java
new file mode 100644
index 000000000..1e9e84e6a
--- /dev/null
+++ b/base/tks/src/com/netscape/tks/TKSApplication.java
@@ -0,0 +1,43 @@
+package com.netscape.tks;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.core.Application;
+
+import com.netscape.cms.servlet.admin.GroupMemberResourceService;
+import com.netscape.cms.servlet.admin.GroupResourceService;
+import com.netscape.cms.servlet.admin.SystemCertificateResourceService;
+import com.netscape.cms.servlet.admin.UserCertResourceService;
+import com.netscape.cms.servlet.admin.UserResourceService;
+import com.netscape.cms.servlet.csadmin.SystemConfigurationResourceService;
+
+public class TKSApplication extends Application {
+
+    private Set<Object> singletons = new HashSet<Object>();
+    private Set<Class<?>> classes = new HashSet<Class<?>>();
+
+    public TKSApplication() {
+        // installer
+        classes.add(SystemConfigurationResourceService.class);
+
+        // user and group management
+        classes.add(GroupMemberResourceService.class);
+        classes.add(GroupResourceService.class);
+        classes.add(UserCertResourceService.class);
+        classes.add(UserResourceService.class);
+
+        // system certs
+        classes.add(SystemCertificateResourceService.class);
+    }
+
+    public Set<Class<?>> getClasses() {
+        return classes;
+    }
+
+    public Set<Object> getSingletons() {
+        return singletons;
+    }
+
+}
+