From a7ad636d5f2f3cf1f782326d95a84edeb8a613e1 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 27 Jun 2023 19:32:22 -0500 Subject: [PATCH] Replace tomcatjss.jar All references to tomcatjss.jar have been replaced with tomcatjss-core.jar and tomcatjss-tomcat-9.0.jar since they are the actual Maven build artifacts. --- .classpath | 3 ++- base/CMakeLists.txt | 13 ++++++++++--- base/ca/CMakeLists.txt | 7 +++++-- base/javadoc/CMakeLists.txt | 6 ++++-- base/ocsp/CMakeLists.txt | 6 ++++-- base/server/CMakeLists.txt | 9 ++++++--- base/server/python/pki/server/instance.py | 5 +++-- base/tomcat-9.0/CMakeLists.txt | 4 +++- 8 files changed, 37 insertions(+), 16 deletions(-) diff --git a/.classpath b/.classpath index c1b161b97f1..1a72bba9817 100644 --- a/.classpath +++ b/.classpath @@ -44,7 +44,8 @@ - + + diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index ddc13a6a881..d0e2edf2e58 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -361,11 +361,18 @@ find_file(TOMCAT_UTIL_SCAN_JAR /usr/share/java ) -find_file(TOMCATJSS_JAR +find_file(TOMCATJSS_CORE_JAR NAMES - tomcatjss.jar + tomcatjss-core.jar PATHS - /usr/share/java + /usr/share/java/tomcatjss +) + +find_file(TOMCATJSS_TOMCAT_9_0_JAR + NAMES + tomcatjss-tomcat-9.0.jar + PATHS + /usr/share/java/tomcatjss ) find_file(BASE_JAR diff --git a/base/ca/CMakeLists.txt b/base/ca/CMakeLists.txt index 9013cd7640b..d8ed52ce673 100644 --- a/base/ca/CMakeLists.txt +++ b/base/ca/CMakeLists.txt @@ -23,9 +23,12 @@ javac(pki-ca-classes ${LDAPJDK_JAR} ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} - ${TOMCATJSS_JAR} + ${TOMCATJSS_CORE_JAR} + ${TOMCATJSS_TOMCAT_9_0_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} - ${PKI_COMMON_JAR} ${PKI_SERVER_JAR} ${PKI_TOMCAT_JAR} + ${PKI_COMMON_JAR} + ${PKI_SERVER_JAR} + ${PKI_TOMCAT_JAR} OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/classes ) diff --git a/base/javadoc/CMakeLists.txt b/base/javadoc/CMakeLists.txt index ceb35591da7..af0a5044968 100644 --- a/base/javadoc/CMakeLists.txt +++ b/base/javadoc/CMakeLists.txt @@ -81,8 +81,10 @@ javadoc(pki-javadoc ${JAVAX_ANNOTATIONS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_CLIENT_JAR} ${JSS_JAR} - ${TOMCATJSS_JAR} - ${PKI_COMMON_JAR} ${PKI_TOOLS_JAR} + ${TOMCATJSS_CORE_JAR} + ${TOMCATJSS_TOMCAT_9_0_JAR} + ${PKI_COMMON_JAR} + ${PKI_TOOLS_JAR} ${PKI_JAVADOC_CLASSPATH} OPTIONS -windowtitle 'pki-javadoc' diff --git a/base/ocsp/CMakeLists.txt b/base/ocsp/CMakeLists.txt index 78009ac575c..c4f2bbf1311 100644 --- a/base/ocsp/CMakeLists.txt +++ b/base/ocsp/CMakeLists.txt @@ -18,8 +18,10 @@ javac(pki-ocsp-classes ${JAXRS_API_JAR} ${JSS_JAR} ${LDAPJDK_JAR} - ${TOMCATJSS_JAR} - ${PKI_COMMON_JAR} ${PKI_SERVER_JAR} + ${TOMCATJSS_CORE_JAR} + ${TOMCATJSS_TOMCAT_9_0_JAR} + ${PKI_COMMON_JAR} + ${PKI_SERVER_JAR} OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/classes ) diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt index f8b66fe91bd..f7292ac5174 100644 --- a/base/server/CMakeLists.txt +++ b/base/server/CMakeLists.txt @@ -18,10 +18,12 @@ javac(pki-server-classes ${JSS_JAR} ${LDAPJDK_JAR} ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} - ${TOMCATJSS_JAR} + ${TOMCATJSS_CORE_JAR} + ${TOMCATJSS_TOMCAT_9_0_JAR} ${JAVAX_ANNOTATIONS_API_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} - ${PKI_COMMON_JAR} ${PKI_TOMCAT_JAR} + ${PKI_COMMON_JAR} + ${PKI_TOMCAT_JAR} OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/classes ) @@ -141,7 +143,8 @@ add_custom_command( COMMAND ln -sf ../../../../../..${RESTEASY_CLIENT_JAR} common/lib/resteasy-client.jar COMMAND ln -sf ../../../../../..${RESTEASY_JACKSON2_PROVIDER_JAR} common/lib/resteasy-jackson2-provider.jar COMMAND ln -sf ../../../../../..${RESTEASY_JAXRS_JAR} common/lib/resteasy-jaxrs.jar - COMMAND ln -sf ../../../../../..${TOMCATJSS_JAR} common/lib/tomcatjss.jar + COMMAND ln -sf ../../../../../..${TOMCATJSS_CORE_JAR} common/lib/tomcatjss-core.jar + COMMAND ln -sf ../../../../../..${TOMCATJSS_TOMCAT_9_0_JAR} common/lib/tomcatjss-tomcat-9.0.jar ) add_custom_target(pki-server-man ALL diff --git a/base/server/python/pki/server/instance.py b/base/server/python/pki/server/instance.py index 54757717a11..4446d7d51cb 100644 --- a/base/server/python/pki/server/instance.py +++ b/base/server/python/pki/server/instance.py @@ -343,9 +343,10 @@ def create_libs(self, force=False): for filename in [ 'jss.jar', 'ldapjdk.jar', + 'tomcatjss-core.jar', + 'tomcatjss-tomcat-9.0.jar', 'pki-common.jar', - 'pki-tomcat.jar', - 'tomcatjss.jar']: + 'pki-tomcat.jar']: source = os.path.join(common_lib_dir, filename) dest = os.path.join(self.common_lib_dir, filename) diff --git a/base/tomcat-9.0/CMakeLists.txt b/base/tomcat-9.0/CMakeLists.txt index c2a59c1d553..2facd8a1759 100644 --- a/base/tomcat-9.0/CMakeLists.txt +++ b/base/tomcat-9.0/CMakeLists.txt @@ -12,7 +12,9 @@ javac(pki-tomcat-classes ${COMMONS_LANG3_JAR} ${TOMCAT_API_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_COYOTE_JAR} ${TOMCAT_UTIL_SCAN_JAR} ${SLF4J_API_JAR} - ${JSS_JAR} ${TOMCATJSS_JAR} + ${JSS_JAR} + ${TOMCATJSS_CORE_JAR} + ${TOMCATJSS_TOMCAT_9_0_JAR} ${PKI_COMMON_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/../tomcat