CSPACE-2902: Undeploy no longer halts if database script directory is missing from...

diff --git a/services/account/pstore/build.xml b/services/account/pstore/build.xml
index b5d5c5d08a3842d4bb100cd39ccc54f71305d5a9..c158ba18b02e11810a67d50ebdb50d326620b763 100644 (file)
--- a/services/account/pstore/build.xml
+++ b/services/account/pstore/build.xml
@@ -5,7 +5,7 @@
     </description>\r
     <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
-    <!-- enviornment should be declared before reading build.properties -->\r
+    <!-- environment should be declared before reading build.properties -->\r
     <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
@@ -193,9 +193,10 @@
     </target>\r
 \r
     <target name="undeploy"\r
-            description="undeploy account service from ${jboss.server.cspace}">\r
+            description="undeploy account service from ${jboss.server.cspace}"\r
+            depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">\r
         <delete>\r
-            <fileset dir="${jboss.server.cspace}/cspace/services/db/${db}"\r
+            <fileset dir="${db.scripts.deploy.dir}"\r
                      includes="**account**.sql"/>\r
         </delete>\r
     </target>\r
@@ -207,5 +208,12 @@
             <fileset dir="${src}/main/resources/"/>\r
         </copy>\r
     </target>\r
+    \r
+    <target name="check.db.scripts.deploy.dir">\r
+        <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>\r
+        <condition property="db.scripts.deploy.dir.exists">\r
+            <available file="${db.scripts.deploy.dir}" type="dir"/>\r
+        </condition>\r
+    </target>\r
 \r
 </project>\r

diff --git a/services/authentication/pstore/build.xml b/services/authentication/pstore/build.xml
index 28ec3fe27dfeaaea5fd0dd10d8133c7023f848cd..5d2473e151dcebd89841afc9b4c34fdf09150cdd 100644 (file)
--- a/services/authentication/pstore/build.xml
+++ b/services/authentication/pstore/build.xml
@@ -5,7 +5,7 @@
     </description>\r
     <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
-    <!-- enviornment should be declared before reading build.properties -->\r
+    <!-- environment should be declared before reading build.properties -->\r
     <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
@@ -193,9 +193,10 @@
     </target>\r
 \r
     <target name="undeploy"\r
-            description="undeploy authentication service from ${jboss.server.cspace}">\r
+            description="undeploy authentication service from ${jboss.server.cspace}"\r
+            depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">\r
         <delete>\r
-            <fileset dir="${jboss.server.cspace}/cspace/services/db/${db}"\r
+            <fileset dir="${db.scripts.deploy.dir}"\r
                      includes="**authentication**.sql"/>\r
         </delete>\r
     </target>\r
@@ -207,5 +208,12 @@
             <fileset dir="${src}/main/resources/"/>\r
         </copy>\r
     </target>\r
+    \r
+    <target name="check.db.scripts.deploy.dir">\r
+        <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>\r
+        <condition property="db.scripts.deploy.dir.exists">\r
+            <available file="${db.scripts.deploy.dir}" type="dir"/>\r
+        </condition>\r
+    </target>\r
 \r
 </project>\r

diff --git a/services/authorization/pstore/build.xml b/services/authorization/pstore/build.xml
index aeb887e437fe5ec257f65f351af9415593b06ec4..ad2bbcef01a2b5da6df32a3252f3410110111f7f 100644 (file)
--- a/services/authorization/pstore/build.xml
+++ b/services/authorization/pstore/build.xml
@@ -5,7 +5,7 @@
     </description>\r
     <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
-    <!-- enviornment should be declared before reading build.properties -->\r
+    <!-- environment should be declared before reading build.properties -->\r
     <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
@@ -204,9 +204,10 @@
     </target>\r
 \r
     <target name="undeploy"\r
-            description="undeploy authorization service from ${jboss.server.cspace}">\r
+            description="undeploy authorization service from ${jboss.server.cspace}"\r
+            depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">\r
         <delete>\r
-            <fileset dir="${jboss.server.cspace}/cspace/services/db/${db}"\r
+            <fileset dir="${db.scripts.deploy.dir}"\r
                      includes="**authorization**.sql"/>\r
         </delete>\r
     </target>\r
@@ -218,5 +219,12 @@
             <fileset dir="${src}/main/resources/"/>\r
         </copy>\r
     </target>\r
+    \r
+    <target name="check.db.scripts.deploy.dir">\r
+        <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>\r
+        <condition property="db.scripts.deploy.dir.exists">\r
+            <available file="${db.scripts.deploy.dir}" type="dir"/>\r
+        </condition>\r
+    </target>\r
 \r
 </project>\r