From 75eb05d35adb1b5a138bf12127f4b161cd91e846 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 29 Mar 2011 21:37:36 +0000
Subject: [PATCH] CSPACE-3755: Workflow service Ant 'deploy' and 'undeploy'
 execution chain broken.

---
 services/build.xml                                     |  3 +++
 .../src/main/resources/OSGI-INF/life-cycle-contrib.xml |  2 +-
 services/workflow/build.xml                            | 10 ++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/services/build.xml b/services/build.xml
index 331e2fadc..d814e0b7b 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -150,6 +150,7 @@
         <ant antfile="authentication/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="authorization/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="blob/build.xml" target="deploy" inheritAll="false"/>
+        <ant antfile="workflow/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="common/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="account/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="relation/build.xml" target="deploy" inheritAll="false"/>
@@ -199,6 +200,7 @@
         <ant antfile="common/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="media/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="blob/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="workflow/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="authorization/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="authentication/build.xml" target="undeploy" inheritAll="false"/>
     </target>
@@ -215,6 +217,7 @@
         <ant antfile="authorization/build.xml" target="dist" inheritAll="false"/>
         <ant antfile="account/build.xml" target="dist" inheritAll="false"/>
         <ant antfile="blob/build.xml" target="dist" inheritAll="false"/>
+        <ant antfile="workflow/build.xml" target="dist" inheritAll="false"/>
         <ant antfile="common/build.xml" target="dist" inheritAll="false"/>
         <ant antfile="relation/build.xml" target="dist" inheritAll="false"/>
         <ant antfile="id/build.xml" target="dist" inheritAll="false"/>
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 21e5598d9..b430dbc0b 100644
--- 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 53604d936..af5c0b16d 100644
--- 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>
-- 
2.47.3