From 43fce69d50682dd1de80ece956f42423a541ff3f Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 3 Mar 2011 15:53:41 +0000
Subject: [PATCH] NIHVIVO-2188 add a "war" target to both build.xml and
 product-build.xml, to create a WAR file of Vivo or Vitro.

---
 webapp/build.xml         | 10 ++++++++++
 webapp/product-build.xml | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/webapp/build.xml b/webapp/build.xml
index 336a225d2..b3ceeef53 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -61,6 +61,7 @@ all      - Runs "clean", then "deploy".
 clean    - Delete all artifacts so the next build will be from scratch.
 compile  - Compile the Java source files.
 test     - Compile and run the JUnit tests.
+war      - Create a WAR file to be deployed in a servlet container.
 deploy   - Deploy the application directly into the Tomcat webapps directory.
 	    </echo>
 	</target>
@@ -309,6 +310,15 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 			<fileset dir="${build.dir}/war" />
 		</sync>
 	</target>
+	
+	<!-- ================================= 
+          target: war              
+         ================================= -->
+	<target name="war"
+	        depends="revisionInfo"
+	        description="--> Build the app and create a WAR file">
+		<jar basedir="${build.dir}/war" destfile="${build.dir}/${webapp.name}.war"/>
+	</target>
 
 	<!-- ================================= 
           target: licenser             
diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index 8c78f5224..5b20eaa21 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -234,6 +234,21 @@
 		</sync>
 	</target>
 
+	<!-- ================================= 
+          target: war              
+         ================================= -->
+	<target name="war" description="--> Build the app and create a WAR file">
+		<innercall target="revisionInfo" />
+		<antcall target="productWar" />
+	</target>
+
+	<!-- - - - - - - - - - - - - - - - - - 
+          target: productWar                      
+         - - - - - - - - - - - - - - - - - -->
+    <target name="productWar"  depends="productRevisionInfo">
+		<jar basedir="${build.dir}/war" destfile="${build.dir}/${webapp.name}.war"/>
+    </target>
+
 	<!-- ================================= 
           target: licenser