Moved cmsbundle into server folder.

The pki-cmsbundle.jar is distributed in pki-server package so the files
have been moved into the base/server folder.

7 files changed, 34 insertions, 30 deletions

diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index 8300795eb..e4f999921 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -164,33 +164,3 @@ install(
 )
 
 set(PKI_CERTSRV_JAR ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar CACHE INTERNAL "pki-certsrv jar file")
-
-
-# build pki-cmsbundle
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmsbundle.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsbundle.mf
-)
-
-jar(pki-cmsbundle-jar
-    CREATE
-        ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
-    OPTIONS
-        m
-    PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsbundle.mf
-    FILES
-        LogMessages.properties
-        UserMessages.properties
-    DEPENDS
-        pki-cmsbundle-jar
-)
-
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
-
-set(PKI_CMSBUNDLE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar INTERNAL "pki-cmsbundle jar file")
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index 5250ff3a6..01a194a3d 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -142,5 +142,6 @@ install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)")
 
 add_subdirectory(tomcat)
 add_subdirectory(cms)
+add_subdirectory(cmsbundle)
 add_subdirectory(cmscore)
 add_subdirectory(test)
diff --git a/base/server/cmsbundle/CMakeLists.txt b/base/server/cmsbundle/CMakeLists.txt
new file mode 100644
index 000000000..b715bc80e
--- /dev/null
+++ b/base/server/cmsbundle/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(cmsbundle)
+
+add_subdirectory(src)
diff --git a/base/server/cmsbundle/src/CMakeLists.txt b/base/server/cmsbundle/src/CMakeLists.txt
new file mode 100644
index 000000000..cc9a72aed
--- /dev/null
+++ b/base/server/cmsbundle/src/CMakeLists.txt
@@ -0,0 +1,30 @@
+project(pki-cmsbundle_java NONE)
+
+# build pki-cmsbundle
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmsbundle.mf
+    ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsbundle.mf
+)
+
+jar(pki-cmsbundle-jar
+    CREATE
+        ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
+    OPTIONS
+        m
+    PARAMS
+        ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsbundle.mf
+    FILES
+        LogMessages.properties
+        UserMessages.properties
+    DEPENDS
+        pki-cmsbundle-jar
+)
+
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
+    DESTINATION
+        ${JAVA_JAR_INSTALL_DIR}/pki
+)
+
+set(PKI_CMSBUNDLE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar INTERNAL "pki-cmsbundle jar file")
diff --git a/base/common/src/LogMessages.properties b/base/server/cmsbundle/src/LogMessages.properties
index aacd7fc61..aacd7fc61 100644
--- a/base/common/src/LogMessages.properties
+++ b/base/server/cmsbundle/src/LogMessages.properties
diff --git a/base/common/src/UserMessages.properties b/base/server/cmsbundle/src/UserMessages.properties
index 1eaa150d3..1eaa150d3 100644
--- a/base/common/src/UserMessages.properties
+++ b/base/server/cmsbundle/src/UserMessages.properties
diff --git a/base/common/src/pki-cmsbundle.mf b/base/server/cmsbundle/src/pki-cmsbundle.mf
index ee384386e..ee384386e 100644
--- a/base/common/src/pki-cmsbundle.mf
+++ b/base/server/cmsbundle/src/pki-cmsbundle.mf