From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Fri, 10 Jul 2009 23:35:10 +0000 (+0000)
Subject: CSPACE-303 added dist(ribution) target to all ant build files (where reqd.) in order... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=3681d256d7b5223627f9e23c8be49c6ec81963df;p=tmp%2Fjakarta-migration.git

CSPACE-303 added dist(ribution) target to all ant build files (where reqd.) in order to create a single compressed file that could be exploded in a jboss cspace domain. changed parent build of doctype builds (collectionobject, intake, relation) to not rely on nuxeo. fixed typos. removed ref. to cspace-services.war from the top level build.

M    services/authentication/build.xml
M    services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
M    services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
M    services/collectionobject/3rdparty/pom.xml
M    services/collectionobject/3rdparty/build.xml
M    services/collectionobject/build.xml
D    services/JaxRsServiceProvider/build.properties
M    services/JaxRsServiceProvider/build.xml
M    services/common/build.xml
_M   services/intake/service
_M   services/intake/jaxb
M    services/intake/3rdparty/pom.xml
_M   services/intake/3rdparty/nuxeo-platform-cs-intake
D    services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties
M    services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
M    services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
A    services/intake/3rdparty/build.xml
_M   services/intake/client
A    services/intake/build.xml
_M   services/id/service
_M   services/id/jaxb
M    services/relation/3rdparty/pom.xml
M    services/relation/3rdparty/build.xml
M    services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
M    services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
M    services/relation/build.xml
M    services/build.xml
D    src/main/assembly
D    src/main/config
D    src/main/filters
D    src/main/resources/schemas
D    src/main/webapp
M    3rdparty/nuxeo/build.xml
M    3rdparty/build.xml
M    build.properties
M    build.xml
M    pom.xml
---

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index fa903f93d..9eb10375d 100644
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -1,7 +1,7 @@
 
 <project name="3rdparty" default="package" basedir=".">
     <description>
-        collectionspace authentication service
+        collectionspace 3rdparty
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value=".."/>
@@ -113,14 +113,18 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy 3rdparty stuff in ${jboss.server.cspace}">
+    description="deploy 3rdparty in ${jboss.server.cspace}">
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service from ${jboss.server.cspace}">
+    description="undeploy 3rdparty from ${jboss.server.cspace}">
         <ant antfile="nuxeo/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
+    <target name="dist"
+    description="generate distribution for 3rdparty">
+        <ant antfile="nuxeo/build.xml" target="dist" inheritall="false"/>
+    </target>
 
 </project>
diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index d984e65fb..f4633c470 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -1,7 +1,7 @@
 
 <project name="nuxeo" default="package" basedir=".">
     <description>
-        collectionspace authentication service
+        collectionspace nuxeo
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
@@ -124,5 +124,11 @@
         <delete dir="${jboss.server.cspace}/nuxeo-client"/>
     </target>
 
+    <target name="dist"
+    description="generate distribution for nuxeo client libs">
+        <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-client">
+            <fileset dir="${basedir}/nuxeo-client"/>
+        </copy>
+    </target>
 
 </project>
diff --git a/build.properties b/build.properties
index a6ad561a0..fdfd1f50f 100644
--- a/build.properties
+++ b/build.properties
@@ -1,18 +1,49 @@
-jboss.release=jboss-4.2.3.GA
+#cspace
+cspace.release=0.2
+cspace.services.release=cspace-services-${cspace.release}
+
+domain.cspace=cspace
+domain.nuxeo=default
+
+#nuxeo
+nuxeo.release=5.2.M4
+nuxeo.ear=nuxeo.ear
+nuxeo.system=${nuxeo.ear}/system
+
+#distribution
+dist=dist
+dist.cspace=${dist}/cspace
+dist.nuxeo=${dist}/nuxeo
+
+#dist cspace domain
+dist.domain.cspace=${domain.cspace}
+dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace}
+dist.deploy.cspace=${dist.server.cspace}/deploy
+dist.lib.cspace=${dist.server.cspace}/lib
+
+#dist nuxeo domain
+dist.domain.nuxeo=${domain.nuxeo}
+dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}
+dist.deploy.nuxeo=${dist.server.nuxeo}/deploy
+dist.lib.nuxeo=${dist.server.nuxeo}/lib
+dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
+
+#jboss
 #assumption: both nuxeo and cspace domains are using the same JBoss installation
+jboss.release=jboss-4.2.3.GA
 jboss.dir=C:/dev/${jboss.release}
 jboss.home=${jboss.dir}
-jboss.domain.cspace=cspace
-jboss.domain.nuxeo=default
+
+#jboss cspace domain
+jboss.domain.cspace=${domain.cspace}
 jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}
 jboss.deploy.cspace=${jboss.server.cspace}/deploy
 jboss.lib.cspace=${jboss.server.cspace}/lib
+
+#jboss nuxeo domain
+jboss.domain.nuxeo=${domain.nuxeo}
 jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}
-jboss.deploy.nuxeo="${jboss.server.nuxeo}/deploy
+jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy
 jboss.lib.nuxeo=${jboss.server.nuxeo}/lib
-cspace.release=cspace-1.0
-cspace.services.release=services-${cspace.release}
-nuxeo.release=nuxeo-5.2.M4
-nuxeo.dir=${jboss.dir}/server/default/deploy/nuxeo.ear/system
-nuxeo.local.repo.dir=file:///${jboss.dir}/server/default/deploy/nuxeo.ear/system
+jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}
 
diff --git a/build.xml b/build.xml
index 820e111aa..0e67881f8 100644
--- a/build.xml
+++ b/build.xml
@@ -7,8 +7,6 @@
     <property file="build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="build" location="build"/>
-    <property name="dist"  location="dist"/>
 
     <property name="db" value="mysql"/>
     <property name="db.script.dir" location="${basedir}/src/main/resources/scripts/db/${db}"/>
@@ -24,45 +22,66 @@
     <target name="init">
     <!-- Create the time stamp -->
         <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build}"/>
-
     </target>
 
-    <target name="compile" depends="init"
-        description="compile the source " >
-    <!-- Compile the java code from ${src} into ${build} -->
-        <javac srcdir="${src}" destdir="${build}"/>
-
+    <target name="dist" depends="install"
+    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"/>
+        </copy>
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="services/build.xml" target="dist" inheritall="false"/>
+
+        <!-- bundle up everything -->
+        <tar destfile="${basedir}/dist/${cspace.services.release}-${jboss.release}.tar.gz" compression="gzip">
+            <tarfileset dir="${basedir}/dist/cspace"
+              preserveLeadingSlashes="true">
+            </tarfileset>
+        </tar>
     </target>
 
-    <target name="dist" depends="package"
-    description="generate cspace service an nuxeo distribution">
-        <!-- Create the distribution directory -->
-        <mkdir dir="${dist}"/>
-        <antcall name="dist-cspace"/>
-        <antcall name="dist-nuxeo"/>
+    <target name="dist-jboss-domains" depends="init"
+    description="create jboss distributions for cspace and nuxeo">
+        <antcall name="dist-jboss-cspace"/>
+        <antcall name="dist-jboss-nuxeo"/>
     </target>
 
-    <target name="dist-cspace" depends="package"
-    description="generate cspace service distribution">
+    <target name="dist-jboss-cspace" depends="dist"
+    description="generate jboss distribution for cspace">
+        <fail message="JBoss is not installed or ${jboss.dir} not found">
+            <condition>
+                <not>
+                    <available file="${jboss.dir}" type="dir"/>
+                </not>
+            </condition>
+        </fail>
 
-        <tar destfile="${dist}/${jboss.release}.${cspace.services.release}.tar.gz" compression="gzip">
-            <tarfileset dir="${basedir}/services"
+        <fail message="CSpace is not deployed or ${nuxeo.deploy} not found">
+            <condition>
+                <not>
+                    <available file="${nuxeo.deploy}" type="dir"/>
+                </not>
+            </condition>
+        </fail>
+
+        <tar destfile="${basedir}/dist/${jboss.release}-${cspace.release}.tar.gz" compression="gzip">
+            <tarfileset dir="${jboss.dir}"
               preserveLeadingSlashes="true">
-                <include name="/services/JaxRsServiceProvider/target/*.war"/>
+                <exclude name="server/${jboss.domain.nuxeo}/**"/>
+                <exclude name="server/${jboss.domain.cspace}/log/**"/>
                 <exclude name="server/${jboss.domain.cspace}/tmp/**"/>
-                <exclude name="server/${jboss.domain.cspace}/deploy/helloworld.war"/>
-            </tarfileset>
-            <tarfileset dir="${src}/main/resources"
-              preserveLeadingSlashes="true">
-                <exclude name="schemas/**"/>
             </tarfileset>
-
         </tar>
     </target>
-
-    <target name="dist-nuxeo" depends="compile"
+    
+    <target name="dist-nuxeo-domain" depends="install"
         description="generate nuxeo domain distribution" >
         <fail message="JBoss is not installed or ${jboss.dir} not found">
             <condition>
@@ -72,27 +91,21 @@
             </condition>
         </fail>
 
-        <fail message="Nuxeo is not deployed or ${nuxeo.deploy} not found">
+        <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.systemy} not found">
             <condition>
                 <not>
-                    <available file="${nuxeo.deploy}" type="dir"/>
+                    <available file="${jboss.deploy.nuxeo.system}" type="dir"/>
                 </not>
             </condition>
         </fail>
 
-
-        <tar destfile="${dist}/${jboss.release}.${nuxeo.release}.tar.gz" compression="gzip">
+        <tar destfile="${basedir}/dist/${jboss.release}-${nuxeo.release}.tar.gz" compression="gzip">
             <tarfileset dir="${jboss.dir}"
               preserveLeadingSlashes="true">
+                <exclude name="server/${jboss.domain.cspace}/**"/>
                 <exclude name="server/${jboss.domain.nuxeo}/log/**"/>
                 <exclude name="server/${jboss.domain.nuxeo}/tmp/**"/>
-                <exclude name="server/${jboss.domain.nuxeo}/deploy/cspace*.*"/>
-            </tarfileset>
-            <tarfileset dir="${src}/main/resources"
-              preserveLeadingSlashes="true">
-                <exclude name="schemas/**"/>
             </tarfileset>
-
         </tar>
     </target>
 
@@ -149,8 +162,8 @@
 
     <target name="clean" depends="clean-unix,clean-windows"
   description="Delete target directories" >
-        <delete dir="${build}"/>
-        <delete dir="${dist}"/>
+        <delete dir="${basedir}/build"/>
+        <delete dir="${basedir}/dist"/>
     </target>
     <target name="clean-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
@@ -201,14 +214,12 @@
     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"
     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"/>
-        <delete file="${jboss.lib.cspace}/${cspace-services.war}"/>
     </target>
 
 
diff --git a/pom.xml b/pom.xml
index 70ea27b0d..b8fd6d24c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <version>1.0</version>
     <artifactId>org.collectionspace.services</artifactId>
     <packaging>pom</packaging>
-    <name>org.collectionspace.services</name>
+    <name>services</name>
 
     <modules>
         <module>services</module>
diff --git a/services/JaxRsServiceProvider/build.properties b/services/JaxRsServiceProvider/build.properties
deleted file mode 100644
index 50c373854..000000000
--- a/services/JaxRsServiceProvider/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-jboss.dir=C:/dev/jboss-4.2.3.GA
-nuxeo.dir=${jboss.dir}/server/default/deploy/nuxeo.ear/system
-nuxeo.local.repo.dir=file:///C:/dev/jboss-4.2.3.GA/server/default/deploy/nuxeo.ear/system
-nuxeo.local.repo.client.dir=file:///C:/dev/nuxeo/nuxeo-core/nuxeo-core-client/target
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 971f5d3c5..579812b7a 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -1,15 +1,13 @@
 
 <project name="jaxrs.provider" default="package" basedir=".">
     <description>
-        collectionspace authentication service
+        collectionspace services war
     </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="cspace-services.war" value="cspace-services.war"/>
 
     <condition property="osfamily-unix">
@@ -22,9 +20,6 @@
     <target name="init">
     <!-- Create the time stamp -->
         <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build}"/>
-
     </target>
 
     <target name="install" depends="package,install-unix,install-windows"
@@ -114,15 +109,20 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy authentication service in ${jboss.server.cspace}">
+    description="deploy cspace services in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service from ${jboss.server.cspace}">
+    description="undeploy cspace services from ${jboss.server.cspace}">
         <delete file="${jboss.server.cspace}/deploy/${cspace-services.war}"/>
     </target>
 
-
+    <target name="dist"
+    description="generate distribution for cspace services" depends="install">
+        <copy todir="${services.trunk}/${dist.deploy.cspace}">
+            <fileset file="${basedir}/target/${cspace-services.war}"/>
+        </copy>
+    </target>
 
 </project>
diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index d2a0615f1..2972776a6 100644
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -8,8 +8,6 @@
     <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="authentication.jar" value="cspace-services-authn.jar"/>
 
     <condition property="osfamily-unix">
@@ -22,9 +20,6 @@
     <target name="init">
     <!-- Create the time stamp -->
         <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build}"/>
-
     </target>
 
 
@@ -126,6 +121,11 @@
         <echo message="Remove authentication-policy from ${jboss.server.cspace}/conf/login-config.xml"/>
     </target>
 
-
+    <target name="dist"
+    description="generate distribution for authentication service" depends="install">
+        <copy todir="${services.trunk}/${dist.lib.cspace}">
+            <fileset file="${basedir}/target/${authentication.jar}"/>
+        </copy>
+    </target>
 
 </project>
diff --git a/services/build.xml b/services/build.xml
index ae3f34bbf..8decfa5d0 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -1,15 +1,13 @@
 
 <project name="services-main" default="package" basedir=".">
     <description>
-        collectionspace services root
+        collectionspace services main
     </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" />
@@ -108,22 +106,33 @@
 
     <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="authentication/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="relation/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="collectionobject/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="intake/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service from ${jboss.server.cspace}">
-        <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>
+    description="undeploy services from ${jboss.server.cspace}">
         <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="relation/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="collectionobject/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="intake/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
+    <target name="dist" depends="install"
+    description="distribute services">
+        <ant antfile="common/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="authentication/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="relation/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="collectionobject/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="intake/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="JaxRsServiceProvider/build.xml" target="dist" inheritall="false"/>
+    </target>
 
-
+    
 </project>
diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 1a281d0a7..3e8a360a8 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -1,7 +1,7 @@
 
-<project name="services.collectionobject.3rdparty" default="package" basedir=".">
+<project name="collectionobject.3rdparty" default="package" basedir=".">
     <description>
-        collectionspace authentication service
+        collectionobject service 3rd party
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../../.."/>
@@ -9,7 +9,6 @@
     <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" />
@@ -21,8 +20,6 @@
     <target name="init" >
     <!-- Create the time stamp -->
         <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build}"/>
 
     </target>
 
@@ -112,15 +109,18 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy common elements in ${jboss.server.cspace}">
+    description="deploy collectionobject in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy common elements from ${jboss.server.cspace}">
+    description="undeploy collectionobject from ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
-
+    <target name="dist"
+    description="generate distribution for collectionobject">
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist" 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 df6ca15ed..5d8933601 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -10,7 +10,7 @@
     <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"/>
+    <property name="nuxeo.collectionobject.jar" value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-1.0.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -113,16 +113,21 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy common elements in ${jboss.server.cspace}">
+    description="deploy collectionobject doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
-        todir="${nuxeo.dir}"/>
+        todir="${jboss.deploy.nuxeo.system}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy common elements from ${jboss.server.cspace}">
-        <delete file="${nuxeo.dir}/${nuxeo.collectionobject.jar}"/>
+    description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">
+        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.collectionobject.jar}"/>
     </target>
 
-
+    <target name="dist"
+    description="generate distribution for collectionobject doctype" depends="install">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
+        </copy>
+    </target>
 
 </project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 56fc1f11d..3ae8f553c 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -1,17 +1,17 @@
 <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.collectionobject.3rdparty</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
-
-    <artifactId>nuxeo-platform-cs-collectionobject</artifactId>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.collectionobject.3rdparty.nuxeo</artifactId>
     <packaging>jar</packaging>
-    <name>nuxeo-platform-cs-collectionobject</name>
+    <name>services.collectionobject.3rdparty.nuxeo</name>
     <description>
     CollectionObject Nuxeo document type
     </description>
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index b4e1485c1..4a9eb4b3e 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -2,7 +2,6 @@
 <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">
-    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>org.collectionspace.services.collectionobject</artifactId>
@@ -10,6 +9,9 @@
         <version>1.0</version>
     </parent>
 
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
     <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
     <packaging>pom</packaging>
     <name>services.collectionobject.3rdparty</name>
diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
index 77cd5ef4e..2de3b385a 100644
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -9,7 +9,6 @@
     <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" />
@@ -107,15 +106,18 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy services in ${jboss.server.cspace}">
+    description="deploy collectionobject service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service from ${jboss.server.cspace}">
+    description="undeploy collectionobject service">
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
-
+    <target name="dist" depends="install"
+    description="distribute collectionobject service}">
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
+    </target>
 
 </project>
diff --git a/services/common/build.xml b/services/common/build.xml
index 31644b289..144607a67 100644
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -1,7 +1,7 @@
 
 <project name="common" default="package" basedir=".">
     <description>
-        collectionspace authentication service
+        collectionspace services common
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
@@ -9,7 +9,6 @@
     <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" />
@@ -21,9 +20,6 @@
     <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"
@@ -122,6 +118,11 @@
         <delete file="${jboss.server.cspace}/cspace/config/services/service-config.xml"/>
     </target>
 
-
+    <target name="dist"
+    description="generate distribution for common elements" depends="install">
+        <copy todir="${services.trunk}/${dist.server.cspace}/cspace/config/services">
+            <fileset file="${basedir}/src/main/config/service-config.xml"/>
+        </copy>
+    </target>
 
 </project>
diff --git a/services/intake/3rdparty/build.xml b/services/intake/3rdparty/build.xml
new file mode 100644
index 000000000..e9b64b774
--- /dev/null
+++ b/services/intake/3rdparty/build.xml
@@ -0,0 +1,125 @@
+
+<project name="intake.3rdparty" default="package" basedir=".">
+    <description>
+        intake service 3rdparty
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../.."/>
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="" />
+    <property name="src" location="src"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init" >
+    <!-- Create the time stamp -->
+        <tstamp/>
+    </target>
+
+    <target name="package" depends="package-unix,package-windows"
+  description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="install" depends="package,install-unix,install-windows"
+  description="Install" />
+    <target name="install-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="install-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    
+    <target name="clean" depends="clean-unix,clean-windows"
+  description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="install"
+    description="deploy intake in ${jboss.server.nuxeo}">
+        <ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy intake from ${jboss.server.nuxeo}">
+        <ant antfile="nuxeo-platform-cs-intake/build.xml" target="undeploy" inheritall="false"/>
+    </target>
+
+    <target name="dist"
+    description="generate distribution for intake">
+        <ant antfile="nuxeo-platform-cs-intake/build.xml" target="dist" inheritall="false"/>
+    </target>
+
+
+</project>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties
deleted file mode 100644
index c26799aa9..000000000
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Example for Windows
-jboss.dir=c:/dev/jboss-4.2.3.GA
-# Example for Unix
-#jboss.dir=/opt/jboss
-
-# Which JBoss server config to use
-jboss.config=default
-
-# nuxeo deployment
-jboss.nuxeo.ear.dir=${jboss.dir}/server/${jboss.config}/deploy/nuxeo.ear
-
-
-# additional command line parameters for mvn commands
-# e.g. to work offline:
-#mvn.opts=-o
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index d4e3b266c..fed418ee9 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -1,14 +1,130 @@
-<?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"/>
+<project name="nuxeo-platform-cs-intake" default="package" basedir=".">
+    <description>
+        intake 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="nuxeo.intake.jar" value="org.collectionspace.services.intake.3rdparty.nuxeo-1.0.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>
+    <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="deploy" depends="install"
+    description="deploy intake doctype in ${jboss.server.nuxeo}">
+        <copy file="${basedir}/target/${nuxeo.intake.jar}"
+        todir="${jboss.deploy.nuxeo.system}"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy intake doctype from ${jboss.server.nuxeo}">
+        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.intake.jar}"/>
+    </target>
+
+
+    <target name="dist"
+    description="generate distribution for intake doctype" depends="install">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+            <fileset file="${basedir}/target/${nuxeo.intake.jar}"/>
+        </copy>
+    </target>
 
 </project>
+
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index 39dcdf8ef..6497beb7d 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -1,17 +1,17 @@
 <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.intake.3rdparty</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
-
-    <artifactId>nuxeo-platform-cs-intake</artifactId>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.intake.3rdparty.nuxeo</artifactId>
     <packaging>jar</packaging>
-    <name>nuxeo-platform-cs-intake</name>
+    <name>services.intake.3rdparty.nuxeo</name>
     <description>
     Intake Nuxeo Document Type
     </description>
diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml
index 1d2e1b106..1f0687f2a 100644
--- a/services/intake/3rdparty/pom.xml
+++ b/services/intake/3rdparty/pom.xml
@@ -2,14 +2,14 @@
 <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">
-    <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <artifactId>org.collectionspace.services.intake</artifactId>
         <groupId>org.collectionspace.services</groupId>
         <version>1.0</version>
     </parent>
-
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
     <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
     <packaging>pom</packaging>
     <name>services.intake.3rdparty</name>
diff --git a/services/intake/build.xml b/services/intake/build.xml
new file mode 100644
index 000000000..814810a0d
--- /dev/null
+++ b/services/intake/build.xml
@@ -0,0 +1,122 @@
+
+<project name="intake" default="package" basedir=".">
+    <description>
+        intake service
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../.."/>
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="" />
+    <property name="src" location="src"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="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 intake service">
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy intake service">
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
+    </target>
+
+    <target name="dist" depends="install"
+    description="distribute intake service">
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
+    </target>
+
+</project>
diff --git a/services/relation/3rdparty/build.xml b/services/relation/3rdparty/build.xml
index 09f98b5cd..b25c96cff 100644
--- a/services/relation/3rdparty/build.xml
+++ b/services/relation/3rdparty/build.xml
@@ -1,15 +1,13 @@
 
-<project name="services.relation.3rdparty" default="package" basedir=".">
+<project name="relation.3rdparty" default="package" basedir=".">
     <description>
-        collectionspace authentication service
+        relation service 3rdparty
     </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" />
@@ -21,8 +19,6 @@
     <target name="init" >
     <!-- Create the time stamp -->
         <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build}"/>
 
     </target>
 
@@ -112,15 +108,19 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy common elements in ${jboss.server.cspace}">
+    description="deploy relation in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy common elements from ${jboss.server.cspace}">
+    description="undeploy relation from ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
+    <target name="dist"
+    description="generate distribution for relation">
+        <ant antfile="nuxeo-platform-cs-relation/build.xml" target="dist" inheritall="false"/>
+    </target>
 
 
 </project>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index 9a1d5745c..e0ce9c1b7 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
@@ -1,16 +1,14 @@
 
 <project name="nuxeo-platform-cs-relation" default="package" basedir=".">
     <description>
-        relationhip nuxeo document type
+        relation 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.relation.jar" value="nuxeo-platform-cs-relation-5.2-SNAPSHOT.jar"/>
+    <property name="nuxeo.relation.jar" value="org.collectionspace.services.relation.3rdparty.nuxeo-1.0.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -22,9 +20,6 @@
     <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"
@@ -113,16 +108,22 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy common elements in ${jboss.server.cspace}">
+    description="deploy relation doctype in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${nuxeo.relation.jar}"
-        todir="${nuxeo.dir}"/>
+        todir="${jboss.deploy.nuxeo.system}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy common elements from ${jboss.server.cspace}">
-        <delete file="${nuxeo.dir}/${nuxeo.relation.jar}"/>
+    description="undeploy relation doctype from ${jboss.server.cspace}">
+        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.relation.jar}"/>
     </target>
 
 
+    <target name="dist"
+    description="generate distribution for relation doctype" depends="install">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+            <fileset file="${basedir}/target/${nuxeo.relation.jar}"/>
+        </copy>
+    </target>
 
 </project>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index 09536d9a5..e45c637ad 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -1,17 +1,17 @@
 <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.relation.3rdparty</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
-
-    <artifactId>nuxeo-platform-cs-relation</artifactId>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.relation.3rdparty.nuxeo</artifactId>
     <packaging>jar</packaging>
-    <name>nuxeo-platform-cs-relation</name>
+    <name>services.relation.3rdparty.nuxeo</name>
     <description>
     CollectionSpace relation Nuxeo document type
     </description>
diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml
index d8c41e45f..5ec58caec 100644
--- a/services/relation/3rdparty/pom.xml
+++ b/services/relation/3rdparty/pom.xml
@@ -2,14 +2,14 @@
 <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">
-    <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <artifactId>org.collectionspace.services.relation</artifactId>
         <groupId>org.collectionspace.services</groupId>
         <version>1.0</version>
     </parent>
-
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
     <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>
     <packaging>pom</packaging>
     <name>services.relation.3rdparty</name>
diff --git a/services/relation/build.xml b/services/relation/build.xml
index 62bf0d23b..92b13dfda 100644
--- a/services/relation/build.xml
+++ b/services/relation/build.xml
@@ -8,8 +8,6 @@
     <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" />
@@ -107,15 +105,19 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy services in ${jboss.server.cspace}">
+    description="deploy relation service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service from ${jboss.server.cspace}">
+    description="undeploy relation service">
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
+    <target name="dist"
+    description="generate distribution for relation">
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
+    </target>
 
 
 </project>