From c5b285d2920cd67b59c4e5d99b3cb2c533f9dd0a Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 13 Aug 2013 16:45:54 -0700
Subject: [PATCH] CSPACE-6142: 'ant undeploy' will no longer fail if the
 $CATALINA_HOME/nuxeo-server/bundles directory is not present.

---
 .../3rdparty/nuxeo-platform-cs-acquisition/build.xml          | 4 +++-
 services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml       | 4 +++-
 .../citation/3rdparty/nuxeo-platform-cs-citation/build.xml    | 4 +++-
 .../nuxeo-platform-collectionobject-lifesci/build.xml         | 4 +++-
 .../3rdparty/nuxeo-platform-cs-collectionobject/build.xml     | 4 +++-
 services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml | 4 +++-
 services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml | 4 +++-
 services/group/3rdparty/nuxeo-platform-cs-group/build.xml     | 4 +++-
 services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml   | 4 +++-
 services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml   | 4 +++-
 services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml | 4 +++-
 .../location/3rdparty/nuxeo-platform-cs-location/build.xml    | 4 +++-
 services/media/3rdparty/nuxeo-platform-cs-media/build.xml     | 4 +++-
 .../movement/3rdparty/nuxeo-platform-cs-movement/build.xml    | 4 +++-
 .../3rdparty/nuxeo-platform-cs-objectexit/build.xml           | 4 +++-
 .../3rdparty/nuxeo-platform-cs-organization/build.xml         | 4 +++-
 services/person/3rdparty/nuxeo-platform-cs-person/build.xml   | 4 +++-
 services/place/3rdparty/nuxeo-platform-cs-place/build.xml     | 4 +++-
 services/report/3rdparty/nuxeo-platform-cs-report/build.xml   | 4 +++-
 .../taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml    | 4 +++-
 .../3rdparty/nuxeo-platform-cs-vocabulary/build.xml           | 4 +++-
 services/work/3rdparty/nuxeo-platform-cs-work/build.xml       | 4 +++-
 22 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index 8cc890bb5..0196c2a2a 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.acquisition.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.acquisition.legacy.jars.all}"/>
             </fileset>
diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
index 5f5d2b5da..17fde560d 100644
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.blob.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.blob.legacy.jars.all}"/>
             </fileset>
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
index 19fee4a31..dbdbd2ea3 100644
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.citation.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.citation.legacy.jars.all}"/>
             </fileset>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index c85a19c9f..24248f586 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -146,7 +146,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>
             </fileset>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index b8bbd3849..9bdc786cf 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -144,7 +144,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.collectionobject.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.collectionobject.legacy.jars.all}"/>
             </fileset>
diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
index a49c5cc13..274e1dd0d 100644
--- a/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
+++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.concept.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.concept.legacy.jars.all}"/>
             </fileset>
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
index 574f331ba..2af2b9b9e 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
@@ -142,7 +142,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.contact.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.contact.legacy.jars.all}"/>
             </fileset>
diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
index 0c4af8cd2..ed94bf6db 100644
--- a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.group.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.group.legacy.jars.all}"/>
             </fileset>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index 7676d6156..951e6df41 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.intake.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.intake.legacy.jars.all}"/>
             </fileset>
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
index 4e9ffaa78..28983ab61 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
@@ -141,7 +141,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.loanin.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.loanin.legacy.jars.all}"/>
             </fileset>
diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
index 1ef7df008..c09c9ec0e 100644
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.loanout.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.loanout.legacy.jars.all}"/>
             </fileset>
diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
index 8818f707d..6e387977e 100644
--- a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.location.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.location.legacy.jars.all}"/>
             </fileset>
diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
index 745b97b15..428c9bda9 100644
--- a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.media.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.media.legacy.jars.all}"/>
             </fileset>
diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
index 8e0a404c3..b1f4dbf2c 100644
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.movement.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.movement.legacy.jars.all}"/>
             </fileset>
diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
index a9fa6b0d1..978cd39b6 100644
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.objectexit.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.objectexit.legacy.jars.all}"/>
             </fileset>
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
index e999a19a4..8e68acda0 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.organization.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.organization.legacy.jars.all}"/>
             </fileset>
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
index 0be228b4c..4a8c55c28 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.person.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.person.legacy.jars.all}"/>
             </fileset>
diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/build.xml b/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
index 54f7d28bd..bf6b21a0b 100644
--- a/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
+++ b/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.place.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.place.legacy.jars.all}"/>
             </fileset>
diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
index fac250cfc..abc0fe953 100644
--- a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.report.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.report.legacy.jars.all}"/>
             </fileset>
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
index 9950070e6..0d90d72d6 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
@@ -142,7 +142,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.taxonomy.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.taxonomy.legacy.jars.all}"/>
             </fileset>
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 00654c46e..1dbd248e4 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -142,7 +142,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.vocabulary.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.vocabulary.legacy.jars.all}"/>
             </fileset>
diff --git a/services/work/3rdparty/nuxeo-platform-cs-work/build.xml b/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
index 43cf9aac0..692a4f7b3 100644
--- a/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
+++ b/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
@@ -140,7 +140,9 @@
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.work.legacy.jars.all}"/>
             </fileset>
-            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.work.legacy.jars.all}"/>
             </fileset>
-- 
2.47.3