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.

653 files changed, 505 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
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index e8f78c4fc..8f1391a73 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -139,3 +139,7 @@ install(
 # install empty directories
 install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/lock/pki)")
 install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)")
+
+add_subdirectory(tomcat)
+add_subdirectory(cms)
+add_subdirectory(cmscore)
diff --git a/base/server/cms/CMakeLists.txt b/base/server/cms/CMakeLists.txt
new file mode 100644
index 000000000..735ca31a8
--- /dev/null
+++ b/base/server/cms/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(cms)
+
+add_subdirectory(src)
diff --git a/base/server/cms/src/CMakeLists.txt b/base/server/cms/src/CMakeLists.txt
new file mode 100644
index 000000000..16fa1fe8a
--- /dev/null
+++ b/base/server/cms/src/CMakeLists.txt
@@ -0,0 +1,168 @@
+project(pki-cms)
+
+find_file(JSS_JAR
+    NAMES
+        jss4.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(LDAPJDK_JAR
+    NAMES
+        ldapjdk.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(COMMONS_CODEC_JAR
+    NAMES
+        commons-codec.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(COMMONS_HTTPCLIENT_JAR
+    NAMES
+        commons-httpclient.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(APACHE_COMMONS_LANG_JAR
+    NAMES
+        apache-commons-lang.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(TOMCAT_CATALINA_JAR
+    NAMES
+        catalina.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(TOMCAT_UTIL_JAR
+    NAMES
+        tomcat-util.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(SERVLET_JAR
+    NAMES
+        servlet.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(VELOCITY_JAR
+    NAMES
+        velocity.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XALAN_JAR
+    NAMES
+        xalan-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XERCES_JAR
+    NAMES
+        xerces-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_JAXRS_JAR
+    NAMES
+        resteasy-jaxrs.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_ATOM_PROVIDER_JAR
+    NAMES
+        resteasy-atom-provider.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(HTTPCLIENT_JAR
+    NAMES
+        httpclient.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+find_file(HTTPCORE_JAR
+    NAMES
+        httpcore.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+# build pki-cms
+javac(pki-cms-classes
+    SOURCES
+        com/netscape/cms/*.java
+    CLASSPATH
+        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_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-tomcat-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")
diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/server/cms/src/com/netscape/cms/authentication/AVAPattern.java
index 3e984c0cc..3e984c0cc 100644
--- a/base/common/src/com/netscape/cms/authentication/AVAPattern.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/AVAPattern.java
diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java
index c65dd3971..c65dd3971 100644
--- a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java
index f2bf40241..f2bf40241 100644
--- a/base/common/src/com/netscape/cms/authentication/CMCAuth.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java
diff --git a/base/common/src/com/netscape/cms/authentication/Crypt.java b/base/server/cms/src/com/netscape/cms/authentication/Crypt.java
index 867181138..867181138 100644
--- a/base/common/src/com/netscape/cms/authentication/Crypt.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/Crypt.java
diff --git a/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/server/cms/src/com/netscape/cms/authentication/DNPattern.java
index ccee3b512..ccee3b512 100644
--- a/base/common/src/com/netscape/cms/authentication/DNPattern.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/DNPattern.java
diff --git a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/DirBasedAuthentication.java
index f2d09df9e..f2d09df9e 100644
--- a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/DirBasedAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/server/cms/src/com/netscape/cms/authentication/FlatFileAuth.java
index 81537f707..81537f707 100644
--- a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/FlatFileAuth.java
diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/base/server/cms/src/com/netscape/cms/authentication/HashAuthData.java
index 0635c445a..0635c445a 100644
--- a/base/common/src/com/netscape/cms/authentication/HashAuthData.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/HashAuthData.java
diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/HashAuthentication.java
index 9ebf8a7c0..9ebf8a7c0 100644
--- a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/HashAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/server/cms/src/com/netscape/cms/authentication/PortalEnroll.java
index c94cec617..c94cec617 100644
--- a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/PortalEnroll.java
diff --git a/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/server/cms/src/com/netscape/cms/authentication/RDNPattern.java
index 14d5a2f8f..14d5a2f8f 100644
--- a/base/common/src/com/netscape/cms/authentication/RDNPattern.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/RDNPattern.java
diff --git a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
index 2bec1b68d..2bec1b68d 100644
--- a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/SharedSecret.java b/base/server/cms/src/com/netscape/cms/authentication/SharedSecret.java
index 7a0784c53..7a0784c53 100644
--- a/base/common/src/com/netscape/cms/authentication/SharedSecret.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/SharedSecret.java
diff --git a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/TokenAuthentication.java
index 99abad7eb..99abad7eb 100644
--- a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/TokenAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
index 2f9fc43bd..2f9fc43bd 100644
--- a/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
index ffa8ea42f..ffa8ea42f 100644
--- a/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
index 9e551966c..9e551966c 100644
--- a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/AAclAuthz.java
index 089cca9be..089cca9be 100644
--- a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
+++ b/base/server/cms/src/com/netscape/cms/authorization/AAclAuthz.java
diff --git a/base/common/src/com/netscape/cms/authorization/ACLInterceptor.java b/base/server/cms/src/com/netscape/cms/authorization/ACLInterceptor.java
index 52d9eb899..52d9eb899 100644
--- a/base/common/src/com/netscape/cms/authorization/ACLInterceptor.java
+++ b/base/server/cms/src/com/netscape/cms/authorization/ACLInterceptor.java
diff --git a/base/common/src/com/netscape/cms/authorization/AuthMethodInterceptor.java b/base/server/cms/src/com/netscape/cms/authorization/AuthMethodInterceptor.java
index c42ba26d0..c42ba26d0 100644
--- a/base/common/src/com/netscape/cms/authorization/AuthMethodInterceptor.java
+++ b/base/server/cms/src/com/netscape/cms/authorization/AuthMethodInterceptor.java
diff --git a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java
index 729b017d8..729b017d8 100644
--- a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
+++ b/base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java
diff --git a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java
index 133fe759e..133fe759e 100644
--- a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
+++ b/base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
index 8a8de4174..8a8de4174 100644
--- a/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
index a34a99373..a34a99373 100644
--- a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
index 4e51b5c9b..4e51b5c9b 100644
--- a/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
index 02bd40927..02bd40927 100644
--- a/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
index 84181a8dd..84181a8dd 100644
--- a/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
index e3e8d2311..e3e8d2311 100644
--- a/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
index 50031c61a..50031c61a 100644
--- a/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
index b7945c0b6..b7945c0b6 100644
--- a/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
index 6ff61fb44..6ff61fb44 100644
--- a/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
index fb2a6e0d5..fb2a6e0d5 100644
--- a/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
index 02cc129c4..02cc129c4 100644
--- a/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
+++ b/base/server/cms/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
diff --git a/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
index e8a32d752..e8a32d752 100644
--- a/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
+++ b/base/server/cms/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
index fe784f3a9..fe784f3a9 100644
--- a/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
+++ b/base/server/cms/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
index c343b110a..c343b110a 100644
--- a/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
+++ b/base/server/cms/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
index 65032608c..65032608c 100644
--- a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
+++ b/base/server/cms/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/jobs/AJobBase.java b/base/server/cms/src/com/netscape/cms/jobs/AJobBase.java
index bd319b94e..bd319b94e 100644
--- a/base/common/src/com/netscape/cms/jobs/AJobBase.java
+++ b/base/server/cms/src/com/netscape/cms/jobs/AJobBase.java
diff --git a/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java b/base/server/cms/src/com/netscape/cms/jobs/PublishCertsJob.java
index 25c80817b..25c80817b 100644
--- a/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
+++ b/base/server/cms/src/com/netscape/cms/jobs/PublishCertsJob.java
diff --git a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/server/cms/src/com/netscape/cms/jobs/RenewalNotificationJob.java
index 37c0e918b..37c0e918b 100644
--- a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
+++ b/base/server/cms/src/com/netscape/cms/jobs/RenewalNotificationJob.java
diff --git a/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java b/base/server/cms/src/com/netscape/cms/jobs/RequestInQueueJob.java
index 5d1ea2f2b..5d1ea2f2b 100644
--- a/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
+++ b/base/server/cms/src/com/netscape/cms/jobs/RequestInQueueJob.java
diff --git a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/server/cms/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
index b28e93751..b28e93751 100644
--- a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
+++ b/base/server/cms/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
diff --git a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/server/cms/src/com/netscape/cms/listeners/CertificateIssuedListener.java
index 44ff46a9b..44ff46a9b 100644
--- a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
+++ b/base/server/cms/src/com/netscape/cms/listeners/CertificateIssuedListener.java
diff --git a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/server/cms/src/com/netscape/cms/listeners/CertificateRevokedListener.java
index b361057b4..b361057b4 100644
--- a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
+++ b/base/server/cms/src/com/netscape/cms/listeners/CertificateRevokedListener.java
diff --git a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/server/cms/src/com/netscape/cms/listeners/PinRemovalListener.java
index 21d69e29d..21d69e29d 100644
--- a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
+++ b/base/server/cms/src/com/netscape/cms/listeners/PinRemovalListener.java
diff --git a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/server/cms/src/com/netscape/cms/listeners/RequestInQListener.java
index f1f396ca3..f1f396ca3 100644
--- a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
+++ b/base/server/cms/src/com/netscape/cms/listeners/RequestInQListener.java
diff --git a/base/common/src/com/netscape/cms/logging/LogEntry.java b/base/server/cms/src/com/netscape/cms/logging/LogEntry.java
index ac8d16f54..ac8d16f54 100644
--- a/base/common/src/com/netscape/cms/logging/LogEntry.java
+++ b/base/server/cms/src/com/netscape/cms/logging/LogEntry.java
diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/server/cms/src/com/netscape/cms/logging/LogFile.java
index c465a4e53..c465a4e53 100644
--- a/base/common/src/com/netscape/cms/logging/LogFile.java
+++ b/base/server/cms/src/com/netscape/cms/logging/LogFile.java
diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java
index 0a7a9f098..0a7a9f098 100644
--- a/base/common/src/com/netscape/cms/logging/RollingLogFile.java
+++ b/base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java
diff --git a/base/common/src/com/netscape/cms/notification/MailNotification.java b/base/server/cms/src/com/netscape/cms/notification/MailNotification.java
index cd4ee431c..cd4ee431c 100644
--- a/base/common/src/com/netscape/cms/notification/MailNotification.java
+++ b/base/server/cms/src/com/netscape/cms/notification/MailNotification.java
diff --git a/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java
index 86e0c68b1..86e0c68b1 100644
--- a/base/common/src/com/netscape/cms/ocsp/DefStore.java
+++ b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java
diff --git a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java
index e2e5fc493..e2e5fc493 100644
--- a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
+++ b/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java
diff --git a/base/common/src/com/netscape/cms/password/PasswordChecker.java b/base/server/cms/src/com/netscape/cms/password/PasswordChecker.java
index ae379761d..ae379761d 100644
--- a/base/common/src/com/netscape/cms/password/PasswordChecker.java
+++ b/base/server/cms/src/com/netscape/cms/password/PasswordChecker.java
diff --git a/base/common/src/com/netscape/cms/policy/APolicyRule.java b/base/server/cms/src/com/netscape/cms/policy/APolicyRule.java
index 8ed943503..8ed943503 100644
--- a/base/common/src/com/netscape/cms/policy/APolicyRule.java
+++ b/base/server/cms/src/com/netscape/cms/policy/APolicyRule.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java
index 2129f0f00..2129f0f00 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
index e12b8220f..e12b8220f 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
index 9b5fbd152..9b5fbd152 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
index fecb59049..fecb59049 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
index efd306bf3..efd306bf3 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
index d656ed463..d656ed463 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
index 56b96f95f..56b96f95f 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
index 363856197..363856197 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
index 3ff977df5..3ff977df5 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
index 2810fae10..2810fae10 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
index 88c59b2fd..88c59b2fd 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
index 15b12af40..15b12af40 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
index 07cc3b956..07cc3b956 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
index 27b5d1a92..27b5d1a92 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
index fb52b1302..fb52b1302 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
index 72be9d75a..72be9d75a 100644
--- a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
+++ b/base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
index 21e4ad920..21e4ad920 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
index d7e058bf8..d7e058bf8 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
index eeee26994..eeee26994 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
index 7cf50385e..7cf50385e 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
index 4124d430d..4124d430d 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
index 58ce112f3..58ce112f3 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
index 779be165b..779be165b 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
index 5f33efe1b..5f33efe1b 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
index 35f5313c1..35f5313c1 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
index 9ceaf99bd..9ceaf99bd 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
index 24e5f45ed..24e5f45ed 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
index ca18b8023..ca18b8023 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
index c5daabed9..c5daabed9 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
index 1b132e835..1b132e835 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
index aece9664a..aece9664a 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
index 0bb77e207..0bb77e207 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
index 0af8b86ca..0af8b86ca 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java
index 7f44c8eb0..7f44c8eb0 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
index fd52e9bb1..fd52e9bb1 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
index b5d6d8eec..b5d6d8eec 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
index d6e626aa9..d6e626aa9 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
index 0d89d8876..0d89d8876 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
index bcd9c9885..bcd9c9885 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
index 16fc73347..16fc73347 100644
--- a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
diff --git a/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java
index ea5108445..ea5108445 100644
--- a/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
index 1ae2f0853..1ae2f0853 100644
--- a/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java
index d0bfdb8a6..d0bfdb8a6 100644
--- a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java
index ca665baf1..ca665baf1 100644
--- a/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfileContext.java
index 444024b94..444024b94 100644
--- a/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfileContext.java
diff --git a/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/base/server/cms/src/com/netscape/cms/profile/common/ProfileContext.java
index d07cdfc27..d07cdfc27 100644
--- a/base/common/src/com/netscape/cms/profile/common/ProfileContext.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/ProfileContext.java
diff --git a/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/base/server/cms/src/com/netscape/cms/profile/common/ProfilePolicy.java
index 157914927..157914927 100644
--- a/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/ProfilePolicy.java
diff --git a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/RAEnrollProfile.java
index 1fe2fa514..1fe2fa514 100644
--- a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/RAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
index a1a83a49f..a1a83a49f 100644
--- a/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
index 710a4616d..710a4616d 100644
--- a/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
+++ b/base/server/cms/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
index ca2668f7d..ca2668f7d 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
index c0a9758da..c0a9758da 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
index a7a159de3..a7a159de3 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
index eb3eb14f6..eb3eb14f6 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
index 7821964b9..7821964b9 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
index 97dc358e3..97dc358e3 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/KeyConstraint.java
index 3a7d09d5f..3a7d09d5f 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/KeyConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
index f7ec42215..f7ec42215 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
index 066553275..066553275 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/NoConstraint.java
index 17f6e0b37..17f6e0b37 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/NoConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
index d1403962e..d1403962e 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
index 4ccb9ad8f..4ccb9ad8f 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
index 027f29b1c..027f29b1c 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
index 869f0e2cc..869f0e2cc 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
index 6545b81fd..6545b81fd 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java
index 30a034cb3..30a034cb3 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
index accbd9d2d..accbd9d2d 100644
--- a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
+++ b/base/server/cms/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
index 36818a907..36818a907 100644
--- a/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
index e789625e4..e789625e4 100644
--- a/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
index 77fd0a5fd..77fd0a5fd 100644
--- a/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AutoAssignDefault.java
index f685a4f59..f685a4f59 100644
--- a/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/AutoAssignDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
index a827b7eaf..a827b7eaf 100644
--- a/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CAEnrollDefault.java
index 1d1d05ed5..1d1d05ed5 100644
--- a/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/CAEnrollDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CAValidityDefault.java
index 44ffd474f..44ffd474f 100644
--- a/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/CAValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
index 4bbd215a2..4bbd215a2 100644
--- a/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
index 9629e4990..9629e4990 100644
--- a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
index 752d99cbb..752d99cbb 100644
--- a/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java
index 7b4c3c74d..7b4c3c74d 100644
--- a/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/EnrollExtDefault.java
index da395871b..da395871b 100644
--- a/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/EnrollExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
index 22f00eb94..22f00eb94 100644
--- a/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
index b78f0e6cf..b78f0e6cf 100644
--- a/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/GenericExtDefault.java
index f344648ab..f344648ab 100644
--- a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/GenericExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/ImageDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/ImageDefault.java
index c1e69c9f4..c1e69c9f4 100644
--- a/base/common/src/com/netscape/cms/profile/def/ImageDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/ImageDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
index 2c176593a..2c176593a 100644
--- a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
index ec203713b..ec203713b 100644
--- a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
index bbc4f5227..bbc4f5227 100644
--- a/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
index f6da8aede..f6da8aede 100644
--- a/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
index 731581945..731581945 100644
--- a/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
index f010b6134..f010b6134 100644
--- a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NoDefault.java
index 2e80aee2f..2e80aee2f 100644
--- a/base/common/src/com/netscape/cms/profile/def/NoDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/NoDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
index ab5b8c62b..ab5b8c62b 100644
--- a/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
index ced6096a3..ced6096a3 100644
--- a/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
index 56d67a93e..56d67a93e 100644
--- a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
index 6532a13f0..6532a13f0 100644
--- a/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java
index b3b16448d..b3b16448d 100644
--- a/base/common/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java
index 81ad58c73..81ad58c73 100644
--- a/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
index 61c200a96..61c200a96 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
index a60721733..a60721733 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
index d850147a4..d850147a4 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
index a8f6a7415..a8f6a7415 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectNameDefault.java
index 31aee6dd6..31aee6dd6 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/SubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserExtensionDefault.java
index a78992a74..a78992a74 100644
--- a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/UserExtensionDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserKeyDefault.java
index 4531e0fe5..4531e0fe5 100644
--- a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/UserKeyDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
index 7625f9a34..7625f9a34 100644
--- a/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
index 77d743334..77d743334 100644
--- a/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserValidityDefault.java
index 8d5ca7d55..8d5ca7d55 100644
--- a/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/UserValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/ValidityDefault.java
index b649c7076..b649c7076 100644
--- a/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/ValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
index bd935fb53..bd935fb53 100644
--- a/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
index c90b76c5d..c90b76c5d 100644
--- a/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
index 9dfda47b5..9dfda47b5 100644
--- a/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
index 86a2a6961..86a2a6961 100644
--- a/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/CMCCertReqInput.java
index a62d6e9f7..a62d6e9f7 100644
--- a/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/CMCCertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/CertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/CertReqInput.java
index e67f5b501..e67f5b501 100644
--- a/base/common/src/com/netscape/cms/profile/input/CertReqInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/CertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/DualKeyGenInput.java
index 8a2629667..8a2629667 100644
--- a/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/DualKeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
index dae8143ee..dae8143ee 100644
--- a/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java
index b4ed31223..b4ed31223 100644
--- a/base/common/src/com/netscape/cms/profile/input/EnrollInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java b/base/server/cms/src/com/netscape/cms/profile/input/FileSigningInput.java
index f62a5964c..f62a5964c 100644
--- a/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/FileSigningInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/base/server/cms/src/com/netscape/cms/profile/input/GenericInput.java
index e92fbe93e..e92fbe93e 100644
--- a/base/common/src/com/netscape/cms/profile/input/GenericInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/GenericInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/ImageInput.java b/base/server/cms/src/com/netscape/cms/profile/input/ImageInput.java
index 5874cc07f..5874cc07f 100644
--- a/base/common/src/com/netscape/cms/profile/input/ImageInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/ImageInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/KeyGenInput.java
index 1b3564ab7..1b3564ab7 100644
--- a/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/KeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
index c2566139a..c2566139a 100644
--- a/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
index 6ee2fd42e..6ee2fd42e 100644
--- a/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SubjectDNInput.java
index a12351f8a..a12351f8a 100644
--- a/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/SubjectDNInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SubjectNameInput.java
index 2c0de4486..2c0de4486 100644
--- a/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/SubjectNameInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
index e15e13e91..e15e13e91 100644
--- a/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
index 15f296a9e..15f296a9e 100644
--- a/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
index f14df1a80..f14df1a80 100644
--- a/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/CMMFOutput.java
index 9c04e6962..9c04e6962 100644
--- a/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/output/CMMFOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/CertOutput.java
index a556d4a44..a556d4a44 100644
--- a/base/common/src/com/netscape/cms/profile/output/CertOutput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/output/CertOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/EnrollOutput.java
index 06c940e8c..06c940e8c 100644
--- a/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/output/EnrollOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/base/server/cms/src/com/netscape/cms/profile/output/PKCS7Output.java
index c412eb2fd..c412eb2fd 100644
--- a/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
+++ b/base/server/cms/src/com/netscape/cms/profile/output/PKCS7Output.java
diff --git a/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/nsNKeyOutput.java
index 571022ad8..571022ad8 100644
--- a/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
+++ b/base/server/cms/src/com/netscape/cms/profile/output/nsNKeyOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
index b703f5b47..b703f5b47 100644
--- a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
+++ b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/AVAPattern.java
index e612c339a..e612c339a 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/AVAPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
index 1b1531000..1b1531000 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
index 8ed702f50..8ed702f50 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
index 21a3a0794..21a3a0794 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
index a1f7207f6..a1f7207f6 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
index ca5903ee0..ca5903ee0 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
index 96ff2a11e..96ff2a11e 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
index a970602bd..a970602bd 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
index 8f88ffaba..8f88ffaba 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
index ea69cc5a1..ea69cc5a1 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/MapDNPattern.java
index 6656f4a1f..6656f4a1f 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/MapDNPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
index 058294d7c..058294d7c 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/NoMap.java
index cc12714e2..cc12714e2 100644
--- a/base/common/src/com/netscape/cms/publish/mappers/NoMap.java
+++ b/base/server/cms/src/com/netscape/cms/publish/mappers/NoMap.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
index c48aa2db4..c48aa2db4 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
index 06050480e..06050480e 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
index ac2b64973..ac2b64973 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
index 014cc0e5e..014cc0e5e 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
index 51bebe236..51bebe236 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
index 41a15f93a..41a15f93a 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
index 020c25552..020c25552 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
index f3e9d3c6f..f3e9d3c6f 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java b/base/server/cms/src/com/netscape/cms/publish/publishers/PublisherUtils.java
index 280a0ce97..280a0ce97 100644
--- a/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java
+++ b/base/server/cms/src/com/netscape/cms/publish/publishers/PublisherUtils.java
diff --git a/base/common/src/com/netscape/cms/realm/PKIPrincipal.java b/base/server/cms/src/com/netscape/cms/realm/PKIPrincipal.java
index c39ab4157..c39ab4157 100644
--- a/base/common/src/com/netscape/cms/realm/PKIPrincipal.java
+++ b/base/server/cms/src/com/netscape/cms/realm/PKIPrincipal.java
diff --git a/base/common/src/com/netscape/cms/realm/PKIRealm.java b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
index b035f53f6..b035f53f6 100644
--- a/base/common/src/com/netscape/cms/realm/PKIRealm.java
+++ b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
diff --git a/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/server/cms/src/com/netscape/cms/request/RequestScheduler.java
index 568d6f412..568d6f412 100644
--- a/base/common/src/com/netscape/cms/request/RequestScheduler.java
+++ b/base/server/cms/src/com/netscape/cms/request/RequestScheduler.java
diff --git a/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/server/cms/src/com/netscape/cms/selftests/ASelfTest.java
index e77ece551..e77ece551 100644
--- a/base/common/src/com/netscape/cms/selftests/ASelfTest.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/ASelfTest.java
diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java b/base/server/cms/src/com/netscape/cms/selftests/ca/CAPresence.java
index 83caa0099..83caa0099 100644
--- a/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/ca/CAPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java b/base/server/cms/src/com/netscape/cms/selftests/ca/CAValidity.java
index b1751ecb4..b1751ecb4 100644
--- a/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/ca/CAValidity.java
diff --git a/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java b/base/server/cms/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
index f5b0939f1..f5b0939f1 100644
--- a/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
diff --git a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/server/cms/src/com/netscape/cms/selftests/kra/KRAPresence.java
index 832d2b747..832d2b747 100644
--- a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/kra/KRAPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java b/base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
index a3d9e3ad3..a3d9e3ad3 100644
--- a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java b/base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
index 383779d22..383779d22 100644
--- a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
diff --git a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/server/cms/src/com/netscape/cms/selftests/ra/RAPresence.java
index 6facd807c..6facd807c 100644
--- a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/ra/RAPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/server/cms/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
index 06a6398c5..06a6398c5 100644
--- a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
+++ b/base/server/cms/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
diff --git a/base/common/src/com/netscape/cms/servlet/account/AccountService.java b/base/server/cms/src/com/netscape/cms/servlet/account/AccountService.java
index 611c865ae..611c865ae 100644
--- a/base/common/src/com/netscape/cms/servlet/account/AccountService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/account/AccountService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
index 1244da12c..1244da12c 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminResources.java
index 19b537854..19b537854 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminResources.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
index ab7af9ec3..ab7af9ec3 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index 71cf8a2ac..71cf8a2ac 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthCredentials.java
index 42c8da175..42c8da175 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthCredentials.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
index 09c77e557..09c77e557 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 74c1a94a6..74c1a94a6 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
index 399b97d0c..399b97d0c 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
index 91fec08c4..91fec08c4 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/GroupService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
index 314a4072f..314a4072f 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
index 3f9f558e0..3f9f558e0 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java
index 61536f346..61536f346 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAConnectorService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
index 53ff8e9a2..53ff8e9a2 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index d66522421..d66522421 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
index a7ff92274..a7ff92274 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
index bfc1e6f4a..bfc1e6f4a 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
index 3d25b8b71..3d25b8b71 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index 423fad360..423fad360 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
index 763f421fb..763f421fb 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
index 4d47d318f..4d47d318f 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/SystemCertService.java
index 50df221f9..50df221f9 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/SystemCertService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java
index c14605c54..c14605c54 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/UserService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
index 2cd337123..2cd337123 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
index 56a37b34d..56a37b34d 100644
--- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java
index 8e3a4b5ba..8e3a4b5ba 100644
--- a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
index 52b1258eb..52b1258eb 100644
--- a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
index 357c901c3..357c901c3 100644
--- a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/base/server/cms/src/com/netscape/cms/servlet/base/GetStats.java
index 5fbed7bbc..5fbed7bbc 100644
--- a/base/common/src/com/netscape/cms/servlet/base/GetStats.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/GetStats.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/IndexServlet.java
index c81005b3b..c81005b3b 100644
--- a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/IndexServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/PKIService.java b/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java
index 23e540f0e..23e540f0e 100644
--- a/base/common/src/com/netscape/cms/servlet/base/PKIService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/PortsServlet.java
index 4b1b48108..4b1b48108 100644
--- a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/PortsServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/ProxyServlet.java
index 315d330a9..315d330a9 100644
--- a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/ProxyServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/RESTServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/RESTServlet.java
index 050c0920a..050c0920a 100644
--- a/base/common/src/com/netscape/cms/servlet/base/RESTServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/RESTServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
index 24210f377..24210f377 100644
--- a/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/UserInfo.java b/base/server/cms/src/com/netscape/cms/servlet/base/UserInfo.java
index b509409da..b509409da 100644
--- a/base/common/src/com/netscape/cms/servlet/base/UserInfo.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/UserInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index 71c10ead9..71c10ead9 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java
index 7a26e8e21..7a26e8e21 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
index 8ffa65d9b..8ffa65d9b 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CertProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestDAO.java
index d4785e957..d4785e957 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CertRequestDAO.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestDAO.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java
index 64e045d0d..64e045d0d 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java
index 6071b1dcb..6071b1dcb 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertService.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertService.java
index 6f46d9eb5..6f46d9eb5 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CertService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertService.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
index 097035be1..097035be1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CloneRedirect.java
index bf5fc490f..bf5fc490f 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CloneRedirect.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
index 66c2aa268..66c2aa268 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
index 4b195c282..4b195c282 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
index da7f01ca5..da7f01ca5 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index 3c9d5778c..3c9d5778c 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayCRL.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
index 6c1d6f5f4..6c1d6f5f4 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java
index 64a9856fc..64a9856fc 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
index 63806e659..63806e659 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
index 142fea3c8..142fea3c8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
index 0437a2e0e..0437a2e0e 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
index 4904ec9b7..4904ec9b7 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index 16e2ab840..16e2ab840 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java
index 31b235d2a..31b235d2a 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java b/base/server/cms/src/com/netscape/cms/servlet/cert/FilterBuilder.java
index 5c337afee..5c337afee 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/FilterBuilder.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetBySerial.java
index 2ea7da7c6..2ea7da7c6 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/GetBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCAChain.java
index 9ffb54671..9ffb54671 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCAChain.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCRL.java
index 3ea2297db..3ea2297db 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCRL.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
index af8b3cc02..af8b3cc02 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
index 0c650cf69..0c650cf69 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetInfo.java
index e82b2046f..e82b2046f 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/GetInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index a6e9d832e..a6e9d832e 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
index a56ac1d88..a56ac1d88 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ListCerts.java
index 185e1fa8e..185e1fa8e 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/ListCerts.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/Monitor.java
index 305620580..305620580 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/Monitor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
index c65c482b1..c65c482b1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
index 3f5434d9e..3f5434d9e 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java
index a13a305b8..a13a305b8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalServlet.java
index a697e14e4..a697e14e4 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
index 2826f477e..2826f477e 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java
index 93b7531c8..93b7531c8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RevocationProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationServlet.java
index ec77d1cec..ec77d1cec 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
index 2fce3e6e1..2fce3e6e1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/server/cms/src/com/netscape/cms/servlet/cert/SrchCerts.java
index 508a8df70..508a8df70 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/SrchCerts.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/server/cms/src/com/netscape/cms/servlet/cert/UpdateCRL.java
index e39b66555..e39b66555 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/UpdateCRL.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/server/cms/src/com/netscape/cms/servlet/cert/UpdateDir.java
index a662f8e7b..a662f8e7b 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/UpdateDir.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 30c07d1c1..30c07d1c1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
index 5c7ac856f..5c7ac856f 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
index 3cb88f3f8..3cb88f3f8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/base/server/cms/src/com/netscape/cms/servlet/common/AuthCredentials.java
index 32ae0fcc8..32ae0fcc8 100644
--- a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/AuthCredentials.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
index f1320f44a..f1320f44a 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFile.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSFile.java
index 7f73ce8d3..7f73ce8d3 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSFile.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSFile.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSFileLoader.java
index a27a3dd43..a27a3dd43 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSFileLoader.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSGWResources.java
index 32264c01e..32264c01e 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSGWResources.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSGateway.java
index 3c8f88e89..3c8f88e89 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSGateway.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
index 4e3d3c0bc..4e3d3c0bc 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSRequest.java
index 5ac640952..5ac640952 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSRequest.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java
index 336032dd3..336032dd3 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
index 50c5e824f..50c5e824f 100644
--- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java b/base/server/cms/src/com/netscape/cms/servlet/common/ECMSGWException.java
index 2c24c112a..2c24c112a 100644
--- a/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/ECMSGWException.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
index 29e106ae9..29e106ae9 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
index 83a2d8cf0..83a2d8cf0 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
index 95631ba5e..95631ba5e 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
index bf164977d..bf164977d 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
index 275980cf1..275980cf1 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
index 48a4a54ea..48a4a54ea 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
index cf0b0a063..cf0b0a063 100644
--- a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
index 27bcf308d..27bcf308d 100644
--- a/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/IRawJS.java b/base/server/cms/src/com/netscape/cms/servlet/common/IRawJS.java
index e5714f727..e5714f727 100644
--- a/base/common/src/com/netscape/cms/servlet/common/IRawJS.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/IRawJS.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
index 53ddc4c88..53ddc4c88 100644
--- a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/RawJS.java b/base/server/cms/src/com/netscape/cms/servlet/common/RawJS.java
index 03a4e7e2b..03a4e7e2b 100644
--- a/base/common/src/com/netscape/cms/servlet/common/RawJS.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/RawJS.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/server/cms/src/com/netscape/cms/servlet/common/ServletUtils.java
index a709b6b02..a709b6b02 100644
--- a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/ServletUtils.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/CloneServlet.java
index 5634cfd55..5634cfd55 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/connector/CloneServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
index 5f1fc4805..5f1fc4805 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
index 3d0ad4c62..3d0ad4c62 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
index ebcd42c14..ebcd42c14 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
index 579c54df0..579c54df0 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java
index f7ee25dfe..f7ee25dfe 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
index 6700b9312..6700b9312 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
index f29b22ae7..f29b22ae7 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
index 3b3ae4033..3b3ae4033 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
index 72bffc767..72bffc767 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/Cert.java
index 066f9dea1..066f9dea1 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/Cert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
index 81c6e5ca3..81c6e5ca3 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index 789c0aab5..789c0aab5 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
index 046fb111d..046fb111d 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
index 956c285b5..956c285b5 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
index 03233042c..03233042c 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index bbfb17374..bbfb17374 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
index 462e05455..462e05455 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java
index 1344104f1..1344104f1 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
index 56234f7cd..56234f7cd 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
index 702c5aa92..702c5aa92 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index 57583fdcf..57583fdcf 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
index 7f7929930..7f7929930 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
index 8cc0f85d6..8cc0f85d6 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
index ee013ef48..ee013ef48 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java
index 1e8c65182..1e8c65182 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
index 2c7d225fa..2c7d225fa 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetStatus.java
index 1d2d0e61f..1d2d0e61f 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetStatus.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
index b894971b1..b894971b1 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
index 2f44ca1b0..2f44ca1b0 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
index 649b1214a..649b1214a 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
index b42bdb7de..b42bdb7de 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
index 7019d1492..7019d1492 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
index bc4af9828..bc4af9828 100755
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
index b0dc966f3..b0dc966f3 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
index 713cb170a..713cb170a 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
index 69b2a9d2a..69b2a9d2a 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
index 00474615f..00474615f 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/NamePanel.java
index 070e17e7c..070e17e7c 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/NamePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
index 74197a4a8..74197a4a8 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
index 243e7e839..243e7e839 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
index cdcefbfe7..cdcefbfe7 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
index ed242f691..ed242f691 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
index 1ae4c3397..1ae4c3397 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
index ddfa8fae1..ddfa8fae1 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java
index 399c28a35..399c28a35 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SizePanel.java
index 45a4fe106..45a4fe106 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SizePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java
index aaaf17163..aaaf17163 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
index c6100148f..c6100148f 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java
index cb7667193..cb7667193 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
index 745962c72..745962c72 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
index b2d081f22..b2d081f22 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
index b783c359b..b783c359b 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
index b99a298a9..b99a298a9 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
index c34df8b9c..c34df8b9c 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
index b5e921822..b5e921822 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
index 4fe641240..4fe641240 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
index c7532c7aa..c7532c7aa 100644
--- a/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
index 4225aed77..4225aed77 100644
--- a/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
index 8c62cd311..8c62cd311 100644
--- a/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/EERequestFilter.java
index 8a8bea01c..8a8bea01c 100644
--- a/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/filter/EERequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
index e9faca86d..e9faca86d 100644
--- a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerial.java
index 03af65c1f..03af65c1f 100644
--- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
index 48cac3785..48cac3785 100644
--- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayTransport.java
index e59550af3..e59550af3 100644
--- a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayTransport.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/ExamineRecovery.java
index cd3988944..cd3988944 100644
--- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/ExamineRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/server/cms/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
index 7d24c7ceb..7d24c7ceb 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/server/cms/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
index 773b91e65..773b91e65 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/server/cms/src/com/netscape/cms/servlet/key/GetPk12.java
index c79a82f4d..c79a82f4d 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/GetPk12.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
index 410039133..410039133 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/GrantRecovery.java
index 9d57fbe7c..9d57fbe7c 100644
--- a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/GrantRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRecordParser.java
index 256f72879..256f72879 100644
--- a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRecordParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
index bef0455a9..bef0455a9 100644
--- a/base/common/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyService.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
index f642417e2..f642417e2 100644
--- a/base/common/src/com/netscape/cms/servlet/key/KeyService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/key/RecoverBySerial.java
index 7b961c0b2..7b961c0b2 100644
--- a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/RecoverBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/base/server/cms/src/com/netscape/cms/servlet/key/SrchKey.java
index 5bedf1f58..5bedf1f58 100644
--- a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/SrchKey.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
index 897acfc76..897acfc76 100644
--- a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
index f19a9d646..f19a9d646 100644
--- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
index ac1aad373..ac1aad373 100644
--- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
index 8f44bf739..8f44bf739 100644
--- a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
index 593f2de88..593f2de88 100644
--- a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
index 4894c574a..4894c574a 100644
--- a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
index 940bf657c..940bf657c 100644
--- a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
index 55f688a0b..55f688a0b 100644
--- a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CMCProcessor.java
index 3c5c4080b..3c5c4080b 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CMCProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
index 1da0cf3c4..1da0cf3c4 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
index 3fd42db08..3fd42db08 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
index d3f8ba655..d3f8ba655 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
index 184216972..184216972 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java
index bea899368..bea899368 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/Processor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java
index 5a3b27063..5a3b27063 100644
--- a/base/common/src/com/netscape/cms/servlet/processors/Processor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java
index 648e8bc57..648e8bc57 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java
index 0d6ab0495..0d6ab0495 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
index 7b5343000..7b5343000 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java
index f89d8224e..f89d8224e 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
index 6acc1634c..6acc1634c 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java
index 278acf488..278acf488 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
index 82b168e6f..82b168e6f 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
index 2b3ef83bb..2b3ef83bb 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
index 10013c88c..10013c88c 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileService.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java
index edb8b2248..edb8b2248 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java
index be331d6ef..be331d6ef 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
index 1ee527c97..1ee527c97 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
index 7b0813d71..7b0813d71 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java b/base/server/cms/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
index 0114f6323..0114f6323 100644
--- a/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
index e54f8a4c6..e54f8a4c6 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/CertReqParser.java
index fd4589437..fd4589437 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/CertReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java b/base/server/cms/src/com/netscape/cms/servlet/request/CertRequestService.java
index dd3065427..dd3065427 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/CertRequestService.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/server/cms/src/com/netscape/cms/servlet/request/CheckRequest.java
index 246cefd8c..246cefd8c 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/CheckRequest.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/IReqParser.java
index 7731efcb4..7731efcb4 100644
--- a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/IReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/KeyReqParser.java
index 9e1247520..9e1247520 100644
--- a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/KeyReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java
index 8db16b51f..8db16b51f 100644
--- a/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
index 367c558cb..367c558cb 100644
--- a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessReq.java
index 66c7129f6..66c7129f6 100644
--- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessReq.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/QueryReq.java
index 09bf3a0b8..09bf3a0b8 100644
--- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/QueryReq.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/ReqParser.java
index 4a6a79072..4a6a79072 100644
--- a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/ReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/server/cms/src/com/netscape/cms/servlet/request/SearchReqs.java
index 533199ebc..533199ebc 100644
--- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/SearchReqs.java
diff --git a/base/common/src/com/netscape/cms/servlet/tks/TPSConnectorService.java b/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java
index 26f25bd4f..26f25bd4f 100644
--- a/base/common/src/com/netscape/cms/servlet/tks/TPSConnectorService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java
diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/server/cms/src/com/netscape/cms/servlet/tks/TokenServlet.java
index 766975651..766975651 100644
--- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/tks/TokenServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java b/base/server/cms/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
index d9d3ddec7..d9d3ddec7 100644
--- a/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/server/cms/src/com/netscape/cms/servlet/wizard/WizardServlet.java
index 6deab6bc0..6deab6bc0 100644
--- a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/wizard/WizardServlet.java
diff --git a/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/base/server/cms/src/com/netscape/cms/shares/OldJoinShares.java
index cda8dddfe..cda8dddfe 100644
--- a/base/common/src/com/netscape/cms/shares/OldJoinShares.java
+++ b/base/server/cms/src/com/netscape/cms/shares/OldJoinShares.java
diff --git a/base/common/src/com/netscape/cms/shares/OldShare.java b/base/server/cms/src/com/netscape/cms/shares/OldShare.java
index 2bf27f5ab..2bf27f5ab 100644
--- a/base/common/src/com/netscape/cms/shares/OldShare.java
+++ b/base/server/cms/src/com/netscape/cms/shares/OldShare.java
diff --git a/base/common/src/pki-cms.mf b/base/server/cms/src/pki-cms.mf
index 4810f3fb0..4810f3fb0 100644
--- a/base/common/src/pki-cms.mf
+++ b/base/server/cms/src/pki-cms.mf
diff --git a/base/server/cmscore/CMakeLists.txt b/base/server/cmscore/CMakeLists.txt
new file mode 100644
index 000000000..62ef6ec18
--- /dev/null
+++ b/base/server/cmscore/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(cmscore)
+
+add_subdirectory(src)
diff --git a/base/server/cmscore/src/CMakeLists.txt b/base/server/cmscore/src/CMakeLists.txt
new file mode 100644
index 000000000..94f5f138c
--- /dev/null
+++ b/base/server/cmscore/src/CMakeLists.txt
@@ -0,0 +1,166 @@
+project(pki-cmscore)
+
+find_file(JSS_JAR
+    NAMES
+        jss4.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(LDAPJDK_JAR
+    NAMES
+        ldapjdk.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(COMMONS_CODEC_JAR
+    NAMES
+        commons-codec.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(COMMONS_HTTPCLIENT_JAR
+    NAMES
+        commons-httpclient.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(APACHE_COMMONS_LANG_JAR
+    NAMES
+        apache-commons-lang.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(TOMCAT_CATALINA_JAR
+    NAMES
+        catalina.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(TOMCAT_UTIL_JAR
+    NAMES
+        tomcat-util.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(SERVLET_JAR
+    NAMES
+        servlet.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(VELOCITY_JAR
+    NAMES
+        velocity.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XALAN_JAR
+    NAMES
+        xalan-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XERCES_JAR
+    NAMES
+        xerces-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_JAXRS_JAR
+    NAMES
+        resteasy-jaxrs.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_ATOM_PROVIDER_JAR
+    NAMES
+        resteasy-atom-provider.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(HTTPCLIENT_JAR
+    NAMES
+        httpclient.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+find_file(HTTPCORE_JAR
+    NAMES
+        httpcore.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+# build pki-cmscore
+javac(pki-cmscore-classes
+    SOURCES
+        com/netscape/cmscore/*.java
+    CLASSPATH
+        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_CMS_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")
diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
index ff44c6dea..ff44c6dea 100644
--- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
diff --git a/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CommandQueue.java
index d501de343..d501de343 100644
--- a/base/common/src/com/netscape/cmscore/apps/CommandQueue.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/CommandQueue.java
diff --git a/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java b/base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerEvent.java
index c49307a9e..c49307a9e 100644
--- a/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerEvent.java
diff --git a/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java b/base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerListener.java
index 9cfcb1b31..9cfcb1b31 100644
--- a/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerListener.java
diff --git a/base/common/src/com/netscape/cmscore/apps/Setup.java b/base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java
index fecf024de..fecf024de 100644
--- a/base/common/src/com/netscape/cmscore/apps/Setup.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java
diff --git a/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/base/server/cmscore/src/com/netscape/cmscore/apps/Upgrade.java
index cd5b2991f..cd5b2991f 100644
--- a/base/common/src/com/netscape/cmscore/apps/Upgrade.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/Upgrade.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java
index 549ce01f9..549ce01f9 100644
--- a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
index 573b736d4..573b736d4 100644
--- a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
index f5bde0b54..f5bde0b54 100644
--- a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/NullAuthentication.java
index a7a1461cf..a7a1461cf 100644
--- a/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/NullAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
index 2905f3c75..2905f3c75 100644
--- a/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
index 235362395..235362395 100644
--- a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCert.java
index 0ada86e75..0ada86e75 100644
--- a/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCert.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCerts.java
index ccefe5b21..ccefe5b21 100644
--- a/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCerts.java
diff --git a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
index a6019730a..a6019730a 100644
--- a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java
index 7b7e42a0f..7b7e42a0f 100644
--- a/base/common/src/com/netscape/cmscore/base/ArgBlock.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java
diff --git a/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/base/server/cmscore/src/com/netscape/cmscore/base/FileConfigStore.java
index b77f86d78..b77f86d78 100644
--- a/base/common/src/com/netscape/cmscore/base/FileConfigStore.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/FileConfigStore.java
diff --git a/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java b/base/server/cmscore/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
index 4bcf9b44f..4bcf9b44f 100644
--- a/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
diff --git a/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/base/server/cmscore/src/com/netscape/cmscore/base/PropConfigStore.java
index eb3f6c312..eb3f6c312 100644
--- a/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/PropConfigStore.java
diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/server/cmscore/src/com/netscape/cmscore/base/SimpleProperties.java
index 38c17d861..38c17d861 100644
--- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/SimpleProperties.java
diff --git a/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java b/base/server/cmscore/src/com/netscape/cmscore/base/SourceConfigStore.java
index 546b97591..546b97591 100644
--- a/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/SourceConfigStore.java
diff --git a/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/base/server/cmscore/src/com/netscape/cmscore/base/SubsystemLoader.java
index 8cd2990a1..8cd2990a1 100644
--- a/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/SubsystemLoader.java
diff --git a/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java b/base/server/cmscore/src/com/netscape/cmscore/base/SubsystemRegistry.java
index adae60496..adae60496 100644
--- a/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/SubsystemRegistry.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertDateCompare.java
index c39db40d0..c39db40d0 100644
--- a/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CertDateCompare.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertPrettyPrint.java
index ecd1a4a60..ecd1a4a60 100644
--- a/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CertPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
index 9dc33e541..9dc33e541 100644
--- a/base/common/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertificatePair.java
index 779e0dafc..779e0dafc 100644
--- a/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CertificatePair.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
index 86746619b..86746619b 100644
--- a/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
index 2dc947641..2dc947641 100644
--- a/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
index b0feca8c2..b0feca8c2 100644
--- a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
index 10ac3fbb1..10ac3fbb1 100644
--- a/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
index 95bbd98e7..95bbd98e7 100644
--- a/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
index 60bc8c8f6..60bc8c8f6 100644
--- a/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
diff --git a/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintResources.java
index 0756664d9..0756664d9 100644
--- a/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintResources.java
diff --git a/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
index 5c5b13084..5c5b13084 100644
--- a/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/cert/X500NameSubsystem.java
index 7accf2b4f..7accf2b4f 100644
--- a/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/X500NameSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnFactory.java
index a55a186e3..a55a186e3 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnFactory.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnection.java
index 7a65c1760..7a65c1760 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnection.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnector.java
index 33b0d62b7..33b0d62b7 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnector.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpPKIMessage.java
index 4b35662fa..4b35662fa 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpPKIMessage.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
index bb18030dc..bb18030dc 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
diff --git a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/base/server/cmscore/src/com/netscape/cmscore/connector/LocalConnector.java
index ba2db83a1..ba2db83a1 100644
--- a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/LocalConnector.java
diff --git a/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java b/base/server/cmscore/src/com/netscape/cmscore/connector/RemoteAuthority.java
index 71d01579f..71d01579f 100644
--- a/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/RemoteAuthority.java
diff --git a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/base/server/cmscore/src/com/netscape/cmscore/connector/RequestTransfer.java
index b3479aea0..b3479aea0 100644
--- a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/RequestTransfer.java
diff --git a/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/server/cmscore/src/com/netscape/cmscore/connector/Resender.java
index a949b993e..a949b993e 100644
--- a/base/common/src/com/netscape/cmscore/connector/Resender.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/connector/Resender.java
diff --git a/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/base/server/cmscore/src/com/netscape/cmscore/crmf/CRMFParser.java
index 34b378bf1..34b378bf1 100644
--- a/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/crmf/CRMFParser.java
diff --git a/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java b/base/server/cmscore/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
index 4c5478daf..4c5478daf 100644
--- a/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
index 7d92c79cd..7d92c79cd 100644
--- a/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
index 88d205b20..88d205b20 100644
--- a/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLDBSchema.java
index 60f6b69a1..60f6b69a1 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLDBSchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
index c6d041b34..c6d041b34 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLRepository.java
index c83494984..c83494984 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertDBSchema.java
index 916e83a8a..916e83a8a 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertDBSchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecord.java
index 422d506d5..422d506d5 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CertRecord.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordList.java
index c4f10a61f..c4f10a61f 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordList.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordMapper.java
index a074b41e6..a074b41e6 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertificateRepository.java
index 7d626b93d..7d626b93d 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertificateRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBAttribute.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBAttribute.java
index d89c56e7c..d89c56e7c 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBAttribute.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBAttribute.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBObjectClasses.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBObjectClasses.java
index 8920a4f97..8920a4f97 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBObjectClasses.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBObjectClasses.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBRecord.java
index 8d62b00d2..8d62b00d2 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBRecord.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBRegistry.java
index 653850e02..653850e02 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBRegistry.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSSession.java
index fd59e8d8f..fd59e8d8f 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBSSession.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSSession.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSUtil.java
index 1460db969..1460db969 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSUtil.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSearchResults.java
index a97998916..a97998916 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSearchResults.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
index be674bfd5..be674bfd5 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBVirtualList.java
index 51a9230ac..51a9230ac 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBVirtualList.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/Database.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/Database.java
index 3df2d5919..3df2d5919 100644
--- a/base/common/src/com/netscape/cmscore/dbs/Database.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/Database.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DateArrayMapper.java
index 99d54be60..99d54be60 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DateArrayMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DateMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DateMapper.java
index cb287f05e..cb287f05e 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DateMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DateMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/IntegerMapper.java
index a50ce99d7..a50ce99d7 100644
--- a/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/IntegerMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyDBSchema.java
index 743176318..743176318 100644
--- a/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyDBSchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java
index 7ae546184..7ae546184 100644
--- a/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordList.java
index 732957c25..732957c25 100644
--- a/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordList.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
index b124857ca..b124857ca 100644
--- a/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRepository.java
index 556cab9f5..556cab9f5 100644
--- a/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyStateMapper.java
index 02b49b1c8..02b49b1c8 100644
--- a/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyStateMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/LDAPDatabase.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/LDAPDatabase.java
index f6ded787b..f6ded787b 100644
--- a/base/common/src/com/netscape/cmscore/dbs/LDAPDatabase.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/LDAPDatabase.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
index e31cf1019..e31cf1019 100644
--- a/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/LongMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/LongMapper.java
index 3c066ca43..3c066ca43 100644
--- a/base/common/src/com/netscape/cmscore/dbs/LongMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/LongMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
index f4913b936..f4913b936 100644
--- a/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
index 5c61d36af..5c61d36af 100644
--- a/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
index 8a4dbc77d..8a4dbc77d 100644
--- a/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
index 5a6a61d20..5a6a61d20 100644
--- a/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/Repository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/Repository.java
index e6b6e831e..e6b6e831e 100644
--- a/base/common/src/com/netscape/cmscore/dbs/Repository.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/Repository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RepositoryRecord.java
index a268f68a9..a268f68a9 100644
--- a/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/RepositoryRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RepositorySchema.java
index 5dfc55590..5dfc55590 100644
--- a/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/RepositorySchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfo.java
index 36f470511..36f470511 100644
--- a/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfo.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
index e033f8154..e033f8154 100644
--- a/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/StringMapper.java
index 3282e11b5..3282e11b5 100644
--- a/base/common/src/com/netscape/cmscore/dbs/StringMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/StringMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/StringVectorMapper.java
index db2c9ee58..db2c9ee58 100644
--- a/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/StringVectorMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/X500NameMapper.java
index 50d938d81..50d938d81 100644
--- a/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/X500NameMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
index ef8577747..ef8577747 100644
--- a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
diff --git a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/server/cmscore/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
index 3322ca9b0..3322ca9b0 100644
--- a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
diff --git a/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/base/server/cmscore/src/com/netscape/cmscore/extensions/KeyUsage.java
index c5487de31..c5487de31 100644
--- a/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/extensions/KeyUsage.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/CronItem.java
index 5e6a3296e..5e6a3296e 100644
--- a/base/common/src/com/netscape/cmscore/jobs/CronItem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/jobs/CronItem.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/CronRange.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/CronRange.java
index c49a5b1b4..c49a5b1b4 100644
--- a/base/common/src/com/netscape/cmscore/jobs/CronRange.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/jobs/CronRange.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/JobCron.java
index 7befa611c..7befa611c 100644
--- a/base/common/src/com/netscape/cmscore/jobs/JobCron.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/jobs/JobCron.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/JobsScheduler.java
index feabb1f46..feabb1f46 100644
--- a/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/jobs/JobsScheduler.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapAndExpression.java
index 7c1fa979e..7c1fa979e 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapAndExpression.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapConnModule.java
index 859e442fa..859e442fa 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapConnModule.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapOrExpression.java
index 92a9b902e..92a9b902e 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapOrExpression.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
index 8d98f21b7..8d98f21b7 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPublishModule.java
index c4ff20515..c4ff20515 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPublishModule.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRequestListener.java
index 79131244a..79131244a 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRequestListener.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRule.java
index 2fb148492..2fb148492 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRule.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
index 9a326b25e..9a326b25e 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/PublishObject.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/PublishObject.java
index 940330d6d..940330d6d 100644
--- a/base/common/src/com/netscape/cmscore/ldap/PublishObject.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/PublishObject.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/PublisherProcessor.java
index 5df29c10c..5df29c10c 100644
--- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldap/PublisherProcessor.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
index dfc974e0b..dfc974e0b 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
index 52cdc4b1e..52cdc4b1e 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
index eb3fde26c..eb3fde26c 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
index 5be645b56..5be645b56 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
index 787967a5f..787967a5f 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
index 47dfb0fb1..47dfb0fb1 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
index 4d9e60251..4d9e60251 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
diff --git a/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java b/base/server/cmscore/src/com/netscape/cmscore/listeners/ListenerPlugin.java
index fbdeca579..fbdeca579 100644
--- a/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/listeners/ListenerPlugin.java
diff --git a/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditEventFactory.java
index fea638eb6..fea638eb6 100644
--- a/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditEventFactory.java
diff --git a/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditFormat.java
index 42c3b0d6f..42c3b0d6f 100644
--- a/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditFormat.java
diff --git a/base/common/src/com/netscape/cmscore/logging/AuditService.java b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java
index 89ac6263e..89ac6263e 100644
--- a/base/common/src/com/netscape/cmscore/logging/AuditService.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java
diff --git a/base/common/src/com/netscape/cmscore/logging/Auditor.java b/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java
index f0bcb5bee..f0bcb5bee 100644
--- a/base/common/src/com/netscape/cmscore/logging/Auditor.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java
diff --git a/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java
index 32af1bf2c..32af1bf2c 100644
--- a/base/common/src/com/netscape/cmscore/logging/LogQueue.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java
diff --git a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java
index aa5714668..aa5714668 100644
--- a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/logging/Logger.java b/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java
index aec4caec7..aec4caec7 100644
--- a/base/common/src/com/netscape/cmscore/logging/Logger.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java
diff --git a/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
index 6ba492dc3..6ba492dc3 100644
--- a/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
diff --git a/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditLogger.java
index 4b6fd55a2..4b6fd55a2 100644
--- a/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditLogger.java
diff --git a/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java b/base/server/cmscore/src/com/netscape/cmscore/logging/SystemEventFactory.java
index 6821fac6f..6821fac6f 100644
--- a/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/SystemEventFactory.java
diff --git a/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailFormProcessor.java
index 2625d8efa..2625d8efa 100644
--- a/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailFormProcessor.java
diff --git a/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailResolverKeys.java
index 7012801c5..7012801c5 100644
--- a/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailResolverKeys.java
diff --git a/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailTemplate.java
index 86c232630..86c232630 100644
--- a/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailTemplate.java
diff --git a/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java b/base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
index de34f7be0..de34f7be0 100644
--- a/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
diff --git a/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
index f3d5e8252..f3d5e8252 100644
--- a/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
diff --git a/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java
index 9a2274b11..9a2274b11 100644
--- a/base/common/src/com/netscape/cmscore/policy/AndExpression.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java
diff --git a/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java
index 8d8c05bc6..8d8c05bc6 100644
--- a/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java
diff --git a/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
index 7b3eac274..7b3eac274 100644
--- a/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
diff --git a/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
index 1fbcf2738..1fbcf2738 100644
--- a/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
diff --git a/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java
index 512bba256..512bba256 100644
--- a/base/common/src/com/netscape/cmscore/policy/OrExpression.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java
diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
index c55b84ece..c55b84ece 100644
--- a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
diff --git a/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java
index b5e3459d1..b5e3459d1 100644
--- a/base/common/src/com/netscape/cmscore/policy/PolicySet.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java
diff --git a/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java
index 4f8f0eb9a..4f8f0eb9a 100644
--- a/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java
diff --git a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java
index 27e72352e..27e72352e 100644
--- a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/realm/ACL.java b/base/server/cmscore/src/com/netscape/cmscore/realm/ACL.java
index 13fcdac44..13fcdac44 100644
--- a/base/common/src/com/netscape/cmscore/realm/ACL.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/realm/ACL.java
diff --git a/base/common/src/com/netscape/cmscore/realm/ACLEntry.java b/base/server/cmscore/src/com/netscape/cmscore/realm/ACLEntry.java
index 1e13ad682..1e13ad682 100644
--- a/base/common/src/com/netscape/cmscore/realm/ACLEntry.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/realm/ACLEntry.java
diff --git a/base/common/src/com/netscape/cmscore/registry/PluginInfo.java b/base/server/cmscore/src/com/netscape/cmscore/registry/PluginInfo.java
index f9f734b72..f9f734b72 100644
--- a/base/common/src/com/netscape/cmscore/registry/PluginInfo.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/registry/PluginInfo.java
diff --git a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/server/cmscore/src/com/netscape/cmscore/registry/PluginRegistry.java
index 4e3593411..4e3593411 100644
--- a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/registry/PluginRegistry.java
diff --git a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java
index 446c3b18d..446c3b18d 100644
--- a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java
diff --git a/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestRecord.java
index 5f2aa50b2..5f2aa50b2 100644
--- a/base/common/src/com/netscape/cmscore/request/ARequestRecord.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestRecord.java
diff --git a/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java b/base/server/cmscore/src/com/netscape/cmscore/request/CertRequestConstants.java
index 9b9391d44..9b9391d44 100644
--- a/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/CertRequestConstants.java
diff --git a/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/base/server/cmscore/src/com/netscape/cmscore/request/ExtDataHashtable.java
index 317b8e56c..317b8e56c 100644
--- a/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/ExtDataHashtable.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestAttr.java
index a48fca1d2..a48fca1d2 100644
--- a/base/common/src/com/netscape/cmscore/request/RequestAttr.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/RequestAttr.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestQueue.java
index 6159a2ed5..6159a2ed5 100644
--- a/base/common/src/com/netscape/cmscore/request/RequestQueue.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/RequestQueue.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestRecord.java
index 023dd9478..023dd9478 100644
--- a/base/common/src/com/netscape/cmscore/request/RequestRecord.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/RequestRecord.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestRepository.java
index 31edc31b0..31edc31b0 100644
--- a/base/common/src/com/netscape/cmscore/request/RequestRepository.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/RequestRepository.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestSubsystem.java
index 78d312851..78d312851 100644
--- a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/RequestSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/request/Schema.java b/base/server/cmscore/src/com/netscape/cmscore/request/Schema.java
index 89a7b74b9..89a7b74b9 100644
--- a/base/common/src/com/netscape/cmscore/request/Schema.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/request/Schema.java
diff --git a/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/CASigningCert.java
index 701ac4c18..701ac4c18 100644
--- a/base/common/src/com/netscape/cmscore/security/CASigningCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/CASigningCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/server/cmscore/src/com/netscape/cmscore/security/CertificateInfo.java
index 58eb9ae63..58eb9ae63 100644
--- a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/CertificateInfo.java
diff --git a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java
index e3b744220..e3b744220 100644
--- a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/KRATransportCert.java
index 58c269796..58c269796 100644
--- a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/KRATransportCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/base/server/cmscore/src/com/netscape/cmscore/security/KeyCertUtil.java
index b91b4cf93..b91b4cf93 100644
--- a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/KeyCertUtil.java
diff --git a/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/OCSPSigningCert.java
index 08cdd92e8..08cdd92e8 100644
--- a/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/OCSPSigningCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/base/server/cmscore/src/com/netscape/cmscore/security/PWCBsdr.java
index a62a8561d..a62a8561d 100644
--- a/base/common/src/com/netscape/cmscore/security/PWCBsdr.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/PWCBsdr.java
diff --git a/base/common/src/com/netscape/cmscore/security/PWUtil.java b/base/server/cmscore/src/com/netscape/cmscore/security/PWUtil.java
index 78678b98b..78678b98b 100644
--- a/base/common/src/com/netscape/cmscore/security/PWUtil.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/PWUtil.java
diff --git a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/server/cmscore/src/com/netscape/cmscore/security/PWsdrCache.java
index 729a368f2..729a368f2 100644
--- a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/PWsdrCache.java
diff --git a/base/common/src/com/netscape/cmscore/security/Provider.java b/base/server/cmscore/src/com/netscape/cmscore/security/Provider.java
index 540fe2201..540fe2201 100644
--- a/base/common/src/com/netscape/cmscore/security/Provider.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/Provider.java
diff --git a/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/RASigningCert.java
index 51e05b5e9..51e05b5e9 100644
--- a/base/common/src/com/netscape/cmscore/security/RASigningCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/RASigningCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/SSLCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/SSLCert.java
index 99b920c98..99b920c98 100644
--- a/base/common/src/com/netscape/cmscore/security/SSLCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/SSLCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
index 8cee1d155..8cee1d155 100644
--- a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/SubsystemCert.java
index 5ad3e11f2..5ad3e11f2 100644
--- a/base/common/src/com/netscape/cmscore/security/SubsystemCert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/security/SubsystemCert.java
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
index 62bf09063..62bf09063 100644
--- a/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestService.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java
index da7708e49..da7708e49 100644
--- a/base/common/src/com/netscape/cmscore/selftests/SelfTestService.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
index c44476dd6..c44476dd6 100644
--- a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java b/base/server/cmscore/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java
index 064ae7ecb..064ae7ecb 100644
--- a/base/common/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java
diff --git a/base/common/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java b/base/server/cmscore/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java
index 497f42f7a..497f42f7a 100644
--- a/base/common/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java
diff --git a/base/common/src/com/netscape/cmscore/session/SessionTimer.java b/base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java
index 28c06de32..28c06de32 100644
--- a/base/common/src/com/netscape/cmscore/session/SessionTimer.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java
diff --git a/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java b/base/server/cmscore/src/com/netscape/cmscore/time/SimpleTimeSource.java
index ab832b7cc..ab832b7cc 100644
--- a/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/time/SimpleTimeSource.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
index 673146695..673146695 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
index d9a39afb8..d9a39afb8 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/Group.java
index 25917e901..25917e901 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/Group.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/Group.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
index 3833c2937..3833c2937 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/User.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java
index ef09a1ab5..ef09a1ab5 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/User.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java
diff --git a/base/common/src/com/netscape/cmscore/util/Assert.java b/base/server/cmscore/src/com/netscape/cmscore/util/Assert.java
index 246599290..246599290 100644
--- a/base/common/src/com/netscape/cmscore/util/Assert.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/Assert.java
diff --git a/base/common/src/com/netscape/cmscore/util/AssertionException.java b/base/server/cmscore/src/com/netscape/cmscore/util/AssertionException.java
index 46b3f32da..46b3f32da 100644
--- a/base/common/src/com/netscape/cmscore/util/AssertionException.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/AssertionException.java
diff --git a/base/common/src/com/netscape/cmscore/util/Debug.java b/base/server/cmscore/src/com/netscape/cmscore/util/Debug.java
index bd10a493c..bd10a493c 100644
--- a/base/common/src/com/netscape/cmscore/util/Debug.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/Debug.java
diff --git a/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java b/base/server/cmscore/src/com/netscape/cmscore/util/ExceptionFormatter.java
index 14351cd7b..14351cd7b 100644
--- a/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/ExceptionFormatter.java
diff --git a/base/common/src/com/netscape/cmscore/util/FileAsString.java b/base/server/cmscore/src/com/netscape/cmscore/util/FileAsString.java
index ea8fb796d..ea8fb796d 100644
--- a/base/common/src/com/netscape/cmscore/util/FileAsString.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/FileAsString.java
diff --git a/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/base/server/cmscore/src/com/netscape/cmscore/util/FileDialogFilter.java
index c62d7b8b5..c62d7b8b5 100644
--- a/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/FileDialogFilter.java
diff --git a/base/common/src/com/netscape/cmscore/util/PFXUtils.java b/base/server/cmscore/src/com/netscape/cmscore/util/PFXUtils.java
index ed0e6d641..ed0e6d641 100644
--- a/base/common/src/com/netscape/cmscore/util/PFXUtils.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/PFXUtils.java
diff --git a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/util/ProfileSubsystem.java
index 296aadea5..296aadea5 100644
--- a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/ProfileSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/util/StatsSubsystem.java
index cfac63f21..cfac63f21 100644
--- a/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/StatsSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/util/UtilMessage.java b/base/server/cmscore/src/com/netscape/cmscore/util/UtilMessage.java
index ce2132dc4..ce2132dc4 100644
--- a/base/common/src/com/netscape/cmscore/util/UtilMessage.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/UtilMessage.java
diff --git a/base/common/src/com/netscape/cmscore/util/UtilResources.java b/base/server/cmscore/src/com/netscape/cmscore/util/UtilResources.java
index 9ea7648f5..9ea7648f5 100644
--- a/base/common/src/com/netscape/cmscore/util/UtilResources.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/util/UtilResources.java
diff --git a/base/common/src/pki-cmscore.mf b/base/server/cmscore/src/pki-cmscore.mf
index c23d7b299..c23d7b299 100644
--- a/base/common/src/pki-cmscore.mf
+++ b/base/server/cmscore/src/pki-cmscore.mf
diff --git a/base/server/tomcat/CMakeLists.txt b/base/server/tomcat/CMakeLists.txt
new file mode 100644
index 000000000..555a9329d
--- /dev/null
+++ b/base/server/tomcat/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(tomcat)
+
+add_subdirectory(src)
diff --git a/base/server/tomcat/src/CMakeLists.txt b/base/server/tomcat/src/CMakeLists.txt
new file mode 100644
index 000000000..d9808a803
--- /dev/null
+++ b/base/server/tomcat/src/CMakeLists.txt
@@ -0,0 +1,158 @@
+project(pki-tomcat)
+
+find_file(JSS_JAR
+    NAMES
+        jss4.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(LDAPJDK_JAR
+    NAMES
+        ldapjdk.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(COMMONS_CODEC_JAR
+    NAMES
+        commons-codec.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(COMMONS_HTTPCLIENT_JAR
+    NAMES
+        commons-httpclient.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(APACHE_COMMONS_LANG_JAR
+    NAMES
+        apache-commons-lang.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(TOMCAT_CATALINA_JAR
+    NAMES
+        catalina.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(TOMCAT_UTIL_JAR
+    NAMES
+        tomcat-util.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(SERVLET_JAR
+    NAMES
+        servlet.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(VELOCITY_JAR
+    NAMES
+        velocity.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XALAN_JAR
+    NAMES
+        xalan-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XERCES_JAR
+    NAMES
+        xerces-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_JAXRS_JAR
+    NAMES
+        resteasy-jaxrs.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_ATOM_PROVIDER_JAR
+    NAMES
+        resteasy-atom-provider.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(HTTPCLIENT_JAR
+    NAMES
+        httpclient.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+find_file(HTTPCORE_JAR
+    NAMES
+        httpcore.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+# 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
+)
+
+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")
diff --git a/base/common/src/com/netscape/cms/tomcat/ProxyRealm.java b/base/server/tomcat/src/com/netscape/cms/tomcat/ProxyRealm.java
index 094c0561f..094c0561f 100644
--- a/base/common/src/com/netscape/cms/tomcat/ProxyRealm.java
+++ b/base/server/tomcat/src/com/netscape/cms/tomcat/ProxyRealm.java
diff --git a/base/common/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java b/base/server/tomcat/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java
index 20bf85d22..20bf85d22 100644
--- a/base/common/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java
+++ b/base/server/tomcat/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java
diff --git a/base/common/src/pki-tomcat.mf b/base/server/tomcat/src/pki-tomcat.mf
index ca8d3bf1b..ca8d3bf1b 100644
--- a/base/common/src/pki-tomcat.mf
+++ b/base/server/tomcat/src/pki-tomcat.mf