Reorganized server packages.

The tomcat, cms, and cmscore packages have been moved from base/common
into separate folders in base/server so that they can be built separately.

1 files changed, 0 insertions, 142 deletions

diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index c010bedfe..8300795eb 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -166,148 +166,6 @@ install(
 set(PKI_CERTSRV_JAR ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar CACHE INTERNAL "pki-certsrv jar file")
 
 
-# build pki-cms
-javac(pki-cms-classes
-    SOURCES
-        com/netscape/cms/*.java
-    EXCLUDE
-        com/netscape/cms/tomcat/*.java
-    CLASSPATH
-        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_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}
-        ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
-    OUTPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    DEPENDS
-        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar
-)
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cms.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
-)
-
-jar(pki-cms-jar
-    CREATE
-        ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
-    OPTIONS
-        m
-    PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
-    INPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    FILES
-        com/netscape/cms/*.class
-    EXCLUDE
-        com/netscape/cms/tomcat/*.class
-    DEPENDS
-        pki-cms-classes
-)
-
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
-
-set(PKI_CMS_JAR ${CMAKE_BINARY_DIR}/dist/pki-cms.jar CACHE INTERNAL "pki-cms jar file")
-
-
-# build pki-tomcat
-javac(pki-tomcat-classes
-    SOURCES
-        com/netscape/cms/tomcat/*.java
-    CLASSPATH
-        ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR}
-    OUTPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    DEPENDS
-        pki-cms-jar
-)
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-tomcat.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
-)
-
-jar(pki-tomcat-jar
-    CREATE
-        ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
-    OPTIONS
-        m
-    PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
-    INPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    FILES
-        com/netscape/cms/tomcat/*.class
-    DEPENDS
-        pki-tomcat-classes
-)
-
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
-
-set(PKI_TOMCAT_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar CACHE INTERNAL "pki-tomcat jar file")
-
-
-# build pki-cmscore
-javac(pki-cmscore-classes
-    SOURCES
-        com/netscape/cmscore/*.java
-    CLASSPATH
-        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_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}
-        ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
-    OUTPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    DEPENDS
-        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-tomcat-jar
-)
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmscore.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
-)
-
-jar(pki-cmscore-jar
-    CREATE
-        ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
-    OPTIONS
-        m
-    PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
-    INPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    FILES
-        com/netscape/cmscore/*.class
-    DEPENDS
-        pki-cmscore-classes
-)
-
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
-
-set(PKI_CMSCORE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar CACHE INTERNAL "pki-cmscore jar file")
-
-
 # build pki-cmsbundle
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmsbundle.mf