NIHVIVO-56 Use copy with override to be sure that the product modifications will override any existing files of the same names.

This commit is contained in:
jeb228 2010-02-22 16:45:54 +00:00
parent cbfe1940a6
commit 19ff6ea2fd

View file

@ -118,21 +118,21 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
target: productCopy target: productCopy
- - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - -->
<target name="productCopy" depends="copyEtc, test"> <target name="productCopy" depends="copyEtc, test">
<copy todir="${build.dir}/war/themes"> <copy todir="${build.dir}/war/themes" overwrite="true">
<fileset dir="${product.themes.dir}" /> <fileset dir="${product.themes.dir}" />
</copy> </copy>
<!-- TODO: Have the Jena code read the userId directly from the deploy.properties --> <!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
<copy file="config/vitroUsers.owl.template" <copy file="config/vitroUsers.owl.template"
tofile="${build.dir}/war/WEB-INF/ontologies/auth/vitroUsers.owl" tofile="${build.dir}/war/WEB-INF/ontologies/auth/vitroUsers.owl"
filtering="true"> filtering="true" overwrite="true">
<filterchain> <filterchain>
<expandproperties /> <expandproperties />
</filterchain> </filterchain>
</copy> </copy>
<!-- TODO: Have the Jena code read the userId directly from the deploy.properties --> <!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
<copy todir="${build.dir}/war"> <copy todir="${build.dir}/war" overwrite="true">
<fileset dir="${product.modifications.dir}" /> <fileset dir="${product.modifications.dir}" />
</copy> </copy>
</target> </target>