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

12 files changed, 50 insertions, 88 deletions

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}