2 files changed, 59 insertions, 46 deletions
diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
index cd0c352a8..09cea8ac2 100644
--- a/base/ca/src/CMakeLists.txt
+++ b/base/ca/src/CMakeLists.txt
@@ -31,34 +31,47 @@ find_file(JAXRS_API_JAR
         /usr/share/java/resteasy
 )
 
-# identify java sources
-set(pki-ca_java_SRCS
-    com/netscape/ca/CMSCRLExtensions.java
-    com/netscape/ca/CAService.java
-    com/netscape/ca/SigningUnit.java
-    com/netscape/ca/CRLWithExpiredCerts.java
-    com/netscape/ca/CRLIssuingPoint.java
-    com/netscape/ca/CAPolicy.java
-    com/netscape/ca/CertificateAuthority.java
-    com/netscape/ca/CertificateAuthorityApplication.java
+# build pki-ca
+javac(pki-ca-classes
+    SOURCES
+        com/netscape/ca/*.java
+    CLASSPATH
+        ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
+        ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
+        ${LDAPJDK_JAR} ${JAXRS_API_JAR}
+        ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
+    OUTPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    DEPENDS
+        symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore
 )
 
+jar(pki-ca-jar
+    CREATE
+        ${CMAKE_BINARY_DIR}/dist/pki-ca-${APPLICATION_VERSION}.jar
+    INPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    FILES
+        com/netscape/ca/*.class
+    DEPENDS
+        pki-ca-classes
+)
 
-# set classpath
-set(CMAKE_JAVA_INCLUDE_PATH
-    ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
-    ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
-    ${LDAPJDK_JAR} ${JAXRS_API_JAR}
-    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
-
-
-# set version
-set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
-
+link(pki-ca
+    SOURCE
+        ${CMAKE_BINARY_DIR}/dist/pki-ca.jar
+    DEST
+        pki-ca-${APPLICATION_VERSION}.jar
+    DEPENDS
+        pki-ca-jar
+)
 
-# build pki-ca.jar
-add_jar(pki-ca ${pki-ca_java_SRCS})
-add_dependencies(pki-ca symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
-install_jar(pki-ca ${JAVA_JAR_INSTALL_DIR}/pki)
-set(PKI_CA_JAR ${pki-ca_JAR_FILE} CACHE INTERNAL "pki-ca jar file")
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/dist/pki-ca.jar
+        ${CMAKE_BINARY_DIR}/dist/pki-ca-${APPLICATION_VERSION}.jar
+    DESTINATION
+        ${JAVA_JAR_INSTALL_DIR}/pki
+)
 
+set(PKI_CA_JAR ${CMAKE_BINARY_DIR}/dist/pki-ca.jar CACHE INTERNAL "pki-ca jar file")
diff --git a/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java b/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java
index d539bdb44..bb6431907 100644
--- a/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java
+++ b/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java
@@ -5,16 +5,16 @@ 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.base.CMSException;
-import com.netscape.cms.servlet.cert.CertResourceService;
-import com.netscape.cms.servlet.csadmin.SystemConfigurationResourceService;
-import com.netscape.cms.servlet.profile.ProfileResourceService;
-import com.netscape.cms.servlet.request.CertRequestResourceService;
+import com.netscape.certsrv.base.PKIException;
+import com.netscape.cms.servlet.admin.GroupMemberService;
+import com.netscape.cms.servlet.admin.GroupService;
+import com.netscape.cms.servlet.admin.SystemCertService;
+import com.netscape.cms.servlet.admin.UserCertService;
+import com.netscape.cms.servlet.admin.UserService;
+import com.netscape.cms.servlet.cert.CertService;
+import com.netscape.cms.servlet.csadmin.SystemConfigService;
+import com.netscape.cms.servlet.profile.ProfileService;
+import com.netscape.cms.servlet.request.CertRequestService;
 
 public class CertificateAuthorityApplication extends Application {
     private Set<Object> singletons = new HashSet<Object>();
@@ -22,26 +22,26 @@ public class CertificateAuthorityApplication extends Application {
 
     public CertificateAuthorityApplication() {
         // installer
-        classes.add(SystemConfigurationResourceService.class);
+        classes.add(SystemConfigService.class);
 
         // certs and requests
-        classes.add(CertResourceService.class);
-        classes.add(CertRequestResourceService.class);
+        classes.add(CertService.class);
+        classes.add(CertRequestService.class);
 
         // profile management
-        classes.add(ProfileResourceService.class);
+        classes.add(ProfileService.class);
 
         // user and group management
-        classes.add(GroupMemberResourceService.class);
-        classes.add(GroupResourceService.class);
-        classes.add(UserCertResourceService.class);
-        classes.add(UserResourceService.class);
+        classes.add(GroupMemberService.class);
+        classes.add(GroupService.class);
+        classes.add(UserCertService.class);
+        classes.add(UserService.class);
 
         // system certs
-        classes.add(SystemCertificateResourceService.class);
+        classes.add(SystemCertService.class);
 
         // exception mapper
-        classes.add(CMSException.Mapper.class);
+        classes.add(PKIException.Mapper.class);
     }
 
     public Set<Class<?>> getClasses() {