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.

3 files changed, 15 insertions, 31 deletions

diff --git a/base/common/shared/conf/pki.policy b/base/common/shared/conf/pki.policy
index b9d79fe58..4ae2de734 100644
--- a/base/common/shared/conf/pki.policy
+++ b/base/common/shared/conf/pki.policy
@@ -106,43 +106,23 @@ grant codeBase "file:/usr/share/java/log4j.jar" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:/usr/share/java/resteasy/jaxrs-api.jar" {
+grant codeBase "file:${RESTEASY_LIB}/jaxrs-api.jar" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:/usr/share/java/resteasy/resteasy-atom-provider.jar" {
+grant codeBase "file:${RESTEASY_LIB}/resteasy-atom-provider.jar" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:/usr/share/java/resteasy/resteasy-jaxb-provider.jar" {
+grant codeBase "file:${RESTEASY_LIB}/resteasy-jaxb-provider.jar" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:/usr/share/java/resteasy/resteasy-jaxrs.jar" {
+grant codeBase "file:${RESTEASY_LIB}/resteasy-jaxrs.jar" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:/usr/share/java/resteasy/resteasy-jettison-provider.jar" {
-        permission java.security.AllPermission;
-};
-
-grant codeBase "file:/usr/share/java/resteasy-base/jaxrs-api.jar" {
-        permission java.security.AllPermission;
-};
-
-grant codeBase "file:/usr/share/java/resteasy-base/resteasy-atom-provider.jar" {
-        permission java.security.AllPermission;
-};
-
-grant codeBase "file:/usr/share/java/resteasy-base/resteasy-jaxb-provider.jar" {
-        permission java.security.AllPermission;
-};
-
-grant codeBase "file:/usr/share/java/resteasy-base/resteasy-jaxrs.jar" {
-        permission java.security.AllPermission;
-};
-
-grant codeBase "file:/usr/share/java/resteasy-base/resteasy-jettison-provider.jar" {
+grant codeBase "file:${RESTEASY_LIB}/resteasy-jettison-provider.jar" {
         permission java.security.AllPermission;
 };
 
diff --git a/base/common/shared/conf/tomcat.conf b/base/common/shared/conf/tomcat.conf
index 54d67e4b4..7b8f87cb5 100644
--- a/base/common/shared/conf/tomcat.conf
+++ b/base/common/shared/conf/tomcat.conf
@@ -14,6 +14,10 @@
 # (see, for instance, /etc/sysconfig/tomcat)
 #
 
+if [ -f /etc/pki/pki.conf ] ; then
+  . /etc/pki/pki.conf
+fi
+
 # Where your java installation lives
 #JAVA_HOME="/usr/lib/jvm/jre"
 
@@ -32,6 +36,9 @@ CATALINA_TMPDIR=[PKI_TMPDIR]
 # Enable the following JAVA_OPTS to run a java debugger (e. g. - 'eclipse')
 #JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Djava.awt.headless=true -Xmx128M"
 
+# RESTEasy
+JAVA_OPTS="$JAVA_OPTS -DRESTEASY_LIB=${RESTEASY_LIB}"
+
 # What user should run tomcat
 TOMCAT_USER="[PKI_USER]"
 
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index e21f13ce6..c010bedfe 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -87,24 +87,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