Bugzilla Bug #562986 - Supply convenience symlink(s) for backwards

compatibility (rename jar files as appropriate)


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

11 files changed, 94 insertions, 36 deletions

diff --git a/pki/base/ca/shared/conf/dtomcat5 b/pki/base/ca/shared/conf/dtomcat5
index 1465d5b9..d0ecab17 100755
--- a/pki/base/ca/shared/conf/dtomcat5
+++ b/pki/base/ca/shared/conf/dtomcat5
@@ -230,23 +230,38 @@ elif [ ${OS} = "SunOS" ] ; then
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
-	CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
 
-	if [ -d /usr/share/java/pki/ca ]; then
+	if [ -f /usr/share/java/pkitools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pkitools.jar
+	elif [ -f /usr/share/java/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
+	elif [ -f /usr/share/java/pki/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+	fi
+
+	if [ -f /usr/share/java/ca.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ca.jar
+	elif [ -f /usr/share/java/pki/ca/ca.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
 	fi
-	if [ -d /usr/share/java/pki/kra ]; then
+	if [ -f /usr/share/java/kra.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/kra.jar
+	elif [ -f /usr/share/java/pki/kra/kra.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
 	fi
-	if [ -d /usr/share/java/pki/ocsp ]; then
+	if [ -f /usr/share/java/ocsp.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ocsp.jar
+	elif [ -f /usr/share/java/pki/ocsp/ocsp.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
 	fi
-	if [ -d /usr/share/java/pki/tks ]; then
+	if [ -f /usr/share/java/tks.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/tks.jar
+	elif [ -f /usr/share/java/pki/tks/tks.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
 	fi
 fi
diff --git a/pki/base/console/build.xml b/pki/base/console/build.xml
index 56cc3898..f79babca 100644
--- a/pki/base/console/build.xml
+++ b/pki/base/console/build.xml
@@ -86,12 +86,12 @@
             </fileset>
         </copy>
         <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/console-cms-${version}.jar">
+        <jar jarfile="${build.jars}/pki-console-${version}.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/**"/>
             </fileset>
         </jar>
-        <jar jarfile="${build.jars}/console-cms-${version}_en.jar">
+        <jar jarfile="${build.jars}/pki-console-${version}_en.jar">
             <fileset dir=".">
                 <include name="CMSAdminRS.properties"/>
             </fileset>
@@ -179,18 +179,13 @@
         <echo message="${begin.binary.zip.log.message}"/>
         <copy file="./templates/pki_console_wrapper"
               tofile="./build/pkiconsole"/>
-        <exec executable="sed">
-            <arg value="-i"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="./build/pkiconsole"/>
-        </exec>
         <echo message="${end.binary.zip.log.message}"/>
 
         <echo message="${begin.binary.tar.log.message}"/>
         <zip destfile="${dist.base.binaries}/${dist.name}.zip">
             <zipfileset dir="./build/jars"
                         filemode="755"
-                        prefix="usr/share/java/${product.prefix}">
+                        prefix="usr/share/java">
                 <include name="**"/>
             </zipfileset>
             <zipfileset dir="./build"
@@ -212,7 +207,7 @@
              destfile="${dist.base.binaries}/${dist.name}.tar">
             <tarfileset dir="./build/jars"
                         mode="755"
-                        prefix="${dist.name}/usr/share/java/${product.prefix}">
+                        prefix="${dist.name}/usr/share/java">
                 <include name="**"/>
             </tarfileset>
             <tarfileset dir="./build"
diff --git a/pki/base/console/templates/pki_console_wrapper b/pki/base/console/templates/pki_console_wrapper
index 467b31bc..aed16d10 100755
--- a/pki/base/console/templates/pki_console_wrapper
+++ b/pki/base/console/templates/pki_console_wrapper
@@ -152,8 +152,9 @@ 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/${PRODUCT}/console-cms_en.jar:${CP}
-CP=/usr/share/java/${PRODUCT}/console-cms.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}
 export CP
 
diff --git a/pki/base/java-tools/build.xml b/pki/base/java-tools/build.xml
index e89773e8..34fda6d2 100644
--- a/pki/base/java-tools/build.xml
+++ b/pki/base/java-tools/build.xml
@@ -82,7 +82,7 @@
             description="--> generate jar files">
         <echo message="${begin.build.jars.log.message}"/>
         <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/cstools.jar">
+        <jar jarfile="${build.jars}/pkitools.jar">
             <fileset dir="${build.classes}">
                 <include name="com/netscape/**"/>
             </fileset>
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper b/pki/base/java-tools/templates/pki_java_command_wrapper
index b3d49b19..c2178bf7 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper
+++ b/pki/base/java-tools/templates/pki_java_command_wrapper
@@ -134,7 +134,7 @@ CP=/usr/lib/java/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/cstools.jar:${CP}
+CP=/usr/share/java/pkitools.jar:${CP}
 CP=/usr/share/${PRODUCT}/classes:${CP}
 export CP
 
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 a91e37bd..c4df7a17 100644
--- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
@@ -134,7 +134,7 @@ CP=/usr/lib/java/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/cstools.jar:${CP}
+CP=/usr/share/java/pkitools.jar:${CP}
 CP=/usr/share/${PRODUCT}/classes:${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 861d4c49..e41d6194 100644
--- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
@@ -134,7 +134,7 @@ CP=/usr/lib/java/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/cstools.jar:${CP}
+CP=/usr/share/java/pkitools.jar:${CP}
 CP=/usr/share/${PRODUCT}/classes:${CP}
 export CP
 
diff --git a/pki/base/kra/shared/conf/dtomcat5 b/pki/base/kra/shared/conf/dtomcat5
index 1465d5b9..d0ecab17 100755
--- a/pki/base/kra/shared/conf/dtomcat5
+++ b/pki/base/kra/shared/conf/dtomcat5
@@ -230,23 +230,38 @@ elif [ ${OS} = "SunOS" ] ; then
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
-	CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
 
-	if [ -d /usr/share/java/pki/ca ]; then
+	if [ -f /usr/share/java/pkitools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pkitools.jar
+	elif [ -f /usr/share/java/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
+	elif [ -f /usr/share/java/pki/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+	fi
+
+	if [ -f /usr/share/java/ca.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ca.jar
+	elif [ -f /usr/share/java/pki/ca/ca.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
 	fi
-	if [ -d /usr/share/java/pki/kra ]; then
+	if [ -f /usr/share/java/kra.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/kra.jar
+	elif [ -f /usr/share/java/pki/kra/kra.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
 	fi
-	if [ -d /usr/share/java/pki/ocsp ]; then
+	if [ -f /usr/share/java/ocsp.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ocsp.jar
+	elif [ -f /usr/share/java/pki/ocsp/ocsp.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
 	fi
-	if [ -d /usr/share/java/pki/tks ]; then
+	if [ -f /usr/share/java/tks.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/tks.jar
+	elif [ -f /usr/share/java/pki/tks/tks.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
 	fi
 fi
diff --git a/pki/base/ocsp/shared/conf/dtomcat5 b/pki/base/ocsp/shared/conf/dtomcat5
index 1465d5b9..d0ecab17 100755
--- a/pki/base/ocsp/shared/conf/dtomcat5
+++ b/pki/base/ocsp/shared/conf/dtomcat5
@@ -230,23 +230,38 @@ elif [ ${OS} = "SunOS" ] ; then
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
-	CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
 
-	if [ -d /usr/share/java/pki/ca ]; then
+	if [ -f /usr/share/java/pkitools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pkitools.jar
+	elif [ -f /usr/share/java/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
+	elif [ -f /usr/share/java/pki/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+	fi
+
+	if [ -f /usr/share/java/ca.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ca.jar
+	elif [ -f /usr/share/java/pki/ca/ca.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
 	fi
-	if [ -d /usr/share/java/pki/kra ]; then
+	if [ -f /usr/share/java/kra.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/kra.jar
+	elif [ -f /usr/share/java/pki/kra/kra.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
 	fi
-	if [ -d /usr/share/java/pki/ocsp ]; then
+	if [ -f /usr/share/java/ocsp.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ocsp.jar
+	elif [ -f /usr/share/java/pki/ocsp/ocsp.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
 	fi
-	if [ -d /usr/share/java/pki/tks ]; then
+	if [ -f /usr/share/java/tks.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/tks.jar
+	elif [ -f /usr/share/java/pki/tks/tks.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
 	fi
 fi
diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent
index a051c739..f717d89d 100755
--- a/pki/base/silent/scripts/pkisilent
+++ b/pki/base/silent/scripts/pkisilent
@@ -83,7 +83,7 @@ if($OS eq "Linux")
 					. "/usr/lib/${PRODUCT}:"
 					. "/usr/lib/dirsec:"
 					. "/usr/lib/java/dirsec:"
-				. "/usr/lib64/java:/usr/lib64:/lib64:"
+					. "/usr/lib64/java:/usr/lib64:/lib64:"
 					. "/usr/lib64/${PRODUCT}:"
 					. "/usr/lib64/dirsec:"
 					. "/usr/lib64/java/dirsec:";
@@ -153,7 +153,9 @@ $ENV{CLASSPATH} = "/usr/share/java/silent.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:"
diff --git a/pki/base/tks/shared/conf/dtomcat5 b/pki/base/tks/shared/conf/dtomcat5
index 1465d5b9..d0ecab17 100755
--- a/pki/base/tks/shared/conf/dtomcat5
+++ b/pki/base/tks/shared/conf/dtomcat5
@@ -230,23 +230,38 @@ elif [ ${OS} = "SunOS" ] ; then
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
-	CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
 	CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
 
-	if [ -d /usr/share/java/pki/ca ]; then
+	if [ -f /usr/share/java/pkitools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pkitools.jar
+	elif [ -f /usr/share/java/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/cstools.jar
+	elif [ -f /usr/share/java/pki/cstools.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+	fi
+
+	if [ -f /usr/share/java/ca.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ca.jar
+	elif [ -f /usr/share/java/pki/ca/ca.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
 	fi
-	if [ -d /usr/share/java/pki/kra ]; then
+	if [ -f /usr/share/java/kra.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/kra.jar
+	elif [ -f /usr/share/java/pki/kra/kra.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
 	fi
-	if [ -d /usr/share/java/pki/ocsp ]; then
+	if [ -f /usr/share/java/ocsp.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/ocsp.jar
+	elif [ -f /usr/share/java/pki/ocsp/ocsp.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
 	fi
-	if [ -d /usr/share/java/pki/tks ]; then
+	if [ -f /usr/share/java/tks.jar ]; then
+		CLASSPATH="$CLASSPATH":/usr/share/java/tks.jar
+	elif [ -f /usr/share/java/pki/tks/tks.jar ]; then
 		CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
 	fi
 fi