Index: openacs-4/packages/workflow/workflow.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/workflow.info,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/workflow/workflow.info	8 Aug 2006 21:27:24 -0000	1.19
+++ openacs-4/packages/workflow/workflow.info	17 Jun 2010 18:46:09 -0000	1.20
@@ -6,6 +6,8 @@
     <pretty-plural>Workflows</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
+    <implements-subsite-p>f</implements-subsite-p>
+    <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>workflow</auto-mount>
 
     <version name="2.1.1" url="http://openacs.org/repository/download/apm/workflow-2.1.1.apm">
@@ -22,20 +24,20 @@
           It supports the Bug Tracker, CMS publication, simple approval, and much more.
 &lt;p&gt;
 For more information, see: &lt;a href=&quot;http://www.collaboraid.biz/developer/workflow-spec&quot;&gt;the workflow specification&lt;/a&gt;.</description>
+        <maturity>0</maturity>
 
         <provides url="workflow" version="2.1.1"/>
         <requires url="acs-content-repository" version="5.0.0b4"/>
-        <requires url="acs-kernel" version="5.0.0b4"/>
-        <requires url="acs-tcl" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.2.0d2"/>
         <requires url="notifications" version="5.1.7"/>
 
         <callbacks>
             <callback type="after-install"  proc="workflow::install::package_install"/>
-            <callback type="before-uninstall"  proc="workflow::install::package_uninstall"/>
             <callback type="after-upgrade"  proc="workflow::install::after_upgrade"/>
+            <callback type="before-uninstall"  proc="workflow::install::package_uninstall"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SweepTimedActionsFrequency"  default="300" description="How frequently should we scan for and fire timed actions which have timed out. Specify the number of seconds between each run of the sweeper." section_name="Sweeper"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="SweepTimedActionsFrequency"  default="300" description="How frequently should we scan for and fire timed actions which have timed out. Specify the number of seconds between each run of the sweeper." section_name="Sweeper"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/workflow/tcl/case-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs.tcl,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/workflow/tcl/case-procs.tcl	18 Jun 2008 21:42:42 -0000	1.42
+++ openacs-4/packages/workflow/tcl/case-procs.tcl	17 Jun 2010 18:46:09 -0000	1.43
@@ -1206,12 +1206,17 @@
 } {
     db_transaction { 
         if { $replace_p } {
-            db_dml delete_assignees {}
+            workflow::case::role::assignees_remove -case_id $case_id -role_id $role_id
         }
         
         foreach party_id $party_ids {
             if { [catch {
                 db_dml insert_assignee {}
+
+		callback workflow::case::role::after_assign \
+		    -case_id $case_id \
+		    -party_id $party_id
+
             } errMsg] } {
                 set already_assigned_p [db_string already_assigned_p {}]
                 if { !$already_assigned_p } {
@@ -1240,9 +1245,38 @@
 } {
     db_dml delete_assignee {}
 
+    callback workflow::case::role::after_unassign \
+	-case_id $case_id \
+	-party_id $party_id
+
     workflow::case::role::flush_cache -case_id $case_id
 }
 
+ad_proc -public workflow::case::role::assignees_remove {
+    {-case_id:required}
+    {-role_id:required}
+} {
+    Remove all assignees in this role
+    
+    @param case_id the ID of the case.
+    @param role_id the ID of the role to remove the assignees from.
+
+    @author Ryan Gallimore
+} {
+    set assignees [workflow::case::role::get_assignees -case_id $case_id -role_id $role_id]
+    foreach assignee $assignees {
+        foreach {party_id email name} {
+            callback workflow::case::role::after_unassign \
+                -case_id $case_id \
+                -party_id $party_id
+        }
+    }
+
+    db_dml delete_assignees {}
+
+    workflow::case::role::flush_cache -case_id $case_id
+}
+
 ad_proc -public workflow::case::role::assign {
     {-case_id:required}
     {-array:required}
Index: openacs-4/packages/workflow/tcl/case-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/workflow/tcl/case-procs.xql	5 Feb 2004 10:37:33 -0000	1.14
+++ openacs-4/packages/workflow/tcl/case-procs.xql	17 Jun 2010 18:46:09 -0000	1.15
@@ -137,7 +137,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="workflow::case::role::assignee_insert.delete_assignees">
+  <fullquery name="workflow::case::role::assignees_remove.delete_assignees">
     <querytext>
         delete from workflow_case_role_party_map
         where  case_id = :case_id
Index: openacs-4/packages/workflow/tcl/workflow-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-callback-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/workflow/tcl/workflow-callback-procs.tcl	17 Jun 2010 18:47:12 -0000	1.1
@@ -0,0 +1,19 @@
+ad_library {
+    ad_proc -callback procs for workflow
+}
+
+ad_proc -callback workflow::case::role::after_assign {
+    {-case_id:required}
+    {-party_id:required}
+} {
+    After assignment callback to execute arbitrary code after
+    a party is assigned to a role.
+} -
+
+ad_proc -callback workflow::case::role::after_unassign {
+    {-case_id:required}
+    {-party_id:required}
+} {
+    After assignment callback to execute arbitrary code after
+    a party is unassigned from a role.
+} -
\ No newline at end of file