From fd4fb4ad523253568fdd08f2f75726b7b4f605d9 Mon Sep 17 00:00:00 2001
From: mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Tue, 11 Jan 2011 02:01:32 +0000
Subject: 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
---
 pki/base/ca/build.xml                              |  26 ++---
 pki/base/ca/src/CMakeLists.txt                     |  17 +--
 pki/base/common/build.xml                          |  16 +--
 pki/base/common/src/CMakeLists.txt                 |  58 +++++-----
 pki/base/console/build.xml                         |  15 +--
 pki/base/console/src/CMakeLists.txt                |  19 ++-
 pki/base/console/templates/pki_console_wrapper     |  17 +--
 pki/base/java-tools/build.xml                      |  20 ++--
 pki/base/java-tools/src/CMakeLists.txt             |  20 ++--
 .../java-tools/templates/pki_java_command_wrapper  |  20 ++--
 .../templates/pki_java_command_wrapper.in          |  21 ++--
 .../templates/pretty_print_cert_command_wrapper    |  20 ++--
 .../templates/pretty_print_crl_command_wrapper     |  20 ++--
 pki/base/kra/build.xml                             |  26 ++---
 pki/base/kra/src/CMakeLists.txt                    |  37 +++---
 pki/base/ocsp/build.xml                            |  26 ++---
 pki/base/ocsp/src/CMakeLists.txt                   |  37 +++---
 pki/base/setup/pkicreate                           | 128 +++++++++++----------
 pki/base/silent/build.xml                          |  22 ++--
 pki/base/silent/scripts/pkisilent                  |  43 +++----
 pki/base/silent/src/CMakeLists.txt                 |  15 +--
 pki/base/tks/build.xml                             |  26 ++---
 pki/base/tks/src/CMakeLists.txt                    |  37 +++---
 pki/base/util/build.xml                            |   4 +-
 pki/base/util/src/CMakeLists.txt                   |  28 ++---
 pki/dogtag/ca/pki-ca.spec                          |  13 +--
 pki/dogtag/common/pki-common.spec                  |  16 +--
 pki/dogtag/console-ui/build.xml                    |   6 +-
 pki/dogtag/console-ui/dogtag-pki-console-ui.spec   |   9 +-
 pki/dogtag/console-ui/src/CMakeLists.txt           |  11 +-
 pki/dogtag/console/pki-console.spec                |  11 +-
 pki/dogtag/java-tools/pki-java-tools.spec          |  17 +--
 pki/dogtag/kra/pki-kra.spec                        |  13 +--
 pki/dogtag/ocsp/pki-ocsp.spec                      |  13 +--
 pki/dogtag/silent/pki-silent.spec                  |   8 +-
 pki/dogtag/tks/pki-tks.spec                        |  13 +--
 pki/dogtag/util/pki-util.spec                      |   8 +-
 pki/specs/dogtag-pki-theme.spec                    |  30 +++--
 pki/specs/ipa-pki-theme.spec                       |   7 +-
 pki/specs/pki-console.spec                         |   5 +-
 pki/specs/pki-core.spec                            |  51 +++-----
 pki/specs/pki-kra.spec                             |  17 ++-
 pki/specs/pki-migrate.spec                         |   4 +-
 pki/specs/pki-ocsp.spec                            |  17 ++-
 pki/specs/pki-ra.spec                              |  18 ++-
 pki/specs/pki-tks.spec                             |  17 ++-
 pki/specs/pki-tps.spec                             |  27 ++---
 47 files changed, 476 insertions(+), 573 deletions(-)

diff --git a/pki/base/ca/build.xml b/pki/base/ca/build.xml
index 0c2866abe..f81c15107 100644
--- a/pki/base/ca/build.xml
+++ b/pki/base/ca/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-ca.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/ca/src/CMakeLists.txt b/pki/base/ca/src/CMakeLists.txt
index f8e68c4f6..54dde47a8 100644
--- a/pki/base/ca/src/CMakeLists.txt
+++ b/pki/base/ca/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(ca_java Java)
+project(pki-ca_java Java)
 
 # '/usr/share/java' jars
 find_file(LDAPJDK_JAR
@@ -26,7 +26,7 @@ find_file(OSUTIL_JAR
 
 
 # identify java sources
-set(ca_java_SRCS
+set(pki-ca_java_SRCS
     com/netscape/ca/CMSCRLExtensions.java
     com/netscape/ca/CAService.java
     com/netscape/ca/SigningUnit.java
@@ -39,7 +39,8 @@ set(ca_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})
 
@@ -48,9 +49,9 @@ set(CMAKE_JAVA_INCLUDE_PATH
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 
-# build ca.jar
-add_jar(ca ${ca_java_SRCS})
-add_dependencies(ca osutil symkey nsutil cmsutil certsrv cms cmscore)
-install_jar(ca ${JAVA_JAR_INSTALL_DIR})
-set(CA_JAR ${ca_JAR_FILE} CACHE INTERNAL "ca jar file")
+# build pki-ca.jar
+add_jar(pki-ca ${pki-ca_java_SRCS})
+add_dependencies(pki-ca osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+install_jar(pki-ca ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CA_JAR ${pki-ca_JAR_FILE} CACHE INTERNAL "pki-ca jar file")
 
diff --git a/pki/base/common/build.xml b/pki/base/common/build.xml
index 787284539..53f248d65 100644
--- a/pki/base/common/build.xml
+++ b/pki/base/common/build.xml
@@ -29,15 +29,15 @@
     <property name="velocity.jar" value="${jar.home}/velocity.jar"/>
     <property name="xalan-j2.jar" value="${jar.home}/xalan-j2.jar"/>
     <property name="xerces-j2.jar" value="${jar.home}/xerces-j2.jar"/>
-    <property name="cmsutil.jar" value="${pki-jar.home}/cmsutil.jar"/>
-    <property name="nsutil.jar" value="${pki-jar.home}/nsutil.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}"/>
@@ -113,22 +113,22 @@
             description="--> generate jar files">
         <echo message="${begin.build.jars.log.message}"/>
         <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/certsrv.jar">
+        <jar jarfile="${build.jars}/pki-certsrv.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/certsrv/**"/>
             </fileset>
         </jar>
-        <jar jarfile="${build.jars}/cms.jar">
+        <jar jarfile="${build.jars}/pki-cms.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/cms/**"/>
             </fileset>
         </jar>
-        <jar jarfile="${build.jars}/cmscore.jar">
+        <jar jarfile="${build.jars}/pki-cmscore.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/cmscore/**"/>
             </fileset>
         </jar>
-        <jar jarfile="${build.jars}/cmsbundle.jar">
+        <jar jarfile="${build.jars}/pki-cmsbundle.jar">
             <fileset dir="${src.dir}">
                 <include name="LogMessages.properties"/>
                 <include name="UserMessages.properties"/>
diff --git a/pki/base/common/src/CMakeLists.txt b/pki/base/common/src/CMakeLists.txt
index 4c17236f8..2df82b8bb 100644
--- a/pki/base/common/src/CMakeLists.txt
+++ b/pki/base/common/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(cmsutil_java Java)
+project(pki-certsrv_java Java)
 
 find_file(JSS_JAR
     NAMES
@@ -56,7 +56,7 @@ find_file(XERCES_JAR
         /usr/share/java
 )
 
-set(certsrv_java_SRCS
+set(pki-certsrv_java_SRCS
     com/netscape/certsrv/apps/ICommandQueue.java
     com/netscape/certsrv/apps/CMS.java
     com/netscape/certsrv/apps/ICMSEngine.java
@@ -382,7 +382,7 @@ set(certsrv_java_SRCS
     com/netscape/certsrv/profile/IProfilePolicy.java
 )
 
-set(cms_java_SRCS
+set(pki-cms_java_SRCS
     com/netscape/cms/listeners/PinRemovalListener.java
     com/netscape/cms/listeners/RequestInQListener.java
     com/netscape/cms/listeners/CertificateIssuedListener.java
@@ -804,7 +804,7 @@ set(cms_java_SRCS
     com/netscape/cms/profile/output/CMMFOutput.java
 )
 
-set(cmscore_java_SRCS
+set(pki-cmscore_java_SRCS
     com/netscape/cmscore/apps/PKIServerEvent.java
     com/netscape/cmscore/apps/Upgrade.java
     com/netscape/cmscore/apps/PKIServerListener.java
@@ -986,52 +986,52 @@ set(cmscore_java_SRCS
     com/netscape/cmscore/time/SimpleTimeSource.java
 )
 
-set(cmsbundle_RCS
+set(pki-cmsbundle_RCS
     LogMessages.properties
     UserMessages.properties
 )
 
 set(CMAKE_JAVA_INCLUDE_PATH
-    ${NSUTIL_JAR} ${CMSUTIL_JAR}
+    ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
     ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
     ${JSS_JAR} ${OSUTIL_JAR} ${SYMKEY_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
-# build certsrv
+# build pki-certsrv
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/certsrv)
-add_jar(certsrv ${certsrv_java_SRCS})
-add_dependencies(certsrv osutil nsutil cmsutil)
-install_jar(certsrv ${JAVA_JAR_INSTALL_DIR}/pki)
-set(CERTSRV_JAR ${certsrv_JAR_FILE} CACHE INTERNAL "certsrv jar file")
+add_jar(pki-certsrv ${pki-certsrv_java_SRCS})
+add_dependencies(pki-certsrv osutil pki-nsutil pki-cmsutil)
+install_jar(pki-certsrv ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CERTSRV_JAR ${pki-certsrv_JAR_FILE} CACHE INTERNAL "pki-certsrv jar file")
 
-# build cms
+# build pki-cms
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cms)
-add_jar(cms ${cms_java_SRCS})
-add_dependencies(cms osutil nsutil cmsutil certsrv)
-install_jar(cms ${JAVA_JAR_INSTALL_DIR}/pki)
-set(CMS_JAR ${cms_JAR_FILE} CACHE INTERNAL "cms jar file")
+add_jar(pki-cms ${pki-cms_java_SRCS})
+add_dependencies(pki-cms osutil pki-nsutil pki-cmsutil pki-certsrv)
+install_jar(pki-cms ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CMS_JAR ${pki-cms_JAR_FILE} CACHE INTERNAL "pki-cms jar file")
 
 create_javadoc(pki-common-${APPLICATION_VERSION}
-    FILES ${cms_java_SRCS} ${certsrv_java_SRCS}
-    CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH} ${certsrv_JAR_FILE}
+    FILES ${pki-cms_java_SRCS} ${pki-certsrv_java_SRCS}
+    CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH} ${pki-certsrv_JAR_FILE}
     WINDOWTITLE "pki-common"
     DOCTITLE "<h1>pki-common</h1>"
     AUTHOR TRUE
     USE TRUE
     VERSION TRUE
 )
-add_dependencies(pki-common-${APPLICATION_VERSION}_javadoc cms certsrv)
+add_dependencies(pki-common-${APPLICATION_VERSION}_javadoc pki-cms pki-certsrv)
 
-# build cmscore
+# build pki-cmscore
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cmscore)
-add_jar(cmscore ${cmscore_java_SRCS})
-add_dependencies(cmscore osutil nsutil cmsutil certsrv cms)
-install_jar(cmscore ${JAVA_JAR_INSTALL_DIR}/pki)
-set(CMSCORE_JAR ${cmscore_JAR_FILE} CACHE INTERNAL "cmscore jar file")
+add_jar(pki-cmscore ${pki-cmscore_java_SRCS})
+add_dependencies(pki-cmscore osutil pki-nsutil pki-cmsutil pki-certsrv pki-cms)
+install_jar(pki-cmscore ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CMSCORE_JAR ${pki-cmscore_JAR_FILE} CACHE INTERNAL "pki-cmscore jar file")
 
-# build cmsbundle
-add_jar(cmsbundle ${cmsbundle_RCS})
-add_dependencies(cmsbundle osutil nsutil cmsutil certsrv cms cmscore)
-install_jar(cmsbundle ${JAVA_JAR_INSTALL_DIR}/pki)
-set(CMSBUNDLE_JAR ${cmsbundle_JAR_FILE} CACHE INTERNAL "cmsbundle jar file")
+# build pki-cmsbundle
+add_jar(pki-cmsbundle ${pki-cmsbundle_RCS})
+add_dependencies(pki-cmsbundle osutil pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+install_jar(pki-cmsbundle ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CMSBUNDLE_JAR ${pki-cmsbundle_JAR_FILE} CACHE INTERNAL "pki-cmsbundle jar file")
diff --git a/pki/base/console/build.xml b/pki/base/console/build.xml
index f79babca0..5a7257d38 100644
--- a/pki/base/console/build.xml
+++ b/pki/base/console/build.xml
@@ -28,12 +28,12 @@
     <property name="mcc_en.jar" value="${jar.home}/idm-console-mcc_en.jar"/>
     <property name="nmclf.jar" value="${jar.home}/idm-console-nmclf.jar"/>
     <property name="nmclf_en.jar" value="${jar.home}/idm-console-nmclf_en.jar"/>
-    <property name="nsutil.jar" value="${pki-jar.home}/nsutil.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="${base.jar}"/>
         <pathelement location="${mcc.jar}"/>
         <pathelement location="${mcc_en.jar}"/>
@@ -91,11 +91,6 @@
                 <include name="com/netscape/**"/>
             </fileset>
         </jar>
-        <jar jarfile="${build.jars}/pki-console-${version}_en.jar">
-            <fileset dir=".">
-                <include name="CMSAdminRS.properties"/>
-            </fileset>
-        </jar>
         <echo message="${end.build.jars.log.message}"/>
     </target>
 
@@ -185,7 +180,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"
@@ -207,7 +202,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="./build"
@@ -265,7 +260,6 @@
                 <include name="EULA"/>
                 <include name="LICENSE"/>
                 <include name="build.xml"/>
-                <include name="CMSAdminRS.properties"/>
                 <include name="config/product*.xml"/>
                 <include name="config/release*.xml"/>
                 <include name="release"/>
@@ -285,7 +279,6 @@
                 <include name="EULA"/>
                 <include name="LICENSE"/>
                 <include name="build.xml"/>
-                <include name="CMSAdminRS.properties"/>
                 <include name="config/product*.xml"/>
                 <include name="config/release*.xml"/>
                 <include name="release"/>
diff --git a/pki/base/console/src/CMakeLists.txt b/pki/base/console/src/CMakeLists.txt
index 076f18078..c4e9c3c3b 100644
--- a/pki/base/console/src/CMakeLists.txt
+++ b/pki/base/console/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-project(pki_console_java Java)
+project(pki-console_java Java)
 
 # '/usr/share/java/pki' jars
-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(JSS_JAR
 
 
 # identify java sources
-set(pki_console_java_SRCS
+set(pki-console_java_SRCS
     com/netscape/certsrv/common/TaskId.java
     com/netscape/certsrv/common/DestDef.java
     com/netscape/certsrv/common/NameValuePairs.java
@@ -593,12 +593,11 @@ set(pki_console_java_SRCS
     com/netscape/admin/certsrv/IUIMapper.java
 )
 
-
 # set classpath
 set(CMAKE_JAVA_INCLUDE_PATH
     ${BASE_JAR} ${LDAPJDK_JAR} ${MMC_JAR}
     ${MMC_EN_JAR} ${NMCLF_JAR} ${NMCLF_EN_JAR}
-    ${NSUTIL_JAR}
+    ${PKI_NSUTIL_JAR}
     ${JSS_JAR})
 
 
@@ -607,8 +606,8 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 
 # build pki-console.jar
-add_jar(pki-console ${pki_console_java_SRCS})
-add_dependencies(pki-console nsutil)
-install_jar(pki-console ${JAVA_JAR_INSTALL_DIR})
-set(PKI_CONSOLE_JAR ${pki_console_JAR_FILE} CACHE INTERNAL "pki-console jar file")
+add_jar(pki-console ${pki-console_java_SRCS})
+add_dependencies(pki-console pki-nsutil)
+install_jar(pki-console ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CONSOLE_JAR ${pki-console_JAR_FILE} CACHE INTERNAL "pki-console jar file")
 
diff --git a/pki/base/console/templates/pki_console_wrapper b/pki/base/console/templates/pki_console_wrapper
index aed16d103..feaf87d72 100755
--- a/pki/base/console/templates/pki_console_wrapper
+++ b/pki/base/console/templates/pki_console_wrapper
@@ -87,16 +87,12 @@ 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}
         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/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}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -150,12 +146,9 @@ CP=/usr/share/java/idm-console-nmclf_en.jar:${CP}
 CP=/usr/share/java/idm-console-mcc.jar:${CP}
 CP=/usr/share/java/idm-console-mcc_en.jar:${CP}
 CP=/usr/share/java/idm-console-base.jar:${CP}
-CP=/usr/share/java/fedora-idm-console_en.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/cms-theme_en.jar:${CP}
-CP=/usr/share/java/pki-console-theme_en.jar:${CP}
-CP=/usr/share/java/pki-console_en.jar:${CP}
-CP=/usr/share/java/pki-console.jar:${CP}
-CP=/usr/share/${PRODUCT}/classes:${CP}
+CP=/usr/share/java/389-console_en.jar:${CP}
+CP=/usr/share/java/${PRODUCT}/pki-console-theme.jar:${CP}
+CP=/usr/share/java/${PRODUCT}/pki-console.jar:${CP}
 export CP
 
 
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
 
 
diff --git a/pki/base/kra/build.xml b/pki/base/kra/build.xml
index d620d71c2..0e20cdb7b 100644
--- a/pki/base/kra/build.xml
+++ b/pki/base/kra/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-kra.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/kra/src/CMakeLists.txt b/pki/base/kra/src/CMakeLists.txt
index 6e9734383..9879fbae7 100644
--- a/pki/base/kra/src/CMakeLists.txt
+++ b/pki/base/kra/src/CMakeLists.txt
@@ -1,37 +1,37 @@
-project(kra_java Java)
+project(pki-kra_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(kra_java_SRCS
+set(pki-kra_java_SRCS
     com/netscape/kra/KeyRecoveryAuthority.java
     com/netscape/kra/EnrollmentService.java
     com/netscape/kra/RecoveryService.java
@@ -88,7 +88,8 @@ set(kra_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})
 
@@ -97,9 +98,9 @@ set(CMAKE_JAVA_INCLUDE_PATH
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 
-# build kra.jar
-add_jar(kra ${kra_java_SRCS})
-add_dependencies(kra osutil symkey nsutil cmsutil certsrv cms cmscore)
-install_jar(kra ${JAVA_JAR_INSTALL_DIR})
-set(KRA_JAR ${kra_JAR_FILE} CACHE INTERNAL "kra jar file")
+# build pki-kra.jar
+add_jar(pki-kra ${pki-kra_java_SRCS})
+add_dependencies(pki-kra osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+install_jar(pki-kra ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_KRA_JAR ${pki-kra_JAR_FILE} CACHE INTERNAL "pki-kra jar file")
 
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")
 
diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate
index a46db3f6a..48b7c9551 100755
--- a/pki/base/setup/pkicreate
+++ b/pki/base/setup/pkicreate
@@ -167,18 +167,18 @@ my $addIndexes_ldif_base_name    = "addIndexes.ldif";      # TPS
 my $addTokens_ldif_base_name     = "addTokens.ldif";       # TPS
 my $addVLVIndexes_ldif_base_name = "addVLVIndexes.ldif";   # TPS
 my $nss_pcache_base_name         = "nss_pcache";           # RA, TPS
-my $subsystem_jar_base_name      = undef;                  # CA, KRA, OCSP, TKS
+my $pki_subsystem_jar_base_name  = undef;                  # CA, KRA, OCSP, TKS
 
-my $certsrv_jar_base_name         = "certsrv.jar";         # CA, KRA, OCSP, TKS
-my $cms_jar_base_name             = "cms.jar";             # CA, KRA, OCSP, TKS
-my $cmsbundle_jar_base_name       = "cmsbundle.jar";       # CA, KRA, OCSP, TKS
-my $cmscore_jar_base_name         = "cmscore.jar";         # CA, KRA, OCSP, TKS
-my $cmsutil_jar_base_name         = "cmsutil.jar";         # CA, KRA, OCSP, TKS
+my $pki_certsrv_jar_base_name     = "pki-certsrv.jar";     # CA, KRA, OCSP, TKS
+my $pki_cms_jar_base_name         = "pki-cms.jar";         # CA, KRA, OCSP, TKS
+my $pki_cmsbundle_jar_base_name   = "pki-cmsbundle.jar";   # CA, KRA, OCSP, TKS
+my $pki_cmscore_jar_base_name     = "pki-cmscore.jar";     # CA, KRA, OCSP, TKS
+my $pki_cmsutil_jar_base_name     = "pki-cmsutil.jar";     # CA, KRA, OCSP, TKS
 my $commons_lang_jar_base_name    = undef;                 # CA, KRA, OCSP, TKS
 my $commons_logging_jar_base_name = undef;                 # CA, KRA, OCSP, TKS
 my $jss_jar_base_name             = "jss4.jar";            # CA, KRA, OCSP, TKS
 my $ldapjdk_jar_base_name         = "ldapjdk.jar";         # CA, KRA, OCSP, TKS
-my $nsutil_jar_base_name          = "nsutil.jar";          # CA, KRA, OCSP, TKS
+my $pki_nsutil_jar_base_name      = "pki-nsutil.jar";      # CA, KRA, OCSP, TKS
 my $osutil_jar_base_name          = "osutil.jar";          # CA, KRA, OCSP, TKS
 my $symkey_jar_base_name          = "symkey.jar";          # CA, KRA, OCSP, TKS
 my $tomcatjss_jar_base_name       = "tomcatjss.jar";       # CA, KRA, OCSP, TKS
@@ -439,16 +439,16 @@ my $addTokens_ldif_instance_file_path            = undef;  # TPS
 my $addTokens_ldif_subsystem_file_path           = undef;  # TPS
 my $addVLVIndexes_ldif_instance_file_path        = undef;  # TPS
 my $addVLVIndexes_ldif_subsystem_file_path       = undef;  # TPS
-my $certsrv_jar_file_path                        = undef;  # CA, KRA, OCSP, TKS
-my $certsrv_jar_symlink_path                     = undef;  # CA, KRA, OCSP, TKS
-my $cms_jar_file_path                            = undef;  # CA, KRA, OCSP, TKS
-my $cms_jar_symlink_path                         = undef;  # CA, KRA, OCSP, TKS
-my $cmsbundle_jar_file_path                      = undef;  # CA, KRA, OCSP, TKS
-my $cmsbundle_jar_symlink_path                   = undef;  # CA, KRA, OCSP, TKS
-my $cmscore_jar_file_path                        = undef;  # CA, KRA, OCSP, TKS
-my $cmscore_jar_symlink_path                     = undef;  # CA, KRA, OCSP, TKS
-my $cmsutil_jar_file_path                        = undef;  # CA, KRA, OCSP, TKS
-my $cmsutil_jar_symlink_path                     = undef;  # CA, KRA, OCSP, TKS
+my $pki_certsrv_jar_file_path                    = undef;  # CA, KRA, OCSP, TKS
+my $pki_certsrv_jar_symlink_path                 = undef;  # CA, KRA, OCSP, TKS
+my $pki_cms_jar_file_path                        = undef;  # CA, KRA, OCSP, TKS
+my $pki_cms_jar_symlink_path                     = undef;  # CA, KRA, OCSP, TKS
+my $pki_cmsbundle_jar_file_path                  = undef;  # CA, KRA, OCSP, TKS
+my $pki_cmsbundle_jar_symlink_path               = undef;  # CA, KRA, OCSP, TKS
+my $pki_cmscore_jar_file_path                    = undef;  # CA, KRA, OCSP, TKS
+my $pki_cmscore_jar_symlink_path                 = undef;  # CA, KRA, OCSP, TKS
+my $pki_cmsutil_jar_file_path                    = undef;  # CA, KRA, OCSP, TKS
+my $pki_cmsutil_jar_symlink_path                 = undef;  # CA, KRA, OCSP, TKS
 my $commons_lang_jar_file_path                   = undef;  # CA, KRA, OCSP, TKS
 my $commons_lang_jar_symlink_path                = undef;  # CA, KRA, OCSP, TKS
 my $commons_logging_jar_file_path                = undef;  # CA, KRA, OCSP, TKS
@@ -457,8 +457,8 @@ my $jss_jar_file_path                            = undef;  # CA, KRA, OCSP, TKS
 my $jss_jar_symlink_path                         = undef;  # CA, KRA, OCSP, TKS
 my $ldapjdk_jar_file_path                        = undef;  # CA, KRA, OCSP, TKS
 my $ldapjdk_jar_symlink_path                     = undef;  # CA, KRA, OCSP, TKS
-my $nsutil_jar_file_path                         = undef;  # CA, KRA, OCSP, TKS
-my $nsutil_jar_symlink_path                      = undef;  # CA, KRA, OCSP, TKS
+my $pki_nsutil_jar_file_path                     = undef;  # CA, KRA, OCSP, TKS
+my $pki_nsutil_jar_symlink_path                  = undef;  # CA, KRA, OCSP, TKS
 my $osutil_jar_file_path                         = undef;  # CA, KRA, OCSP, TKS
 my $osutil_jar_symlink_path                      = undef;  # CA, KRA, OCSP, TKS
 my $symkey_jar_file_path                         = undef;  # CA, KRA, OCSP, TKS
@@ -498,8 +498,8 @@ my $server_xml_instance_file_path                = undef;  # CA, KRA, OCSP, TKS
 my $server_xml_subsystem_file_path               = undef;  # CA, KRA, OCSP, TKS
 my $servercertnick_conf_instance_file_path       = undef;  # CA, KRA, OCSP, TKS
 my $servercertnick_conf_subsystem_file_path      = undef;  # CA, KRA, OCSP, TKS
-my $subsystem_jar_file_path                      = undef;  # CA, KRA, OCSP, TKS
-my $subsystem_jar_symlink_path                   = undef;  # CA, KRA, OCSP, TKS
+my $pki_subsystem_jar_file_path                  = undef;  # CA, KRA, OCSP, TKS
+my $pki_subsystem_jar_symlink_path               = undef;  # CA, KRA, OCSP, TKS
 my $tomcat6_conf_subsystem_file_path             = undef;  # CA, KRA, OCSP, TKS
 my $tomcat6_conf_instance_file_path              = undef;  # CA, KRA, OCSP, TKS
 my $tomcat6_instance_pid_file_path               = undef;  # CA, KRA, OCSP, TKS
@@ -1638,30 +1638,30 @@ sub initialize_subdirectory_paths
     } else {
         ## Initialize subdirectory paths (CA, KRA, OCSP, TKS subsystems)
 
-        $subsystem_jar_base_name = "${subsystem_type}.jar";
+        $pki_subsystem_jar_base_name = "pki-${subsystem_type}.jar";
 
-        if (!defined($certsrv_jar_file_path = find_jar($certsrv_jar_base_name))) {
-            emit("could not find jar: $certsrv_jar_base_name", "error");
+        if (!defined($pki_certsrv_jar_file_path = find_jar($pki_certsrv_jar_base_name))) {
+            emit("could not find jar: $pki_certsrv_jar_base_name", "error");
             return 0;
         }
 
-        if (!defined($cms_jar_file_path = find_jar($cms_jar_base_name))) {
-            emit("could not find jar: $cms_jar_base_name", "error");
+        if (!defined($pki_cms_jar_file_path = find_jar($pki_cms_jar_base_name))) {
+            emit("could not find jar: $pki_cms_jar_base_name", "error");
             return 0;
         }
 
-        if (!defined($cmsbundle_jar_file_path = find_jar($cmsbundle_jar_base_name))) {
-            emit("could not find jar: $cmsbundle_jar_base_name", "error");
+        if (!defined($pki_cmsbundle_jar_file_path = find_jar($pki_cmsbundle_jar_base_name))) {
+            emit("could not find jar: $pki_cmsbundle_jar_base_name", "error");
             return 0;
         }
 
-        if (!defined($cmscore_jar_file_path = find_jar($cmscore_jar_base_name))) {
-            emit("could not find jar: $cmscore_jar_base_name", "error");
+        if (!defined($pki_cmscore_jar_file_path = find_jar($pki_cmscore_jar_base_name))) {
+            emit("could not find jar: $pki_cmscore_jar_base_name", "error");
             return 0;
         }
 
-        if (!defined($cmsutil_jar_file_path = find_jar($cmsutil_jar_base_name))) {
-            emit("could not find jar: $cmsutil_jar_base_name", "error");
+        if (!defined($pki_cmsutil_jar_file_path = find_jar($pki_cmsutil_jar_base_name))) {
+            emit("could not find jar: $pki_cmsutil_jar_base_name", "error");
             return 0;
         }
 
@@ -1699,8 +1699,8 @@ sub initialize_subdirectory_paths
             return 0;
         }
 
-        if (!defined($nsutil_jar_file_path = find_jar($nsutil_jar_base_name))) {
-            emit("could not find jar: $nsutil_jar_base_name", "error");
+        if (!defined($pki_nsutil_jar_file_path = find_jar($pki_nsutil_jar_base_name))) {
+            emit("could not find jar: $pki_nsutil_jar_base_name", "error");
             return 0;
         }
 
@@ -1709,8 +1709,8 @@ sub initialize_subdirectory_paths
             return 0;
         }
 
-        if (!defined($subsystem_jar_file_path = find_jar($subsystem_jar_base_name))) {
-            emit("could not find jar: $subsystem_jar_base_name", "error");
+        if (!defined($pki_subsystem_jar_file_path = find_jar($pki_subsystem_jar_base_name))) {
+            emit("could not find jar: $pki_subsystem_jar_base_name", "error");
             return 0;
         }
 
@@ -1748,16 +1748,16 @@ sub initialize_subdirectory_paths
         $webapps_subsystem_instance_path   = $webapps_instance_path
                                            . "/" . $subsystem_type;
 
-        $certsrv_jar_symlink_path          = $webinf_lib_instance_path
-                                           . "/" . $certsrv_jar_base_name;
-        $cms_jar_symlink_path              = $webinf_lib_instance_path
-                                           . "/" . $cms_jar_base_name;
-        $cmsbundle_jar_symlink_path        = $webinf_lib_instance_path
-                                           . "/" . $cmsbundle_jar_base_name;
-        $cmscore_jar_symlink_path          = $webinf_lib_instance_path
-                                           . "/" . $cmscore_jar_base_name;
-        $cmsutil_jar_symlink_path          = $webinf_lib_instance_path
-                                           . "/" . $cmsutil_jar_base_name;
+        $pki_certsrv_jar_symlink_path      = $webinf_lib_instance_path
+                                           . "/" . $pki_certsrv_jar_base_name;
+        $pki_cms_jar_symlink_path          = $webinf_lib_instance_path
+                                           . "/" . $pki_cms_jar_base_name;
+        $pki_cmsbundle_jar_symlink_path    = $webinf_lib_instance_path
+                                           . "/" . $pki_cmsbundle_jar_base_name;
+        $pki_cmscore_jar_symlink_path      = $webinf_lib_instance_path
+                                           . "/" . $pki_cmscore_jar_base_name;
+        $pki_cmsutil_jar_symlink_path      = $webinf_lib_instance_path
+                                           . "/" . $pki_cmsutil_jar_base_name;
         $commons_lang_jar_symlink_path     = $webinf_lib_instance_path
                                            . "/" . $commons_lang_jar_base_name;
         $commons_logging_jar_symlink_path  = $tomcat_instance_common_lib_path
@@ -1766,14 +1766,14 @@ sub initialize_subdirectory_paths
                                            . "/" . $jss_jar_base_name;
         $ldapjdk_jar_symlink_path          = $webinf_lib_instance_path
                                            . "/" . $ldapjdk_jar_base_name;
-        $nsutil_jar_symlink_path           = $webinf_lib_instance_path
-                                           . "/" . $nsutil_jar_base_name;
+        $pki_nsutil_jar_symlink_path       = $webinf_lib_instance_path
+                                           . "/" . $pki_nsutil_jar_base_name;
         $osutil_jar_symlink_path           = $webinf_lib_instance_path
                                            . "/" . $osutil_jar_base_name;
         $symkey_jar_symlink_path           = $webinf_lib_instance_path
                                            . "/" . $symkey_jar_base_name;
-        $subsystem_jar_symlink_path        = $webinf_lib_instance_path
-                                           . "/" . $subsystem_jar_base_name;
+        $pki_subsystem_jar_symlink_path    = $webinf_lib_instance_path
+                                           . "/" . $pki_subsystem_jar_base_name;
         $tomcatjss_jar_symlink_path        = $tomcat_instance_common_lib_path
                                            . "/" . $tomcatjss_jar_base_name;
         $velocity_jar_symlink_path         = $webinf_lib_instance_path
@@ -2050,6 +2050,8 @@ sub process_pki_directories
                 set_permissions("${cgibin_instance_path}/sow/*.cgi",   $default_exe_permissions);
                 set_permissions("${cgibin_instance_path}/sow/*.html",  $default_file_permissions);
                 set_permissions("${cgibin_instance_path}/sow/*.pl",    $default_exe_permissions);
+                set_permissions("${docroot_instance_path}/",           $default_dir_permissions);
+                set_permissions("${docroot_instance_path}/*.cgi",      $default_exe_permissions);
             }
         }
     } else {
@@ -2646,24 +2648,24 @@ sub process_pki_files_and_symlinks
         return 0 if !create_directory($webinf_lib_instance_path,
                                       $default_dir_permissions, $pki_user, $pki_group);
 
-        # create instance symlink to "certsrv.jar"
-        return 0 if !create_symlink($certsrv_jar_symlink_path, $certsrv_jar_file_path,
+        # create instance symlink to "pki-certsrv.jar"
+        return 0 if !create_symlink($pki_certsrv_jar_symlink_path, $pki_certsrv_jar_file_path,
                                     $pki_user, $pki_group);
 
-        # create instance symlink to "cms.jar"
-        return 0 if !create_symlink($cms_jar_symlink_path, $cms_jar_file_path,
+        # create instance symlink to "pki-cms.jar"
+        return 0 if !create_symlink($pki_cms_jar_symlink_path, $pki_cms_jar_file_path,
                                     $pki_user, $pki_group);
 
-        # create instance symlink to "cmsbundle.jar"
-        return 0 if !create_symlink($cmsbundle_jar_symlink_path, $cmsbundle_jar_file_path,
+        # create instance symlink to "pki-cmsbundle.jar"
+        return 0 if !create_symlink($pki_cmsbundle_jar_symlink_path, $pki_cmsbundle_jar_file_path,
                                     $pki_user, $pki_group);
 
-        # create instance symlink to "cmscore.jar"
-        return 0 if !create_symlink($cmscore_jar_symlink_path, $cmscore_jar_file_path,
+        # create instance symlink to "pki-cmscore.jar"
+        return 0 if !create_symlink($pki_cmscore_jar_symlink_path, $pki_cmscore_jar_file_path,
                                     $pki_user, $pki_group);
 
-        # create instance symlink to "cmsutil.jar"
-        return 0 if !create_symlink($cmsutil_jar_symlink_path, $cmsutil_jar_file_path,
+        # create instance symlink to "pki-cmsutil.jar"
+        return 0 if !create_symlink($pki_cmsutil_jar_symlink_path, $pki_cmsutil_jar_file_path,
                                     $pki_user, $pki_group);
 
         # create symlink to either "apache-commons-lang.jar" or "jakarta-commons-lang.jar"
@@ -2686,8 +2688,8 @@ sub process_pki_files_and_symlinks
         return 0 if !create_symlink($ldapjdk_jar_symlink_path, $ldapjdk_jar_file_path,
                                     $pki_user, $pki_group);
 
-        # create instance symlink to "nsutil.jar"
-        return 0 if !create_symlink($nsutil_jar_symlink_path, $nsutil_jar_file_path,
+        # create instance symlink to "pki-nsutil.jar"
+        return 0 if !create_symlink($pki_nsutil_jar_symlink_path, $pki_nsutil_jar_file_path,
                                     $pki_user, $pki_group);
 
         # create instance symlink to "osutil.jar"
@@ -2695,7 +2697,7 @@ sub process_pki_files_and_symlinks
                                     $pki_user, $pki_group);
 
         # create instance symlink to "${subsystem_type}.jar"
-        return 0 if !create_symlink($subsystem_jar_symlink_path, $subsystem_jar_file_path,
+        return 0 if !create_symlink($pki_subsystem_jar_symlink_path, $pki_subsystem_jar_file_path,
                                     $pki_user, $pki_group);
 
         # create instance symlink to "symkey.jar"
diff --git a/pki/base/silent/build.xml b/pki/base/silent/build.xml
index c28c4b0fd..23e7ebf86 100644
--- a/pki/base/silent/build.xml
+++ b/pki/base/silent/build.xml
@@ -25,21 +25,21 @@
     <property name="osutil.jar" value="${jni-jar.home}/osutil.jar"/>
     <property name="symkey.jar" value="${jni-jar.home}/symkey.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="${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="${cms.jar}"/>
-        <pathelement location="${certsrv.jar}"/>
+        <pathelement location="${pki-cms.jar}"/>
+        <pathelement location="${pki-certsrv.jar}"/>
     </path>
 
 
@@ -81,7 +81,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-silent.jar">
             <fileset dir="${build.classes}">
                 <include name="**"/>
             </fileset>
@@ -170,7 +170,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="./scripts"
@@ -197,7 +197,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="./scripts"
diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent
index 3bceea407..6a310c3f7 100755
--- a/pki/base/silent/scripts/pkisilent
+++ b/pki/base/silent/scripts/pkisilent
@@ -66,12 +66,8 @@ if($OS eq "Linux")
 	{
 		$libpath="/usr/lib";
 
-		$ENV{LD_LIBRARY_PATH} = "/usr/lib/java::"
-					. "/usr/lib/${PRODUCT}:"
-					. "/usr/lib/dirsec:"
-					. "/usr/lib/java/dirsec:"
-					. "/usr/lib/jvm/jre-1.5.0-ibm/lib/i386/:"
-			. "/usr/lib/jvm/jre-1.5.0-ibm/lib/i386/native_threads:"
+		$ENV{LD_LIBRARY_PATH} = "/usr/lib/osutil:"
+					. "/usr/lib/jss:"
 					. "/usr/lib/:/lib/:" ;
 	}
 
@@ -79,14 +75,12 @@ if($OS eq "Linux")
 	{
 		$libpath="/usr/lib64";
 
-		$ENV{LD_LIBRARY_PATH} = "/usr/lib/java:/usr/lib:/lib"
-					. "/usr/lib/${PRODUCT}:"
-					. "/usr/lib/dirsec:"
-					. "/usr/lib/java/dirsec:"
-					. "/usr/lib64/java:/usr/lib64:/lib64:"
-					. "/usr/lib64/${PRODUCT}:"
-					. "/usr/lib64/dirsec:"
-					. "/usr/lib64/java/dirsec:";
+		$ENV{LD_LIBRARY_PATH} = "/usr/lib64/osutil:"
+					. "/usr/lib64/jss:"
+					. "/usr/lib64/:/lib64/:"
+					. "/usr/lib/osutil:"
+					. "/usr/lib/jss:"
+					. "/usr/lib/:/lib/:" ;
 	}
 	else
 	{
@@ -146,19 +140,18 @@ else
 
 print "libpath=$libpath\n";
 
-$ENV{CLASSPATH} = "/usr/share/java/silent.jar:"
-	. "/usr/lib/java/jss4.jar:"
+$ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-silent.jar:"
+	. "/usr/share/java/${PRODUCT}/pki-certsrv.jar:"
+	. "/usr/share/java/${PRODUCT}/pki-cmscore.jar:"
+	. "/usr/share/java/${PRODUCT}/pki-nsutil.jar:"
+	. "/usr/share/java/${PRODUCT}/pki-cmsutil.jar:"
+	. "/usr/share/java/${PRODUCT}/pki-tools.jar:"
 	. "/usr/share/java/ldapjdk.jar:"
-	. "/usr/share/java/${PRODUCT}/certsrv.jar:"
-	. "/usr/share/java/${PRODUCT}/cmscore.jar:"
-	. "/usr/share/java/${PRODUCT}/nsutil.jar:"
-	. "/usr/share/java/${PRODUCT}/cmsutil.jar:"
-	. "/usr/share/java/pkitools.jar:"
-	. "/usr/share/java/cstools.jar:"
-	. "/usr/share/java/${PRODUCT}/cstools.jar:"
-	. "/usr/share/${PRODUCT}/classes:"
-	. "/usr/share/java/xml-commons-resolver.jar:"
 	. "/usr/share/java/xerces-j2.jar:"
+	. "/usr/share/java/xml-commons-resolver.jar:"
+	. "/usr/lib/java/dirsec/jss4.jar:"
+	. "/usr/lib/java/jss4.jar:"
+	. "/usr/lib/java/dirsec/osutil.jar:"
 	. "/usr/lib/java/osutil.jar:";
 
 
diff --git a/pki/base/silent/src/CMakeLists.txt b/pki/base/silent/src/CMakeLists.txt
index f442b095b..d7bfc6b1d 100644
--- a/pki/base/silent/src/CMakeLists.txt
+++ b/pki/base/silent/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(silent_java Java)
+project(pki-silent_java Java)
 
 find_file(JSS_JAR
     NAMES
@@ -24,7 +24,7 @@ find_file(XERCES_JAR
         /usr/share/java
 )
 
-set(silent_java_SRCS
+set(pki-silent_java_SRCS
     common/AutoInstaller.java
     common/CMSConfig.java
     common/ParseXML.java
@@ -73,13 +73,14 @@ set(silent_java_SRCS
 )
 
 set(CMAKE_JAVA_INCLUDE_PATH
-    ${CERTSRV_JAR} ${CMS_JAR} ${CMSUTIL_JAR} ${NSUTIL_JAR}
+    ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR}
+    ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
     ${LDAPJDK_JAR} ${XERCES_JAR}
     ${JSS_JAR} ${OSUTIL_JAR} ${SYMKEY_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
-add_jar(silent ${silent_java_SRCS})
-add_dependencies(silent osutil symkey cmsutil nsutil certsrv cms)
-install_jar(silent ${JAVA_JAR_INSTALL_DIR})
-set(SILENT_JAR ${silent_JAR_FILE} CACHE INTERNAL "silent jar file")
+add_jar(pki-silent ${pki-silent_java_SRCS})
+add_dependencies(pki-silent osutil symkey pki-cmsutil pki-nsutil pki-certsrv pki-cms)
+install_jar(pki-silent ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_SILENT_JAR ${pki-silent_JAR_FILE} CACHE INTERNAL "pki-silent jar file")
diff --git a/pki/base/tks/build.xml b/pki/base/tks/build.xml
index 85b01d465..5d7d52cfe 100644
--- a/pki/base/tks/build.xml
+++ b/pki/base/tks/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-tks.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/tks/src/CMakeLists.txt b/pki/base/tks/src/CMakeLists.txt
index 6178dd3f9..5ec7101bc 100644
--- a/pki/base/tks/src/CMakeLists.txt
+++ b/pki/base/tks/src/CMakeLists.txt
@@ -1,37 +1,37 @@
-project(tks_java Java)
+project(pki-tks_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,14 +71,15 @@ find_file(SYMKEY_JAR
 
 
 # identify java sources
-set(tks_java_SRCS
+set(pki-tks_java_SRCS
     com/netscape/tks/TKSAuthority.java
 )
 
 
 # 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})
 
@@ -87,9 +88,9 @@ set(CMAKE_JAVA_INCLUDE_PATH
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 
-# build tks.jar
-add_jar(tks ${tks_java_SRCS})
-add_dependencies(tks osutil symkey nsutil cmsutil certsrv cms cmscore)
-install_jar(tks ${JAVA_JAR_INSTALL_DIR})
-set(TKS_JAR ${tks_JAR_FILE} CACHE INTERNAL "tks jar file")
+# build pki-tks.jar
+add_jar(pki-tks ${pki-tks_java_SRCS})
+add_dependencies(pki-tks osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+install_jar(pki-tks ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_TKS_JAR ${pki-tks_JAR_FILE} CACHE INTERNAL "pki-tks jar file")
 
diff --git a/pki/base/util/build.xml b/pki/base/util/build.xml
index 8c1a5debb..e1eb0c859 100644
--- a/pki/base/util/build.xml
+++ b/pki/base/util/build.xml
@@ -81,12 +81,12 @@
             description="--> generate jar files">
         <echo message="${begin.build.jars.log.message}"/>
         <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/nsutil.jar">
+        <jar jarfile="${build.jars}/pki-nsutil.jar">
             <fileset dir="${build.classes}">
                 <include name="netscape/**"/>
             </fileset>
         </jar>
-        <jar jarfile="${build.jars}/cmsutil.jar">
+        <jar jarfile="${build.jars}/pki-cmsutil.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/cmsutil/**"/>
             </fileset>
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt
index e0de631be..a7f0f4e6d 100644
--- a/pki/base/util/src/CMakeLists.txt
+++ b/pki/base/util/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(cmsutil_java Java)
+project(pki-cmsutil_java Java)
 
 find_file(JSS_JAR
     NAMES
@@ -40,7 +40,7 @@ find_file(XERCES_JAR
         /usr/share/java
 )
 
-set(netscape_java_SRCS
+set(pki-nsutil_java_SRCS
     netscape/net/TransferProtocolClient.java
     netscape/net/smtp/SmtpProtocolException.java
     netscape/net/smtp/SmtpClient.java
@@ -222,7 +222,7 @@ set(netscape_java_SRCS
     netscape/security/acl/PermissionImpl.java
 )
 
-set(cmsutil_java_SRCS
+set(pki-cmsutil_java_SRCS
     com/netscape/cmsutil/ldap/LDAPUtil.java
     com/netscape/cmsutil/xml/XMLObject.java
     com/netscape/cmsutil/scep/CRSPKIMessage.java
@@ -335,19 +335,19 @@ set(CMAKE_JAVA_INCLUDE_PATH
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
-# build nsutil
+# build pki-nsutil
 set(CMAKE_JAR_CLASSES_PREFIX netscape)
-add_jar(nsutil ${netscape_java_SRCS})
-add_dependencies(nsutil osutil)
-install_jar(nsutil ${JAVA_JAR_INSTALL_DIR}/pki)
-set(NSUTIL_JAR ${nsutil_JAR_FILE} CACHE INTERNAL "nsutil jar file")
+add_jar(pki-nsutil ${pki-nsutil_java_SRCS})
+add_dependencies(pki-nsutil osutil)
+install_jar(pki-nsutil ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_NSUTIL_JAR ${pki-nsutil_JAR_FILE} CACHE INTERNAL "pki-nsutil jar file")
 
-# build cmsutil
+# build pki-cmsutil
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cmsutil)
-add_jar(cmsutil ${cmsutil_java_SRCS})
-add_dependencies(cmsutil osutil nsutil)
-install_jar(cmsutil ${JAVA_JAR_INSTALL_DIR}/pki)
-set(CMSUTIL_JAR ${cmsutil_JAR_FILE} CACHE INTERNAL "cmsutil jar file")
+add_jar(pki-cmsutil ${pki-cmsutil_java_SRCS})
+add_dependencies(pki-cmsutil osutil pki-nsutil)
+install_jar(pki-cmsutil ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CMSUTIL_JAR ${pki-cmsutil_JAR_FILE} CACHE INTERNAL "pki-cmsutil jar file")
 
 create_javadoc(pki-util-${APPLICATION_VERSION}
     PACKAGES com.netscape.cmsutil.crypto
@@ -369,4 +369,4 @@ create_javadoc(pki-util-${APPLICATION_VERSION}
     USE TRUE
     VERSION TRUE
 )
-add_dependencies(pki-util-${APPLICATION_VERSION}_javadoc cmsutil)
+add_dependencies(pki-util-${APPLICATION_VERSION}_javadoc pki-cmsutil)
diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index 000a101d1..527716af4 100644
--- a/pki/dogtag/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
@@ -68,14 +68,9 @@ mkdir -p %{buildroot}%{_localstatedir}/lock/pki/ca
 mkdir -p %{buildroot}%{_localstatedir}/run/pki/ca
 cd %{buildroot}%{_datadir}/pki/ca/setup
 mv config.desktop.in config.desktop
-cd %{buildroot}%{_javadir}
-mv ca.jar ca-%{version}.jar
-ln -s ca-%{version}.jar ca.jar
-
-# supply convenience symlink(s) for backwards compatibility
-mkdir -p %{buildroot}%{_javadir}/pki/ca
-cd %{buildroot}%{_javadir}/pki/ca
-ln -s ../../ca.jar ca.jar
+cd %{buildroot}%{_javadir}/pki
+mv pki-ca.jar pki-ca-%{version}.jar
+ln -s pki-ca-%{version}.jar pki-ca.jar
 
 %clean
 rm -rf %{buildroot}
@@ -99,7 +94,7 @@ fi
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_initrddir}/*
-%{_javadir}/*
+%{_javadir}/pki/
 %{_datadir}/pki/
 %{_localstatedir}/lock/*
 %{_localstatedir}/run/*
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index d6922361e..83bd59b4c 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -84,14 +84,14 @@ rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
 cd %{buildroot}%{_javadir}/pki
-mv certsrv.jar certsrv-%{version}.jar
-ln -s certsrv-%{version}.jar certsrv.jar
-mv cms.jar cms-%{version}.jar
-ln -s cms-%{version}.jar cms.jar
-mv cmsbundle.jar cmsbundle-%{version}.jar
-ln -s cmsbundle-%{version}.jar cmsbundle.jar
-mv cmscore.jar cmscore-%{version}.jar
-ln -s cmscore-%{version}.jar cmscore.jar
+mv pki-certsrv.jar pki-certsrv-%{version}.jar
+ln -s pki-certsrv-%{version}.jar pki-certsrv.jar
+mv pki-cms.jar pki-cms-%{version}.jar
+ln -s pki-cms-%{version}.jar pki-cms.jar
+mv pki-cmsbundle.jar pki-cmsbundle-%{version}.jar
+ln -s pki-cmsbundle-%{version}.jar pki-cmsbundle.jar
+mv pki-cmscore.jar pki-cmscore-%{version}.jar
+ln -s pki-cmscore-%{version}.jar pki-cmscore.jar
 
 %clean
 rm -rf %{buildroot}
diff --git a/pki/dogtag/console-ui/build.xml b/pki/dogtag/console-ui/build.xml
index 9fb814f9a..068a23d31 100644
--- a/pki/dogtag/console-ui/build.xml
+++ b/pki/dogtag/console-ui/build.xml
@@ -59,7 +59,7 @@
             description="--> generate jar files">
         <echo message="${begin.build.jars.log.message}"/>
         <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/pki-console-theme-${version}_en.jar">
+        <jar jarfile="${build.jars}/pki-console-theme-${version}.jar">
             <fileset dir=".">
                 <include name="CMSAdminRS.properties"/>
             </fileset>
@@ -155,7 +155,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="."
@@ -171,7 +171,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="."
diff --git a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
index 22c8ec6f8..d33ea016c 100644
--- a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
+++ b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
@@ -55,13 +55,8 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
-cd %{buildroot}%{_javadir}
-ln -s pki-console-theme-%{version}_en.jar pki-console-theme_en.jar
-
-# supply convenience symlink(s) for backwards compatibility
-mkdir -p %{buildroot}%{_javadir}/pki
 cd %{buildroot}%{_javadir}/pki
-ln -s ../pki-console-theme_en.jar cms-theme_en.jar
+ln -s pki-console-theme-%{version}.jar pki-console-theme.jar
 
 %clean
 rm -rf %{buildroot}
@@ -69,7 +64,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_javadir}/*
+%{_javadir}/pki/
 
 %changelog
 * Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
diff --git a/pki/dogtag/console-ui/src/CMakeLists.txt b/pki/dogtag/console-ui/src/CMakeLists.txt
index 2ff647440..b2288d5f7 100644
--- a/pki/dogtag/console-ui/src/CMakeLists.txt
+++ b/pki/dogtag/console-ui/src/CMakeLists.txt
@@ -1,6 +1,6 @@
-set(console_ui_java Java)
+set(pki-console-theme_java Java)
 
-set(console_ui_java_SRCS
+set(pki-console-theme_java_RCS
     ../CMSAdminRS.properties
     com/netscape/management/client/theme/theme.properties
     com/netscape/management/client/theme/images/login.gif
@@ -12,8 +12,7 @@ set(console_ui_java_SRCS
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
-add_jar(pki-console-theme_en ${console_ui_java_SRCS})
-install_jar(pki-console-theme_en ${JAVA_JAR_INSTALL_DIR})
-
-set(CONSOLE_UI_JAR ${pki-console-theme_en_JAR_FILE} CACHE INTERNAL "console-ui jar file")
+add_jar(pki-console-theme ${pki-console-theme_java_RCS})
+install_jar(pki-console-theme ${JAVA_JAR_INSTALL_DIR}/pki)
+set(PKI_CONSOLE_THEME_JAR ${pki-console-theme_JAR_FILE} CACHE INTERNAL "pki-console-theme jar file")
 
diff --git a/pki/dogtag/console/pki-console.spec b/pki/dogtag/console/pki-console.spec
index 3cc3241f4..1d4103095 100644
--- a/pki/dogtag/console/pki-console.spec
+++ b/pki/dogtag/console/pki-console.spec
@@ -48,15 +48,8 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
-cd %{buildroot}%{_javadir}
-ln -s pki-console-%{version}.jar pki-console.jar
-ln -s pki-console-%{version}_en.jar pki-console_en.jar
-
-# supply convenience symlink(s) for backwards compatibility
-mkdir -p %{buildroot}%{_javadir}/pki
 cd %{buildroot}%{_javadir}/pki
-ln -s ../pki-console.jar console-cms.jar
-ln -s ../pki-console_en.jar console-cms_en.jar
+ln -s pki-console-%{version}.jar pki-console.jar
 
 %clean
 rm -rf %{buildroot}
@@ -65,7 +58,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_bindir}/pkiconsole
-%{_javadir}/*
+%{_javadir}/pki/
 
 %changelog
 * Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
diff --git a/pki/dogtag/java-tools/pki-java-tools.spec b/pki/dogtag/java-tools/pki-java-tools.spec
index 4c952d71d..6ceaaeb90 100644
--- a/pki/dogtag/java-tools/pki-java-tools.spec
+++ b/pki/dogtag/java-tools/pki-java-tools.spec
@@ -57,17 +57,12 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
-cd %{buildroot}%{_javadir}
-mv pkitools.jar pkitools-%{version}.jar
-ln -s pkitools-%{version}.jar pkitools.jar
-rm -rf %{buildroot}%{_datadir}/pki
-
-# supply convenience symlink(s) for backwards compatibility
-mkdir -p %{buildroot}%{_javadir}/pki
 cd %{buildroot}%{_javadir}/pki
-ln -s ../pkitools.jar cstools.jar
-cd %{buildroot}%{_javadir}
-ln -s pkitools.jar cstools.jar
+mv pki-tools.jar pki-tools-%{version}.jar
+ln -s pki-tools-%{version}.jar pki-tools.jar
+
+## remove unwanted files
+rm -rf %{buildroot}/usr/share/pki
 
 %clean
 rm -rf %{buildroot}
@@ -76,7 +71,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_bindir}/*
-%{_javadir}/*
+%{_javadir}/pki/
 
 %files javadoc
 %defattr(0644,root,root,0755)
diff --git a/pki/dogtag/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec
index ba9e8b615..40b581cb2 100644
--- a/pki/dogtag/kra/pki-kra.spec
+++ b/pki/dogtag/kra/pki-kra.spec
@@ -77,14 +77,9 @@ mkdir -p %{buildroot}%{_localstatedir}/lock/pki/kra
 mkdir -p %{buildroot}%{_localstatedir}/run/pki/kra
 cd %{buildroot}%{_datadir}/pki/kra/setup
 mv config.desktop.in config.desktop
-cd %{buildroot}%{_javadir}
-mv kra.jar kra-%{version}.jar
-ln -s kra-%{version}.jar kra.jar
-
-# supply convenience symlink(s) for backwards compatibility
-mkdir -p %{buildroot}%{_javadir}/pki/kra
-cd %{buildroot}%{_javadir}/pki/kra
-ln -s ../../kra.jar kra.jar
+cd %{buildroot}%{_javadir}/pki
+mv pki-kra.jar pki-kra-%{version}.jar
+ln -s pki-kra-%{version}.jar pki-kra.jar
 
 %clean
 rm -rf %{buildroot}
@@ -108,7 +103,7 @@ fi
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_initrddir}/*
-%{_javadir}/*
+%{_javadir}/pki/
 %{_datadir}/pki/
 %{_localstatedir}/lock/*
 %{_localstatedir}/run/*
diff --git a/pki/dogtag/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec
index 63ab5e225..eacd28196 100644
--- a/pki/dogtag/ocsp/pki-ocsp.spec
+++ b/pki/dogtag/ocsp/pki-ocsp.spec
@@ -86,14 +86,9 @@ mkdir -p %{buildroot}%{_localstatedir}/lock/pki/ocsp
 mkdir -p %{buildroot}%{_localstatedir}/run/pki/ocsp
 cd %{buildroot}%{_datadir}/pki/ocsp/setup
 mv config.desktop.in config.desktop
-cd %{buildroot}%{_javadir}
-mv ocsp.jar ocsp-%{version}.jar
-ln -s ocsp-%{version}.jar ocsp.jar
-
-# supply convenience symlink(s) for backwards compatibility
-mkdir -p %{buildroot}%{_javadir}/pki/ocsp
-cd %{buildroot}%{_javadir}/pki/ocsp
-ln -s ../../ocsp.jar ocsp.jar
+cd %{buildroot}%{_javadir}/pki
+mv pki-ocsp.jar pki-ocsp-%{version}.jar
+ln -s pki-ocsp-%{version}.jar pki-ocsp.jar
 
 %clean
 rm -rf %{buildroot}
@@ -117,7 +112,7 @@ fi
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_initrddir}/*
-%{_javadir}/*
+%{_javadir}/pki/
 %{_datadir}/pki/
 %{_localstatedir}/lock/*
 %{_localstatedir}/run/*
diff --git a/pki/dogtag/silent/pki-silent.spec b/pki/dogtag/silent/pki-silent.spec
index fb80a6da8..ddc785966 100644
--- a/pki/dogtag/silent/pki-silent.spec
+++ b/pki/dogtag/silent/pki-silent.spec
@@ -57,9 +57,9 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
-cd %{buildroot}%{_javadir}
-mv silent.jar silent-%{version}.jar
-ln -s silent-%{version}.jar silent.jar
+cd %{buildroot}%{_javadir}/pki
+mv pki-silent.jar pki-silent-%{version}.jar
+ln -s pki-silent-%{version}.jar pki-silent.jar
 
 %clean
 rm -rf %{buildroot}
@@ -68,7 +68,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_bindir}/*
-%{_javadir}/*
+%{_javadir}/pki/
 %{_datadir}/pki/
 
 %changelog
diff --git a/pki/dogtag/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec
index 4c64da5ef..8a570f1c8 100644
--- a/pki/dogtag/tks/pki-tks.spec
+++ b/pki/dogtag/tks/pki-tks.spec
@@ -79,14 +79,9 @@ mkdir -p %{buildroot}%{_localstatedir}/lock/pki/tks
 mkdir -p %{buildroot}%{_localstatedir}/run/pki/tks
 cd %{buildroot}%{_datadir}/pki/tks/setup
 mv config.desktop.in config.desktop
-cd %{buildroot}%{_javadir}
-mv tks.jar tks-%{version}.jar
-ln -s tks-%{version}.jar tks.jar
-
-# supply convenience symlink(s) for backwards compatibility
-mkdir -p %{buildroot}%{_javadir}/pki/tks
-cd %{buildroot}%{_javadir}/pki/tks
-ln -s ../../tks.jar tks.jar
+cd %{buildroot}%{_javadir}/pki
+mv pki-tks.jar pki-tks-%{version}.jar
+ln -s pki-tks-%{version}.jar pki-tks.jar
 
 %clean
 rm -rf %{buildroot}
@@ -110,7 +105,7 @@ fi
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_initrddir}/*
-%{_javadir}/*
+%{_javadir}/pki/
 %{_datadir}/pki/
 %{_localstatedir}/lock/*
 %{_localstatedir}/run/*
diff --git a/pki/dogtag/util/pki-util.spec b/pki/dogtag/util/pki-util.spec
index 747acdd20..ad4203bd8 100644
--- a/pki/dogtag/util/pki-util.spec
+++ b/pki/dogtag/util/pki-util.spec
@@ -70,10 +70,10 @@ rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
 cd %{buildroot}%{_javadir}/pki
-mv cmsutil.jar cmsutil-%{version}.jar
-ln -s cmsutil-%{version}.jar cmsutil.jar
-mv nsutil.jar nsutil-%{version}.jar
-ln -s nsutil-%{version}.jar nsutil.jar
+mv pki-cmsutil.jar pki-cmsutil-%{version}.jar
+ln -s pki-cmsutil-%{version}.jar pki-cmsutil.jar
+mv pki-nsutil.jar pki-nsutil-%{version}.jar
+ln -s pki-nsutil-%{version}.jar pki-nsutil.jar
 
 %clean
 rm -rf %{buildroot}
diff --git a/pki/specs/dogtag-pki-theme.spec b/pki/specs/dogtag-pki-theme.spec
index 591263804..19e87d885 100644
--- a/pki/specs/dogtag-pki-theme.spec
+++ b/pki/specs/dogtag-pki-theme.spec
@@ -479,8 +479,7 @@ cd build
 %defattr(-,root,root,-)
 %doc dogtag/common-ui/LICENSE
 %dir %{_datadir}/pki
-%dir %{_datadir}/pki/common-ui
-%{_datadir}/pki/common-ui/*
+%{_datadir}/pki/common-ui/
 
 
 ################################
@@ -490,8 +489,8 @@ cd build
 %files -n dogtag-pki-ca-theme
 %defattr(-,root,root,-)
 %doc dogtag/ca-ui/LICENSE
-%dir %{_datadir}/pki/ca-ui
-%{_datadir}/pki/ca-ui/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/ca-ui/
 
 
 ################################
@@ -501,8 +500,8 @@ cd build
 %files -n dogtag-pki-kra-theme
 %defattr(-,root,root,-)
 %doc dogtag/kra-ui/LICENSE
-%dir %{_datadir}/pki/kra-ui
-%{_datadir}/pki/kra-ui/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/kra-ui/
 
 
 ################################
@@ -512,8 +511,8 @@ cd build
 %files -n dogtag-pki-ocsp-theme
 %defattr(-,root,root,-)
 %doc dogtag/ocsp-ui/LICENSE
-%dir %{_datadir}/pki/ocsp-ui
-%{_datadir}/pki/ocsp-ui/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/ocsp-ui/
 
 
 ################################
@@ -523,8 +522,8 @@ cd build
 %files -n dogtag-pki-ra-theme
 %defattr(-,root,root,-)
 %doc dogtag/ra-ui/LICENSE
-%dir %{_datadir}/pki/ra-ui
-%{_datadir}/pki/ra-ui/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/ra-ui/
 
 
 ################################
@@ -534,8 +533,8 @@ cd build
 %files -n dogtag-pki-tks-theme
 %defattr(-,root,root,-)
 %doc dogtag/tks-ui/LICENSE
-%dir %{_datadir}/pki/tks-ui
-%{_datadir}/pki/tks-ui/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/tks-ui/
 
 
 ################################
@@ -545,8 +544,8 @@ cd build
 %files -n dogtag-pki-tps-theme
 %defattr(-,root,root,-)
 %doc dogtag/tps-ui/LICENSE
-%dir %{_datadir}/pki/tps-ui
-%{_datadir}/pki/tps-ui/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/tps-ui/
 
 
 ################################
@@ -556,8 +555,7 @@ cd build
 %files -n dogtag-pki-console-theme
 %defattr(-,root,root,-)
 %doc dogtag/console-ui/LICENSE
-%{_javadir}/*
-#%{_javadir}/pki/*
+%{_javadir}/pki/
 
 
 ###############################################################################
diff --git a/pki/specs/ipa-pki-theme.spec b/pki/specs/ipa-pki-theme.spec
index 92e85e821..14826375e 100644
--- a/pki/specs/ipa-pki-theme.spec
+++ b/pki/specs/ipa-pki-theme.spec
@@ -204,8 +204,7 @@ cd build
 %defattr(-,root,root,-)
 %doc dogtag/common-ui/LICENSE
 %dir %{_datadir}/pki
-%dir %{_datadir}/pki/common-ui
-%{_datadir}/pki/common-ui/*
+%{_datadir}/pki/common-ui/
 
 
 ##############################
@@ -215,8 +214,8 @@ cd build
 %files -n ipa-pki-ca-theme
 %defattr(-,root,root,-)
 %doc dogtag/ca-ui/LICENSE
-%dir %{_datadir}/pki/ca-ui
-%{_datadir}/pki/ca-ui/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/ca-ui/
 
 
 ###############################################################################
diff --git a/pki/specs/pki-console.spec b/pki/specs/pki-console.spec
index ec34ca87b..5d87ad408 100644
--- a/pki/specs/pki-console.spec
+++ b/pki/specs/pki-console.spec
@@ -70,10 +70,7 @@ cd build
 %defattr(-,root,root,-)
 %doc base/console/LICENSE
 %{_bindir}/pkiconsole
-%{_javadir}/pki-console-%{version}.jar
-%{_javadir}/pki-console.jar
-#%{_javadir}/pki/pki-console-%{version}.jar
-#%{_javadir}/pki/pki-console.jar
+%{_javadir}/pki/
 
 
 %changelog
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec
index b6096c255..ca78f811e 100644
--- a/pki/specs/pki-core.spec
+++ b/pki/specs/pki-core.spec
@@ -583,10 +583,7 @@ fi
 %{_bindir}/pkicreate
 %{_bindir}/pkiremove
 %dir %{_datadir}/pki
-%dir %{_datadir}/pki/scripts
-%{_datadir}/pki/scripts/pkicommon.pm
-%dir %{_localstatedir}/lock/pki
-%dir %{_localstatedir}/run/pki
+%{_datadir}/pki/scripts/
 
 
 ########################
@@ -613,6 +610,7 @@ fi
 %{_bindir}/setpin
 %{_bindir}/sslget
 %{_bindir}/tkstool
+%dir %{_datadir}/pki
 %{_datadir}/pki/native-tools/
 
 
@@ -623,11 +621,7 @@ fi
 %files -n pki-util
 %defattr(-,root,root,-)
 %doc base/util/LICENSE
-%dir %{_javadir}/pki
-%{_javadir}/pki/cmsutil-%{version}.jar
-%{_javadir}/pki/cmsutil.jar
-%{_javadir}/pki/nsutil-%{version}.jar
-%{_javadir}/pki/nsutil.jar
+%{_javadir}/pki/
 
 %files -n pki-util-javadoc
 %defattr(-,root,root,-)
@@ -660,12 +654,7 @@ fi
 %{_bindir}/PrettyPrintCert
 %{_bindir}/PrettyPrintCrl
 %{_bindir}/TokenInfo
-%{_javadir}/pkitools-%{version}.jar
-%{_javadir}/pkitools.jar
-#%{_javadir}/cstools.jar
-#%{_javadir}/pki/pkitools-%{version}.jar
-#%{_javadir}/pki/pkitools.jar
-#%{_javadir}/pki/cstools.jar
+%{_javadir}/pki/
 
 %files -n pki-java-tools-javadoc
 %defattr(-,root,root,-)
@@ -679,20 +668,10 @@ fi
 %files -n pki-common
 %defattr(-,root,root,-)
 %doc base/common/LICENSE
-%{_javadir}/pki/certsrv-%{version}.jar
-%{_javadir}/pki/certsrv.jar
-%{_javadir}/pki/cms-%{version}.jar
-%{_javadir}/pki/cms.jar
-%{_javadir}/pki/cmsbundle-%{version}.jar
-%{_javadir}/pki/cmsbundle.jar
-%{_javadir}/pki/cmscore-%{version}.jar
-%{_javadir}/pki/cmscore.jar
-%{_datadir}/pki/scripts/functions
-%{_datadir}/pki/scripts/pki_apache_initscript
-%dir %{_datadir}/pki/setup
-%{_datadir}/pki/setup/CertServer.directory
-%{_datadir}/pki/setup/menu.xml
-%{_datadir}/pki/setup/web-app_2_3.dtd
+%{_javadir}/pki/
+%dir %{_datadir}/pki
+%{_datadir}/pki/scripts/
+%{_datadir}/pki/setup/
 
 %files -n pki-common-javadoc
 %defattr(-,root,root,-)
@@ -717,10 +696,8 @@ fi
 %defattr(-,root,root,-)
 %doc base/ca/LICENSE
 %{_initrddir}/pki-cad
-%{_javadir}/ca-%{version}.jar
-%{_javadir}/ca.jar
-#%{_javadir}/pki/ca-%{version}.jar
-#%{_javadir}/pki/ca/ca.jar
+%{_javadir}/pki/
+%dir %{_datadir}/pki
 %dir %{_datadir}/pki/ca
 %{_datadir}/pki/ca/conf/
 %{_datadir}/pki/ca/emails/
@@ -728,7 +705,9 @@ fi
 %{_datadir}/pki/ca/profiles/ca/
 %{_datadir}/pki/ca/webapps/
 %{_datadir}/pki/ca/setup/
+%dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/lock/pki/ca
+%dir %{_localstatedir}/run/pki
 %dir %{_localstatedir}/run/pki/ca
 
 
@@ -740,10 +719,8 @@ fi
 %defattr(-,root,root,-)
 %doc base/silent/LICENSE
 %{_bindir}/pkisilent
-%{_javadir}/silent-%{version}.jar
-%{_javadir}/silent.jar
-#%{_javadir}/pki/silent-%{version}.jar
-#%{_javadir}/pki/silent.jar
+%{_javadir}/pki/
+%dir %{_datadir}/pki
 %{_datadir}/pki/silent/
 
 
diff --git a/pki/specs/pki-kra.spec b/pki/specs/pki-kra.spec
index 2a2b78a77..7abd87d4d 100644
--- a/pki/specs/pki-kra.spec
+++ b/pki/specs/pki-kra.spec
@@ -123,18 +123,15 @@ fi
 %defattr(-,root,root,-)
 %doc base/kra/LICENSE
 %{_initrddir}/pki-krad
-%{_javadir}/kra-%{version}.jar
-%{_javadir}/kra.jar
-#%{_javadir}/pki/kra-%{version}.jar
-#%{_javadir}/pki/kra/kra.jar
+%{_javadir}/pki/
+%dir %{_datadir}/pki
 %dir %{_datadir}/pki/kra
-%dir %{_datadir}/pki/kra/conf
-%{_datadir}/pki/kra/conf/*
-%dir %{_datadir}/pki/kra/setup
-%{_datadir}/pki/kra/setup/*
-%dir %{_datadir}/pki/kra/webapps
-%{_datadir}/pki/kra/webapps/*
+%{_datadir}/pki/kra/conf/
+%{_datadir}/pki/kra/setup/
+%{_datadir}/pki/kra/webapps/
+%dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/lock/pki/kra
+%dir %{_localstatedir}/run/pki
 %dir %{_localstatedir}/run/pki/kra
 
 
diff --git a/pki/specs/pki-migrate.spec b/pki/specs/pki-migrate.spec
index fa5d36ef6..979f03f00 100644
--- a/pki/specs/pki-migrate.spec
+++ b/pki/specs/pki-migrate.spec
@@ -67,8 +67,8 @@ cd build
 %files
 %defattr(-,root,root,-)
 %doc base/migrate/LICENSE
-%dir %{_datadir}/pki/migrate
-%{_datadir}/pki/migrate/*
+%dir %{_datadir}/pki
+%{_datadir}/pki/migrate/
 
 
 %changelog
diff --git a/pki/specs/pki-ocsp.spec b/pki/specs/pki-ocsp.spec
index d95b13ee6..0bb13b0d9 100644
--- a/pki/specs/pki-ocsp.spec
+++ b/pki/specs/pki-ocsp.spec
@@ -130,18 +130,15 @@ fi
 %defattr(-,root,root,-)
 %doc base/ocsp/LICENSE
 %{_initrddir}/pki-ocspd
-%{_javadir}/ocsp-%{version}.jar
-%{_javadir}/ocsp.jar
-#%{_javadir}/pki/ocsp-%{version}.jar
-#%{_javadir}/pki/ocsp/ocsp.jar
+%{_javadir}/pki/
+%dir %{_datadir}/pki
 %dir %{_datadir}/pki/ocsp
-%dir %{_datadir}/pki/ocsp/conf
-%{_datadir}/pki/ocsp/conf/*
-%dir %{_datadir}/pki/ocsp/setup
-%{_datadir}/pki/ocsp/setup/*
-%dir %{_datadir}/pki/ocsp/webapps
-%{_datadir}/pki/ocsp/webapps/*
+%{_datadir}/pki/ocsp/conf/
+%{_datadir}/pki/ocsp/setup/
+%{_datadir}/pki/ocsp/webapps/
+%dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/lock/pki/ocsp
+%dir %{_localstatedir}/run/pki
 %dir %{_localstatedir}/run/pki/ocsp
 
 
diff --git a/pki/specs/pki-ra.spec b/pki/specs/pki-ra.spec
index 6d4bc22b2..49e9b8d11 100644
--- a/pki/specs/pki-ra.spec
+++ b/pki/specs/pki-ra.spec
@@ -132,18 +132,16 @@ fi
 %defattr(-,root,root,-)
 %doc base/ra/LICENSE
 %{_initrddir}/pki-rad
+%dir %{_datadir}/pki
 %dir %{_datadir}/pki/ra
-%dir %{_datadir}/pki/ra/conf
-%{_datadir}/pki/ra/conf/*
-%dir %{_datadir}/pki/ra/docroot
-%{_datadir}/pki/ra/docroot/*
-%dir %{_datadir}/pki/ra/lib
-%{_datadir}/pki/ra/lib/*
-%dir %{_datadir}/pki/ra/scripts
-%{_datadir}/pki/ra/scripts/*
-%dir %{_datadir}/pki/ra/setup
-%{_datadir}/pki/ra/setup/*
+%{_datadir}/pki/ra/conf/
+%{_datadir}/pki/ra/docroot/
+%{_datadir}/pki/ra/lib/
+%{_datadir}/pki/ra/scripts/
+%{_datadir}/pki/ra/setup/
+%dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/lock/pki/ra
+%dir %{_localstatedir}/run/pki
 %dir %{_localstatedir}/run/pki/ra
 
 
diff --git a/pki/specs/pki-tks.spec b/pki/specs/pki-tks.spec
index a3256acae..01dda425d 100644
--- a/pki/specs/pki-tks.spec
+++ b/pki/specs/pki-tks.spec
@@ -124,18 +124,15 @@ fi
 %defattr(-,root,root,-)
 %doc base/tks/LICENSE
 %{_initrddir}/pki-tksd
-%{_javadir}/tks-%{version}.jar
-%{_javadir}/tks.jar
-#%{_javadir}/pki/tks-%{version}.jar
-#%{_javadir}/pki/tks/tks.jar
+%{_javadir}/pki/
+%dir %{_datadir}/pki
 %dir %{_datadir}/pki/tks
-%dir %{_datadir}/pki/tks/conf
-%{_datadir}/pki/tks/conf/*
-%dir %{_datadir}/pki/tks/setup
-%{_datadir}/pki/tks/setup/*
-%dir %{_datadir}/pki/tks/webapps
-%{_datadir}/pki/tks/webapps/*
+%{_datadir}/pki/tks/conf/
+%{_datadir}/pki/tks/setup/
+%{_datadir}/pki/tks/webapps/
+%dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/lock/pki/tks
+%dir %{_localstatedir}/run/pki
 %dir %{_localstatedir}/run/pki/tks
 
 
diff --git a/pki/specs/pki-tps.spec b/pki/specs/pki-tps.spec
index bcaff293b..0aacc47d3 100644
--- a/pki/specs/pki-tps.spec
+++ b/pki/specs/pki-tps.spec
@@ -173,24 +173,19 @@ fi
 %{_bindir}/tpsclient
 %{_libdir}/httpd/modules/*
 %{_libdir}/lib*
+%dir %{_datadir}/pki
 %dir %{_datadir}/pki/tps
-%dir %{_datadir}/pki/tps/applets
-%{_datadir}/pki/tps/applets/*
-%dir %{_datadir}/pki/tps/cgi-bin
-%{_datadir}/pki/tps/cgi-bin/*
-%dir %{_datadir}/pki/tps/conf
-%{_datadir}/pki/tps/conf/*
-%dir %{_datadir}/pki/tps/docroot
-%{_datadir}/pki/tps/docroot/*
-%dir %{_datadir}/pki/tps/lib
-%{_datadir}/pki/tps/lib/*
-%dir %{_datadir}/pki/tps/samples
-%{_datadir}/pki/tps/samples/*
-%dir %{_datadir}/pki/tps/scripts
-%{_datadir}/pki/tps/scripts/*
-%dir %{_datadir}/pki/tps/setup
-%{_datadir}/pki/tps/setup/*
+%{_datadir}/pki/tps/applets/
+%{_datadir}/pki/tps/cgi-bin/
+%{_datadir}/pki/tps/conf/
+%{_datadir}/pki/tps/docroot/
+%{_datadir}/pki/tps/lib/
+%{_datadir}/pki/tps/samples/
+%{_datadir}/pki/tps/scripts/
+%{_datadir}/pki/tps/setup/
+%dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/lock/pki/tps
+%dir %{_localstatedir}/run/pki
 %dir %{_localstatedir}/run/pki/tps
 
 
-- 
cgit