rewritten to use pki.conf. please review. Ade On Tue, 2013-06-11 at 11:21 -0700, Matthew Harmsen wrote:

On 06/10/13 21:05, Ade Lee wrote:

...

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

Please review.

Thanks, Ade

_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel ACK

On Tue, 2013-06-11 at 18:29 -0500, Endi Sukma Dewata wrote:

On 6/11/2013 3:59 PM, Ade Lee wrote:

...

rewritten to use pki.conf.

please review. Ade

ACK.

There are actually a few more locations, but they may not actually cause problems so they can be fixed separately later.

1. In base/common/shared/conf/pki.policy the 2 possible jss4.jar paths are hardcoded. We should be able to pass the JNI_JAR_DIR just like the RESTEASY_LIB.

2. In base/console/templates/pki_console_wrapper the paths are stacked, so it should still work assuming there's only one JSS version installed.

3. In base/java-tools/pki the paths are stacked.

4. In base/setup/scripts/functions the jni_dir is hardcoded, but this seems to be only used by Dogtag 9.

5. In base/silent/scripts/pkisilent the paths are stacked.

6. In scripts/dev_setup the ARCH might not be correct for F19, but this is only used to initialize dev environment.

Yeah, I specifically decided beforehand not to fix these are they were causing no problems. They can be fixed in a separate ticket. Pushed to Dogtag 10.0 branch and master