diff options
Diffstat (limited to 'base/java-tools')
| -rwxr-xr-x | base/java-tools/pki | 11 | ||||
| -rw-r--r-- | base/java-tools/src/CMakeLists.txt | 9 |
2 files changed, 10 insertions, 10 deletions
diff --git a/base/java-tools/pki b/base/java-tools/pki index e465fa926..07194c9ed 100755 --- a/base/java-tools/pki +++ b/base/java-tools/pki @@ -71,6 +71,9 @@ if( $ARCHITECTURE eq "i386" ) { ## order this command wrapper uses to find jar files. ## ############################################################################### +my $RESTEASY_LIB = `source /etc/pki/pki.conf && echo \$RESTEASY_LIB`; +chomp($RESTEASY_LIB); + $ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-certsrv.jar:" . "/usr/share/java/${PRODUCT}/pki-nsutil.jar:" . "/usr/share/java/${PRODUCT}/pki-tools.jar:" @@ -82,10 +85,10 @@ $ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-certsrv.jar:" . "/usr/share/java/httpcomponents/httpclient.jar:" . "/usr/share/java/httpcomponents/httpcore.jar:" . "/usr/share/java/jaxb-api.jar:" - . "/usr/share/java/resteasy/jaxrs-api.jar:" - . "/usr/share/java/resteasy/resteasy-atom-provider.jar:" - . "/usr/share/java/resteasy/resteasy-jaxb-provider.jar:" - . "/usr/share/java/resteasy/resteasy-jaxrs.jar:" + . "${RESTEASY_LIB}/jaxrs-api.jar:" + . "${RESTEASY_LIB}/resteasy-atom-provider.jar:" + . "${RESTEASY_LIB}/resteasy-jaxb-provider.jar:" + . "${RESTEASY_LIB}/resteasy-jaxrs.jar:" . "/usr/share/java/servlet.jar:"; if( $ARCHITECTURE eq "x86_64" ) { diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt index 96aae5c30..6ea69cae9 100644 --- a/base/java-tools/src/CMakeLists.txt +++ b/base/java-tools/src/CMakeLists.txt @@ -49,24 +49,21 @@ find_file(JAXRS_API_JAR NAMES jaxrs-api.jar PATHS - /usr/share/java/resteasy - /usr/share/java/resteasy-base + ${RESTEASY_LIB} ) find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar PATHS - /usr/share/java/resteasy - /usr/share/java/resteasy-base + ${RESTEASY_LIB} ) find_file(RESTEASY_ATOM_PROVIDER_JAR NAMES resteasy-atom-provider.jar PATHS - /usr/share/java/resteasy - /usr/share/java/resteasy-base + ${RESTEASY_LIB} ) find_file(HTTPCLIENT_JAR |