diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-01-23 18:45:54 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-01-23 22:44:22 +0100 |
| commit | f0ac4d8d8a013eff907970734337f60d6b41c372 (patch) | |
| tree | e59c1affe9a8db1ce30caf96eafb642f68df63c0 /base/java-tools | |
| parent | 79c6d70a8434cf52f9bac8bfa0367876baccb054 (diff) | |
| download | pki-f0ac4d8d8a013eff907970734337f60d6b41c372.tar.gz pki-f0ac4d8d8a013eff907970734337f60d6b41c372.tar.xz pki-f0ac4d8d8a013eff907970734337f60d6b41c372.zip | |
Updated wrapper script for legacy CLIs.
The wrapper script for legacy CLIs has been updated to use
java.ext.dirs to specify the client library folder instead
of a class path variable containing individual JAR files.
The same mechanism is already in use in PKI CLI.
Diffstat (limited to 'base/java-tools')
| -rw-r--r-- | base/java-tools/templates/pki_java_command_wrapper.in | 24 |
1 files changed, 3 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 fcf3b3a2e..696f661b3 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -112,30 +112,12 @@ fi ############################################################################### -## (5) Set the CP environment variable to determine the search ## -## order this command wrapper uses to find jar files. ## -############################################################################### - -CP=${JNI_JAR_DIR}/jss4.jar -CP=/usr/share/java/commons-cli.jar:${CP} -CP=/usr/share/java/commons-codec.jar:${CP} -CP=/usr/share/java/commons-io.jar:${CP} -CP=/usr/share/java/commons-logging.jar:${CP} -CP=/usr/share/java/httpcomponents/httpclient.jar:${CP} -CP=/usr/share/java/httpcomponents/httpcore.jar:${CP} -CP=/usr/share/java/ldapjdk.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-tools.jar:${CP} -export CP - -############################################################################### -## (6) Execute the java command specified by this java command wrapper ## -## based upon the preset LD_LIBRARY_PATH and CP environment variables. ## +## (5) Execute the java command specified by this java command wrapper ## +## based upon the LD_LIBRARY_PATH and PKI_LIB environment variables. ## ############################################################################### ${JAVA} ${JAVA_OPTIONS} \ - -cp ${CP} \ + -Djava.ext.dirs=${PKI_LIB} \ -Djava.util.logging.config.file=${LOGGING_CONFIG} \ com.netscape.cmstools.${COMMAND} "$@" |