Reorganize Tomcat sources

The Tomcat sources have been moved into base/tomcat/src/main
and base/tomcat-9.0/src/main. All references have been updated.

.classpath

@@ -8,8 +8,8 @@
 	<classpathentry kind="src" path="base/common/src/test/java"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/common/examples/java"/>
 	<classpathentry kind="src" path="base/tools/src/main/java"/>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/server/tomcat/src"/>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/server/tomcat-9.0/src"/>
+	<classpathentry kind="src" path="base/tomcat/src/main/java"/>
+	<classpathentry kind="src" path="base/tomcat-9.0/src/main/java"/>
 	<classpathentry kind="src" path="base/server/src/main/java"/>
 	<classpathentry kind="src" path="base/server/src/test/java"/>
 	<classpathentry kind="src" path="base/ca/src/main/java"/>

base/CMakeLists.txt

@@ -394,6 +394,7 @@ if (BUILD_PKI_CORE OR BUILD_PKI_CONSOLE)
 
     if(WITH_SERVER)
 
+        add_subdirectory(${APP_SERVER})
         add_subdirectory(server)
 
         list(APPEND PKI_JAVADOC_SOURCEPATH

base/server/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(server)
 
-add_subdirectory(${APP_SERVER})
-add_subdirectory(tomcat)
 add_subdirectory(cmsbundle)
 add_subdirectory(healthcheck)
 

base/server/tomcat-9.0/src/CMakeLists.txt → base/tomcat-9.0/CMakeLists.txt

@@ -1,10 +1,10 @@
-project(pki-tomcat-8.5)
+project(pki-tomcat-9.0)
 
 # build pki-tomcat
 javac(pki-tomcat-classes
     SOURCES
-        ../../tomcat/src/*.java
-        *.java
+        ../tomcat/src/main/java/*.java
+        src/main/java/*.java
     CLASSPATH
         ${SERVLET_JAR}
         ${JAXRS_API_JAR}
@@ -15,25 +15,27 @@ javac(pki-tomcat-classes
         ${JSS_JAR} ${TOMCATJSS_JAR}
         ${PKI_CMSUTIL_JAR}
     OUTPUT_DIR
-        ${CMAKE_BINARY_DIR}/../../tomcat
+        ${CMAKE_BINARY_DIR}/../tomcat
     DEPENDS
         pki-cmsutil-jar pki-tools-jar
 )
 
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-tomcat.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources/META-INF/MANIFEST.MF
+    ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.MF
 )
 
+set(PKI_TOMCAT_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar CACHE INTERNAL "pki-tomcat jar file")
+
 jar(pki-tomcat-jar
     CREATE
         ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
     OPTIONS
         m
     PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
+        ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.MF
     INPUT_DIR
-        ${CMAKE_BINARY_DIR}/../../tomcat
+        ${CMAKE_BINARY_DIR}/../tomcat
     DEPENDS
         pki-tomcat-classes
 )
@@ -45,4 +47,9 @@ install(
         ${JAVA_JAR_INSTALL_DIR}/pki
 )
 
-set(PKI_TOMCAT_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar CACHE INTERNAL "pki-tomcat jar file")
+install(
+    DIRECTORY
+        conf/
+    DESTINATION
+        ${DATA_INSTALL_DIR}/server/conf/
+)