Workflow:

- Fix failing test due to incorrect comparisons of id
- Further consolidation of id, name, title & description properties of workflow objects

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

source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java

@@ -1332,11 +1332,11 @@ public class JBPMEngine extends BPMEngine
     @SuppressWarnings("unchecked")
     protected WorkflowNode createWorkflowNode(Node node)
     {
-        String name = node.getName();
         String processName = node.getProcessDefinition().getName();
         WorkflowNode workflowNode = new WorkflowNode();
-        workflowNode.title = getLabel(processName + ".node." + name, TITLE_LABEL, name);
+        workflowNode.name = node.getName();
-        workflowNode.description = getLabel(processName + ".node." + name, DESC_LABEL, workflowNode.title);
+        workflowNode.title = getLabel(processName + ".node." + workflowNode.name, TITLE_LABEL, workflowNode.name);
+        workflowNode.description = getLabel(processName + ".node." + workflowNode.name, DESC_LABEL, workflowNode.title);
         if (node instanceof HibernateProxy)
         {
             Node realNode = (Node)((HibernateProxy)node).getHibernateLazyInitializer().getImplementation();        
@@ -1412,10 +1412,10 @@ public class JBPMEngine extends BPMEngine
     protected WorkflowDefinition createWorkflowDefinition(ProcessDefinition definition)
     {
         WorkflowDefinition workflowDef = new WorkflowDefinition();
-        String name = definition.getName();
-        workflowDef.title = getLabel(name + ".workflow", TITLE_LABEL, name);
-        workflowDef.description = getLabel(name + ".workflow", DESC_LABEL, workflowDef.title);
         workflowDef.id = createGlobalId(new Long(definition.getId()).toString());
+        workflowDef.name = definition.getName();
+        workflowDef.title = getLabel(workflowDef.name + ".workflow", TITLE_LABEL, workflowDef.name);
+        workflowDef.description = getLabel(workflowDef.name + ".workflow", DESC_LABEL, workflowDef.title);
         workflowDef.version = new Integer(definition.getVersion()).toString();
         Task startTask = definition.getTaskMgmtDefinition().getStartTask();
         if (startTask != null)
@@ -1433,24 +1433,25 @@ public class JBPMEngine extends BPMEngine
      */
     protected WorkflowTask createWorkflowTask(TaskInstance task)
     {
+        String processName = task.getTask().getProcessDefinition().getName();
+
         WorkflowTask workflowTask = new WorkflowTask();
         workflowTask.id = createGlobalId(new Long(task.getId()).toString());
+        workflowTask.name = task.getName();
         workflowTask.path = createWorkflowPath(task.getToken());
         workflowTask.state = getWorkflowTaskState(task);
         workflowTask.definition = createWorkflowTaskDefinition(task.getTask());
         workflowTask.properties = getTaskProperties(task);
-        String name = task.getName();
+        workflowTask.title = getLabel(processName + ".task." + workflowTask.name, TITLE_LABEL, null);
-        String processName = task.getTask().getProcessDefinition().getName();
-        workflowTask.title = getLabel(processName + ".task." + name, TITLE_LABEL, null);
         if (workflowTask.title == null)
         {
             workflowTask.title = workflowTask.definition.metadata.getTitle();
             if (workflowTask.title == null)
             {
-                workflowTask.title = name;
+                workflowTask.title = workflowTask.name;
             }
         }
-        workflowTask.description = getLabel(processName + ".task." + name, DESC_LABEL, null);
+        workflowTask.description = getLabel(processName + ".task." + workflowTask.name, DESC_LABEL, null);
         if (workflowTask.description == null)
         {
             String description = workflowTask.definition.metadata.getDescription();

source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java

@@ -77,7 +77,7 @@ public class JBPMEngineTest extends BaseSpringTest
         WorkflowDeployment deployment = workflowComponent.deployDefinition(processDef.getInputStream(), MimetypeMap.MIMETYPE_XML); 
         testWorkflowDef = deployment.definition; 
         assertNotNull(testWorkflowDef);
-        assertEquals("Test", testWorkflowDef.title);
+        assertEquals("test", testWorkflowDef.name);
         assertEquals("1", testWorkflowDef.version);
         assertTrue(workflowComponent.isDefinitionDeployed(processDef.getInputStream(), MimetypeMap.MIMETYPE_XML));
 
@@ -102,7 +102,7 @@ public class JBPMEngineTest extends BaseSpringTest
         WorkflowDeployment deployment = workflowComponent.deployDefinition(processDef.getInputStream(), MimetypeMap.MIMETYPE_XML); 
         testWorkflowDef = deployment.definition; 
         assertNotNull(testWorkflowDef);
-        assertEquals("Test", testWorkflowDef.title);
+        assertEquals("test", testWorkflowDef.name);
         assertEquals("2", testWorkflowDef.version);
     }
     
@@ -331,7 +331,7 @@ public class JBPMEngineTest extends BaseSpringTest
         assertNotNull(assignedTasks);
         assignedTasks = filterTasksByWorkflowInstance(assignedTasks, path.instance.id);
         assertEquals(1, assignedTasks.size());
-        assertEquals("Review", assignedTasks.get(0).title);
+        assertEquals("review", assignedTasks.get(0).name);
     }
 
     
@@ -373,7 +373,7 @@ public class JBPMEngineTest extends BaseSpringTest
         assertEquals(1, tasks1.size());
         WorkflowTask getTask = taskComponent.getTaskById(tasks1.get(0).id);
         assertNotNull(getTask);
-        assertEquals(getTask.title, tasks1.get(0).title);
+        assertEquals(getTask.id, tasks1.get(0).id);
     }
 
     

source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java

@@ -27,6 +27,9 @@ public class WorkflowDefinition
     /** Workflow Definition unique id */
     public String id;
     
+    /** Workflow Definition name */
+    public String name;
+    
     /** Workflow Definition version */
     public String version;
     

source/java/org/alfresco/service/cmr/workflow/WorkflowNode.java

@@ -26,6 +26,9 @@ package org.alfresco.service.cmr.workflow;
  */
 public class WorkflowNode
 {
+    /** Workflow Node Name */
+    public String name;
+    
     /** Workflow Node Title (Localised) */
     public String title;
     

source/java/org/alfresco/service/cmr/workflow/WorkflowTask.java

@@ -34,6 +34,9 @@ public class WorkflowTask
     /** Unique id of Task */
     public String id;
     
+    /** Task Name */
+    public String name;
+    
     /** Task Title (Localised) */
     public String title;