summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/scriptlets/pkijython.py
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-11-20 23:34:32 -0500
committerAde Lee <alee@redhat.com>2012-11-21 00:04:32 -0500
commit40e58f937d49f1a0029a226ab714cb54f12a9239 (patch)
tree74220b09ecb3554044caae086c9695569b248709 /base/deploy/src/scriptlets/pkijython.py
parent96af71db61acac4adb3a1c8a73391467b3572a49 (diff)
downloadpki-40e58f937d49f1a0029a226ab714cb54f12a9239.tar.gz
pki-40e58f937d49f1a0029a226ab714cb54f12a9239.tar.xz
pki-40e58f937d49f1a0029a226ab714cb54f12a9239.zip
Link to resteasy-base on rhel systems when running pkispawnalee-91
Diffstat (limited to 'base/deploy/src/scriptlets/pkijython.py')
-rw-r--r--base/deploy/src/scriptlets/pkijython.py24
1 files changed, 13 insertions, 11 deletions
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py
index 8d027f91a..e6098b01a 100644
--- a/base/deploy/src/scriptlets/pkijython.py
+++ b/base/deploy/src/scriptlets/pkijython.py
@@ -77,6 +77,9 @@ class classPathHacker:
b = method.invoke(sysloader, jar_a)
return u
+# PKI Python Imports
+import pkiconfig as config
+import pkimessages as log
# Dynamically Load Additional Java Jars ('append' to existing classpath)
jarLoad = classPathHacker()
@@ -87,13 +90,18 @@ jarLoad.addFile("/usr/share/java/apache-commons-cli.jar")
jarLoad.addFile("/usr/share/java/apache-commons-codec.jar")
jarLoad.addFile("/usr/share/java/apache-commons-logging.jar")
jarLoad.addFile("/usr/share/java/istack-commons-runtime.jar")
+
# Resteasy Jars
+RESTEASY_ROOT = "resteasy"
+if config.is_rhel():
+ RESTEASY_ROOT = "resteasy-base"
+
jarLoad.addFile("/usr/share/java/glassfish-jaxb/jaxb-impl.jar")
-jarLoad.addFile("/usr/share/java/resteasy/jaxrs-api.jar")
-jarLoad.addFile("/usr/share/java/resteasy/resteasy-atom-provider.jar")
-jarLoad.addFile("/usr/share/java/resteasy/resteasy-jaxb-provider.jar")
-jarLoad.addFile("/usr/share/java/resteasy/resteasy-jaxrs.jar")
-jarLoad.addFile("/usr/share/java/resteasy/resteasy-jettison-provider.jar")
+jarLoad.addFile("/usr/share/java/" + RESTEASY_ROOT + "/jaxrs-api.jar")
+jarLoad.addFile("/usr/share/java/" + RESTEASY_ROOT + "/resteasy-atom-provider.jar")
+jarLoad.addFile("/usr/share/java/" + RESTEASY_ROOT + "/resteasy-jaxb-provider.jar")
+jarLoad.addFile("/usr/share/java/" + RESTEASY_ROOT + "/resteasy-jaxrs.jar")
+jarLoad.addFile("/usr/share/java/" + RESTEASY_ROOT + "/resteasy-jettison-provider.jar")
jarLoad.addFile("/usr/share/java/scannotation.jar")
# PKI Jars
jarLoad.addFile("/usr/share/java/pki/pki-certsrv.jar")
@@ -148,12 +156,6 @@ from com.netscape.certsrv.system import ConfigurationResponse
from com.netscape.cmsutil.util import Utils
from netscape.security.x509 import X500Name
-
-# PKI Python Imports
-import pkiconfig as config
-import pkimessages as log
-
-
# PKI Deployment Jython Helper Functions
def generateCRMFRequest(token, keysize, subjectdn, dualkey):
kg = token.getKeyPairGenerator(KeyPairAlgorithm.RSA)