CSPACE-3755: Workflow service Ant 'deploy' and 'undeploy' execution chain broken.

diff --git a/services/build.xml b/services/build.xml
index 331e2fadca805842c06fc3e9192359b0cad36822..d814e0b7b91ee3ca8551abb3288101e78166ad53 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -150,6 +150,7 @@
         <ant antfile="authentication/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="authorization/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="blob/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="workflow/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="common/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="account/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="relation/build.xml" target="deploy" inheritAll="false"/>\r
@@ -199,6 +200,7 @@
         <ant antfile="common/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="media/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="blob/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="workflow/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="authorization/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="authentication/build.xml" target="undeploy" inheritAll="false"/>\r
     </target>\r
@@ -215,6 +217,7 @@
         <ant antfile="authorization/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="account/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="blob/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="workflow/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="common/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

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 21e5598d9619f9e11633cd0df73fa79ee83ea92a..b430dbc0b29883853e1667505c794e50bf9bb1d6 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.ecm.platform.intake.LifeCycleManagerExtensions">
+<component name="org.collectionspace.ecm.platform.dimension.LifeCycleManagerExtensions">
 
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">

diff --git a/services/workflow/build.xml b/services/workflow/build.xml
index 53604d9368313aea0c500b54221b8d48db0fa971..af5c0b16dc4be7084726de75e20a171462c56ea8 100644 (file)
--- a/services/workflow/build.xml
+++ b/services/workflow/build.xml
@@ -107,15 +107,17 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy workflow service">
+        description="deploy workflow">
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy workflow service">
+        description="undeploy workflow service">
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist" depends="package"
-    description="distribute workflow service">
+        description="distribute workflow service">
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
     </target>
-
 </project>