From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Tue, 7 Jul 2009 18:41:30 +0000 (+0000)
Subject: cspace-62 added ant build for collectionobject. co doctype is copied to correct lcoat... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4600cdb731c4a716b2f3b2d662c437e0953acfee;p=tmp%2Fjakarta-migration.git

cspace-62 added ant build for collectionobject. co doctype is copied to correct lcoation in jboss domain. deploy depends on install instead of package to make sure local maven repository is populated. removed dependencies to defunct local directory locations.

M    services/authentication/build.xml
M    services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
A    services/collectionobject/3rdparty/build.xml
A    services/collectionobject/build.xml
M    services/JaxRsServiceProvider/pom.xml
M    services/JaxRsServiceProvider/build.xml
M    services/common/build.xml
M    services/pom.xml
M    services/id/service/pom.xml
M    services/build.xml
M    3rdparty/nuxeo/build.xml
M    3rdparty/build.xml
M    build.xml
---

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index 8f8b43231..fa903f93d 100644
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -51,7 +51,31 @@
             <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" >
@@ -88,7 +112,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy 3rdparty stuff in ${jboss.server.cspace}">
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 46355799e..d984e65fb 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -52,6 +52,30 @@
         </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" >
@@ -88,7 +112,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy nuxeo client libs to ${jboss.server.cspace}">
         <copy todir="${jboss.server.cspace}/nuxeo-client">
             <fileset dir="${basedir}/nuxeo-client"/>
diff --git a/build.xml b/build.xml
index f8e34c8cc..820e111aa 100644
--- a/build.xml
+++ b/build.xml
@@ -14,7 +14,6 @@
     <property name="db.script.dir" location="${basedir}/src/main/resources/scripts/db/${db}"/>
 
 
-
     <condition property="osfamily-unix">
         <os family="unix" />
     </condition>
@@ -22,7 +21,7 @@
         <os family="windows" />
     </condition>
 
-    <target name="init" depends="setup">
+    <target name="init">
     <!-- Create the time stamp -->
         <tstamp/>
     <!-- Create the build directory structure used by compile -->
@@ -97,7 +96,7 @@
         </tar>
     </target>
 
-    <target name="package" depends="setup,package-unix,package-windows"
+    <target name="package" depends="package-unix,package-windows"
   description="Package CollectionSpace Services" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
@@ -122,6 +121,31 @@
         </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" >
@@ -160,8 +184,7 @@
     </target>
 
     <target name="create_db"
-    description="create database(s), grant privileges to test users"
-    depends="setup">
+    description="create database(s), grant privileges to test users">
         <sql driver="com.mysql.jdbc.Driver"
         url="jdbc:mysql://localhost:3306/cspace"
         userid="root"
@@ -174,14 +197,14 @@
         </sql>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy services in ${jboss.server.cspace}">
         <ant antfile="services/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.lib.cspace}"/>
     </target>
 
-    <target name="undeploy" depends="setup"
+    <target name="undeploy"
     description="undeploy authentication service from ${jboss.server.cspace}">
         <ant antfile="services/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index d984b062e..971f5d3c5 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -27,6 +27,30 @@
 
     </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="package" depends="package-unix,package-windows"
   description="Package CollectionSpace Services" />
@@ -89,7 +113,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy authentication service in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
     </target>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 83bdb6a83..80073564a 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -154,7 +154,6 @@
                 <executions>
                     <execution>
                         <id>jboss-undeploy</id>
-                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>undeploy</goal>
                         </goals>
@@ -166,7 +165,6 @@
                     </execution>
                     <execution>
                         <id>jboss-deploy</id>
-                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>deploy</goal>
                         </goals>
diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index 9978f2a07..d2a0615f1 100644
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -53,7 +53,31 @@
         </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}"/>
@@ -89,7 +113,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy authentication service in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>
         <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>
diff --git a/services/build.xml b/services/build.xml
index 7241d51a0..998c99087 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -46,6 +46,31 @@
     </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}"/>
@@ -81,10 +106,11 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy services in ${jboss.server.cspace}">
         <ant antfile="authentication/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="common/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="collectionobject/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritall="false"/>
     </target>
 
@@ -92,6 +118,7 @@
     description="undeploy authentication service from ${jboss.server.cspace}">
         <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="collectionobject/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
new file mode 100644
index 000000000..1a281d0a7
--- /dev/null
+++ b/services/collectionobject/3rdparty/build.xml
@@ -0,0 +1,126 @@
+
+<project name="services.collectionobject.3rdparty" default="package" basedir=".">
+    <description>
+        collectionspace authentication 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"/>
+    <property name="build" location="build"/>
+    <property name="dist"  location="dist"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init" >
+    <!-- Create the time stamp -->
+        <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+        <mkdir dir="${build}"/>
+
+    </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="deploy" depends="install"
+    description="deploy common elements in ${jboss.server.cspace}">
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy common elements from ${jboss.server.cspace}">
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="undeploy" inheritall="false"/>
+    </target>
+
+
+
+</project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index d4e3b266c..df6ca15ed 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -1,14 +1,128 @@
-<?xml version="1.0"?>
-<project name="nuxeo cs" default="all" basedir=".">
-
-  <property file="build.properties" />
-  <property name="cs.nuxeo.jar" value="nuxeo-platform-collectionspace-5.2-SNAPSHOT.jar"/>
-
-  <target name="all" description="all">
-    <delete file="${jboss.nuxeo.ear.dir}/system/${cs.nuxeo.jar}"/>
-    <copy todir="${jboss.nuxeo.ear.dir}/system">
-      <fileset file="${basedir}/target/${cs.nuxeo.jar}" />
-    </copy>
-  </target>
-
-</project>
+
+<project name="nuxeo-platform-cs-collectionobject" default="package" basedir=".">
+    <description>
+        collectionobject nuxeo document type
+    </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"/>
+    <property name="build" location="build"/>
+    <property name="dist"  location="dist"/>
+    <property name="nuxeo.collectionobject.jar" value="nuxeo-platform-cs-collectionobject-5.2-SNAPSHOT.jar"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init" >
+    <!-- Create the time stamp -->
+        <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+        <mkdir dir="${build}"/>
+
+    </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="deploy" depends="install"
+    description="deploy common elements in ${jboss.server.cspace}">
+        <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
+        todir="${nuxeo.dir}"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy common elements from ${jboss.server.cspace}">
+        <delete file="${nuxeo.dir}/${nuxeo.collectionobject.jar}"/>
+    </target>
+
+
+
+</project>
diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
new file mode 100644
index 000000000..77cd5ef4e
--- /dev/null
+++ b/services/collectionobject/build.xml
@@ -0,0 +1,121 @@
+
+<project name="collectionobject" default="package" basedir=".">
+    <description>
+        collectionobject 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"/>
+    <property name="build" location="build"/>
+    <property name="dist"  location="dist"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <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="deploy" depends="install"
+    description="deploy services in ${jboss.server.cspace}">
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy authentication service from ${jboss.server.cspace}">
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
+    </target>
+
+
+
+</project>
diff --git a/services/common/build.xml b/services/common/build.xml
index 6a8076574..31644b289 100644
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -51,7 +51,31 @@
         </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}"/>
@@ -87,7 +111,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy common elements in ${jboss.server.cspace}">
         <copy file="${basedir}/src/main/config/service-config.xml"
         todir="${jboss.server.cspace}/cspace/config/services"/>
diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index c936752c9..3c90f2664 100644
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -159,7 +159,7 @@
   
   <!-- Build element: declares the project's directory structure and manages plugins. -->
   <build>
-    <finalName>collectionspace-services-commonobject</finalName>
+    <finalName>collectionspace-services-id</finalName>
     <plugins>
       <plugin>
         <!-- The Mojo project manages a collection of plugins for Maven 2. -->
diff --git a/services/pom.xml b/services/pom.xml
index dcf87756a..cf53bde2b 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -36,14 +36,6 @@
             <name>Public online Restlet repository</name>
             <url>http://maven.restlet.org</url>
         </repository>
-        <repository>
-            <id>cspace.local.nuxeo</id>
-            <url>${nuxeo.local.repo.dir}</url>
-        </repository>
-        <repository>
-            <id>cspace.local.nuxeo.client</id>
-            <url>${nuxeo.local.repo.client.dir}</url>
-        </repository>
         <repository>
             <id>public</id>
             <url>http://maven.nuxeo.org/public</url>