summaryrefslogtreecommitdiffstats
path: root/base/java-tools/pki
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-12-06 13:06:14 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-12-06 19:31:38 -0500
commit7259a1256afc853b91aa09cd48592a706591fa08 (patch)
tree50d156b9c2d537ddd32bc04fe3b4c72329c37925 /base/java-tools/pki
parentcd279e34b5d92ff8fe53e79c974baf9972221748 (diff)
downloadpki-ticket-422-1.tar.gz
pki-ticket-422-1.tar.xz
pki-ticket-422-1.zip
Parameterizing RESTEasy paths.ticket-422-1
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/pki')
-rwxr-xr-xbase/java-tools/pki11
1 files changed, 7 insertions, 4 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" ) {