From f6f88ecc7fd6e6c1b70be458061bfc951f68372e Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 5 Sep 2013 17:59:47 -0700
Subject: [PATCH] CSPACE-6178: Removing two additional Ant directives missed
 during first pass.

---
 .../nuxeo-platform-collectionobject-lifesci/build.xml      | 7 ++-----
 .../3rdparty/nuxeo-platform-person-lifesci/build.xml       | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index 639c3b797..01760d33a 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -133,11 +133,8 @@
     <target name="undeploy"
         description="undeploy collectionobject doctype from ${jee.server.nuxeo}">
         <delete>
-            <!-- Doctype JAR(s) are removed via the 'undeploy' Ant target in the -->
-            <!-- buildfile for the common schema -->
-            <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.collectionobject.schema.naturalhistory.jars.all}"/>
-            </fileset>
+            <!-- Both doctype and schema JAR(s) are removed via the 'undeploy' target -->
+            <!-- in another Ant buildfile, in a peer module to this module -->
             <!-- Undeploy legacy artifacts -->
             <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
             <!-- Ant buildfile for the common schema -->
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml b/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
index 13ef235e0..f75f1305c 100644
--- a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
@@ -131,11 +131,8 @@
     <target name="undeploy"
         description="undeploy person doctype from ${jee.server.nuxeo}">
         <delete>
-            <!-- Doctype JAR(s) are removed via the 'undeploy' Ant target in the -->
-            <!-- buildfile for the common schema -->
-            <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.person.schema.naturalhistory.jars.all}"/>
-            </fileset>
+            <!-- Both doctype and schema JAR(s) are removed via the 'undeploy' target -->
+            <!-- in another Ant buildfile, in a peer module to this module -->
             <!-- Undeploy legacy artifacts -->
             <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
             <!-- Ant buildfile for the common schema -->
-- 
2.47.3