The classpath in Console wrapper script has been updated to include the complete PKI client library.
Pushed to master under trivial rule. -- Endi S. Dewata
>From 1e56b4c84028fb98b906be4b6caed803e6862706 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <edew...@redhat.com> Date: Sat, 18 Feb 2017 09:15:19 +0100 Subject: [PATCH] Updated classpath in Console wrapper script. The classpath in Console wrapper script has been updated to include the complete PKI client library. --- base/console/templates/pki_console_wrapper | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/base/console/templates/pki_console_wrapper b/base/console/templates/pki_console_wrapper index 296eba24d4934303197a49230e33613a92265ece..3e3c1692672d69bd9a71052e00f646bd7aed4393 100755 --- a/base/console/templates/pki_console_wrapper +++ b/base/console/templates/pki_console_wrapper @@ -19,6 +19,12 @@ # --- END COPYRIGHT BLOCK --- # +# Read default PKI configuration. +. /usr/share/pki/etc/pki.conf + +# Read user-defined PKI configuration. +. /etc/pki/pki.conf + # Check to insure that this script's original invocation directory # has not been deleted! CWD=`/bin/pwd > /dev/null 2>&1` @@ -124,23 +130,13 @@ 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, 17, 18 - CP=/usr/lib64/java/jss4.jar:${CP} -fi -CP=/usr/share/java/ldapjdk.jar:${CP} +CP=${PKI_LIB}/* CP=/usr/share/java/idm-console-nmclf.jar:${CP} CP=/usr/share/java/idm-console-nmclf_en.jar:${CP} CP=/usr/share/java/idm-console-mcc.jar:${CP} CP=/usr/share/java/idm-console-mcc_en.jar:${CP} CP=/usr/share/java/idm-console-base.jar:${CP} CP=/usr/share/java/389-console_en.jar:${CP} -CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} -CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} -CP=/usr/share/java/${PRODUCT}/pki-certsrv.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-console-theme.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-console.jar:${CP} export CP @@ -151,6 +147,12 @@ export CP ## based upon the preset LD_LIBRARY_PATH and CP environment variables. ## ############################################################################### -${JAVA} ${JAVA_OPTIONS} -cp ${CP} -Djava.util.prefs.systemRoot=/tmp/.java -Djava.util.prefs.userRoot=/tmp/java com.netscape.admin.certsrv.Console -s instanceID -a $1 +${JAVA} ${JAVA_OPTIONS} \ + -cp ${CP} \ + -Djava.util.prefs.systemRoot=/tmp/.java \ + -Djava.util.prefs.userRoot=/tmp/java \ + com.netscape.admin.certsrv.Console \ + -s instanceID \ + -a $1 + exit $? - -- 2.9.3
_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel