CSPACE-6527: Undeploy compiled .jasper report files.

diff --git a/services/report/3rdparty/build.xml b/services/report/3rdparty/build.xml
index 83c710cceae3bc393656fcc0fbfc5200f179f317..1176252aaec45d37a5753d661bcf471e0aa9cb12 100644 (file)
--- a/services/report/3rdparty/build.xml
+++ b/services/report/3rdparty/build.xml
@@ -107,34 +107,55 @@
         </exec>
     </target>
     
-    <!-- Preserve the legacy name for this target -->
+    <!-- 
+         Preserve the legacy name for this target, while noting that
+         legacy name is no longer descriptive of its purpose.
+     -->
     <target name="deploy_jasper_samples" depends="deploy_report_files" />
 
-    <target name="deploy_report_files" 
-        description="Copy report files to ${jee.server.cspace}/cspace/reports">
+    <target name="deploy_report_files"
+        description="Deploy report files">
         <copy todir="${jee.server.cspace}/cspace/reports" overwrite="true">
             <fileset dir="${basedir}/jasper-cs-report/src/main/resources"
                 includes="*.jrxml"/>
         </copy>
     </target>
+    
+    <target name="undeploy_report_files"
+      depends="undeploy_source_report_files,undeploy_compiled_report_files"
+      description="Undeploy report files">
+    </target>
+    
+    <target name="undeploy_source_report_files"
+      description="Undeploy source (.jrxml) report files">
+      <delete failonerror="false">
+        <fileset dir="${jee.server.cspace}/cspace/reports" includes="*.jrxml"/>
+      </delete>
+    </target>
+    
+    <target name="undeploy_compiled_report_files"
+      description="Undeploy compiled (.jasper) report files">
+      <delete failonerror="false">
+        <fileset dir="${jee.server.cspace}/cspace/reports" includes="*.jasper"/>
+      </delete>
+    </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_report_files" />
+    <target name="deploy" depends="install,deploy_source_report_files"
+      description="Deploy report-related artifacts">
+      <!--
+        The following ant call 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"/>
+      -->
     </target>
 
-    <target name="undeploy"
-    description="undeploy report from ${jee.server.nuxeo}">
-       <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
-       leaving this only for backwards compatibility reasons. -->
+    <target name="undeploy" depends="undeploy_compiled_report_files"
+      description="Undeploy report-related artifacts">
         <ant antfile="nuxeo-platform-cs-report/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
-    description="generate distribution for report" depends="package">
+    description="Generate distribution for report" depends="package">
         <ant antfile="nuxeo-platform-cs-report/build.xml" target="dist" inheritall="false"/>
     </target>
 

diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
index 272cfda25d138701db7997d1ce3efc514d6ab30b..6bc50b1e82fb763b4075e493a77b8da43067502f 100644 (file)
--- a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
@@ -120,14 +120,15 @@
 
     <target name="deploy" depends="install"
         description="deploy report doctype in ${jee.server.nuxeo}">
-        <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
-        leaving this only for backwards compatibility reasons. -->  
+        <!-- This target is obsolete. The Nuxeo artifacts are now created
+        and deployed using the "csmake" tool, leaving this legacy call
+        only for backwards compatibility reasons. -->  
         <copy file="${basedir}/target/${nuxeo.report.legacy.jar}"
             todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy report doctype from ${jee.server.nuxeo}">
+        description="undeploy report doctypes from ${jee.server.nuxeo}">
         <delete>
             <!-- Undeploy doctype and schema artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">