Reorganized server files.

Some server files in base/common have been moved to base/server for
consistency. The build scripts have been updated accordingly.

58 files changed, 35 insertions, 38 deletions

diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index 3798503c0..e2b2a2f15 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -33,32 +33,6 @@ install(
         ${PYTHON_SITE_PACKAGES}
 )
 
-# install systemd scripts
-install(
-    FILES
-        shared/lib/systemd/system/pki-tomcatd.target
-        shared/lib/systemd/system/pki-tomcatd@.service
-    DESTINATION
-        ${SYSTEMD_LIB_INSTALL_DIR}
-    PERMISSIONS
-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
-        GROUP_EXECUTE GROUP_READ
-        WORLD_EXECUTE WORLD_READ
-)
-
-install(
-    FILES
-        setup/CertServer.directory
-        setup/menu.xml
-        setup/pkidaemon_registry
-    DESTINATION
-        ${DATA_INSTALL_DIR}/setup/
-    PERMISSIONS
-        OWNER_WRITE OWNER_READ
-        GROUP_READ
-        WORLD_READ
-)
-
 # install executables
 install(
     FILES
@@ -71,18 +45,6 @@ install(
         WORLD_EXECUTE WORLD_READ
 )
 
-# install server files
-# TODO: move into base/server
-install(
-    DIRECTORY
-        shared/
-    DESTINATION
-        ${DATA_INSTALL_DIR}/server/
-    PATTERN
-        "lib/*" EXCLUDE
-)
-
-
 install(
     DIRECTORY
         upgrade
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index 8beedbb67..89fa033a8 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -52,6 +52,31 @@ install(
         ${PYTHON_SITE_PACKAGES}
 )
 
+# install systemd scripts
+install(
+    DIRECTORY
+        share/lib/systemd/system/
+    DESTINATION
+        ${SYSTEMD_LIB_INSTALL_DIR}
+    FILE_PERMISSIONS
+        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+        GROUP_EXECUTE GROUP_READ
+        WORLD_EXECUTE WORLD_READ
+)
+
+install(
+    FILES
+        setup/CertServer.directory
+        setup/menu.xml
+        setup/pkidaemon_registry
+    DESTINATION
+        ${DATA_INSTALL_DIR}/setup/
+    PERMISSIONS
+        OWNER_WRITE OWNER_READ
+        GROUP_READ
+        WORLD_READ
+)
+
 # install executables
 install(
     FILES
@@ -117,6 +142,16 @@ install(
         ${DATA_INSTALL_DIR}/deployment
 )
 
+# install server files
+install(
+    DIRECTORY
+        share/
+    DESTINATION
+        ${DATA_INSTALL_DIR}/server/
+    PATTERN
+        "lib/*" EXCLUDE
+)
+
 # install server configuration files
 install(
     DIRECTORY
diff --git a/base/common/setup/CertServer.directory b/base/server/setup/CertServer.directory
index 6d21bacb9..6d21bacb9 100644
--- a/base/common/setup/CertServer.directory
+++ b/base/server/setup/CertServer.directory
diff --git a/base/common/setup/menu.xml b/base/server/setup/menu.xml
index 562ea0261..562ea0261 100644
--- a/base/common/setup/menu.xml
+++ b/base/server/setup/menu.xml
diff --git a/base/common/setup/pkidaemon_registry b/base/server/setup/pkidaemon_registry
index 572f4b23c..572f4b23c 100644
--- a/base/common/setup/pkidaemon_registry
+++ b/base/server/setup/pkidaemon_registry
diff --git a/base/common/setup/web-app_2_3.dtd b/base/server/setup/web-app_2_3.dtd
index 5e3ab01c0..5e3ab01c0 100644
--- a/base/common/setup/web-app_2_3.dtd
+++ b/base/server/setup/web-app_2_3.dtd
diff --git a/base/common/shared/conf/catalina.policy b/base/server/share/conf/catalina.policy
index 7023a10fb..7023a10fb 100644
--- a/base/common/shared/conf/catalina.policy
+++ b/base/server/share/conf/catalina.policy
diff --git a/base/common/shared/conf/catalina.properties b/base/server/share/conf/catalina.properties
index 003089a43..003089a43 100644
--- a/base/common/shared/conf/catalina.properties
+++ b/base/server/share/conf/catalina.properties
diff --git a/base/common/shared/conf/context.xml b/base/server/share/conf/context.xml
index 4b00dbe3c..4b00dbe3c 100644
--- a/base/common/shared/conf/context.xml
+++ b/base/server/share/conf/context.xml
diff --git a/base/common/shared/conf/custom.policy b/base/server/share/conf/custom.policy
index 94f65a1d4..94f65a1d4 100644
--- a/base/common/shared/conf/custom.policy
+++ b/base/server/share/conf/custom.policy
diff --git a/base/common/shared/conf/log4j.properties b/base/server/share/conf/log4j.properties
index dd4bd9318..dd4bd9318 100644
--- a/base/common/shared/conf/log4j.properties
+++ b/base/server/share/conf/log4j.properties
diff --git a/base/common/shared/conf/logging.properties b/base/server/share/conf/logging.properties
index dfdc0a40f..dfdc0a40f 100644
--- a/base/common/shared/conf/logging.properties
+++ b/base/server/share/conf/logging.properties
diff --git a/base/common/shared/conf/pki.policy b/base/server/share/conf/pki.policy
index 52e3d7fe1..52e3d7fe1 100644
--- a/base/common/shared/conf/pki.policy
+++ b/base/server/share/conf/pki.policy
diff --git a/base/common/shared/conf/server.xml b/base/server/share/conf/server.xml
index 93af08b19..93af08b19 100644
--- a/base/common/shared/conf/server.xml
+++ b/base/server/share/conf/server.xml
diff --git a/base/common/shared/conf/serverCertNick.conf b/base/server/share/conf/serverCertNick.conf
index ae5153c52..ae5153c52 100644
--- a/base/common/shared/conf/serverCertNick.conf
+++ b/base/server/share/conf/serverCertNick.conf
diff --git a/base/common/shared/conf/tomcat-users.xml b/base/server/share/conf/tomcat-users.xml
index f84711c0b..f84711c0b 100644
--- a/base/common/shared/conf/tomcat-users.xml
+++ b/base/server/share/conf/tomcat-users.xml
diff --git a/base/common/shared/conf/tomcat.conf b/base/server/share/conf/tomcat.conf
index 9457b0ce7..9457b0ce7 100644
--- a/base/common/shared/conf/tomcat.conf
+++ b/base/server/share/conf/tomcat.conf
diff --git a/base/common/shared/conf/web.xml b/base/server/share/conf/web.xml
index cc8383cbf..cc8383cbf 100644
--- a/base/common/shared/conf/web.xml
+++ b/base/server/share/conf/web.xml
diff --git a/base/common/shared/lib/systemd/system/pki-tomcatd.target b/base/server/share/lib/systemd/system/pki-tomcatd.target
index 633beae71..633beae71 100644
--- a/base/common/shared/lib/systemd/system/pki-tomcatd.target
+++ b/base/server/share/lib/systemd/system/pki-tomcatd.target
diff --git a/base/common/shared/lib/systemd/system/pki-tomcatd@.service b/base/server/share/lib/systemd/system/pki-tomcatd@.service
index 12bcf75a0..12bcf75a0 100644
--- a/base/common/shared/lib/systemd/system/pki-tomcatd@.service
+++ b/base/server/share/lib/systemd/system/pki-tomcatd@.service
diff --git a/base/common/shared/webapps/ROOT/META-INF/context.xml b/base/server/share/webapps/ROOT/META-INF/context.xml
index ce98bfa4e..ce98bfa4e 100644
--- a/base/common/shared/webapps/ROOT/META-INF/context.xml
+++ b/base/server/share/webapps/ROOT/META-INF/context.xml
diff --git a/base/common/shared/webapps/ROOT/WEB-INF/web.xml b/base/server/share/webapps/ROOT/WEB-INF/web.xml
index 54e880610..54e880610 100644
--- a/base/common/shared/webapps/ROOT/WEB-INF/web.xml
+++ b/base/server/share/webapps/ROOT/WEB-INF/web.xml
diff --git a/base/common/shared/webapps/ROOT/index.jsp b/base/server/share/webapps/ROOT/index.jsp
index f5ef47df2..f5ef47df2 100644
--- a/base/common/shared/webapps/ROOT/index.jsp
+++ b/base/server/share/webapps/ROOT/index.jsp
diff --git a/base/common/shared/webapps/pki/META-INF/context.xml b/base/server/share/webapps/pki/META-INF/context.xml
index ce98bfa4e..ce98bfa4e 100644
--- a/base/common/shared/webapps/pki/META-INF/context.xml
+++ b/base/server/share/webapps/pki/META-INF/context.xml
diff --git a/base/common/shared/webapps/pki/admin/console/config/adminauthenticatepanel.vm b/base/server/share/webapps/pki/admin/console/config/adminauthenticatepanel.vm
index b27042cfb..b27042cfb 100644
--- a/base/common/shared/webapps/pki/admin/console/config/adminauthenticatepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/adminauthenticatepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/adminpanel.vm b/base/server/share/webapps/pki/admin/console/config/adminpanel.vm
index 37d922764..37d922764 100644
--- a/base/common/shared/webapps/pki/admin/console/config/adminpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/adminpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/agentauthenticatepanel.vm b/base/server/share/webapps/pki/admin/console/config/agentauthenticatepanel.vm
index abb7678ae..abb7678ae 100644
--- a/base/common/shared/webapps/pki/admin/console/config/agentauthenticatepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/agentauthenticatepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/backupkeycertpanel.vm b/base/server/share/webapps/pki/admin/console/config/backupkeycertpanel.vm
index 3ec3526d1..3ec3526d1 100644
--- a/base/common/shared/webapps/pki/admin/console/config/backupkeycertpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/backupkeycertpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/certchainpanel.vm b/base/server/share/webapps/pki/admin/console/config/certchainpanel.vm
index 08bcc1331..08bcc1331 100644
--- a/base/common/shared/webapps/pki/admin/console/config/certchainpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/certchainpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/certprettyprintpanel.vm b/base/server/share/webapps/pki/admin/console/config/certprettyprintpanel.vm
index ac8da10ee..ac8da10ee 100644
--- a/base/common/shared/webapps/pki/admin/console/config/certprettyprintpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/certprettyprintpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/certrequestpanel.vm b/base/server/share/webapps/pki/admin/console/config/certrequestpanel.vm
index 0502834e4..0502834e4 100644
--- a/base/common/shared/webapps/pki/admin/console/config/certrequestpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/certrequestpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/config_addhsm.vm b/base/server/share/webapps/pki/admin/console/config/config_addhsm.vm
index 839cff56a..839cff56a 100644
--- a/base/common/shared/webapps/pki/admin/console/config/config_addhsm.vm
+++ b/base/server/share/webapps/pki/admin/console/config/config_addhsm.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/config_hsmloginpanel.vm b/base/server/share/webapps/pki/admin/console/config/config_hsmloginpanel.vm
index 147425bae..147425bae 100644
--- a/base/common/shared/webapps/pki/admin/console/config/config_hsmloginpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/config_hsmloginpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/createsubsystempanel.vm b/base/server/share/webapps/pki/admin/console/config/createsubsystempanel.vm
index 8ae6f3f7b..8ae6f3f7b 100644
--- a/base/common/shared/webapps/pki/admin/console/config/createsubsystempanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/createsubsystempanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/databasepanel.vm b/base/server/share/webapps/pki/admin/console/config/databasepanel.vm
index 174710110..174710110 100644
--- a/base/common/shared/webapps/pki/admin/console/config/databasepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/databasepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/displaycertchainpanel.vm b/base/server/share/webapps/pki/admin/console/config/displaycertchainpanel.vm
index 26506c12f..26506c12f 100644
--- a/base/common/shared/webapps/pki/admin/console/config/displaycertchainpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/displaycertchainpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/donepanel.vm b/base/server/share/webapps/pki/admin/console/config/donepanel.vm
index 136760171..136760171 100644
--- a/base/common/shared/webapps/pki/admin/console/config/donepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/donepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/footer.vm b/base/server/share/webapps/pki/admin/console/config/footer.vm
index a596e45b1..a596e45b1 100644
--- a/base/common/shared/webapps/pki/admin/console/config/footer.vm
+++ b/base/server/share/webapps/pki/admin/console/config/footer.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/header.vm b/base/server/share/webapps/pki/admin/console/config/header.vm
index e0fe6a962..e0fe6a962 100644
--- a/base/common/shared/webapps/pki/admin/console/config/header.vm
+++ b/base/server/share/webapps/pki/admin/console/config/header.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/hierarchypanel.vm b/base/server/share/webapps/pki/admin/console/config/hierarchypanel.vm
index e6c03a6b1..e6c03a6b1 100644
--- a/base/common/shared/webapps/pki/admin/console/config/hierarchypanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/hierarchypanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/importadmincertpanel.vm b/base/server/share/webapps/pki/admin/console/config/importadmincertpanel.vm
index 53d445946..53d445946 100644
--- a/base/common/shared/webapps/pki/admin/console/config/importadmincertpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/importadmincertpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/importcachainpanel.vm b/base/server/share/webapps/pki/admin/console/config/importcachainpanel.vm
index c53c3af2a..c53c3af2a 100755
--- a/base/common/shared/webapps/pki/admin/console/config/importcachainpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/importcachainpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/login.vm b/base/server/share/webapps/pki/admin/console/config/login.vm
index 2400bd2d3..2400bd2d3 100644
--- a/base/common/shared/webapps/pki/admin/console/config/login.vm
+++ b/base/server/share/webapps/pki/admin/console/config/login.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/modulepanel.vm b/base/server/share/webapps/pki/admin/console/config/modulepanel.vm
index f0952ecbe..f0952ecbe 100644
--- a/base/common/shared/webapps/pki/admin/console/config/modulepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/modulepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/namepanel.vm b/base/server/share/webapps/pki/admin/console/config/namepanel.vm
index a1fff3807..a1fff3807 100644
--- a/base/common/shared/webapps/pki/admin/console/config/namepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/namepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/restorekeycertpanel.vm b/base/server/share/webapps/pki/admin/console/config/restorekeycertpanel.vm
index ab9b06f4c..ab9b06f4c 100644
--- a/base/common/shared/webapps/pki/admin/console/config/restorekeycertpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/restorekeycertpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/savepkcs12panel.vm b/base/server/share/webapps/pki/admin/console/config/savepkcs12panel.vm
index ce74ecae8..ce74ecae8 100644
--- a/base/common/shared/webapps/pki/admin/console/config/savepkcs12panel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/savepkcs12panel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/securitydomainloginpanel.vm b/base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm
index e9e0763ab..e9e0763ab 100644
--- a/base/common/shared/webapps/pki/admin/console/config/securitydomainloginpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/securitydomainpanel.vm b/base/server/share/webapps/pki/admin/console/config/securitydomainpanel.vm
index a8ac15bf5..a8ac15bf5 100644
--- a/base/common/shared/webapps/pki/admin/console/config/securitydomainpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/securitydomainpanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/sidemenu.vm b/base/server/share/webapps/pki/admin/console/config/sidemenu.vm
index 09fe16870..09fe16870 100644
--- a/base/common/shared/webapps/pki/admin/console/config/sidemenu.vm
+++ b/base/server/share/webapps/pki/admin/console/config/sidemenu.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/sizepanel.vm b/base/server/share/webapps/pki/admin/console/config/sizepanel.vm
index 1dee1ce6b..1dee1ce6b 100644
--- a/base/common/shared/webapps/pki/admin/console/config/sizepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/sizepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/topmenu.vm b/base/server/share/webapps/pki/admin/console/config/topmenu.vm
index 64881066f..64881066f 100644
--- a/base/common/shared/webapps/pki/admin/console/config/topmenu.vm
+++ b/base/server/share/webapps/pki/admin/console/config/topmenu.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/welcomepanel.vm b/base/server/share/webapps/pki/admin/console/config/welcomepanel.vm
index 07b0d641f..07b0d641f 100644
--- a/base/common/shared/webapps/pki/admin/console/config/welcomepanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/welcomepanel.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/wizard.vm b/base/server/share/webapps/pki/admin/console/config/wizard.vm
index cc868e572..cc868e572 100644
--- a/base/common/shared/webapps/pki/admin/console/config/wizard.vm
+++ b/base/server/share/webapps/pki/admin/console/config/wizard.vm
diff --git a/base/common/shared/webapps/pki/admin/console/config/xml.vm b/base/server/share/webapps/pki/admin/console/config/xml.vm
index ee4bc2c97..ee4bc2c97 100644
--- a/base/common/shared/webapps/pki/admin/console/config/xml.vm
+++ b/base/server/share/webapps/pki/admin/console/config/xml.vm
diff --git a/base/common/shared/webapps/pki/admin/console/js/misc.js b/base/server/share/webapps/pki/admin/console/js/misc.js
index d4dc336ab..d4dc336ab 100644
--- a/base/common/shared/webapps/pki/admin/console/js/misc.js
+++ b/base/server/share/webapps/pki/admin/console/js/misc.js
diff --git a/base/common/shared/webapps/pki/js/jquery-min.js b/base/server/share/webapps/pki/js/jquery-min.js
index 83589daa7..83589daa7 100644
--- a/base/common/shared/webapps/pki/js/jquery-min.js
+++ b/base/server/share/webapps/pki/js/jquery-min.js
diff --git a/base/common/shared/webapps/pki/js/jquery.i18n.properties-min.js b/base/server/share/webapps/pki/js/jquery.i18n.properties-min.js
index 059b4906d..059b4906d 100644
--- a/base/common/shared/webapps/pki/js/jquery.i18n.properties-min.js
+++ b/base/server/share/webapps/pki/js/jquery.i18n.properties-min.js