diff options
| author | Ade Lee <alee@redhat.com> | 2012-11-21 10:16:04 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-11-21 10:47:50 -0500 |
| commit | 871b4423babc140d984d4b49aa380710cfcaf72a (patch) | |
| tree | bd3d543c10118d1a00bc767bf20f5c9e91cdb7d1 /base/common | |
| parent | 40e58f937d49f1a0029a226ab714cb54f12a9239 (diff) | |
| download | pki-871b4423babc140d984d4b49aa380710cfcaf72a.tar.gz pki-871b4423babc140d984d4b49aa380710cfcaf72a.tar.xz pki-871b4423babc140d984d4b49aa380710cfcaf72a.zip | |
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
Diffstat (limited to 'base/common')
| -rw-r--r-- | base/common/shared/conf/pki.policy | 20 | ||||
| -rw-r--r-- | base/common/src/CMakeLists.txt | 3 |
2 files changed, 23 insertions, 0 deletions
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 |