From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Thu, 13 Aug 2009 18:35:20 +0000 (+0000)
Subject: CSPACE-182 see CSPACE 328/329/330, relevant pom.xmls changed to depend on 5.2.1 and... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f3c94d39182bb705a3b56b5e0111a5b8fd415c45;p=tmp%2Fjakarta-migration.git

CSPACE-182 see CSPACE 328/329/330, relevant pom.xmls changed to depend on 5.2.1 and 1.5.1. doc-type pom.xmls still need version properties locally
CSPACE-328 built nuxeo using 5.2GA source updated wiki with notes see http://wiki.collectionspace.org/display/collectionspace/Build+Nuxeo+5.2
CSPACE-329 nuxeo domain uses 5.2GA, Mysql and JDK 1.6, see http://wiki.collectionspace.org/display/collectionspace/Configure+Nuxeo+domain
CSPACE-330 ran all services tests to verify build works. changed NuxeoConnector to use new properties for remote API fix from Nuxeo
CSPACE-303 ant deploy and dist now depend on package instead of install,
CSPACE-89 dist-jboss-domains (calls dist-jboss-nuxeo and dist-jboss-cspace) packages two working domains, dist packages just cspace binaries.

M    3rdparty/pom.xml
D    3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-query-1.5-SNAPSHOT.jar
A    3rdparty/nuxeo/nuxeo-client/lib/5.2.M4
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-query-1.5-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-api-1.5-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-runtime-1.5-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-schema-1.5-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-common-1.5-SNAPSHOT.jar
D    3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-api-1.5-SNAPSHOT.jar
D    3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar
D    3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-1.5-SNAPSHOT.jar
A    3rdparty/nuxeo/nuxeo-client/lib/5.2.GA
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-query-1.5.1-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-api-1.5.1-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-osgi-1.5.1-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-1.5.1-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-schema-1.5.1-SNAPSHOT.jar
AM   3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-common-1.5.1-SNAPSHOT.jar
D    3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-schema-1.5-SNAPSHOT.jar
D    3rdparty/nuxeo/nuxeo-client/lib/nuxeo-common-1.5-SNAPSHOT.jar
M    3rdparty/nuxeo/pom.xml
M    3rdparty/nuxeo/build.xml
M    3rdparty/build.xml
_M   services/authentication/service
M    services/authentication/service/build.xml
_M   services/authentication/client
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/build.xml
M    services/collectionobject/pom.xml
M    services/collectionobject/build.xml
M    services/JaxRsServiceProvider/pom.xml
M    services/JaxRsServiceProvider/build.xml
M    services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnector.java
M    services/common/pom.xml
M    services/common/build.xml
M    services/pom.xml
M    services/id/pom.xml
M    services/id/build.xml
M    services/build.xml
M    services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
M    services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
M    services/intake/3rdparty/build.xml
M    services/intake/pom.xml
M    services/intake/build.xml
_M   services/relation/service
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/pom.xml
M    services/relation/build.xml
_M   services/relation/client
M    services/relation/client/pom.xml
M    build.properties
M    build.xml
M    pom.xml
---

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index 9eb10375d..d9def5db0 100644
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -112,7 +112,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy 3rdparty 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 f4633c470..bd277ae16 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -112,10 +112,15 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy nuxeo client libs to ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/nuxeo-client">
-            <fileset dir="${basedir}/nuxeo-client"/>
+        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">
+            <fileset dir="${basedir}/nuxeo-client/lib">
+                <include name="*.jar"/>
+            </fileset>
+            <fileset dir="${basedir}/nuxeo-client/lib/${nuxeo.release}">
+                <include name="*.jar"/>
+            </fileset>
         </copy>
     </target>
 
@@ -125,7 +130,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for nuxeo client libs">
+    description="generate distribution for nuxeo client libs" depends="package">
         <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-client">
             <fileset dir="${basedir}/nuxeo-client"/>
         </copy>
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-common-1.5.1-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-common-1.5.1-SNAPSHOT.jar
new file mode 100644
index 000000000..d08eb07c0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-common-1.5.1-SNAPSHOT.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-api-1.5.1-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-api-1.5.1-SNAPSHOT.jar
new file mode 100644
index 000000000..d1c69fd3e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-api-1.5.1-SNAPSHOT.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-query-1.5.1-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-query-1.5.1-SNAPSHOT.jar
new file mode 100644
index 000000000..e1198a1b0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-query-1.5.1-SNAPSHOT.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-schema-1.5.1-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-schema-1.5.1-SNAPSHOT.jar
new file mode 100644
index 000000000..f65ce0b45
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-core-schema-1.5.1-SNAPSHOT.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-1.5.1-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-1.5.1-SNAPSHOT.jar
new file mode 100644
index 000000000..ea4faae56
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-1.5.1-SNAPSHOT.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-osgi-1.5.1-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-osgi-1.5.1-SNAPSHOT.jar
new file mode 100644
index 000000000..c1ecde294
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/5.2.GA/nuxeo-runtime-osgi-1.5.1-SNAPSHOT.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-common-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-common-1.5-SNAPSHOT.jar
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-client/lib/nuxeo-common-1.5-SNAPSHOT.jar
rename to 3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-common-1.5-SNAPSHOT.jar
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-api-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-api-1.5-SNAPSHOT.jar
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-api-1.5-SNAPSHOT.jar
rename to 3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-api-1.5-SNAPSHOT.jar
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-query-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-query-1.5-SNAPSHOT.jar
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-query-1.5-SNAPSHOT.jar
rename to 3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-query-1.5-SNAPSHOT.jar
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-schema-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-schema-1.5-SNAPSHOT.jar
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-schema-1.5-SNAPSHOT.jar
rename to 3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-core-schema-1.5-SNAPSHOT.jar
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-runtime-1.5-SNAPSHOT.jar
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-1.5-SNAPSHOT.jar
rename to 3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-runtime-1.5-SNAPSHOT.jar
diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar
rename to 3rdparty/nuxeo/nuxeo-client/lib/5.2.M4/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar
diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 36db42cef..2248385a1 100644
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -12,14 +12,7 @@
     <version>1.0</version>
     <name>services.3rdparty.nuxeo</name>
 
-    <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-    
+   
     <repositories>
         <repository>
             <id>public</id>
diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index b8f233ba4..afc215ba6 100644
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -12,14 +12,6 @@
     <packaging>pom</packaging>
     <name>services.3rdparty</name>
 
-    <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-
     <modules>
         <module>nuxeo</module>
     </modules>
diff --git a/build.properties b/build.properties
index 4bacc4e52..770a857b1 100644
--- a/build.properties
+++ b/build.properties
@@ -6,7 +6,8 @@ domain.cspace=cspace
 domain.nuxeo=default
 
 #nuxeo
-nuxeo.release=5.2.M4
+#nuxeo.release=5.2.M4
+nuxeo.release=5.2.GA
 nuxeo.ear=nuxeo.ear
 nuxeo.system=${nuxeo.ear}/system
 
diff --git a/build.xml b/build.xml
index 3c2c22b93..9c14a3bb9 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
         <tstamp/>
     </target>
 
-    <target name="dist" depends="install"
+    <target name="dist" depends="package"
     description="generate cspace service distribution">
         <!-- Create the distribution directory -->
         <mkdir dir="${basedir}/dist"/>
@@ -36,8 +36,8 @@
         <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"/>
+        <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">
@@ -212,7 +212,7 @@
         </sql>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy services in ${jboss.server.cspace}">
                 <!-- copy db scripts, etc. -->
         <copy todir="${jboss.server.cspace}/cspace/services">
@@ -222,17 +222,18 @@
         <copy todir="${jboss.deploy.cspace}">
             <fileset dir="${src}/main/resources/config"/>
         </copy>
-        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
-        <ant antfile="services/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false"/>
+        <ant antfile="services/build.xml" target="deploy" inheritAll="false"/>
 
     </target>
 
     <target name="undeploy"
     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 file="${jboss.deploy.cspace}/cspace-ds.xml"/>
-        <delete dir="${jboss.server.cspace}/cspace/services"/>
+        <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"/>
+        <delete failonerror="false" dir="${jboss.server.cspace}/cspace/services"/>
+        <delete failonerror="false" dir="${jboss.server.cspace}/cspace/config/services"/>
     </target>
 
 
diff --git a/pom.xml b/pom.xml
index b8fd6d24c..9ae5bb44a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,14 @@
     <packaging>pom</packaging>
     <name>services</name>
 
+    <properties>
+        <jboss.version>4.2.3.GA</jboss.version>
+        <jboss.ejb.version>3.0</jboss.ejb.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
+    </properties>
+    
     <modules>
         <module>services</module>
     </modules>
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 5a969a5bb..035d602b6 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -108,7 +108,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy cspace services in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
     </target>
@@ -119,7 +119,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for cspace services" depends="install">
+    description="generate distribution for cspace services" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.cspace}">
             <fileset file="${basedir}/target/${cspace-services.war}"/>
         </copy>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index df50b2273..e60b0739b 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -14,16 +14,6 @@
     <packaging>war</packaging>
     <version>1.0</version>
     <name>services.jaxrs.provider</name>
-    
-    <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <apacheds.version>1.5.1</apacheds.version>
-        <apachedshared.version>0.9.7</apachedshared.version>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
 
 
     <dependencies>
@@ -47,11 +37,17 @@
             <artifactId>org.collectionspace.services.intake.service</artifactId>
             <version>1.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.relation.service</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
@@ -162,6 +158,7 @@
 
     <build>
         <finalName>cspace-services</finalName>
+        <defaultGoal>package</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -172,12 +169,12 @@
                     <port>8180</port>
                 </configuration>
                 <executions>
-<!--                    <execution>
+                    <execution>
                         <id>jboss-undeploy</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>undeploy</goal>
                         </goals>
-                        <phase>pre-integration-test</phase>
                         <configuration>
                             <fileNames>
                                 <param>${project.build.directory}/${project.build.finalName}.war</param>
@@ -186,16 +183,16 @@
                     </execution>
                     <execution>
                         <id>jboss-deploy</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>deploy</goal>
                         </goals>
-                        <phase>pre-integration-test</phase>
                         <configuration>
                             <fileNames>
                                 <param>${project.build.directory}/${project.build.finalName}.war</param>
                             </fileNames>
                         </configuration>
-                    </execution> -->
+                    </execution>
                 </executions>
             </plugin>
 
diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index 6a6432163..b83e2f5f6 100644
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -105,7 +105,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy authentication service">
         <ant antfile="service/build.xml" target="deploy" inheritall="false"/>
     </target>
@@ -115,7 +115,7 @@
         <ant antfile="service/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
-    <target name="dist" depends="install"
+    <target name="dist" depends="package"
     description="distribute authentication service}">
         <ant antfile="service/build.xml" target="dist" inheritall="false"/>
     </target>
diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml
index 86bf45265..4bda27abe 100644
--- a/services/authentication/service/build.xml
+++ b/services/authentication/service/build.xml
@@ -108,7 +108,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     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"/>
@@ -122,7 +122,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for authentication service" depends="install">
+    description="generate distribution for authentication service" depends="package">
         <copy todir="${services.trunk}/${dist.lib.cspace}">
             <fileset file="${basedir}/target/${authentication.jar}"/>
         </copy>
diff --git a/services/build.xml b/services/build.xml
index cd229d094..a729a9d21 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -105,39 +105,39 @@
     </target>
 
     <!-- this target is called in order based on the dependencies between the services -->
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy services in ${jboss.server.cspace}">
-        <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="id/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"/>
+        <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="id/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>
 
     <!-- this target is called in revese order of deploy targets -->
     <target name="undeploy"
     description="undeploy services from ${jboss.server.cspace}">
-        <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="intake/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="collectionobject/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="id/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="relation/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="intake/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="collectionobject/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="id/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="relation/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="authentication/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="common/build.xml" target="undeploy" inheritAll="false"/>
     </target>
 
     <!-- this target is called in order based on the dependencies between the services -->
-    <target name="dist" depends="install"
+    <target name="dist" depends="package"
     description="create distribution for 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="id/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"/>
+        <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="id/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>
 
     
diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 3e8a360a8..d5256ba26 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -108,7 +108,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy collectionobject in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>
     </target>
@@ -119,7 +119,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for collectionobject">
+    description="generate distribution for collectionobject" depends="package">
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist" inheritall="false"/>
     </target>
 
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 5d8933601..44a3a46a6 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -112,7 +112,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy collectionobject doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>
@@ -124,7 +124,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for collectionobject doctype" depends="install">
+    description="generate distribution for collectionobject doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
             <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
         </copy>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 53b33ddd1..a92db9318 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -17,8 +17,8 @@
     CollectionObject Nuxeo document type
     </description>
     <properties>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
     </properties>
     <dependencies>
         <dependency>
diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
index 2de3b385a..b365bdbad 100644
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -105,7 +105,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy collectionobject service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
@@ -115,7 +115,7 @@
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
-    <target name="dist" depends="install"
+    <target name="dist" depends="package"
     description="distribute collectionobject service}">
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
     </target>
diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 80aae0990..4d9007f6b 100644
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -12,11 +12,6 @@
     <packaging>pom</packaging>
     <name>services.collectionobject</name>
 
-    <properties>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-
     <modules>
         <module>jaxb</module>
         <module>service</module>
diff --git a/services/common/build.xml b/services/common/build.xml
index fe4e82a87..a3fffc528 100644
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy common elements in ${jboss.server.cspace}">
         <copy file="${basedir}/src/main/config/service-config.xml"
         todir="${jboss.server.cspace}/cspace/config/services"/>
@@ -115,11 +115,11 @@
 
     <target name="undeploy"
     description="undeploy common elements from ${jboss.server.cspace}">
-        <delete file="${jboss.server.cspace}/cspace/config/services/service-config.xml"/>
+        <delete failonerror="false" file="${jboss.server.cspace}/cspace/config/services/service-config.xml"/>
     </target>
 
     <target name="dist"
-    description="generate distribution for common elements" depends="install">
+    description="generate distribution for common elements" depends="package">
         <copy todir="${services.trunk}/${dist.server.cspace}/cspace/config/services">
             <fileset file="${basedir}/src/main/config/service-config.xml"/>
         </copy>
diff --git a/services/common/pom.xml b/services/common/pom.xml
index addbb8400..113107ef5 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -11,14 +11,6 @@
     <packaging>jar</packaging>
     <version>1.0</version>
     <name>services.common</name>
-
-    <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
     
     <dependencies>
         <dependency>
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnector.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnector.java
index 491a105e5..adde28f86 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnector.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnector.java
@@ -131,6 +131,7 @@ public class NuxeoConnector {
     }
 
     private void setProperties(NuxeoClientConfig nuxeoClientConfig) {
+        System.setProperty("nuxeo.client.on.jboss", Boolean.TRUE.toString());
         System.setProperty("org.nuxeo.runtime.server.enabled", Boolean.FALSE.toString());
         System.setProperty("org.nuxeo.runtime.server.port", "" + nuxeoClientConfig.getPort());
         System.setProperty("org.nuxeo.runtime.server.host", nuxeoClientConfig.getHost());
diff --git a/services/id/build.xml b/services/id/build.xml
index 2e1ec252a..3fe6a2cad 100644
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy id service">
         
     </target>
@@ -115,7 +115,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for id">
+    description="generate distribution for id" depends="package">
         
     </target>
 
diff --git a/services/id/pom.xml b/services/id/pom.xml
index 835959d81..92a3133f5 100644
--- a/services/id/pom.xml
+++ b/services/id/pom.xml
@@ -38,11 +38,6 @@
   <packaging>pom</packaging>
   <name>services.id</name>
 
-  <properties>
-    <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-    <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-  </properties>
-
   
   <modules>
     <module>jaxb</module>
diff --git a/services/intake/3rdparty/build.xml b/services/intake/3rdparty/build.xml
index e9b64b774..ac71f9636 100644
--- a/services/intake/3rdparty/build.xml
+++ b/services/intake/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy intake in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>
     </target>
@@ -117,7 +117,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for intake">
+    description="generate distribution for intake" depends="package">
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="dist" inheritall="false"/>
     </target>
 
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index fed418ee9..f7a947b49 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy intake doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.intake.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>
@@ -120,7 +120,7 @@
 
 
     <target name="dist"
-    description="generate distribution for intake doctype" depends="install">
+    description="generate distribution for intake doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
             <fileset file="${basedir}/target/${nuxeo.intake.jar}"/>
         </copy>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index 3773c0f61..3818ff2cb 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -17,8 +17,8 @@
     Intake Nuxeo Document Type
     </description>
     <properties>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
     </properties>
     <dependencies>
         <dependency>
diff --git a/services/intake/build.xml b/services/intake/build.xml
index 814810a0d..d3728d366 100644
--- a/services/intake/build.xml
+++ b/services/intake/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy intake service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
@@ -114,7 +114,7 @@
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
-    <target name="dist" depends="install"
+    <target name="dist" depends="package"
     description="distribute intake service">
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
     </target>
diff --git a/services/intake/pom.xml b/services/intake/pom.xml
index f3fd0ecf1..80fbea3b8 100644
--- a/services/intake/pom.xml
+++ b/services/intake/pom.xml
@@ -13,10 +13,6 @@
     <packaging>pom</packaging>
     <name>services.intake</name>
 
-    <properties>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
 
     <modules>
         <module>jaxb</module>
diff --git a/services/pom.xml b/services/pom.xml
index 102bbeb38..4a1d9c393 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -12,13 +12,6 @@
     <packaging>pom</packaging>
     <name>services.main</name>
 
-    <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
 
     <modules>
         <!-- add modules below in the order based on dependencies -->
diff --git a/services/relation/3rdparty/build.xml b/services/relation/3rdparty/build.xml
index b25c96cff..def61c0d8 100644
--- a/services/relation/3rdparty/build.xml
+++ b/services/relation/3rdparty/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy relation in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>
     </target>
@@ -118,7 +118,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for relation">
+    description="generate distribution for relation" depends="package">
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="dist" inheritall="false"/>
     </target>
 
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index e0ce9c1b7..696ebfe30 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy relation doctype in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${nuxeo.relation.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>
@@ -120,7 +120,7 @@
 
 
     <target name="dist"
-    description="generate distribution for relation doctype" depends="install">
+    description="generate distribution for relation doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
             <fileset file="${basedir}/target/${nuxeo.relation.jar}"/>
         </copy>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index 927a949bb..b79f1a1db 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -18,8 +18,8 @@
     CollectionSpace relation Nuxeo document type
     </description>
     <properties>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
     </properties>
     <dependencies>
         <dependency>
diff --git a/services/relation/build.xml b/services/relation/build.xml
index 92b13dfda..52237f1d0 100644
--- a/services/relation/build.xml
+++ b/services/relation/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy relation service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
@@ -115,7 +115,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for relation">
+    description="generate distribution for relation" depends="package">
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
     </target>
 
diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index 771dd5c6d..f05cbae5d 100644
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -32,7 +32,13 @@
             <artifactId>org.collectionspace.services.client</artifactId>
             <version>1.0</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.relation.service</artifactId>
+            <version>1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index bb78e64aa..29e583cbe 100644
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -13,11 +13,6 @@
     <packaging>pom</packaging>
     <name>services.relation</name>
 
-    <properties>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-
     <modules>
         <module>service</module>
         <module>3rdparty</module>