summaryrefslogtreecommitdiffstats
path: root/base/tps-tomcat/src/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'base/tps-tomcat/src/CMakeLists.txt')
-rw-r--r--base/tps-tomcat/src/CMakeLists.txt44
1 files changed, 27 insertions, 17 deletions
diff --git a/base/tps-tomcat/src/CMakeLists.txt b/base/tps-tomcat/src/CMakeLists.txt
index 837587f63..0070a3c34 100644
--- a/base/tps-tomcat/src/CMakeLists.txt
+++ b/base/tps-tomcat/src/CMakeLists.txt
@@ -1,12 +1,5 @@
project(pki-tps_java NONE)
-find_file(APACHE_COMMONS_LANG_JAR
- NAMES
- apache-commons-lang.jar
- PATHS
- /usr/share/java
-)
-
find_file(LDAPJDK_JAR
NAMES
ldapjdk.jar
@@ -14,13 +7,6 @@ find_file(LDAPJDK_JAR
/usr/share/java
)
-find_file(JAXRS_API_JAR
- NAMES
- jaxrs-api.jar
- PATHS
- ${RESTEASY_LIB}
-)
-
find_file(JSS_JAR
NAMES
jss4.jar
@@ -35,6 +21,13 @@ find_file(COMMONS_CODEC_JAR
/usr/share/java
)
+find_file(COMMONS_LANG_JAR
+ NAMES
+ commons-lang.jar
+ PATHS
+ /usr/share/java
+)
+
find_file(JAXRS_API_JAR
NAMES
jaxrs-api.jar
@@ -84,6 +77,20 @@ find_file(PKI_NSUTIL_JAR
/usr/share/java/pki
)
+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
@@ -112,10 +119,13 @@ javac(pki-tps-classes
SOURCES
org/dogtagpki/server/tps/*.java
CLASSPATH
- ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
+ ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR}
+ ${LDAPJDK_JAR}
+ ${JSS_JAR} ${SYMKEY_JAR}
+ ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
+ ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR}
${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
- ${APACHE_COMMONS_LANG_JAR} ${LDAPJDK_JAR} ${JAXRS_API_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
- ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR}
+ ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS