Data Dictionary:

- Add check to ensure property override actually refers to an existing property
Workflow:
- Fix overridden property defaults for Review & Approve tasks
- Update workflow resource bundles to reflect recent model changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/bpm-messages.properties

@@ -37,12 +37,15 @@ bpm_businessprocessmodel.property.bpm_workflowInstanceId.title=Workflow Instance
 bpm_businessprocessmodel.property.bpm_workflowInstanceId.description=Workflow Instance Id
 bpm_businessprocessmodel.property.bpm_context.title=Task Context
 bpm_businessprocessmodel.property.bpm_context.description=The context within which this task has been assigned
+bpm_businessprocessmodel.property.bpm_outcome.title=Task Outcome
+bpm_businessprocessmodel.property.bpm_outcome.description=Decision made on completing Task
+bpm_businessprocessmodel.property.bpm_completedItems.title=Completed Items
+bpm_businessprocessmodel.property.bpm_completedItems.description=Package items marked as complete
+bpm_businessprocessmodel.property.bpm_packageActionGroup.title=Package Actions
+bpm_businessprocessmodel.property.bpm_packageActionGroup.description=Actions available on workflow package
+bpm_businessprocessmodel.property.bpm_packageItemActionGroup.title=Package Item Actions
+bpm_businessprocessmodel.property.bpm_packageItemActionGroup.description=Actions available on workflow package items
 bpm_businessprocessmodel.association.bpm_package.title=Content Package
 bpm_businessprocessmodel.association.bpm_package.description=The collection of content routed through the workflow
-bpm_businessprocessmodel.association.bpm_completedItems.title=Completed Items
-bpm_businessprocessmodel.association.bpm_completedItems.description=Package items marked as complete
-
-# Workflow Package
-
 bpm_businessprocessmodel.aspect.bpm_workflowPackage.title=Workflow Package
 bpm_businessprocessmodel.aspect.bpm_workflowPackage.description=The collection of content routed through the workflow

config/alfresco/messages/workflow-messages.properties

@@ -13,30 +13,31 @@ wf_workflowmodel.type.wf_submitReviewTask.title=Submit Review
 wf_workflowmodel.type.wf_submitReviewTask.description=Submit documents for review & approval
 wf_workflowmodel.property.wf_reviewDueDate.title=Review Due Date
 wf_workflowmodel.property.wf_reviewDueDate.description=Review Due Date
-wf_workflowmodel.property.wf_priority.title=Review Priority
+wf_workflowmodel.property.wf_reviewPriority.title=Review Priority
-wf_workflowmodel.property.wf_priority.description=Review Priority
+wf_workflowmodel.property.wf_reviewPriority.description=Review Priority
 wf_workflowmodel.association.wf_reviewer.title=Reviewer
 wf_workflowmodel.association.wf_reviewer.description=Reviewer
 
+wf_workflowmodel.type.wf_reviewTask.title=Review
+wf_workflowmodel.type.wf_reviewTask.description=Review Documents to Approve or Reject them
+
 # Review & Approve Process Definitions
 
 wf_review.node.start.title=Start
 wf_review.node.start.description=Start
 wf_review.node.review.title=Review
 wf_review.node.review.description=Review
-wf_review.task.wf_review.title=Review
-wf_review.task.wf_review.description=Review
 wf_review.node.review.transition.reject.title=Reject
 wf_review.node.review.transition.reject.description=Reject
 wf_review.node.review.transition.approve.title=Approve
 wf_review.node.review.transition.approve.description=Approve
 wf_review.node.rejected.title=Rejected
 wf_review.node.rejected.description=Rejected
-wf_review.task.wf_rejected.title=Rejected
+wf_review.task.wf_rejectedTask.title=Rejected
-wf_review.task.wf_rejected.description=Rejected
+wf_review.task.wf_rejectedTask.description=Rejected
 wf_review.node.approved.title=Approved
 wf_review.node.approved.description=Approved
-wf_review.task.wf_approved.title=Approved
+wf_review.task.wf_approvedTask.title=Approved
-wf_review.task.wf_approved.description=Approved
+wf_review.task.wf_approvedTask.description=Approved
 wf_review.node.end.title=End
 wf_review.node.end.description=End

config/alfresco/model/workflowModel.xml

@@ -63,11 +63,11 @@
 
          <overrides>
 
-            <property name="wf:packageActionGroup">
+            <property name="bpm:packageActionGroup">
                <default>workflow_collection_actions</default>
             </property>
 
-            <property name="wf:packageItemActionGroup">
+            <property name="bpm:packageItemActionGroup">
                <default>workflow_item_collection_actions</default>
             </property>
 
@@ -86,7 +86,7 @@
          
          <overrides>
          
-            <property name="wf:packageItemActionGroup">
+            <property name="bpm:packageItemActionGroup">
                <default>workflow_item_edit_actions</default>
             </property>
             

source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java

@@ -191,6 +191,15 @@ import org.alfresco.service.namespace.QName;
         {
             ((M2AssociationDefinition)def).resolveDependencies(query);
         }
+
+        for (Map.Entry<QName, M2PropertyOverride> override : propertyOverrides.entrySet())
+        {
+            PropertyDefinition propDef = query.getProperty(override.getKey());
+            if (propDef == null)
+            {
+                throw new DictionaryException("Class " + name.toPrefixString() + " attempting to override property " + override.getKey().toPrefixString() + " which does not exist");
+            }
+        }
         
         for (QName aspectName : defaultAspectNames)
         {

source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java

@@ -70,7 +70,6 @@ public class WorkflowServiceImplTest extends BaseSpringTest
         NodeRef nodeRef = workflowService.createPackage(null);
         assertNotNull(nodeRef);
         assertTrue(nodeService.hasAspect(nodeRef, WorkflowModel.ASPECT_WORKFLOW_PACKAGE));
-        setComplete();
     }
     
 }

source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml

@@ -21,7 +21,7 @@
    </swimlane>
    
    <task-node name="review">
-      <task name="wf:review" swimlane="reviewer">
+      <task name="wf:reviewTask" swimlane="reviewer">
          <event type="task-create">
             <script>
                taskInstance.dueDate = reviewduedate;
@@ -38,7 +38,7 @@
    </task-node>
    
    <task-node name="rejected">
-      <task name="wf:rejected" swimlane="initiator">
+      <task name="wf:rejectedTask" swimlane="initiator">
          <controller>
             <variable name="comment" access="read"/>
             <variable name="package" access="read,required" mapped-name="bpm:package"/>
@@ -48,7 +48,7 @@
    </task-node>
    
    <task-node name="approved">
-      <task name="wf:approved" swimlane="initiator">
+      <task name="wf:approvedTask" swimlane="initiator">
          <controller>
             <variable name="comment" access="read"/>
             <variable name="package" access="read,required" mapped-name="bpm:package"/>