From bc86f50c5b4243b62e1f92768afe3c9b6b724757 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 25 Oct 2010 21:29:25 +0000
Subject: [PATCH] NIHVIVO-1229 Move the revision info file into
 WEB-INF/resources

---
 webapp/build.xml         | 4 +++-
 webapp/product-build.xml | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/build.xml b/webapp/build.xml
index 461cee705..4ec75277c 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -19,6 +19,7 @@
 	<property name="war.dir" location="${build.dir}/war" />
 	<property name="war-webinf.dir" location="${war.dir}/WEB-INF" />
 	<property name="war-classes.dir" location="${war-webinf.dir}/classes" />
+	<property name="war-resources.dir" location="${war-webinf.dir}/resources" />
 	<property name="war-lib.dir" location="${war-webinf.dir}/lib" />
 
 	<property name="test-classes.dir" location="${build.dir}/testclasses" />
@@ -125,6 +126,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 	<target name="prepare" depends="properties">
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${war-classes.dir}" />
+		<mkdir dir="${war-resources.dir}" />
 		<mkdir dir="${test-classes.dir}" />
 
 		<!-- copy the themes into the war directory. -->
@@ -259,7 +261,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
          ================================= -->
 	<target name="revisionInfo" depends="test" description="--> Store revision info in build">
 		<property name="revisionInfo.product.dir" location="${ant.file.vitroCore}/.." />
-		<property name="revisionInfo.build.file" location="${war-classes.dir}/revisionInfo.txt" />
+		<property name="revisionInfo.build.file" location="${war-resources.dir}/revisionInfo.txt" />
 
 		<delete file="${revisionInfo.build.file}" />
 
diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index 211d0100c..036873f24 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -32,6 +32,7 @@
 	<property name="war.dir" location="${build.dir}/war" />
 	<property name="war-webinf.dir" location="${war.dir}/WEB-INF" />
 	<property name="war-classes.dir" location="${war-webinf.dir}/classes" />
+	<property name="war-resources.dir" location="${war-webinf.dir}/resources" />
 	<property name="war-lib.dir" location="${war-webinf.dir}/lib" />
 	<property name="test-classes.dir" location="${build.dir}/testclasses" />
 	<property name="servletjars.dir" location="${build.dir}/servletjars" />
@@ -194,7 +195,7 @@
          - - - - - - - - - - - - - - - - - -->
     <target name="productRevisionInfo" depends="productTest">
 		<property name="revisionInfo.product.dir" location="${ant.file}/.." />
-		<property name="revisionInfo.build.file" location="${war-classes.dir}/revisionInfo.txt" />
+		<property name="revisionInfo.build.file" location="${war-resources.dir}/revisionInfo.txt" />
 
 		<java classname="edu.cornell.mannlib.vitro.utilities.revisioninfo.RevisionInfoBuilder"
 		      fork="no"