litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1229 Move the revision info file into WEB-INF/resources

Browse source
This commit is contained in:
jeb228 2010-10-25 21:29:25 +00:00
parent 44ebaa9bae
commit bc86f50c5b
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/build.xml
View file

@ -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}" />

3
webapp/product-build.xml
View file

@ -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"