Misc changes to get rhel 7 build to work

1. Modified cmake dependency
2. Corrected conditionals in spec file
3. Added paths for resteasy-base
4. Added paths to policy for resteasy-base

7 files changed, 30 insertions, 0 deletions

diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
index f4349efaa..aa19cc42b 100644
--- a/base/ca/src/CMakeLists.txt
+++ b/base/ca/src/CMakeLists.txt
@@ -29,6 +29,7 @@ find_file(JAXRS_API_JAR
         jaxrs-api.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 # build pki-ca
diff --git a/base/common/shared/conf/pki.policy b/base/common/shared/conf/pki.policy
index d26598671..9b71feb76 100644
--- a/base/common/shared/conf/pki.policy
+++ b/base/common/shared/conf/pki.policy
@@ -118,6 +118,26 @@ 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" {
+        permission java.security.AllPermission;
+};
+
 grant codeBase "file:/usr/share/java/scannotation.jar" {
         permission java.security.AllPermission;
 };
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index c589cb184..e21f13ce6 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -88,6 +88,7 @@ find_file(JAXRS_API_JAR
         jaxrs-api.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 find_file(RESTEASY_JAXRS_JAR
@@ -95,6 +96,7 @@ find_file(RESTEASY_JAXRS_JAR
         resteasy-jaxrs.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 find_file(RESTEASY_ATOM_PROVIDER_JAR
@@ -102,6 +104,7 @@ find_file(RESTEASY_ATOM_PROVIDER_JAR
         resteasy-atom-provider.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 find_file(HTTPCLIENT_JAR
diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
index 131375bb1..96aae5c30 100644
--- a/base/java-tools/src/CMakeLists.txt
+++ b/base/java-tools/src/CMakeLists.txt
@@ -50,6 +50,7 @@ find_file(JAXRS_API_JAR
         jaxrs-api.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 find_file(RESTEASY_JAXRS_JAR
@@ -57,6 +58,7 @@ find_file(RESTEASY_JAXRS_JAR
         resteasy-jaxrs.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 find_file(RESTEASY_ATOM_PROVIDER_JAR
@@ -64,6 +66,7 @@ find_file(RESTEASY_ATOM_PROVIDER_JAR
         resteasy-atom-provider.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 find_file(HTTPCLIENT_JAR
diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt
index 7f570ddc5..d9ab25cd2 100644
--- a/base/kra/src/CMakeLists.txt
+++ b/base/kra/src/CMakeLists.txt
@@ -51,6 +51,7 @@ find_file(JAXRS_API_JAR
         jaxrs-api.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 # '${JAVA_LIB_INSTALL_DIR}' jars
diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt
index 36a1908d1..39468cadd 100644
--- a/base/ocsp/src/CMakeLists.txt
+++ b/base/ocsp/src/CMakeLists.txt
@@ -51,6 +51,7 @@ find_file(JAXRS_API_JAR
         jaxrs-api.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )
 
 # '${JAVA_LIB_INSTALL_DIR}' jars
diff --git a/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt
index cf82ccc50..0ff69ae3c 100644
--- a/base/tks/src/CMakeLists.txt
+++ b/base/tks/src/CMakeLists.txt
@@ -51,6 +51,7 @@ find_file(JAXRS_API_JAR
         jaxrs-api.jar
     PATHS
         /usr/share/java/resteasy
+        /usr/share/java/resteasy-base
 )