diff options
Diffstat (limited to 'base/deploy/src/scriptlets/pkijython.py')
-rw-r--r-- | base/deploy/src/scriptlets/pkijython.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py index c1bec9327..3546f2132 100644 --- a/base/deploy/src/scriptlets/pkijython.py +++ b/base/deploy/src/scriptlets/pkijython.py @@ -83,6 +83,7 @@ import pkimessages as log # Dynamically Load Additional Java Jars ('append' to existing classpath) jarLoad = classPathHacker() + # Webserver Jars jarLoad.addFile("/usr/share/java/httpcomponents/httpclient.jar") jarLoad.addFile("/usr/share/java/httpcomponents/httpcore.jar") @@ -91,23 +92,15 @@ 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_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") jarLoad.addFile("/usr/share/java/pki/pki-client.jar") jarLoad.addFile("/usr/share/java/pki/pki-cmsutil.jar") jarLoad.addFile("/usr/share/java/pki/pki-nsutil.jar") + # JSS JNI Jars # # NOTE: Always load 64-bit JNI 'jss4.jar' @@ -116,7 +109,6 @@ jarLoad.addFile("/usr/share/java/pki/pki-nsutil.jar") jarLoad.addFile("/usr/lib64/java/jss4.jar") jarLoad.addFile("/usr/lib/java/jss4.jar") - # Apache Commons Java Imports from org.apache.commons.cli import CommandLine from org.apache.commons.cli import CommandLineParser @@ -156,6 +148,16 @@ from com.netscape.certsrv.system import ConfigurationResponse from com.netscape.cmsutil.util import Utils from netscape.security.x509 import X500Name +# Dynamically Load RESTEasy Jars ('append' to existing classpath) +def load_resteasy(path): + + jarLoad.addFile(path + "/jaxrs-api.jar") + jarLoad.addFile(path + "/resteasy-atom-provider.jar") + jarLoad.addFile(path + "/resteasy-jaxb-provider.jar") + jarLoad.addFile(path + "/resteasy-jaxrs.jar") + jarLoad.addFile(path + "/resteasy-jettison-provider.jar") + + # PKI Deployment Jython Helper Functions def generateCRMFRequest(token, keysize, subjectdn, dualkey): kg = token.getKeyPairGenerator(KeyPairAlgorithm.RSA) |