CSPACE-303 deploys datasource config and db scripts

diff --git a/build.xml b/build.xml
index bb1f2d327a50d685e8c48ed41410f922d6cff6fb..3c2c22b937d6596370330832e0587b74103f582b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -214,14 +214,25 @@
 \r
     <target name="deploy" depends="install"\r
     description="deploy services in ${jboss.server.cspace}">\r
-        <ant antfile="services/build.xml" target="deploy" inheritall="false"/>\r
+                <!-- copy db scripts, etc. -->\r
+        <copy todir="${jboss.server.cspace}/cspace/services">\r
+            <fileset dir="${src}/main/resources/scripts"/>\r
+        </copy>\r
+        <!-- copy datasources -->\r
+        <copy todir="${jboss.deploy.cspace}">\r
+            <fileset dir="${src}/main/resources/config"/>\r
+        </copy>\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="services/build.xml" target="deploy" inheritall="false"/>\r
+\r
     </target>\r
 \r
     <target name="undeploy"\r
     description="undeploy services from ${jboss.server.cspace}">\r
         <ant antfile="services/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
+        <delete file="${jboss.deploy.cspace}/cspace-ds.xml"/>\r
+        <delete dir="${jboss.server.cspace}/cspace/services"/>\r
     </target>\r
 \r
 \r