From 145114f713a58ed5ce896e2192e50eeb382a3c74 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Thu, 6 Dec 2012 13:06:14 -0500
Subject: Added RESTEASY_LIB.

---
 base/common/shared/conf/pki.policy  | 30 +++++-------------------------
 base/common/shared/conf/tomcat.conf |  3 +++
 2 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'base/common/shared')

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]"
 
-- 
cgit