From 4d66c70e30c9a194a4172fbb2093cac2f799ea85 Mon Sep 17 00:00:00 2001 From: Ariel Backenroth Date: Sat, 23 Dec 2006 01:44:19 +0000 Subject: [PATCH] putting jon's change from last night back in and fixing mostly everything (i know of) that it broke - added utility methods to AVMConstants to extract information about stores from their names. this has to be reimplemented to look at store properties rather than inferring things from their names - but it works for now. this also centralizes all the usage of the store name to infer data about it so it'll make it easier later. - made the problematic constants jon changed private to avoid having this problem happen again - checked pretty much every usage of buildAVM to ensure that nothing else was broken. in the process removed the AVM part from the buildAVM part of the method to shorten it and since it's redundant with the classname AVMConstants in which their contained. creating workflow sandboxes in a manner consistent with user sandboxes - added a method to SandboxFactory to create workflow sandboxes. they're created with the name --workflow- - centralized workflow package creation code in AVMWorkflowUtil. - refactored sandbox creation code to use new utility methods in AVMConstants and so that at some point it can be further refactored. getting avm actions to show up in manage task screen for avm workflows - modified the model to use different packageItemActionGroups for wcm workflows - modified the AVMWorkflowEvaluator to allow all actions for items in a workflow package - added some debug output to various classes - made wcm navigation ids exposed throughout the app since they are now called from workflow jsps. things that now work that didn't before: - virtualization now works again with jon's new naming scheme - some actions from the manage task screen. known bugs introduced or remaining as a consequence of this change (i'll filed jira issues for these as soon as i commit this): - i'm inaccurately counting the number of users in a sandbox since it's harder now to differentiate between user main sandboxes and all the other ones that are being created - preview does not work on assets within the workflow sandboxes - review and approve workflow does not appear to actually submit once approved. not sure if it did before - lots of actions still do not work from manage tasks, though edit does appear to. - i commented out the location column in the manage task screen since the path link was causing me troubles - need to put that back in. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/workflow/wcmWorkflowModel.xml | 319 ++++++++++-------- config/alfresco/workflow/workflowModel.xml | 161 ++++----- 2 files changed, 243 insertions(+), 237 deletions(-) diff --git a/config/alfresco/workflow/wcmWorkflowModel.xml b/config/alfresco/workflow/wcmWorkflowModel.xml index 447d47e687..f285b9a143 100644 --- a/config/alfresco/workflow/wcmWorkflowModel.xml +++ b/config/alfresco/workflow/wcmWorkflowModel.xml @@ -2,156 +2,179 @@ - - - - + + + + - - - - - - - - - - - Serial - Parallel - - - - - - - + + + + + + + + + + + Serial + Parallel + + + - - - - - - - - - bpm:startTask - - - - bpm:workflowTask - + + + - - - - - - wcmwf:startTask - - - Serial or Parallel Review - d:text - true - Serial - - - - - - - bpm:assignees - wcmwf:submission - - + + + + + + + + + bpm:startTask + + + edit_and_remove_wcm_package_item_actions + + + + + + bpm:workflowTask + + + read_wcm_package_item_actions + + + + + + wcmwf:startTask + + + Serial or Parallel Review + d:text + true + Serial + + + + + + + bpm:assignees + wcmwf:submission + + + + + wcmwf:workflowTask + + + edit_wcm_package_item_actions + + + + + + bpm:assignees + wcmwf:submission + wcmwf:reviewType + + + + + wcmwf:workflowTask + + bpm:assignees + wcmwf:reviewType + wcmwf:reviewInfo + + + + + wcmwf:workflowTask + + bpm:assignees + wcmwf:reviewType + wcmwf:reviewInfo + + + + + wcmwf:startTask + + + d:text + + + + bpm:assignee + + + + + + + + + + + Source Folder Path + Folder where items have been submitted from + d:text + true + + + Snapshot Label + d:text + true + + + + + + + + Review Type + d:text + true + + + + + + + + + + + Reviewer Count + d:int + true + + + Approver Count + d:int + true + + + + + + + + Workflow Instance Id + d:text + true + + + + + - - wcmwf:workflowTask - - - - bpm:assignees - wcmwf:submission - wcmwf:reviewType - - - - - wcmwf:workflowTask - - bpm:assignees - wcmwf:reviewType - wcmwf:reviewInfo - - - - - wcmwf:workflowTask - - bpm:assignees - wcmwf:reviewType - wcmwf:reviewInfo - - - - - - - - - - - Source Folder Path - Folder where items have been submitted from - d:text - true - - - Snapshot Label - d:text - true - - - - - - - - Review Type - d:text - true - - - - - - - - - - - Reviewer Count - d:int - true - - - Approver Count - d:int - true - - - - - - - - Workflow Instance Id - d:text - true - - - - - - \ No newline at end of file diff --git a/config/alfresco/workflow/workflowModel.xml b/config/alfresco/workflow/workflowModel.xml index 4953635bab..f946336b1c 100644 --- a/config/alfresco/workflow/workflowModel.xml +++ b/config/alfresco/workflow/workflowModel.xml @@ -23,26 +23,26 @@ bpm:assignee - - - bpm:startTask - - - d:int - true - 50 - - - 1 - 100 - - - - - - bpm:assignees - - + + + bpm:startTask + + + d:int + true + 50 + + + 1 + 100 + + + + + + bpm:assignees + + bpm:workflowTask @@ -52,35 +52,35 @@ - - - bpm:workflowTask - - bpm:assignee - - - - - bpm:workflowTask - - bpm:assignee - - - - - bpm:workflowTask - - wf:parallelReviewStats - - - - bpm:workflowTask - - wf:parallelReviewStats - - - + + bpm:workflowTask + + bpm:assignee + + + + + bpm:workflowTask + + bpm:assignee + + + + + bpm:workflowTask + + wf:parallelReviewStats + + + + + bpm:workflowTask + + wf:parallelReviewStats + + + @@ -113,49 +113,32 @@ bpm:workflowTask - - bpm:assignee - + + bpm:assignee + - - - - - - - - bpm:startTask - - - d:text - - - - bpm:assignee - - - - - - - - - - d:int - - - d:int - - - d:int - - - d:int - - - - + + + + + + + + d:int + + + d:int + + + d:int + + + d:int + + + + \ No newline at end of file