added product version to manifest

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@610 d688527b-c9ab-4aba-bd8d-4036d912da1d

4 files changed, 36 insertions, 14 deletions

diff --git a/id.server/build.xml b/id.server/build.xml
index c4c3ea1ed..e46aed57b 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -179,8 +179,8 @@
 	</target>
 	<!-- package moa-id-auth.war -->
 	<!--  base target for moa-id-auth.war file with IAIK libraries for commercial use  -->
-	<target name="package-auth-base">
-		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml">
+	<target name="package-auth-base" depends="manifest">
+		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml" manifest="${tmp}/MANIFEST.MF">
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
@@ -201,8 +201,8 @@
 		</war>
 	</target>
 	<!--  base target for moa-id-auth.war file with IAIK libraries for educational and research use  -->
-	<target name="package-auth-base-eval">
-		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml">
+	<target name="package-auth-base-eval" depends="manifest">
+		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml" manifest="${tmp}/MANIFEST.MF">
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
@@ -223,8 +223,8 @@
 		</war>
 	</target>
 	<!--  base target for moa-id-auth.war file without IAIK libraries  -->
-	<target name="package-auth-base-woIAIK" description="base target for moa-id-auth.war file without IAIK libraries">
-		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml">
+	<target name="package-auth-base-woIAIK" description="base target for moa-id-auth.war file without IAIK libraries" depends="manifest">
+		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml" manifest="${tmp}/MANIFEST.MF">
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
@@ -257,8 +257,8 @@
 
 	<!-- package moa-id-proxy.war -->
 	<!--  base target for moa-id-proxy.war file with IAIK libraries for commercial use  -->
-	<target name="package-proxy-base">
-		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml">
+	<target name="package-proxy-base" depends="manifest">
+		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml" manifest="${tmp}/MANIFEST.MF">
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
@@ -279,8 +279,8 @@
 		</war>
 	</target>
 	<!--  base target for moa-id-proxy.war file with IAIK libraries for educational and research use  -->
-	<target name="package-proxy-base-eval" description="base target for moa-id-proxy.war file for educational and research use">
-		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml">
+	<target name="package-proxy-base-eval" description="base target for moa-id-proxy.war file for educational and research use" depends="manifest">
+		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml" manifest="${tmp}/MANIFEST.MF">
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
@@ -301,8 +301,8 @@
 		</war>
 	</target>
 	<!--  base target for moa-id-proxy.war file without IAIK libraries  -->
-	<target name="package-proxy-base-woIAIK" description="base target for moa-id-proxy.war file for commercial use">
-		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml">
+	<target name="package-proxy-base-woIAIK" description="base target for moa-id-proxy.war file for commercial use" depends="manifest">
+		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml" manifest="${tmp}/MANIFEST.MF">
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
@@ -704,4 +704,8 @@
 	<target name="clean">
 		<delete dir="${tmp}"/>
 	</target>
+	<target name="manifest">
+		<filter token="version" value="${version}" /> 
+		<copy file="manifest.template" tofile="${tmp}/MANIFEST.MF" overwrite="true" filtering="true" /> 
+	</target>	
 </project>
diff --git a/id.server/manifest.template b/id.server/manifest.template
new file mode 100644
index 000000000..c2dbd96ba
--- /dev/null
+++ b/id.server/manifest.template
@@ -0,0 +1,6 @@
+Manifest-version: 1.0
+
+Name: at/gv/egovernment/moa/id/
+Implementation-Title: MOA-ID	
+Implementation-Version: @version@
+Implementation-URL: http://www.cio.gv.at/onlineservices/basicmodules/moa-id/         
diff --git a/spss.server/build.xml b/spss.server/build.xml
index ccfa2c7eb..9735252af 100644
--- a/spss.server/build.xml
+++ b/spss.server/build.xml
@@ -100,9 +100,9 @@
     </javac>
   </target>
   
-  <target name="package-ws" depends="compile">
+  <target name="package-ws" depends="compile, manifest">
     <description>package the server war file</description>
-    <war warfile="${dist.ws}/moa-spss.war" webxml="web.xml">
+    <war warfile="${dist.ws}/moa-spss.war" webxml="web.xml" manifest="${tmp}/MANIFEST.MF">
       <lib dir="${lib.xalan}"/>
       <lib dir="${lib.xerces}"/>
       <lib dir="${lib.jaxp}"/>
@@ -454,4 +454,10 @@
     <description>clean temporary files</description>
     <delete dir="${tmp}"/>
   </target>
+	
+  <target name="manifest">
+    <filter token="version" value="${version}" /> 
+    <copy file="manifest.template" tofile="${tmp}/MANIFEST.MF" overwrite="true" filtering="true" /> 
+  </target>	
+  	
 </project>
diff --git a/spss.server/manifest.template b/spss.server/manifest.template
new file mode 100644
index 000000000..ad8035280
--- /dev/null
+++ b/spss.server/manifest.template
@@ -0,0 +1,6 @@
+Manifest-version: 1.0
+
+Name: at/gv/egovernment/moa/spss/
+Implementation-Title: MOA-SP/SS
+Implementation-Version: @version@
+Implementation-URL: http://www.cio.gv.at/onlineservices/basicmodules/moa-spss/
\ No newline at end of file