From 2c881d6852823e11d9b3ab7476e7ff3ecfc2417f Mon Sep 17 00:00:00 2001
From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Tue, 23 Feb 2010 22:43:13 +0000
Subject: [PATCH] NOJIRA - fixed deploy/undeploy tasks of account and
 authentication services

D    trunk/services/authentication/pstore/src/main/resources/db/mysql/test_authn.sql
A  + trunk/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
M    trunk/services/authentication/pstore/build.xml
M    trunk/services/account/pstore/build.xml
---
 services/account/pstore/build.xml                           | 4 ++++
 services/authentication/pstore/build.xml                    | 6 +++++-
 .../db/mysql/{test_authn.sql => test_authentication.sql}    | 0
 3 files changed, 9 insertions(+), 1 deletion(-)
 rename services/authentication/pstore/src/main/resources/db/mysql/{test_authn.sql => test_authentication.sql} (100%)

diff --git a/services/account/pstore/build.xml b/services/account/pstore/build.xml
index 64ffab32d..c3c9b43eb 100644
--- a/services/account/pstore/build.xml
+++ b/services/account/pstore/build.xml
@@ -194,6 +194,10 @@
 
     <target name="undeploy"
             description="undeploy account service from ${jboss.server.cspace}">
+        <delete>
+            <fileset dir="${jboss.server.cspace}/cspace/services/db/${db}"
+                     includes="**account**.sql"/>
+        </delete>
     </target>
 
     <target name="dist"
diff --git a/services/authentication/pstore/build.xml b/services/authentication/pstore/build.xml
index 242a6a0b0..2374ec50a 100644
--- a/services/authentication/pstore/build.xml
+++ b/services/authentication/pstore/build.xml
@@ -177,7 +177,7 @@
              url="jdbc:mysql://${db.host}:${db.port}/cspace"
              userid="${db.user}"
              password="${db.user.password}"
-             src="${db.script.dir}/test_authn.sql"
+             src="${db.script.dir}/test_authentication.sql"
              >
             <classpath>
                 <pathelement path="${db.driver.jar}"/>
@@ -194,6 +194,10 @@
 
     <target name="undeploy"
             description="undeploy authentication service from ${jboss.server.cspace}">
+        <delete>
+            <fileset dir="${jboss.server.cspace}/cspace/services/db/${db}"
+                     includes="**authentication**.sql"/>
+        </delete>
     </target>
 
     <target name="dist"
diff --git a/services/authentication/pstore/src/main/resources/db/mysql/test_authn.sql b/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
similarity index 100%
rename from services/authentication/pstore/src/main/resources/db/mysql/test_authn.sql
rename to services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
-- 
2.47.3