diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-02-25 12:33:34 +0100 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2016-03-29 18:21:19 -0600 |
| commit | 250bcf7e0aee5d7de616803fad3c7be56be0df3a (patch) | |
| tree | 8ce08d0a4f14ab6ea130abae11f637b8443059ab | |
| parent | b15f7a6bce6d5c2adc066be2ce06e3fdbd56d002 (diff) | |
| download | pki-250bcf7e0aee5d7de616803fad3c7be56be0df3a.tar.gz pki-250bcf7e0aee5d7de616803fad3c7be56be0df3a.tar.xz pki-250bcf7e0aee5d7de616803fad3c7be56be0df3a.zip | |
pki-tomcat8 needs tomcat-api.jar to compile
Tomcat 8.0.32 has moved org.apache.tomcat.ContextBind into
tomcat-api.jar. Add tomcat-api.jar to javac classpath to compile pki
with latest Tomcat.
https://fedorahosted.org/pki/attachment/ticket/2222
(cherry picked from commit 263dc2152640a95c8ca9b2829e74cce3a877f077)
(cherry picked from commit a7055d92466463d444da83db94c7b775a33e6aa0)
| -rw-r--r-- | base/server/tomcat8/src/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/base/server/tomcat8/src/CMakeLists.txt b/base/server/tomcat8/src/CMakeLists.txt index a2badac69..74d789bff 100644 --- a/base/server/tomcat8/src/CMakeLists.txt +++ b/base/server/tomcat8/src/CMakeLists.txt @@ -44,6 +44,13 @@ find_file(TOMCAT_CATALINA_JAR /usr/share/java/tomcat ) +find_file(TOMCAT_API_JAR + NAMES + tomcat-api.jar + PATHS + /usr/share/java/tomcat +) + find_file(TOMCAT_UTIL_SCAN_JAR NAMES tomcat-util-scan.jar @@ -123,7 +130,8 @@ javac(pki-tomcat8-classes SOURCES com/netscape/cms/tomcat/*.java CLASSPATH - ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_SCAN_JAR} + ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_SCAN_JAR} ${TOMCAT_API_JAR} + ${CMAKE_BINARY_DIR}/../../tomcat OUTPUT_DIR ${CMAKE_BINARY_DIR}/../../tomcat ) |