From ba66a43bd625de12cd33cfeabedb17a928cbee29 Mon Sep 17 00:00:00 2001
From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Tue, 24 Nov 2009 22:38:32 +0000
Subject: [PATCH] NOJIRA create_db made recursive. create_db now exists for id,
 account and authentication services in addition to trunk. Update local
 build.properties to incorporate new JDBC related properties from this
 checkin. Deploy now also copies db scripts to destination domain. tests: ant
 create_db at trunk mvn test at service

M    trunk/services/authentication/service/build.xml
M    trunk/services/authentication/build.xml
M    trunk/services/id/service/build.xml
M    trunk/services/id/build.xml
M    trunk/services/account/build.xml
A    trunk/services/account/client/build.xml
M    trunk/services/build.xml
M    trunk/nbproject/private/private.xml
A  + trunk/src/main/resources/db
D    trunk/src/main/resources/scripts/db
M    trunk/build.properties
M    trunk/build.xml
---
 build.properties                              |  10 +-
 build.xml                                     |  15 +-
 nbproject/private/private.xml                 |  12 +-
 services/account/build.xml                    |   7 +-
 services/account/client/build.xml             | 142 ++++++++++++++++++
 services/authentication/build.xml             |   6 +
 services/authentication/service/build.xml     |  32 +++-
 services/build.xml                            |  11 +-
 services/id/build.xml                         |   5 +
 services/id/service/build.xml                 |  30 +++-
 .../{scripts => }/db/mysql/init_db.sql        |   0
 .../{scripts => }/db/mysql/service-dump.sql   |   0
 12 files changed, 246 insertions(+), 24 deletions(-)
 create mode 100644 services/account/client/build.xml
 rename src/main/resources/{scripts => }/db/mysql/init_db.sql (100%)
 rename src/main/resources/{scripts => }/db/mysql/service-dump.sql (100%)

diff --git a/build.properties b/build.properties
index 4479f23b1..956127b9e 100644
--- a/build.properties
+++ b/build.properties
@@ -36,7 +36,7 @@ dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
 #jboss
 #assumption: both nuxeo and cspace domains are using the same JBoss installation
 jboss.release=jboss-4.2.3.GA
-jboss.dir=C:/dev/${jboss.release}
+jboss.dir=/home/sanjaydalal/work/${jboss.release}
 jboss.home=${jboss.dir}
 
 #jboss cspace domain
@@ -55,3 +55,11 @@ jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy
 jboss.lib.nuxeo=${jboss.server.nuxeo}/lib
 jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}
 
+#database
+db=mysql
+db.script.dir=${basedir}/src/main/resources/db/${db}
+db.user=root
+db.user.password=admin
+db.host=localhost
+db.port=3306
+db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 4cbc54949..7af82a079 100644
--- a/build.xml
+++ b/build.xml
@@ -8,10 +8,6 @@
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
 
-    <property name="db" value="mysql"/>
-    <property name="db.script.dir" location="${basedir}/src/main/resources/scripts/db/${db}"/>
-
-
     <condition property="osfamily-unix">
         <os family="unix" />
     </condition>
@@ -203,22 +199,23 @@
     <target name="create_db"
     description="create database(s), grant privileges to test users">
         <sql driver="com.mysql.jdbc.Driver"
-        url="jdbc:mysql://localhost:3306/cspace"
-        userid="root"
-        password=""
+        url="jdbc:mysql://${db.host}:${db.port}/cspace"
+        userid="${db.user}"
+        password="${db.user.password}"
         src="${db.script.dir}/init_db.sql"
         >
             <classpath>
-                <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>
+                <pathelement path="${db.driver.jar}"/>
             </classpath>
         </sql>
+        <ant antfile="services/build.xml" target="create_db" inheritAll="false"/>
     </target>
 
     <target name="deploy" depends="install"
     description="deploy services in ${jboss.server.cspace}">
                 <!-- copy db scripts, etc. -->
         <copy todir="${jboss.server.cspace}/cspace/services">
-            <fileset dir="${src}/main/resources/scripts"/>
+            <fileset dir="${src}/main/resources/"/>
         </copy>
         <!-- copy datasources -->
         <copy todir="${jboss.deploy.cspace}">
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 392f2c6e0..c1f155a78 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -1,8 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/C:/dev/src/cs/src/services/trunk/build.xml</file>
-        <file>file:/C:/dev/src/cs/src/services/trunk/pom.xml</file>
-    </open-files>
-</project-private>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+</project-private>
diff --git a/services/account/build.xml b/services/account/build.xml
index 445894e2f..6c5a6f903 100644
--- a/services/account/build.xml
+++ b/services/account/build.xml
@@ -105,6 +105,11 @@
         </exec>
     </target>
 
+    <target name="create_db"
+    description="create tables(s), indices for account service">
+        <ant antfile="client/build.xml" target="create_db" inheritAll="false"/>
+    </target>
+
     <target name="deploy" depends="install"
     description="deploy collectionobject service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
@@ -117,7 +122,7 @@
 
     <target name="dist" depends="package"
     description="distribute collectionobject service}">
-        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="client/build.xml" target="dist" inheritall="false"/>
     </target>
 
 </project>
diff --git a/services/account/client/build.xml b/services/account/client/build.xml
new file mode 100644
index 000000000..1a316e46e
--- /dev/null
+++ b/services/account/client/build.xml
@@ -0,0 +1,142 @@
+
+<project name="account.client" default="package" basedir=".">
+    <description>
+        collectionspace account service
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../.."/>
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="" />
+    <property name="src" location="src"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init">
+    <!-- Create the time stamp -->
+        <tstamp/>
+    </target>
+
+
+    <target name="package" depends="package-unix,package-windows"
+  description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="install" depends="package,install-unix,install-windows"
+  description="Install" />
+    <target name="install-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="install-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    
+    <target name="clean" depends="clean-unix,clean-windows"
+  description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="create_db"
+    description="create tables(s), indices for account service">
+        <sql driver="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db.host}:${db.port}/cspace"
+        userid="${db.user}"
+        password="${db.user.password}"
+        src="${db.script.dir}/account.sql"
+        >
+            <classpath>
+                <pathelement path="${db.driver.jar}"/>
+            </classpath>
+        </sql>
+    </target>
+    <target name="deploy" depends="install"
+    description="deploy account service in ${jboss.server.cspace}">
+        <copy todir="${jboss.server.cspace}/cspace/services">
+            <fileset dir="${src}/main/resources/"/>
+        </copy>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy account service from ${jboss.server.cspace}">
+    </target>
+
+    <target name="dist"
+    description="generate distribution for account service" depends="package">
+        <!-- copy db scripts, etc. -->
+        <copy todir="${services.trunk}/${dist.server.cspace}/cspace/services">
+            <fileset dir="${src}/main/resources/"/>
+        </copy>
+    </target>
+
+</project>
diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index 16f15b573..5a88b75ae 100644
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -105,6 +105,12 @@
         </exec>
     </target>
 
+
+    <target name="create_db"
+    description="create tables(s), indices for authentication service">
+        <ant antfile="service/build.xml" target="create_db" inheritAll="false"/>
+    </target>
+
     <target name="deploy" depends="install"
     description="deploy authentication service">
         <ant antfile="service/build.xml" target="deploy" inheritall="false"/>
diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml
index 5df18f8b3..374b8c71f 100644
--- a/services/authentication/service/build.xml
+++ b/services/authentication/service/build.xml
@@ -1,5 +1,5 @@
 
-<project name="authentication" default="package" basedir=".">
+<project name="authentication.service" default="package" basedir=".">
     <description>
         collectionspace authentication service
     </description>
@@ -108,9 +108,35 @@
         </exec>
     </target>
 
+    <target name="create_db"
+    description="create tables(s), indices for authentication service">
+        <sql driver="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db.host}:${db.port}/cspace"
+        userid="${db.user}"
+        password="${db.user.password}"
+        src="${db.script.dir}/authentication.sql"
+        >
+            <classpath>
+                <pathelement path="${db.driver.jar}"/>
+            </classpath>
+        </sql>
+        <sql driver="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db.host}:${db.port}/cspace"
+        userid="${db.user}"
+        password="${db.user.password}"
+        src="${db.script.dir}/test_authn.sql"
+        >
+            <classpath>
+                <pathelement path="${db.driver.jar}"/>
+            </classpath>
+        </sql>
+    </target>
     <target name="deploy" depends="install"
     description="deploy authentication service in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>
+        <copy todir="${jboss.server.cspace}/cspace/services">
+            <fileset dir="${src}/main/resources/"/>
+        </copy>
         <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>
         <echo message="Make sure cspace-ds.xml exists in ${jboss.server.cspace}/deploy"/>
     </target>
@@ -126,6 +152,10 @@
         <copy todir="${services.trunk}/${dist.lib.cspace}">
             <fileset file="${basedir}/target/${authentication.jar}"/>
         </copy>
+        <!-- copy db scripts, etc. -->
+        <copy todir="${services.trunk}/${dist.server.cspace}/cspace/services">
+            <fileset dir="${src}/main/resources/"/>
+        </copy>
     </target>
 
 </project>
diff --git a/services/build.xml b/services/build.xml
index 3902c2ecb..82d6a92f0 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -104,6 +104,13 @@
         </exec>
     </target>
 
+    <target name="create_db"
+    description="create service-specific tables(s), indices, etc.">
+        <ant antfile="authentication/build.xml" target="create_db" inheritAll="false"/>
+        <ant antfile="account/build.xml" target="create_db" inheritAll="false"/>
+        <ant antfile="id/build.xml" target="create_db" inheritAll="false"/>
+    </target>
+
     <!-- this target is called in order based on the dependencies between the services -->
     <target name="deploy" depends="install"
     description="deploy services in ${jboss.server.cspace}">
@@ -161,7 +168,7 @@
         </copy>
         <ant antfile="id/build.xml" target="dist_installer" inheritAll="false"/>
         <ant antfile="collectionobject/build.xml" target="dist_installer" inheritAll="false"/>
-        <ant antfile="vocabulary/build.xml" target="dist_installer" inheritAll="false"/>    
+        <ant antfile="vocabulary/build.xml" target="dist_installer" inheritAll="false"/>
 <!--
         <ant antfile="common/build.xml" target="dist_installer" inheritAll="false"/>
         <ant antfile="authentication/build.xml" target="dist_installer" inheritAll="false"/>
@@ -170,7 +177,7 @@
         <ant antfile="acquisition/build.xml" target="dist_installer" inheritAll="false"/>
         <ant antfile="JaxRsServiceProvider/build.xml" target="dist_installer" inheritAll="false"/>
 -->        
-    </target>    
+    </target>
 
     
 </project>
diff --git a/services/id/build.xml b/services/id/build.xml
index 56d6c5c28..7f6bba48a 100644
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -104,6 +104,11 @@
         </exec>
     </target>
 
+    <target name="create_db"
+    description="create tables(s), indices for id service">
+        <ant antfile="service/build.xml" target="create_db" inheritAll="false"/>
+    </target>
+
     <target name="deploy" depends="install"
     description="deploy id service">
         <ant antfile="service/build.xml" target="deploy" inheritall="false"/>
diff --git a/services/id/service/build.xml b/services/id/service/build.xml
index e20419d33..c7fe75a8d 100644
--- a/services/id/service/build.xml
+++ b/services/id/service/build.xml
@@ -1,5 +1,5 @@
 
-<project name="id" default="package" basedir=".">
+<project name="id.service" default="package" basedir=".">
     <description>
         id service
     </description>
@@ -8,7 +8,6 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="id.jar" value="collectionspace-services-id.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -106,8 +105,35 @@
         </exec>
     </target>
 
+    <target name="create_db"
+    description="create tables(s), indices for id service">
+        <sql driver="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db.host}:${db.port}/cspace"
+        userid="${db.user}"
+        password="${db.user.password}"
+        src="${db.script.dir}/create_id_generators_table.sql"
+        >
+            <classpath>
+                <pathelement path="${db.driver.jar}"/>
+            </classpath>
+        </sql>
+        <sql driver="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db.host}:${db.port}/cspace"
+        userid="${db.user}"
+        password="${db.user.password}"
+        src="${db.script.dir}/load_id_generators.sql"
+        >
+            <classpath>
+                <pathelement path="${db.driver.jar}"/>
+            </classpath>
+        </sql>
+    </target>
+
     <target name="deploy" depends="install"
     description="deploy id service">
+        <copy todir="${jboss.server.cspace}/cspace/services">
+            <fileset dir="${src}/main/resources/"/>
+        </copy>
     </target>
 
     <target name="undeploy"
diff --git a/src/main/resources/scripts/db/mysql/init_db.sql b/src/main/resources/db/mysql/init_db.sql
similarity index 100%
rename from src/main/resources/scripts/db/mysql/init_db.sql
rename to src/main/resources/db/mysql/init_db.sql
diff --git a/src/main/resources/scripts/db/mysql/service-dump.sql b/src/main/resources/db/mysql/service-dump.sql
similarity index 100%
rename from src/main/resources/scripts/db/mysql/service-dump.sql
rename to src/main/resources/db/mysql/service-dump.sql
-- 
2.47.3