diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-02-09 18:41:40 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-02-12 02:16:27 +0100 |
| commit | aa613fa272defcc8eebd4b9ef2556e61683b4e97 (patch) | |
| tree | e06f610f2726c600f0111a7726607aa479a7676d /base/java-tools/templates | |
| parent | 0278fe33e3d49b2a994eeec4b9b18a0c4353f69e (diff) | |
| download | pki-aa613fa272defcc8eebd4b9ef2556e61683b4e97.tar.gz pki-aa613fa272defcc8eebd4b9ef2556e61683b4e97.tar.xz pki-aa613fa272defcc8eebd4b9ef2556e61683b4e97.zip | |
Refactored PKCS12Export.
The code to export NSS database into PKCS #12 file in PKCS12Export
tool has been refactored into PKCS12Util class to simplify further
enhancements.
The PKCS12Export tool has also been modified to use Java Logging
API. A default logging configuration file has been added. The
command-line wrapper has been modified to get the path to the
logging configuration file from pki.conf.
https://fedorahosted.org/pki/ticket/1742
Diffstat (limited to 'base/java-tools/templates')
| -rw-r--r-- | base/java-tools/templates/pki_java_command_wrapper.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in index 404bcf0a1..56ca9f1fc 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -124,12 +124,17 @@ CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-tools.jar:${CP} export CP +LOGGING_CONFIG=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $LOGGING_CONFIG` ############################################################################### ## (6) Execute the java command specified by this java command wrapper ## ## based upon the preset LD_LIBRARY_PATH and CP environment variables. ## ############################################################################### -${JAVA} ${JAVA_OPTIONS} -cp ${CP} com.netscape.cmstools.${COMMAND} "$@" +${JAVA} ${JAVA_OPTIONS} \ + -cp ${CP} \ + -Djava.util.logging.config.file=${LOGGING_CONFIG} \ + com.netscape.cmstools.${COMMAND} "$@" + exit $? |