diff options
| author | Ade Lee <alee@redhat.com> | 2013-06-10 23:58:24 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2013-06-12 10:50:36 -0400 |
| commit | 7cf2a4786a2e34be14e5f5885ce137589dc3ae99 (patch) | |
| tree | cf90d3568874f246eddd08204e0c13dcf5005527 /base/java-tools/templates | |
| parent | 34fe36d79d03e9579b49648fb9d51246fb5b71dd (diff) | |
| download | pki-7cf2a4786a2e34be14e5f5885ce137589dc3ae99.tar.gz pki-7cf2a4786a2e34be14e5f5885ce137589dc3ae99.tar.xz pki-7cf2a4786a2e34be14e5f5885ce137589dc3ae99.zip | |
Modify java-tools startup scripts to use correct JNI path
In Fedora 19, the JNI path changed yet again, breaking all java-tools
because the classpath does not contain the correct location for jss4.jar
on x86_64. With this fix, both /usr/lib/java/jss4.jar and
/usr/lib64/java/jss4.jar are in the classpath.
Trac Ticket 646
Diffstat (limited to 'base/java-tools/templates')
3 files changed, 7 insertions, 21 deletions
diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in index b0d406161..e9ff00553 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -125,13 +125,8 @@ fi ## order this command wrapper uses to find jar files. ## ############################################################################### -CP=/usr/lib/java/jss4.jar -CP=/usr/lib/java/dirsec/jss4.jar:${CP} -if [ "${OS}" = "Linux" ] && - [ "${ARCHITECTURE}" = "x86_64" ] ; then - # Fedora 16+ - CP=/usr/lib64/java/jss4.jar -fi +JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` +CP=${JNI_JAR_DIR}/jss4.jar CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in index d3c36f802..811935ef4 100644 --- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -125,13 +125,8 @@ fi ## order this command wrapper uses to find jar files. ## ############################################################################### -CP=/usr/lib/java/jss4.jar -CP=/usr/lib/java/dirsec/jss4.jar:${CP} -if [ "${OS}" = "Linux" ] && - [ "${ARCHITECTURE}" = "x86_64" ] ; then - # Fedora 16+ - CP=/usr/lib64/java/jss4.jar -fi +JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` +CP=${JNI_JAR_DIR}/jss4.jar CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in index 7bece4c2c..e70b9ab34 100644 --- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -125,13 +125,9 @@ fi ## order this command wrapper uses to find jar files. ## ############################################################################### -CP=/usr/lib/java/jss4.jar -CP=/usr/lib/java/dirsec/jss4.jar:${CP} -if [ "${OS}" = "Linux" ] && - [ "${ARCHITECTURE}" = "x86_64" ] ; then - # Fedora 16+ - CP=/usr/lib64/java/jss4.jar -fi +JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` +CP=${JNI_JAR_DIR}/jss4.jar + CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} |