CSPACE-182 see CSPACE 328/329/330, relevant pom.xmls changed to depend on 5.2.1 and...

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 9eb10375dbe15101dd52b6423b535f34873aee57..d9def5db098a8510b3db5223df54980a180363fc 100644 (file)
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -112,7 +112,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy 3rdparty in ${jboss.server.cspace}">\r
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index f4633c47077e9c1a297cf642eab81a83dc8f4c4c..bd277ae1612cdcbad373c915027cefa73665f448 100644 (file)
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -112,10 +112,15 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy nuxeo client libs to ${jboss.server.cspace}">\r
-        <copy todir="${jboss.server.cspace}/nuxeo-client">\r
-            <fileset dir="${basedir}/nuxeo-client"/>\r
+        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
+            <fileset dir="${basedir}/nuxeo-client/lib">\r
+                <include name="*.jar"/>\r
+            </fileset>\r
+            <fileset dir="${basedir}/nuxeo-client/lib/${nuxeo.release}">\r
+                <include name="*.jar"/>\r
+            </fileset>\r
         </copy>\r
     </target>\r
 \r
@@ -125,7 +130,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for nuxeo client libs">\r
+    description="generate distribution for nuxeo client libs" depends="package">\r
         <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-client">\r
             <fileset dir="${basedir}/nuxeo-client"/>\r
         </copy>\r

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 (file)
index 0000000..d08eb07
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 (file)
index 0000000..d1c69fd
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 (file)
index 0000000..e1198a1
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 (file)
index 0000000..f65ce0b
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 (file)
index 0000000..ea4faae
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 (file)
index 0000000..c1ecde2
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 36db42ceffb6facdc13a85b532e5b0842dc78040..2248385a192252428fef120515b95739b164543c 100644 (file)
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -12,14 +12,7 @@
     <version>1.0</version>\r
     <name>services.3rdparty.nuxeo</name>\r
 \r
-    <properties>\r
-        <jboss.version>4.2.3.GA</jboss.version>\r
-        <jboss.ejb.version>3.0</jboss.ejb.version>\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
-    \r
+   \r
     <repositories>\r
         <repository>\r
             <id>public</id>\r

diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index b8f233ba48d0fa5ccea61cc8bfa1c1c0534e536e..afc215ba6697ec085a4d19a9bb02ae8b71837ce9 100644 (file)
--- 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 4bacc4e52319fcce13a8d6b1d5797471d8c5ca06..770a857b11715ecc4b7f0b3e2d5ce62027a976cb 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -6,7 +6,8 @@ domain.cspace=cspace
 domain.nuxeo=default\r
 \r
 #nuxeo\r
-nuxeo.release=5.2.M4\r
+#nuxeo.release=5.2.M4\r
+nuxeo.release=5.2.GA\r
 nuxeo.ear=nuxeo.ear\r
 nuxeo.system=${nuxeo.ear}/system\r
 \r

diff --git a/build.xml b/build.xml
index 3c2c22b937d6596370330832e0587b74103f582b..9c14a3bb938fa44331081e5e496851f941092d0b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
         <tstamp/>\r
     </target>\r
 \r
-    <target name="dist" depends="install"\r
+    <target name="dist" depends="package"\r
     description="generate cspace service distribution">\r
         <!-- Create the distribution directory -->\r
         <mkdir dir="${basedir}/dist"/>\r
@@ -36,8 +36,8 @@
         <copy todir="${basedir}/${dist.deploy.cspace}">\r
             <fileset dir="${src}/main/resources/config"/>\r
         </copy>\r
-        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="services/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="3rdparty/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="services/build.xml" target="dist" inheritAll="false"/>\r
 \r
         <!-- bundle up everything -->\r
         <tar destfile="${basedir}/dist/${cspace.services.release}-${jboss.release}.tar.gz" compression="gzip">\r
@@ -212,7 +212,7 @@
         </sql>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy services in ${jboss.server.cspace}">\r
                 <!-- copy db scripts, etc. -->\r
         <copy todir="${jboss.server.cspace}/cspace/services">\r
@@ -222,17 +222,18 @@
         <copy todir="${jboss.deploy.cspace}">\r
             <fileset dir="${src}/main/resources/config"/>\r
         </copy>\r
-        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="services/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="services/build.xml" target="deploy" inheritAll="false"/>\r
 \r
     </target>\r
 \r
     <target name="undeploy"\r
     description="undeploy services from ${jboss.server.cspace}">\r
-        <ant antfile="services/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
-        <delete file="${jboss.deploy.cspace}/cspace-ds.xml"/>\r
-        <delete dir="${jboss.server.cspace}/cspace/services"/>\r
+        <ant antfile="services/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritAll="false"/>\r
+        <delete failonerror="false"  file="${jboss.deploy.cspace}/cspace-ds.xml"/>\r
+        <delete failonerror="false" dir="${jboss.server.cspace}/cspace/services"/>\r
+        <delete failonerror="false" dir="${jboss.server.cspace}/cspace/config/services"/>\r
     </target>\r
 \r
 \r

diff --git a/pom.xml b/pom.xml
index b8fd6d24c259b585afc3ef0a7c141b9d8cc1d52c..9ae5bb44af2cf71d668da9f6deb7c943bd28716e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,14 @@
     <packaging>pom</packaging>\r
     <name>services</name>\r
 \r
+    <properties>\r
+        <jboss.version>4.2.3.GA</jboss.version>\r
+        <jboss.ejb.version>3.0</jboss.ejb.version>\r
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>\r
+        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>\r
+    </properties>\r
+    \r
     <modules>\r
         <module>services</module>\r
     </modules>\r

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 5a969a5bb92d2996a9000aaa886bd6fa2ff7bc34..035d602b69a70e4a02988c2caaf02b0c428fd011 100644 (file)
--- 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 df50b22736140f5fb3282bc63abf175f430e5e7e..e60b0739b7cc90eda524f682aea5a364d9c612a9 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -14,16 +14,6 @@
     <packaging>war</packaging>\r
     <version>1.0</version>\r
     <name>services.jaxrs.provider</name>\r
-    \r
-    <properties>\r
-        <jboss.version>4.2.3.GA</jboss.version>\r
-        <jboss.ejb.version>3.0</jboss.ejb.version>\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <apacheds.version>1.5.1</apacheds.version>\r
-        <apachedshared.version>0.9.7</apachedshared.version>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
 \r
 \r
     <dependencies>\r
@@ -47,11 +37,17 @@
             <artifactId>org.collectionspace.services.intake.service</artifactId>\r
             <version>1.0</version>\r
         </dependency>\r
+\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.relation.service</artifactId>\r
             <version>1.0</version>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>commons-io</groupId>\r
+            <artifactId>commons-io</artifactId>\r
+            <version>1.4</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
@@ -162,6 +158,7 @@
 \r
     <build>\r
         <finalName>cspace-services</finalName>\r
+        <defaultGoal>package</defaultGoal>\r
         <plugins>\r
             <plugin>\r
                 <groupId>org.codehaus.mojo</groupId>\r
@@ -172,12 +169,12 @@
                     <port>8180</port>\r
                 </configuration>\r
                 <executions>\r
-<!--                    <execution>\r
+                    <execution>\r
                         <id>jboss-undeploy</id>\r
+                        <phase>pre-integration-test</phase>\r
                         <goals>\r
                             <goal>undeploy</goal>\r
                         </goals>\r
-                        <phase>pre-integration-test</phase>\r
                         <configuration>\r
                             <fileNames>\r
                                 <param>${project.build.directory}/${project.build.finalName}.war</param>\r
@@ -186,16 +183,16 @@
                     </execution>\r
                     <execution>\r
                         <id>jboss-deploy</id>\r
+                        <phase>pre-integration-test</phase>\r
                         <goals>\r
                             <goal>deploy</goal>\r
                         </goals>\r
-                        <phase>pre-integration-test</phase>\r
                         <configuration>\r
                             <fileNames>\r
                                 <param>${project.build.directory}/${project.build.finalName}.war</param>\r
                             </fileNames>\r
                         </configuration>\r
-                    </execution> -->\r
+                    </execution>\r
                 </executions>\r
             </plugin>\r
 \r

diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index 6a64321637dd0e883b28399d656ff645ebfcc8ce..b83e2f5f600d1b19ee18a912305c520fc9a88fd0 100644 (file)
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -105,7 +105,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy authentication service">\r
         <ant antfile="service/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -115,7 +115,7 @@
         <ant antfile="service/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
-    <target name="dist" depends="install"\r
+    <target name="dist" depends="package"\r
     description="distribute authentication service}">\r
         <ant antfile="service/build.xml" target="dist" inheritall="false"/>\r
     </target>\r

diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml
index 86bf45265ef53f16bfb6d141b038b0b9909c46fb..4bda27abe76960b651f0cce22e3464c91cee82f9 100644 (file)
--- a/services/authentication/service/build.xml
+++ b/services/authentication/service/build.xml
@@ -108,7 +108,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy authentication service in ${jboss.server.cspace}">\r
         <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>\r
         <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>\r
@@ -122,7 +122,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for authentication service" depends="install">\r
+    description="generate distribution for authentication service" depends="package">\r
         <copy todir="${services.trunk}/${dist.lib.cspace}">\r
             <fileset file="${basedir}/target/${authentication.jar}"/>\r
         </copy>\r

diff --git a/services/build.xml b/services/build.xml
index cd229d094558eeeec9c569e32bbd08c4f90f9c05..a729a9d21ff73e51de9b8af0bbea7f969ff8ff8c 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -105,39 +105,39 @@
     </target>\r
 \r
     <!-- this target is called in order based on the dependencies between the services -->\r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy services in ${jboss.server.cspace}">\r
-        <ant antfile="common/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="authentication/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="relation/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="id/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="collectionobject/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="intake/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="common/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="authentication/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="relation/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="id/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="intake/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritAll="false"/>\r
     </target>\r
 \r
     <!-- this target is called in revese order of deploy targets -->\r
     <target name="undeploy"\r
     description="undeploy services from ${jboss.server.cspace}">\r
-        <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="intake/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="collectionobject/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="id/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="relation/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="intake/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="id/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="relation/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="authentication/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="common/build.xml" target="undeploy" inheritAll="false"/>\r
     </target>\r
 \r
     <!-- this target is called in order based on the dependencies between the services -->\r
-    <target name="dist" depends="install"\r
+    <target name="dist" depends="package"\r
     description="create distribution for services">\r
-        <ant antfile="common/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="authentication/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="relation/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="id/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="collectionobject/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="intake/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="JaxRsServiceProvider/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="common/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="authentication/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="relation/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="id/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="intake/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="dist" inheritAll="false"/>\r
     </target>\r
 \r
     \r

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 3e8a360a89bacbea5f6d060c25b2237d03546419..d5256ba26ced9db6cbdf9505dd2567bde473938d 100644 (file)
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -108,7 +108,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy collectionobject in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -119,7 +119,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for collectionobject">\r
+    description="generate distribution for collectionobject" depends="package">\r
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 5d8933601d2ecd02f6446de0c93542a8bc6a9d5b..44a3a46a628fe155b14688cbb7783005a61366ad 100644 (file)
--- 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>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy collectionobject doctype in ${jboss.server.nuxeo}">\r
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
         todir="${jboss.deploy.nuxeo.system}"/>\r
@@ -124,7 +124,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for collectionobject doctype" depends="install">\r
+    description="generate distribution for collectionobject doctype" depends="package">\r
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">\r
             <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
         </copy>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 53b33ddd1760bea78040dc314159cfc82f99b32a..a92db9318e959f03df64e22bafd92e43a5fd1513 100644 (file)
--- 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 2de3b385a3be8e0599ed15c7bf0a8f4ed4763f72..b365bdbad974119dae7e00e7d532c3a52709cefb 100644 (file)
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -105,7 +105,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy collectionobject service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -115,7 +115,7 @@
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
-    <target name="dist" depends="install"\r
+    <target name="dist" depends="package"\r
     description="distribute collectionobject service}">\r
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
     </target>\r

diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 80aae09908f2f7c54e75999ed701b113cf506857..4d9007f6b3a62de2cb37911a523594e67ce37708 100644 (file)
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -12,11 +12,6 @@
     <packaging>pom</packaging>\r
     <name>services.collectionobject</name>\r
 \r
-    <properties>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
-\r
     <modules>\r
         <module>jaxb</module>\r
         <module>service</module>\r

diff --git a/services/common/build.xml b/services/common/build.xml
index fe4e82a873f89cb5f41664804d2ab1e3af313a03..a3fffc52864e26f1ca2af08eedcec0b740df630e 100644 (file)
--- 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 addbb8400e66339837f902081ffae94636424be9..113107ef5e8c75a043720504fa3cb418322efe51 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -11,14 +11,6 @@
     <packaging>jar</packaging>\r
     <version>1.0</version>\r
     <name>services.common</name>\r
-\r
-    <properties>\r
-        <jboss.version>4.2.3.GA</jboss.version>\r
-        <jboss.ejb.version>3.0</jboss.ejb.version>\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
     \r
     <dependencies>\r
         <dependency>\r

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 491a105e5840353dee580de90cdb2ab66e2844f7..adde28f86aff37ef87269a0fa487a45a090d3292 100644 (file)
--- 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 2e1ec252ade08f089f55deeff2ae5e24a2804693..3fe6a2cadea4e86c3ba0dc283da378f34db47ca6 100644 (file)
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy id service">\r
         \r
     </target>\r
@@ -115,7 +115,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for id">\r
+    description="generate distribution for id" depends="package">\r
         \r
     </target>\r
 \r

diff --git a/services/id/pom.xml b/services/id/pom.xml
index 835959d81ffc8493c60a730f07c64c5e815e8803..92a3133f550238e0fb5060db5e5e52951d1270e0 100644 (file)
--- 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 e9b64b774a069569966a17ecdfdf2bee129d565a..ac71f96367d5e7f8995da5f8c43a2575305e6c88 100644 (file)
--- a/services/intake/3rdparty/build.xml
+++ b/services/intake/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy intake in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -117,7 +117,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for intake">\r
+    description="generate distribution for intake" depends="package">\r
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index fed418ee99642218ff5606e6372a608dcbfea9ba..f7a947b49cb21bd60b07f7a8668fe5ae457e29d2 100644 (file)
--- 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 3773c0f61466fd8d86a519079500094a825c0da8..3818ff2cb48940b9e1bdc1cee0281c4f1916413e 100644 (file)
--- 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 814810a0d96d3f81b6ad4a321f5d1d9c4591eab9..d3728d366e454c556bb724c9ae46ea27b380e0e2 100644 (file)
--- a/services/intake/build.xml
+++ b/services/intake/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy intake service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -114,7 +114,7 @@
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
-    <target name="dist" depends="install"\r
+    <target name="dist" depends="package"\r
     description="distribute intake service">\r
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
     </target>\r

diff --git a/services/intake/pom.xml b/services/intake/pom.xml
index f3fd0ecf1e998232aa4b98854f9b564327e23781..80fbea3b87debf11993b8a896686aa20da61dcc5 100644 (file)
--- a/services/intake/pom.xml
+++ b/services/intake/pom.xml
@@ -13,10 +13,6 @@
     <packaging>pom</packaging>\r
     <name>services.intake</name>\r
 \r
-    <properties>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/pom.xml b/services/pom.xml
index 102bbeb38bcab8aee1e649d47b8bb1295dc6dba9..4a1d9c3930f57a296fe160918b7686e80852d465 100644 (file)
--- 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 b25c96cffe8e4420370387a0d9614024d6cf6224..def61c0d8606407cb6ff2a23bb81d17f88d51d9c 100644 (file)
--- a/services/relation/3rdparty/build.xml
+++ b/services/relation/3rdparty/build.xml
@@ -107,7 +107,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy relation in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -118,7 +118,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for relation">\r
+    description="generate distribution for relation" depends="package">\r
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index e0ce9c1b710b6f4e5833c6f11ab8e1bc21fb4fe3..696ebfe30999bcb4381fbd14a59dde32d810795e 100644 (file)
--- 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>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy relation doctype in ${jboss.server.cspace}">\r
         <copy file="${basedir}/target/${nuxeo.relation.jar}"\r
         todir="${jboss.deploy.nuxeo.system}"/>\r
@@ -120,7 +120,7 @@
 \r
 \r
     <target name="dist"\r
-    description="generate distribution for relation doctype" depends="install">\r
+    description="generate distribution for relation doctype" depends="package">\r
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">\r
             <fileset file="${basedir}/target/${nuxeo.relation.jar}"/>\r
         </copy>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index 927a949bb6fd66e2b57331e2ac123da524eff6b6..b79f1a1db1b180efca6613a27d27f7ae34f237f4 100644 (file)
--- 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 92b13dfda6c9e2cf6ce0c6049471ac88ce309e3b..52237f1d0e3e14ef53f5d60e2ba06dfb01da8bdc 100644 (file)
--- a/services/relation/build.xml
+++ b/services/relation/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="install"\r
+    <target name="deploy" depends="package"\r
     description="deploy relation service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -115,7 +115,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for relation">\r
+    description="generate distribution for relation" depends="package">\r
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r

diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index 771dd5c6d6958550021ac7bd02142b7a02c8934f..f05cbae5d5fa9a016dc96c0051f86ccf33d29f98 100644 (file)
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -32,7 +32,13 @@
             <artifactId>org.collectionspace.services.client</artifactId>\r
             <version>1.0</version>\r
         </dependency>\r
-        \r
+\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.relation.service</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
+\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index bb78e64aa497982479446162d9a2bf76fe88ecc9..29e583cbe624f8b68f870467037b98ca2de0dbc1 100644 (file)
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -13,11 +13,6 @@
     <packaging>pom</packaging>\r
     <name>services.relation</name>\r
 \r
-    <properties>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
-\r
     <modules>\r
         <module>service</module>\r
         <module>3rdparty</module>\r