Bugzilla Bug #656733 - Standardize jar install location and jar names

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1719 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

6 files changed, 61 insertions, 60 deletions

diff --git a/pki/base/java-tools/build.xml b/pki/base/java-tools/build.xml
index 34fda6d28..68e732ef4 100644
--- a/pki/base/java-tools/build.xml
+++ b/pki/base/java-tools/build.xml
@@ -24,19 +24,19 @@
     <property name="jss.jar" value="${jss.home}/jss4.jar"/>
     <property name="osutil.jar" value="${jni-jar.home}/osutil.jar"/>
     <property name="ldapjdk.jar" value="${jar.home}/ldapjdk.jar"/>
-    <property name="certsrv.jar" value="${pki-jar.home}/certsrv.jar"/>
-    <property name="cms.jar" value="${pki-jar.home}/cms.jar"/>
-    <property name="cmsutil.jar" value="${pki-jar.home}/cmsutil.jar"/>
-    <property name="nsutil.jar" value="${pki-jar.home}/nsutil.jar"/>
+    <property name="pki-certsrv.jar" value="${pki-jar.home}/pki-certsrv.jar"/>
+    <property name="pki-cms.jar" value="${pki-jar.home}/pki-cms.jar"/>
+    <property name="pki-cmsutil.jar" value="${pki-jar.home}/pki-cmsutil.jar"/>
+    <property name="pki-nsutil.jar" value="${pki-jar.home}/pki-nsutil.jar"/>
 
     <path id="classpath">
         <pathelement location="${jss.jar}"/>
         <pathelement location="${ldapjdk.jar}"/>
-        <pathelement location="${nsutil.jar}"/>
+        <pathelement location="${pki-nsutil.jar}"/>
         <pathelement location="${osutil.jar}"/>
-        <pathelement location="${cmsutil.jar}"/>
-        <pathelement location="${cms.jar}"/>
-        <pathelement location="${certsrv.jar}"/>
+        <pathelement location="${pki-cmsutil.jar}"/>
+        <pathelement location="${pki-cms.jar}"/>
+        <pathelement location="${pki-certsrv.jar}"/>
     </path>
     <path id="javadoc_classpath">
         <path refid="classpath"/>
@@ -82,7 +82,7 @@
             description="--> generate jar files">
         <echo message="${begin.build.jars.log.message}"/>
         <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/pkitools.jar">
+        <jar jarfile="${build.jars}/pki-tools.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/**"/>
             </fileset>
@@ -414,7 +414,7 @@
         <zip destfile="${dist.base.binaries}/${dist.name}.zip">
             <zipfileset dir="./build/jars"
                         filemode="755"
-                        prefix="usr/share/java">
+                        prefix="usr/share/java/${product.prefix}">
                 <include name="**"/>
             </zipfileset>
             <zipfileset dir="./build/cmds"
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt
index 54b7e0eb0..6d40bf39b 100644
--- a/pki/base/java-tools/src/CMakeLists.txt
+++ b/pki/base/java-tools/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(pkitools_java Java)
+project(pki-tools_java Java)
 
 find_file(JSS_JAR
     NAMES
@@ -32,7 +32,7 @@ find_file(XERCES_JAR
         /usr/share/java
 )
 
-set(pkitools_java_SRCS
+set(pki-tools_java_SRCS
     com/netscape/cmstools/PrettyPrintCrl.java
     com/netscape/cmstools/BtoA.java
     com/netscape/cmstools/PasswordCache.java
@@ -57,20 +57,20 @@ set(pkitools_java_SRCS
 )
 
 set(CMAKE_JAVA_INCLUDE_PATH
-    ${NSUTIL_JAR} ${CMSUTIL_JAR}
+    ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
     ${XALAN_JAR} ${XERCES_JAR}
     ${JSS_JAR} ${OSUTIL_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
-# build pkitools
-add_jar(pkitools ${pkitools_java_SRCS})
-add_dependencies(pkitools osutil nsutil cmsutil)
-install_jar(pkitools ${JAVA_JAR_INSTALL_DIR})
-set(PKITOOLS_JAR ${pkitools_JAR_FILE} CACHE INTERNAL "pkitools jar file")
+# build pki-tools
+add_jar(pki-tools ${pki-tools_java_SRCS})
+add_dependencies(pki-tools osutil pki-nsutil pki-cmsutil)
+install_jar(pki-tools ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_TOOLS_JAR ${pki-tools_JAR_FILE} CACHE INTERNAL "pki-tools jar file")
 
 create_javadoc(pki-java-tools-${APPLICATION_VERSION}
-    FILES ${pkitools_java_SRCS}
+    FILES ${pki-tools_java_SRCS}
     CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
     WINDOWTITLE "pki-java-tools"
     DOCTITLE "<h1>pki-java-tools</h1>"
@@ -78,4 +78,4 @@ create_javadoc(pki-java-tools-${APPLICATION_VERSION}
     USE TRUE
     VERSION TRUE
 )
-add_dependencies(pki-java-tools-${APPLICATION_VERSION}_javadoc pkitools)
+add_dependencies(pki-java-tools-${APPLICATION_VERSION}_javadoc pki-tools)
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper b/pki/base/java-tools/templates/pki_java_command_wrapper
index c2178bf70..27ddf11e4 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper
+++ b/pki/base/java-tools/templates/pki_java_command_wrapper
@@ -73,16 +73,16 @@ if [ "${OS}" = "Linux" ] ; then
 
     if [ "${ARCHITECTURE}" = "i386" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -131,11 +131,11 @@ fi
 CP=/usr/lib/java/jss4.jar
 CP=/usr/lib/java/dirsec/jss4.jar:${CP}
 CP=/usr/lib/java/osutil.jar:${CP}
+CP=/usr/lib/java/dirsec/osutil.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/nsutil.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/cmsutil.jar:${CP}
-CP=/usr/share/java/pkitools.jar:${CP}
-CP=/usr/share/${PRODUCT}/classes:${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
 
 
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/pki/base/java-tools/templates/pki_java_command_wrapper.in
index bd7e0c95b..3c804de3f 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper.in
+++ b/pki/base/java-tools/templates/pki_java_command_wrapper.in
@@ -73,16 +73,16 @@ if [ "${OS}" = "Linux" ] ; then
 
     if [ "${ARCHITECTURE}" = "i386" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -131,11 +131,11 @@ fi
 CP=/usr/lib/java/jss4.jar
 CP=/usr/lib/java/dirsec/jss4.jar:${CP}
 CP=/usr/lib/java/osutil.jar:${CP}
+CP=/usr/lib/java/dirsec/osutil.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/nsutil.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/cmsutil.jar:${CP}
-CP=/usr/share/java/pkitools.jar:${CP}
-CP=/usr/share/${PRODUCT}/classes:${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
 
 
@@ -146,3 +146,4 @@ export CP
 
 ${JAVA} ${JAVA_OPTIONS} -cp ${CP} com.netscape.cmstools.${COMMAND} "$@"
 exit $?
+
diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
index c4df7a17e..d9f57a05e 100644
--- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
@@ -73,16 +73,16 @@ if [ "${OS}" = "Linux" ] ; then
 
     if [ "${ARCHITECTURE}" = "i386" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -131,11 +131,11 @@ fi
 CP=/usr/lib/java/jss4.jar
 CP=/usr/lib/java/dirsec/jss4.jar:${CP}
 CP=/usr/lib/java/osutil.jar:${CP}
+CP=/usr/lib/java/dirsec/osutil.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/nsutil.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/cmsutil.jar:${CP}
-CP=/usr/share/java/pkitools.jar:${CP}
-CP=/usr/share/${PRODUCT}/classes:${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
 
 
diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
index e41d6194f..8b9b04cdc 100644
--- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
@@ -73,16 +73,16 @@ if [ "${OS}" = "Linux" ] ; then
 
     if [ "${ARCHITECTURE}" = "i386" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -131,11 +131,11 @@ fi
 CP=/usr/lib/java/jss4.jar
 CP=/usr/lib/java/dirsec/jss4.jar:${CP}
 CP=/usr/lib/java/osutil.jar:${CP}
+CP=/usr/lib/java/dirsec/osutil.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/nsutil.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/cmsutil.jar:${CP}
-CP=/usr/share/java/pkitools.jar:${CP}
-CP=/usr/share/${PRODUCT}/classes:${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