From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 14 Feb 2014 01:03:48 +0000 (-0800)
Subject: CSPACE-6304: Added 'overwrite=true' to deterministically ensure that .jrxml files... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=07096e7a5c1df3108687f7ab6aed04d78ec584ee;p=tmp%2Fjakarta-migration.git

CSPACE-6304: Added 'overwrite=true' to deterministically ensure that .jrxml files in the Services source code tree always overwrite any identically-named files in the target destination on an 'ant deploy'.
---

diff --git a/services/report/3rdparty/build.xml b/services/report/3rdparty/build.xml
index c5d63353c..4051538af 100644
--- a/services/report/3rdparty/build.xml
+++ b/services/report/3rdparty/build.xml
@@ -106,21 +106,24 @@
             <arg value="${mvn.opts}" />
         </exec>
     </target>
+    
+    <!-- Preserve the legacy name for this target -->
+    <target name="deploy_jasper_samples" depends="deploy_report_files" />
 
-		<target name="deploy_jasper_samples" 
-			description="Copy sample jasper files to ${jee.server.cspace}/cspace/reports">
-        <copy todir="${jee.server.cspace}/cspace/reports">
-					<fileset dir="${basedir}/jasper-cs-report/src/main/resources"
-									includes="*.jrxml"/>
+    <target name="deploy_report_files" 
+        description="Copy report files to ${jee.server.cspace}/cspace/reports">
+        <copy todir="${jee.server.cspace}/cspace/reports" overwrite="true">
+            <fileset dir="${basedir}/jasper-cs-report/src/main/resources"
+                includes="*.jrxml"/>
         </copy>
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy report in ${jee.server.nuxeo}">
-    	<!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
-        <ant antfile="nuxeo-platform-cs-report/build.xml" target="deploy" inheritall="false"/>
-		-->
-		<antcall target="deploy_jasper_samples" />
+        description="deploy report in ${jee.server.nuxeo}">
+        <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+            <ant antfile="nuxeo-platform-cs-report/build.xml" target="deploy" inheritall="false"/>
+        -->
+        <antcall target="deploy_report_files" />
     </target>
 
     <target name="undeploy"