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

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"/>