From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 29 Sep 2010 02:48:15 +0000 (+0000)
Subject: CSPACE-2902: Undeploy no longer halts if database script directory is missing from... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9584f252b244672f27584a38061fda0546e9df73;p=tmp%2Fjakarta-migration.git

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

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