diff options
Diffstat (limited to 'base/ocsp/src')
-rw-r--r-- | base/ocsp/src/CMakeLists.txt | 62 | ||||
-rw-r--r-- | base/ocsp/src/com/netscape/ocsp/OCSPApplication.java | 28 |
2 files changed, 53 insertions, 37 deletions
diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt index 932b4d234..34b1ec4c2 100644 --- a/base/ocsp/src/CMakeLists.txt +++ b/base/ocsp/src/CMakeLists.txt @@ -76,31 +76,47 @@ find_file(SYMKEY_JAR ) -# identify java sources -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 +# build pki-ocsp +javac(pki-ocsp-classes + SOURCES + com/netscape/ocsp/*.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-ocsp-jar + CREATE + ${CMAKE_BINARY_DIR}/dist/pki-ocsp-${APPLICATION_VERSION}.jar + INPUT_DIR + ${CMAKE_BINARY_DIR}/classes + FILES + com/netscape/ocsp/*.class + DEPENDS + pki-ocsp-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-ocsp + SOURCE + ${CMAKE_BINARY_DIR}/dist/pki-ocsp.jar + DEST + pki-ocsp-${APPLICATION_VERSION}.jar + DEPENDS + pki-ocsp-jar +) -# build pki-ocsp.jar -add_jar(pki-ocsp ${pki-ocsp_java_SRCS}) -add_dependencies(pki-ocsp symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore) -install_jar(pki-ocsp ${JAVA_JAR_INSTALL_DIR}/pki) -set(PKI_OCSP_JAR ${pki-ocsp_JAR_FILE} CACHE INTERNAL "pki-ocsp jar file") +install( + FILES + ${CMAKE_BINARY_DIR}/dist/pki-ocsp.jar + ${CMAKE_BINARY_DIR}/dist/pki-ocsp-${APPLICATION_VERSION}.jar + DESTINATION + ${JAVA_JAR_INSTALL_DIR}/pki +) +set(PKI_OCSP_JAR ${CMAKE_BINARY_DIR}/dist/pki-ocsp.jar CACHE INTERNAL "pki-ocsp jar file") diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java index 5e70fe49f..498aa63ab 100644 --- a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java +++ b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java @@ -5,13 +5,13 @@ 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.csadmin.SystemConfigurationResourceService; +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.csadmin.SystemConfigService; public class OCSPApplication extends Application { @@ -20,19 +20,19 @@ public class OCSPApplication extends Application { public OCSPApplication() { // installer - classes.add(SystemConfigurationResourceService.class); + classes.add(SystemConfigService.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() { |