From 670cfb3cd23dad14ae33b4ffd80c1403f409973d Mon Sep 17 00:00:00 2001
From: "peter.danner" <peter.danner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 14 Dec 2005 14:53:30 +0000
Subject: added product version to manifest

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@610 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id.server/build.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'id.server/build.xml')

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>
-- 
cgit v1.2.3