From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 15 Dec 2012 01:48:39 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5498
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8d52469fd9c8f16aba17002abd3faf2332b40ded;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into CSPACE-5498

Conflicts:
	3rdparty/nuxeo/nuxeo-platform-listener/build.xml
	3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
---

8d52469fd9c8f16aba17002abd3faf2332b40ded
diff --cc 3rdparty/nuxeo/nuxeo-platform-listener/build.xml
index 0e0014a7f,10dc369ba..985b9dc67
--- a/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
@@@ -115,17 -115,17 +115,20 @@@
  
      <target name="deploy" depends="package"
              description="deploy nuxeo server libs to ${jee.server.cspace}">
+         <ant antfile="updateobjectlocationonmove/build.xml" target="deploy" inheritall="false"/>
 +        <ant antfile="updaterelationsondelete/build.xml" target="deploy" inheritall="false"/>
      </target>
  
      <target name="undeploy"
              description="undeploy nuxeo server libs from ${jee.server.cspace}">
+         <ant antfile="updateobjectlocationonmove/build.xml" target="undeploy" inheritall="false"/>
 +        <ant antfile="updaterelationsondelete/build.xml" target="undeploy" inheritall="false"/>
      </target>
  
      <target name="dist"
              description="generate distribution for nuxeo server libs" depends="package">
+         <ant antfile="updateobjectlocationonmove/build.xml" target="dist" inheritall="false"/>
 +        <ant antfile="updaterelationsondelete/build.xml" target="dist" inheritall="false"/>
      </target>
  
  </project>
diff --cc 3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
index 7548a2a71,a19a3425f..2a2cbc27f
--- a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
@@@ -13,7 -14,7 +13,8 @@@
      <name>services.3rdparty.nuxeo.listener</name>
  
      <modules>
+         <module>updateobjectlocationonmove</module>
 +        <module>updaterelationsondelete</module>
      </modules>
  
      <dependencies>