diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-12-06 13:06:14 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-12-06 21:23:11 -0500 |
| commit | 9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b (patch) | |
| tree | 449a55d01c5092a59192e0dffd28bbeb1c6e17f9 /base/java-tools | |
| parent | 883e0ec158eec04547da6856dbdaef0a8f640cb0 (diff) | |
| download | pki-9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b.tar.gz pki-9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b.tar.xz pki-9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b.zip | |
Parameterizing RESTEasy paths.
The paths to RESTEasy jar files have been modified such that it can
be configured globally at build time using the spec file to support
different distributions, and at deployment time using a system-wide
configuration in /etc/pki/pki.conf.
Ticket #422, #423.
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 |