Merged V2.0 to HEAD

5178: WCM-336, checkin performance
   5182: Missing OpenSearch strings
   5183: AR-1126
   5185: OpenSearch externalized strings
   5190: Schema and xforms
   5191: WCM-343
   5205: NTML using incorrect auth component
   5210: No virtual server start
   5211: WCM-352, WCM-353
   5212: Manage Task Dialog issues


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-03-07 15:04:21 +00:00
parent 920e29438f
commit 78d5d43e86
2 changed files with 37 additions and 1 deletions

View File

@@ -1501,7 +1501,12 @@ public class JBPMEngine extends BPMEngine
{ {
throw new WorkflowException("Task owner '" + value + "' is invalid"); throw new WorkflowException("Task owner '" + value + "' is invalid");
} }
String actorId = (String)value;
String existingActorId = instance.getActorId();
if (existingActorId == null || !actorId.equals(existingActorId))
{
instance.setActorId((String)value); instance.setActorId((String)value);
}
continue; continue;
} }
} }

View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="wf:testtaskassign">
<swimlane name="initiator" />
<start-state name="start">
<task name="bpm:startTask" swimlane="initiator" />
<transition name="" to="assign" />
</start-state>
<swimlane name="assignee">
<assignment class="org.alfresco.repo.workflow.jbpm.AlfrescoAssignment">
<actor>#{bpm_assignee}</actor>
</assignment>
</swimlane>
<task-node name="assign">
<task name="wf:workflowTask" swimlane="assignee">
<event type="task-assign">
<script>
System.out.println("Task assigned: " + executionContext.getTaskInstance().getActorId());
</script>
</event>
</task>
<transition name="" to="end" />
</task-node>
<end-state name="end" />
</process-definition>