Starting with Fedora 14 jars and classes which were named jakarata have been renamed to apache. We need to detect the flavour of the Java installation and adjust the names we use in pkicreate when setting up the links to the jars. We may also need to adjust any BuildRequires, Requires in our spec files and/or CMakeLists.txt which reference the affected jars. We seem to be fortunate in that we do not appear to reference any jakarta class via an import in our Java code, therefore this seems to be a jar rename issue only. The Fedora rename work is tracked by this bug: https://bugzilla.redhat.com/show_bug.cgi?id=588764
Created attachment 471031 [details] setup pki instance jars by searching the installed jars This patch does 3 fundamental things: 1) Adds a utility to find the path to a jar (find_jar) 2) Sets up the pki instance jars by calling find_jar() instead of hard coding their expected location. 3) Conditions the commons-logging and commons-lang jar depending on whether apache-commons is found, else falls back to jakarta-commons In addition the patch organizes the jar variables, jar setup, etc. by alphabetical jar name so things are consistent and easier to find in the source code.
Created attachment 471032 [details] setup pki instance jars by searching the installed jars updated patch to check return values
Created attachment 471034 [details] setup pki instance jars by searching the installed jars Fix the jar search path order, the pki directory should come first giving it highest precedence.
Sending setup/pkicommon.pm Sending setup/pkicreate Transmitting file data .. Committed revision 1684.