From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Thu, 17 Dec 2009 21:29:06 +0000 (+0000)
Subject: NOJIRA moved db script generation and create_db tasks out of account.client and authe... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e42ef77846140e4f5f676425c0198d7df4aafa42;p=tmp%2Fjakarta-migration.git

NOJIRA moved db script generation and create_db tasks out of account.client and authentication.client to account.pstore and authentication.pstore
Added gen_ddl task at trunk level and service.main levels


M    trunk/services/authentication/pom.xml
AM   trunk/services/authentication/pstore
A    trunk/services/authentication/pstore/src
A    trunk/services/authentication/pstore/src/test
A    trunk/services/authentication/pstore/src/test/resources
A    trunk/services/authentication/pstore/src/test/resources/META-INF
A    trunk/services/authentication/pstore/src/test/resources/META-INF/persistence.xml
A    trunk/services/authentication/pstore/src/test/resources/log4j.properties
A    trunk/services/authentication/pstore/src/test/resources/hibernate.cfg.xml
A    trunk/services/authentication/pstore/src/main
A    trunk/services/authentication/pstore/src/main/resources
A  + trunk/services/authentication/pstore/src/main/resources/db
A    trunk/services/authentication/pstore/pom.xml
A    trunk/services/authentication/pstore/build.xml
D    trunk/services/authentication/client/src/main/resources/db
M    trunk/services/authentication/client/pom.xml
M    trunk/services/authentication/client/build.xml
M    trunk/services/authentication/build.xml
M    trunk/services/account/pom.xml
A    trunk/services/account/pstore
A    trunk/services/account/pstore/src
A    trunk/services/account/pstore/src/test
A    trunk/services/account/pstore/src/test/resources
A    trunk/services/account/pstore/src/test/resources/META-INF
A    trunk/services/account/pstore/src/test/resources/META-INF/persistence.xml
A    trunk/services/account/pstore/src/test/resources/log4j.properties
A    trunk/services/account/pstore/src/test/resources/hibernate.cfg.xml
A    trunk/services/account/pstore/src/main
A    trunk/services/account/pstore/src/main/resources
A    trunk/services/account/pstore/src/main/resources/db
A    trunk/services/account/pstore/src/main/resources/db/mysql
A  + trunk/services/account/pstore/src/main/resources/db/mysql/test_account.sql
A  + trunk/services/account/pstore/src/main/resources/db/mysql/account.sql
A    trunk/services/account/pstore/pom.xml
A    trunk/services/account/pstore/build.xml
M    trunk/services/account/build.xml
D    trunk/services/account/client/src/main/resources/db/mysql/test_account.sql
D    trunk/services/account/client/src/main/resources/db/mysql/account.sql
M    trunk/services/account/client/pom.xml
M    trunk/services/account/client/build.xml
M    trunk/services/build.xml
M    trunk/build.xml
---

diff --git a/build.xml b/build.xml
index 4f4e1888e..e16026705 100644
--- a/build.xml
+++ b/build.xml
@@ -18,20 +18,20 @@
     </condition>
 
     <target name="init">
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </target>
 
     <target name="dist" depends="package"
-    description="generate cspace service distribution">
+            description="generate cspace service distribution">
         <!-- Create the distribution directory -->
         <mkdir dir="${basedir}/dist"/>
-        
+
         <!-- copy db scripts, etc. -->
         <copy todir="${basedir}/${dist.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/scripts"/>
         </copy>
-        
+
         <!-- copy datasources -->
         <copy todir="${basedir}/${dist.deploy.cspace}">
             <fileset dir="${src}/main/resources/config"/>
@@ -42,19 +42,19 @@
         <!-- bundle up everything -->
         <tar destfile="${basedir}/dist/${cspace.services.release}-${jboss.release}.tar.gz" compression="gzip">
             <tarfileset dir="${basedir}/dist/cspace"
-              preserveLeadingSlashes="true">
+                        preserveLeadingSlashes="true">
             </tarfileset>
         </tar>
     </target>
 
     <target name="dist-jboss-domains" depends="init"
-    description="create jboss distributions for cspace and nuxeo">
+            description="create jboss distributions for cspace and nuxeo">
         <antcall target="dist-jboss-cspace"/>
         <antcall target="dist-jboss-nuxeo"/>
     </target>
 
     <target name="dist-jboss-cspace" depends="dist"
-    description="generate jboss distribution for cspace">
+            description="generate jboss distribution for cspace">
         <fail message="JBoss is not installed or ${jboss.dir} not found">
             <condition>
                 <not>
@@ -73,17 +73,17 @@
 
         <tar destfile="${basedir}/dist/${jboss.release}-${domain.cspace}-${cspace.release}.tar.gz" compression="gzip">
             <tarfileset dir="${jboss.dir}"
-            prefix="${jboss.release}"
-              preserveLeadingSlashes="true">
+                        prefix="${jboss.release}"
+                        preserveLeadingSlashes="true">
                 <exclude name="server/${jboss.domain.nuxeo}/**"/>
                 <exclude name="server/${jboss.domain.cspace}/log/**"/>
                 <exclude name="server/${jboss.domain.cspace}/tmp/**"/>
             </tarfileset>
         </tar>
     </target>
-    
+
     <target name="dist-jboss-nuxeo" depends="dist"
-        description="generate nuxeo domain distribution" >
+            description="generate nuxeo domain distribution" >
         <fail message="JBoss is not installed or ${jboss.dir} not found">
             <condition>
                 <not>
@@ -102,8 +102,8 @@
 
         <tar destfile="${basedir}/dist/${jboss.release}-${domain.nuxeo}-${nuxeo.release}.tar.gz" compression="gzip">
             <tarfileset dir="${jboss.dir}"
-              prefix="${jboss.release}"
-              preserveLeadingSlashes="true">
+                        prefix="${jboss.release}"
+                        preserveLeadingSlashes="true">
                 <exclude name="server/${jboss.domain.cspace}/**"/>
                 <exclude name="server/${jboss.domain.nuxeo}/log/**"/>
                 <exclude name="server/${jboss.domain.nuxeo}/tmp/**"/>
@@ -112,7 +112,7 @@
     </target>
 
     <target name="package" depends="package-unix,package-windows"
-  description="mvn package" />
+            description="mvn package" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -137,7 +137,7 @@
     </target>
 
     <target name="install" depends="package,install-unix,install-windows"
-  description="mvn install" />
+            description="mvn install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -163,7 +163,7 @@
 
 
     <target name="clean" depends="clean-unix,clean-windows"
-  description="Delete target directories" >
+            description="Delete target directories" >
         <delete dir="${basedir}/build"/>
         <delete dir="${basedir}/dist"/>
     </target>
@@ -198,24 +198,30 @@
         </exec>
     </target>
 
+    <target name="gen_ddl"
+            description="generate service-specific tables(s), indices, etc.">
+        <ant antfile="services/build.xml" target="gen_ddl" inheritAll="false"/>
+    </target>
+
     <target name="create_db"
-    description="create database(s), grant privileges to test users">
+            description="create database(s), grant privileges to test users">
         <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}/init_db.sql"
-        >
+             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="${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. -->
+            description="deploy services in ${jboss.server.cspace}">
+        <!-- copy db scripts, etc. -->
         <copy todir="${jboss.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/"/>
         </copy>
@@ -229,7 +235,7 @@
     </target>
 
     <target name="undeploy"
-    description="undeploy services from ${jboss.server.cspace}">
+            description="undeploy services from ${jboss.server.cspace}">
         <ant antfile="services/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritAll="false"/>
         <delete failonerror="false"  file="${jboss.deploy.cspace}/cspace-ds.xml"/>
@@ -239,7 +245,7 @@
 
 
     <target name="hotdeploy" depends="install"
-    description="deploy services in running ${jboss.server.cspace}">
+            description="deploy services in running ${jboss.server.cspace}">
         <ant antfile="services/build.xml" target="hotdeploy" inheritAll="false"/>
     </target>
 
@@ -263,7 +269,7 @@
     </target>
 
     <target name="dist_installer" depends="package"
-    	description="Installer: Creates an installer distribution for the CollectionSpace services.">
+            description="Installer: Creates an installer distribution for the CollectionSpace services.">
         <!-- copy install scripts, etc. -->
         <copy todir="${basedir}/${dist.installer}">
             <fileset file="${basedir}/build.properties"/>
diff --git a/services/account/build.xml b/services/account/build.xml
index cf82f7bd7..7ba51d58e 100644
--- a/services/account/build.xml
+++ b/services/account/build.xml
@@ -3,7 +3,7 @@
     <description>
         collectionobject service
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
     <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
@@ -20,8 +20,8 @@
     </condition>
 
     <target name="package" depends="package-unix,package-windows"
-  description="Package CollectionSpace Services" />
-  
+            description="Package CollectionSpace Services" />
+
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -32,7 +32,7 @@
             <arg value="${mvn.opts}" />
         </exec>
     </target>
-    
+
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
@@ -48,7 +48,7 @@
 
 
     <target name="install" depends="package,install-unix,install-windows"
-  description="Install" />
+            description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -73,7 +73,7 @@
     </target>
 
     <target name="clean" depends="clean-unix,clean-windows"
-  description="Delete target directories" >
+            description="Delete target directories" >
         <delete dir="${build}"/>
     </target>
     <target name="clean-unix" if="osfamily-unix">
@@ -107,24 +107,29 @@
         </exec>
     </target>
 
+    <target name="gen_ddl"
+            description="generate service-specific tables(s), indices, etc.">
+        <ant antfile="pstore/build.xml" target="gen_ddl" inheritAll="false"/>
+    </target>
+    
     <target name="create_db"
-    description="create tables(s), indices for account service">
-        <ant antfile="client/build.xml" target="create_db" inheritAll="false"/>
+            description="create tables(s), indices for account service">
+        <ant antfile="pstore/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"/>
+            description="deploy collectionobject service">
+        <ant antfile="pstore/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy collectionobject service">
-        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
+            description="undeploy collectionobject service">
+        <ant antfile="pstore/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist" depends="package"
-    description="distribute collectionobject service}">
-        <ant antfile="client/build.xml" target="dist" inheritall="false"/>
+            description="distribute collectionobject service}">
+        <ant antfile="pstore/build.xml" target="dist" inheritall="false"/>
     </target>
 
 </project>
diff --git a/services/account/client/build.xml b/services/account/client/build.xml
index b41dd80a0..669ece089 100644
--- a/services/account/client/build.xml
+++ b/services/account/client/build.xml
@@ -126,59 +126,8 @@
         </copy>
     </target>
 
-    <target name="gen_ddl" depends="gen_ddl-unix,gen_ddl-windows"
-            description="geneate ddl" />
-    <target name="gen_ddl-unix" if="osfamily-unix" depends="setup_hibernate.cfg">
-        <exec executable="mvn" failonerror="true">
-            <arg value="-Pddl" />
-            <arg value="process-test-resources" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-    <target name="gen_ddl-windows" if="osfamily-windows" depends="setup_hibernate.cfg">
-        <exec executable="cmd" failonerror="true">
-            <arg value="/c" />
-            <arg value="mvn.bat" />
-            <arg value="-Pddl" />
-            <arg value="process-test-resources" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <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>
-        <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_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"
@@ -187,10 +136,6 @@
 
     <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/account/client/pom.xml b/services/account/client/pom.xml
index 3f0d57433..093e95431 100644
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -14,10 +14,6 @@
     <artifactId>org.collectionspace.services.account.client</artifactId>
     <version>1.0</version>
     <name>services.account.client</name>
-    <properties>
-        <sql.file>account.sql</sql.file>
-        <sql.dir>${basedir}/src/main/resources/db/mysql</sql.dir>
-    </properties>
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -133,69 +129,6 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <!-- use profile as this task is not needed for every build and test -->
-            <id>ddl</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>hibernate3-maven-plugin</artifactId>
-                        <version>2.2</version>
-                        <executions>
-                            <execution>
-                                <phase>process-test-resources</phase>
-                                <goals>
-                                    <goal>hbm2ddl</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <components>
-                                <component>
-                                    <name>hbm2ddl</name>
-                                </component>
-                            </components>
-                            <componentProperties>
-                                <outputfilename>${sql.file}</outputfilename>
-                                <implementation>jpaconfiguration</implementation>
-                                <drop>true</drop>
-                                <create>true</create>
-                                <export>true</export>
-                                <jdk5>true</jdk5>
-                                <ejb3>false</ejb3>
-                                <persistenceunit>org.collectionspace.services.account</persistenceunit>
-                            </componentProperties>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>mysql</groupId>
-                                <artifactId>mysql-connector-java</artifactId>
-                                <version>5.0.5</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>process-test-resources</phase>
-                                <configuration>
-                                    <tasks>
-                                        <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${sql.file}"/>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
 
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
 
diff --git a/services/account/pom.xml b/services/account/pom.xml
index 15ce11de5..dfff467a8 100644
--- a/services/account/pom.xml
+++ b/services/account/pom.xml
@@ -14,6 +14,7 @@
 
     <modules>
         <module>jaxb</module>
+        <module>pstore</module>
         <module>service</module>
         <module>client</module>
     </modules>
diff --git a/services/account/pstore/build.xml b/services/account/pstore/build.xml
new file mode 100644
index 000000000..27e12ea2a
--- /dev/null
+++ b/services/account/pstore/build.xml
@@ -0,0 +1,197 @@
+
+<project name="account.pstore" default="package" basedir=".">
+    <description>
+        collectionspace account service
+    </description>
+    <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
+    <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="setup_hibernate.cfg" description="replace property keywords in hibernate.cfg.xml">
+        <property name="src.hibernate.cfg" value="${basedir}/src/test/resources/hibernate.cfg.xml"/>
+        <property name="dest.hibernate.cfg" value="${basedir}/target/test-classes/hibernate.cfg.xml"/>
+        <delete file="${dest.hibernate.cfg}" verbose="true" />
+        <filter token="DB_URL" value="${db.jdbc.url}" />
+        <filter token="DB_DRIVER_CLASS" value="${db.jdbc.driver.class}" />
+        <filter token="DB_USER" value="${env.DB_USER}" /> <!-- double-sub from ${db.user} fails -->
+        <filter token="DB_PASSWORD" value="${env.DB_PASSWORD}" /> <!-- double-sub from ${db.user.password} fails -->
+        <filter token="DB_DIALECT" value="${db.dialect}" />
+        <copy todir="${basedir}/target/test-classes" filtering="true">
+            <fileset dir="${basedir}/src/test/resources">
+                <include name="hibernate.cfg.xml" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="gen_ddl" depends="gen_ddl-unix,gen_ddl-windows"
+            description="geneate ddl" />
+    <target name="gen_ddl-unix" if="osfamily-unix" depends="setup_hibernate.cfg">
+        <exec executable="mvn" failonerror="true">
+            <arg value="-Pddl" />
+            <arg value="process-test-resources" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="gen_ddl-windows" if="osfamily-windows" depends="setup_hibernate.cfg">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="-Pddl" />
+            <arg value="process-test-resources" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <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"
+             onerror="continue"
+             >
+            <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_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/account/pstore/pom.xml b/services/account/pstore/pom.xml
new file mode 100644
index 000000000..8dcd7084a
--- /dev/null
+++ b/services/account/pstore/pom.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <artifactId>org.collectionspace.services.account</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.account.pstore</artifactId>
+    <version>1.0</version>
+    <name>services.account.pstore</name>
+    <properties>
+        <sql.file>account.sql</sql.file>
+        <sql.dir>${basedir}/src/main/resources/db/mysql</sql.dir>
+    </properties>
+    <dependencies>
+        <!-- keep slf4j dependencies on the top -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.account.jaxb</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>cspace-services-account-client</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>subs-hibernate-config</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <property name="runtime-classpath" refid="maven.runtime.classpath"/>
+                                <ant target="setup_hibernate.cfg" inheritRefs="true"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>file:target/test-classes/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <!-- use profile as this task is not needed for every build and test -->
+            <id>ddl</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>hibernate3-maven-plugin</artifactId>
+                        <version>2.2</version>
+                        <executions>
+                            <execution>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>hbm2ddl</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <components>
+                                <component>
+                                    <name>hbm2ddl</name>
+                                </component>
+                            </components>
+                            <componentProperties>
+                                <outputfilename>${sql.file}</outputfilename>
+                                <implementation>jpaconfiguration</implementation>
+                                <drop>true</drop>
+                                <create>true</create>
+                                <export>true</export>
+                                <jdk5>true</jdk5>
+                                <ejb3>false</ejb3>
+                                <persistenceunit>org.collectionspace.services.account</persistenceunit>
+                            </componentProperties>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>mysql</groupId>
+                                <artifactId>mysql-connector-java</artifactId>
+                                <version>5.0.5</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-test-resources</phase>
+                                <configuration>
+                                    <tasks>
+                                        <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${sql.file}"/>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
+
diff --git a/services/account/client/src/main/resources/db/mysql/account.sql b/services/account/pstore/src/main/resources/db/mysql/account.sql
similarity index 100%
rename from services/account/client/src/main/resources/db/mysql/account.sql
rename to services/account/pstore/src/main/resources/db/mysql/account.sql
diff --git a/services/account/client/src/main/resources/db/mysql/test_account.sql b/services/account/pstore/src/main/resources/db/mysql/test_account.sql
similarity index 100%
rename from services/account/client/src/main/resources/db/mysql/test_account.sql
rename to services/account/pstore/src/main/resources/db/mysql/test_account.sql
diff --git a/services/account/pstore/src/test/resources/META-INF/persistence.xml b/services/account/pstore/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 000000000..f4c1e8b49
--- /dev/null
+++ b/services/account/pstore/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
+http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <persistence-unit name="org.collectionspace.services.account">
+        <class>org.collectionspace.services.account.AccountsCommon</class>
+        <class>org.collectionspace.services.account.AccountsCommon$Tenant</class>
+        <class>org.collectionspace.services.account.AccountsCommonList</class>
+        <class>org.collectionspace.services.account.AccountsCommonList$AccountListItem</class>
+        <properties>
+            <property name="hibernate.ejb.cfgfile" value="hibernate.cfg.xml"/>
+
+            <!--property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
+            <property name="hibernate.max_fetch_depth" value="3"/>
+            <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"/>
+            <property name="hibernate.connection.username" value="test"/>
+            <property name="hibernate.connection.password" value="test"/>
+            <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/cspace"/-->
+        </properties>
+    </persistence-unit>
+</persistence>
diff --git a/services/account/pstore/src/test/resources/hibernate.cfg.xml b/services/account/pstore/src/test/resources/hibernate.cfg.xml
new file mode 100644
index 000000000..8296399cf
--- /dev/null
+++ b/services/account/pstore/src/test/resources/hibernate.cfg.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : hibernate.cfg.xml
+    Created on : 
+    Author     : 
+    Description:
+        Hibernate configuration file for testing and tools
+-->
+<!DOCTYPE hibernate-configuration PUBLIC
+          "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+    <session-factory>
+        <property name="connection.url">@DB_URL@</property>
+        <property name="connection.driver_class">@DB_DRIVER_CLASS@</property>
+        <property name="connection.username">@DB_USER@</property>
+        <property name="connection.password">@DB_PASSWORD@</property>
+        <property name="dialect">@DB_DIALECT@</property>
+        <property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
+        <property name="current_session_context_class">thread</property>
+        <property name="hibernate.show_sql">true</property>
+    </session-factory>
+</hibernate-configuration>
diff --git a/services/account/pstore/src/test/resources/log4j.properties b/services/account/pstore/src/test/resources/log4j.properties
new file mode 100644
index 000000000..f9c47870a
--- /dev/null
+++ b/services/account/pstore/src/test/resources/log4j.properties
@@ -0,0 +1,25 @@
+log4j.rootLogger=debug, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=target/test-client.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+#packages
+log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.apache=INFO
+log4j.logger.httpclient=INFO
+log4j.logger.org.jboss.resteasy=INFO
+log4j.logger.org.hibernate=INFO
+log4j.logger.org.hibernate.cfg=WARN
diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index e63117331..81a73cfce 100644
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -3,7 +3,7 @@
     <description>
         authentication service
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
     <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
@@ -20,8 +20,8 @@
     </condition>
 
     <target name="package" depends="package-unix,package-windows"
-  description="Package CollectionSpace Services" />
-  
+            description="Package CollectionSpace Services" />
+
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -32,7 +32,7 @@
             <arg value="${mvn.opts}" />
         </exec>
     </target>
-    
+
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
@@ -48,7 +48,7 @@
 
 
     <target name="install" depends="package,install-unix,install-windows"
-  description="Install" />
+            description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -73,7 +73,7 @@
     </target>
 
     <target name="clean" depends="clean-unix,clean-windows"
-  description="Delete target directories" >
+            description="Delete target directories" >
         <delete dir="${build}"/>
     </target>
     <target name="clean-unix" if="osfamily-unix">
@@ -107,26 +107,31 @@
         </exec>
     </target>
 
+    <target name="gen_ddl"
+            description="generate service-specific tables(s), indices, etc.">
+        <ant antfile="pstore/build.xml" target="gen_ddl" inheritAll="false"/>
+    </target>
 
     <target name="create_db"
-    description="create tables(s), indices for authentication service">
-        <ant antfile="client/build.xml" target="create_db" inheritAll="false"/>
+            description="create tables(s), indices for authentication service">
+        <ant antfile="pstore/build.xml" target="create_db" inheritAll="false"/>
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy authentication service">
-        <ant antfile="client/build.xml" target="deploy" inheritAll="false"/>
+            description="deploy authentication service">
+        <ant antfile="pstore/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="service/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service">
-        <ant antfile="client/build.xml" target="undeploy" inheritAll="false"/>
+            description="undeploy authentication service">
+        <ant antfile="pstore/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="service/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist" depends="package"
-    description="distribute authentication service}">
+            description="distribute authentication service}">
+        <ant antfile="pstore/build.xml" target="dist" inheritall="false"/>
         <ant antfile="service/build.xml" target="dist" inheritall="false"/>
     </target>
 
diff --git a/services/authentication/client/build.xml b/services/authentication/client/build.xml
index 631350b86..c4ffad0f6 100644
--- a/services/authentication/client/build.xml
+++ b/services/authentication/client/build.xml
@@ -124,62 +124,9 @@
             </fileset>
         </copy>
     </target>
-
-
-    <target name="gen_ddl" depends="gen_ddl-unix,gen_ddl-windows"
-  description="geneate ddl" />
-    <target name="gen_ddl-unix" if="osfamily-unix" depends="setup_hibernate.cfg">
-        <exec executable="mvn" failonerror="true">
-            <arg value="-Pddl" />
-            <arg value="process-test-resources" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-    <target name="gen_ddl-windows" if="osfamily-windows" depends="setup_hibernate.cfg">
-        <exec executable="cmd" failonerror="true">
-            <arg value="/c" />
-            <arg value="mvn.bat" />
-            <arg value="-Pddl" />
-            <arg value="process-test-resources" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <arg value="${mvn.opts}" />
-        </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 todir="${jboss.server.cspace}/cspace/services">
-            <fileset dir="${src}/main/resources/"/>
-        </copy>
     </target>
 
     <target name="undeploy"
@@ -188,10 +135,6 @@
 
     <target name="dist"
     description="generate distribution for authentication 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/client/pom.xml b/services/authentication/client/pom.xml
index 4d0086b8c..a5bda0fa0 100644
--- a/services/authentication/client/pom.xml
+++ b/services/authentication/client/pom.xml
@@ -14,10 +14,6 @@
     <artifactId>org.collectionspace.services.authentication.client</artifactId>
     <version>1.0</version>
     <name>services.authentication.client</name>
-    <properties>
-        <sql.file>authentication.sql</sql.file>
-        <sql.dir>${basedir}/src/main/resources/db/mysql</sql.dir>
-    </properties>
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -40,17 +36,6 @@
             <artifactId>org.collectionspace.services.client</artifactId>
             <version>1.0</version>
         </dependency>
-        <!-- authentication tests use CollectionObject service and Account service -->
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.account.client</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -132,69 +117,6 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <!-- use profile as this task is not needed for every build and test -->
-            <id>ddl</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>hibernate3-maven-plugin</artifactId>
-                        <version>2.2</version>
-                        <executions>
-                            <execution>
-                                <phase>process-test-resources</phase>
-                                <goals>
-                                    <goal>hbm2ddl</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <components>
-                                <component>
-                                    <name>hbm2ddl</name>
-                                </component>
-                            </components>
-                            <componentProperties>
-                                <outputfilename>${sql.file}</outputfilename>
-                                <implementation>jpaconfiguration</implementation>
-                                <drop>true</drop>
-                                <create>true</create>
-                                <export>true</export>
-                                <jdk5>true</jdk5>
-                                <ejb3>false</ejb3>
-                                <persistenceunit>org.collectionspace.services.authentication</persistenceunit>
-                            </componentProperties>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>mysql</groupId>
-                                <artifactId>mysql-connector-java</artifactId>
-                                <version>5.0.5</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>process-test-resources</phase>
-                                <configuration>
-                                    <tasks>
-                                        <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${sql.file}"/>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
 
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
 
diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml
index 8d131d494..da983b443 100644
--- a/services/authentication/pom.xml
+++ b/services/authentication/pom.xml
@@ -17,6 +17,7 @@
 
     <modules>
         <module>jaxb</module>
+        <module>pstore</module>
         <module>service</module>
         <module>client</module>
     </modules>
diff --git a/services/authentication/pstore/build.xml b/services/authentication/pstore/build.xml
new file mode 100644
index 000000000..1add12b45
--- /dev/null
+++ b/services/authentication/pstore/build.xml
@@ -0,0 +1,197 @@
+
+<project name="authentication.pstore" default="package" basedir=".">
+    <description>
+        collectionspace authentication service
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
+    <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="setup_hibernate.cfg" description="replace property keywords in hibernate.cfg.xml">
+        <property name="src.hibernate.cfg" value="${basedir}/src/test/resources/hibernate.cfg.xml"/>
+        <property name="dest.hibernate.cfg" value="${basedir}/target/test-classes/hibernate.cfg.xml"/>
+        <delete file="${dest.hibernate.cfg}" verbose="true" />
+        <filter token="DB_URL" value="${db.jdbc.url}" />
+        <filter token="DB_DRIVER_CLASS" value="${db.jdbc.driver.class}" />
+        <filter token="DB_USER" value="${env.DB_USER}" /> <!-- double-sub from ${db.user} fails -->
+        <filter token="DB_PASSWORD" value="${env.DB_PASSWORD}" /> <!-- double-sub from ${db.user.password} fails -->
+        <filter token="DB_DIALECT" value="${db.dialect}" />
+        <copy todir="${basedir}/target/test-classes" filtering="true">
+            <fileset dir="${basedir}/src/test/resources">
+                <include name="hibernate.cfg.xml" />
+            </fileset>
+        </copy>
+    </target>
+
+
+    <target name="gen_ddl" depends="gen_ddl-unix,gen_ddl-windows"
+  description="geneate ddl" />
+    <target name="gen_ddl-unix" if="osfamily-unix" depends="setup_hibernate.cfg">
+        <exec executable="mvn" failonerror="true">
+            <arg value="-Pddl" />
+            <arg value="process-test-resources" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="gen_ddl-windows" if="osfamily-windows" depends="setup_hibernate.cfg">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="-Pddl" />
+            <arg value="process-test-resources" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </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 todir="${jboss.server.cspace}/cspace/services">
+            <fileset dir="${src}/main/resources/"/>
+        </copy>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy authentication service from ${jboss.server.cspace}">
+    </target>
+
+    <target name="dist"
+    description="generate distribution for authentication 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/pstore/pom.xml b/services/authentication/pstore/pom.xml
new file mode 100644
index 000000000..cb896ca76
--- /dev/null
+++ b/services/authentication/pstore/pom.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <artifactId>org.collectionspace.services.authentication</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.authentication.pstore</artifactId>
+    <version>1.0</version>
+    <name>services.authentication.pstore</name>
+    <properties>
+        <sql.file>authentication.sql</sql.file>
+        <sql.dir>${basedir}/src/main/resources/db/mysql</sql.dir>
+    </properties>
+    <dependencies>
+        <!-- keep slf4j dependencies on the top -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>cspace-services-authentication-client</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>subs-hibernate-config</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <property name="runtime-classpath" refid="maven.runtime.classpath"/>
+                                <ant target="setup_hibernate.cfg" inheritRefs="true"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>file:target/test-classes/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <!-- use profile as this task is not needed for every build and test -->
+            <id>ddl</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>hibernate3-maven-plugin</artifactId>
+                        <version>2.2</version>
+                        <executions>
+                            <execution>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>hbm2ddl</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <components>
+                                <component>
+                                    <name>hbm2ddl</name>
+                                </component>
+                            </components>
+                            <componentProperties>
+                                <outputfilename>${sql.file}</outputfilename>
+                                <implementation>jpaconfiguration</implementation>
+                                <drop>true</drop>
+                                <create>true</create>
+                                <export>true</export>
+                                <jdk5>true</jdk5>
+                                <ejb3>false</ejb3>
+                                <persistenceunit>org.collectionspace.services.authentication</persistenceunit>
+                            </componentProperties>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>mysql</groupId>
+                                <artifactId>mysql-connector-java</artifactId>
+                                <version>5.0.5</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-test-resources</phase>
+                                <configuration>
+                                    <tasks>
+                                        <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${sql.file}"/>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
+
diff --git a/services/authentication/client/src/main/resources/db/mysql/authentication.sql b/services/authentication/pstore/src/main/resources/db/mysql/authentication.sql
similarity index 100%
rename from services/authentication/client/src/main/resources/db/mysql/authentication.sql
rename to services/authentication/pstore/src/main/resources/db/mysql/authentication.sql
diff --git a/services/authentication/client/src/main/resources/db/mysql/test_authn.sql b/services/authentication/pstore/src/main/resources/db/mysql/test_authn.sql
similarity index 100%
rename from services/authentication/client/src/main/resources/db/mysql/test_authn.sql
rename to services/authentication/pstore/src/main/resources/db/mysql/test_authn.sql
diff --git a/services/authentication/pstore/src/test/resources/META-INF/persistence.xml b/services/authentication/pstore/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 000000000..97d00a01d
--- /dev/null
+++ b/services/authentication/pstore/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
+http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <persistence-unit name="org.collectionspace.services.authentication">
+        <class>org.collectionspace.services.authentication.User</class>
+        <class>org.collectionspace.services.authentication.Role</class>
+        <class>org.collectionspace.services.authentication.UserRole</class>
+        <properties>
+            <property name="hibernate.ejb.cfgfile" value="hibernate.cfg.xml"/>
+
+            <!--property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
+            <property name="hibernate.max_fetch_depth" value="3"/>
+            <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"/>
+            <property name="hibernate.connection.username" value="test"/>
+            <property name="hibernate.connection.password" value="test"/>
+            <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/cspace"/-->
+        </properties>
+    </persistence-unit>
+</persistence>
diff --git a/services/authentication/pstore/src/test/resources/hibernate.cfg.xml b/services/authentication/pstore/src/test/resources/hibernate.cfg.xml
new file mode 100644
index 000000000..8296399cf
--- /dev/null
+++ b/services/authentication/pstore/src/test/resources/hibernate.cfg.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : hibernate.cfg.xml
+    Created on : 
+    Author     : 
+    Description:
+        Hibernate configuration file for testing and tools
+-->
+<!DOCTYPE hibernate-configuration PUBLIC
+          "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+    <session-factory>
+        <property name="connection.url">@DB_URL@</property>
+        <property name="connection.driver_class">@DB_DRIVER_CLASS@</property>
+        <property name="connection.username">@DB_USER@</property>
+        <property name="connection.password">@DB_PASSWORD@</property>
+        <property name="dialect">@DB_DIALECT@</property>
+        <property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
+        <property name="current_session_context_class">thread</property>
+        <property name="hibernate.show_sql">true</property>
+    </session-factory>
+</hibernate-configuration>
diff --git a/services/authentication/pstore/src/test/resources/log4j.properties b/services/authentication/pstore/src/test/resources/log4j.properties
new file mode 100644
index 000000000..5d288d87d
--- /dev/null
+++ b/services/authentication/pstore/src/test/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=target/test-client.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+#packages
+log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.apache=INFO
+log4j.logger.httpclient=INFO
+log4j.logger.org.jboss.resteasy=WARN
diff --git a/services/build.xml b/services/build.xml
index b040be636..de51ae0c1 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -104,6 +104,12 @@
         </exec>
     </target>
 
+    <target name="gen_ddl"
+            description="generate service-specific tables(s), indices, etc.">
+        <ant antfile="authentication/build.xml" target="gen_ddl" inheritAll="false"/>
+        <ant antfile="account/build.xml" target="gen_ddl" inheritAll="false"/>
+    </target>
+
     <target name="create_db"
             description="create service-specific tables(s), indices, etc.">
         <ant antfile="authentication/build.xml" target="create_db" inheritAll="false"/>