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

2 files changed, 32 insertions, 31 deletions

diff --git a/pki/base/ocsp/build.xml b/pki/base/ocsp/build.xml
index d3303d9e4..b2d2f31b7 100644
--- a/pki/base/ocsp/build.xml
+++ b/pki/base/ocsp/build.xml
@@ -27,24 +27,24 @@
     <property name="ldapjdk.jar" value="${jar.home}/ldapjdk.jar"/>
     <property name="servlet.jar" value="${jar.home}/servlet.jar"/>
     <property name="velocity.jar" value="${jar.home}/velocity.jar"/>
-    <property name="certsrv.jar" value="${pki-jar.home}/certsrv.jar"/>
-    <property name="cms.jar" value="${pki-jar.home}/cms.jar"/>
-    <property name="cmscore.jar" value="${pki-jar.home}/cmscore.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-cmscore.jar" value="${pki-jar.home}/pki-cmscore.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="${servlet.jar}"/>
         <pathelement location="${jss.jar}"/>
         <pathelement location="${ldapjdk.jar}"/>
-        <pathelement location="${nsutil.jar}"/>
-        <pathelement location="${cmsutil.jar}"/>
+        <pathelement location="${pki-nsutil.jar}"/>
+        <pathelement location="${pki-cmsutil.jar}"/>
         <pathelement location="${osutil.jar}"/>
         <pathelement location="${symkey.jar}"/>
         <pathelement location="${velocity.jar}"/>
-        <pathelement location="${cms.jar}"/>
-        <pathelement location="${certsrv.jar}"/>
-        <pathelement location="${cmscore.jar}"/>
+        <pathelement location="${pki-cms.jar}"/>
+        <pathelement location="${pki-certsrv.jar}"/>
+        <pathelement location="${pki-cmscore.jar}"/>
     </path>
 
     <!-- Set up component-specific properties -->
@@ -95,7 +95,7 @@
             description="--> generate jar files">
         <echo message="${begin.build.jars.log.message}"/>
         <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/${product}.jar">
+        <jar jarfile="${build.jars}/pki-ocsp.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/${product}/**"/>
             </fileset>
@@ -184,7 +184,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="./setup"
@@ -218,7 +218,7 @@
              destfile="${dist.base.binaries}/${dist.name}.tar">
             <tarfileset dir="./build/jars"
                         mode="755"
-                        prefix="${dist.name}/usr/share/java">
+                        prefix="${dist.name}/usr/share/java/${product.prefix}">
                 <include name="**"/>
             </tarfileset>
             <tarfileset dir="./setup"
diff --git a/pki/base/ocsp/src/CMakeLists.txt b/pki/base/ocsp/src/CMakeLists.txt
index f707654e5..5e14d079f 100644
--- a/pki/base/ocsp/src/CMakeLists.txt
+++ b/pki/base/ocsp/src/CMakeLists.txt
@@ -1,37 +1,37 @@
-project(ocsp_java Java)
+project(pki-ocsp_java Java)
 
 # '/usr/share/java/pki' jars
-find_file(CERTSRV_JAR
+find_file(PKI_CERTSRV_JAR
     NAMES
-        certsrv.jar
+        pki-certsrv.jar
     PATHS
         /usr/share/java/pki
 )
 
-find_file(CMS_JAR
+find_file(PKI_CMS_JAR
     NAMES
-        cms.jar
+        pki-cms.jar
     PATHS
         /usr/share/java/pki
 )
 
-find_file(CMSCORE_JAR
+find_file(PKI_CMSCORE_JAR
     NAMES
-        cmscore.jar
+        pki-cmscore.jar
     PATHS
         /usr/share/java/pki
 )
 
-find_file(CMSUTIL_JAR
+find_file(PKI_CMSUTIL_JAR
     NAMES
-        cmsutil.jar
+        pki-cmsutil.jar
     PATHS
         /usr/share/java/pki
 )
 
-find_file(NSUTIL_JAR
+find_file(PKI_NSUTIL_JAR
     NAMES
-        nsutil.jar
+        pki-nsutil.jar
     PATHS
         /usr/lib/java
         /usr/share/java/pki
@@ -71,7 +71,7 @@ find_file(SYMKEY_JAR
 
 
 # identify java sources
-set(ocsp_java_SRCS
+set(pki-ocsp_java_SRCS
     com/netscape/ocsp/OCSPResources.java
     com/netscape/ocsp/OCSPAuthority.java
     com/netscape/ocsp/SigningUnit.java
@@ -81,7 +81,8 @@ set(ocsp_java_SRCS
 
 # set classpath
 set(CMAKE_JAVA_INCLUDE_PATH
-    ${CERTSRV_JAR} ${CMS_JAR} ${CMSCORE_JAR} ${CMSUTIL_JAR} ${NSUTIL_JAR}
+    ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
+    ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
     ${LDAPJDK_JAR}
     ${JSS_JAR} ${OSUTIL_JAR} ${SYMKEY_JAR})
 
@@ -90,9 +91,9 @@ set(CMAKE_JAVA_INCLUDE_PATH
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 
-# build ocsp.jar
-add_jar(ocsp ${ocsp_java_SRCS})
-add_dependencies(ocsp osutil symkey nsutil cmsutil certsrv cms cmscore)
-install_jar(ocsp ${JAVA_JAR_INSTALL_DIR})
-set(OCSP_JAR ${ocsp_JAR_FILE} CACHE INTERNAL "ocsp jar file")
+# build pki-ocsp.jar
+add_jar(pki-ocsp ${pki-ocsp_java_SRCS})
+add_dependencies(pki-ocsp osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+install_jar(pki-ocsp ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_OCSP_JAR ${pki-ocsp_JAR_FILE} CACHE INTERNAL "pki-ocsp jar file")