CSPACE-6304: Added 'overwrite=true' to deterministically ensure that .jrxml files...

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