3 files changed, 11 insertions, 31 deletions
diff --git a/base/common/shared/conf/pki.policy b/base/common/shared/conf/pki.policy
index b9d79fe58..121b7732f 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..fe3072b31 100644
--- a/base/common/shared/conf/tomcat.conf
+++ b/base/common/shared/conf/tomcat.conf
@@ -32,6 +32,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=/usr/share/java/resteasy"
+
 # 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