[jbpm-commits] JBoss JBPM SVN: r6807 - in jbpm4/trunk/modules: examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Nov 9 11:41:19 EST 2010


Author: rebody
Date: 2010-11-09 11:41:18 -0500 (Tue, 09 Nov 2010)
New Revision: 6807

Modified:
   jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractGatewayBinding.java
   jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractTaskBinding.java
   jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml
   jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_user.bpmn.xml
   jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml
   jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_group.bpmn.xml
   jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_user.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ExclusiveGatewayTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ParallelGatewayTest.java
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskGroup.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSequenceFlowCondition.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSimple.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGateway.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayConvergingInvalid.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayDivergingInvalid.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayInvalidConditionExpression.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedInvalid.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedValid.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonBoundDefault.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonExistingDefault.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayTwoTransitions.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayXPath.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlow.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlowCondition.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/manualTask.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/newLineConditionExpression.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGateway.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGatewayInvalid.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.java.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.ws.bpmn.xml
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml
Log:
JBPM-2741 update process definition for new schema

Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractGatewayBinding.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractGatewayBinding.java	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractGatewayBinding.java	2010-11-09 16:41:18 UTC (rev 6807)
@@ -34,7 +34,7 @@
 
 /**
  * Abstract super class for all gateway types.
- * 
+ *
  * @author Ronald Van kuijk
  * @author Joram Barrez
  */
@@ -44,49 +44,49 @@
 
   protected int incoming;
   protected List<Element> inSequenceFlows;
-  
+
   protected int outgoing;
   protected List<Element> outSequenceFlows;
-  
+
   protected String id;
   protected String name;
-  
-  protected String gatewayDirection; 
+
+  protected String gatewayDirection;
   protected boolean valid = true;
-  
+
   static ObjectBinding objectBinding = new ObjectBinding();
   static WireParser wireParser = WireParser.getInstance();
 
   public AbstractGatewayBinding(String tagName) {
     super(tagName);
   }
-  
+
   /**
    * Subclasses should call this method while parsing.
    * Common attributes and elements will be parsed and stored in the protected member fields.
    */
   public void parse(Element element, Parse parse) {
-    
+
     resetMemberFields();
-    
+
     id = element.getAttribute("id");
     name = element.getAttribute("name");
-    
-    // 'gatewayDirection' is a constraint on any gateway type. 
+
+    // 'gatewayDirection' is a constraint on any gateway type.
     // Since this is an optional attribute, we can't rely on it at runtime.
     // As such, it is only used at parsing time to check if the constraints are met.
     if (element.hasAttribute("gatewayDirection")) {
       gatewayDirection = element.getAttribute("gatewayDirection");
     } else {
-      gatewayDirection = "unspecified"; // default
+      gatewayDirection = "Unspecified"; // default
     }
 
     // Count in/out sequence flow to validate gatewaydirection
     List<Element> allSequenceFlow = XmlUtil.elements((Element) element.getParentNode(), "sequenceFlow");
     Iterator<Element> iterator = allSequenceFlow.iterator();
-    
+
     while (iterator.hasNext()) {
-      
+
       Element sequenceFlowElement = iterator.next();
       String sourceRef = sequenceFlowElement.getAttribute("sourceRef");
       if (id.equals(sourceRef)) {
@@ -96,11 +96,11 @@
         incoming++;
         inSequenceFlows.add(sequenceFlowElement);
       }
-      
+
     }
-    
+
     valid = validGatewayDirection(parse, name, element);
-    
+
   }
 
   private void resetMemberFields() {
@@ -112,60 +112,60 @@
   }
 
   protected boolean validGatewayDirection(Parse parse, String elementName, Element element) {
-   
+
     if (log.isDebugEnabled()) {
       log.debug("Defined gatewayDirection: " + gatewayDirection + ". Nr of incomming: " + incoming + ", nr of outgoing: " + outgoing);
     }
-    
-    boolean valid = !(("converging".equals(gatewayDirection) && (!(incoming > 1) || outgoing != 1))
-            || ("diverging".equals(gatewayDirection) && (incoming != 1 || !(outgoing > 1)))
-            || ("mixed".equals(gatewayDirection) && (incoming <= 1 || outgoing <= 1)));
 
+    boolean valid = !(("Converging".equals(gatewayDirection) && (!(incoming > 1) || outgoing != 1))
+            || ("Diverging".equals(gatewayDirection) && (incoming != 1 || !(outgoing > 1)))
+            || ("Mixed".equals(gatewayDirection) && (incoming <= 1 || outgoing <= 1)));
+
     if (!valid) {
       parse.addProblem(tagName+ " '" + elementName + "' has the wrong number of incomming (" + incoming + ") and outgoing (" + outgoing
             + ") transitions for gatewayDirection='" + gatewayDirection + "'", element);
     }
     return valid;
   }
-  
+
   /**
    * For some gateway types (eg. exclusive), conditions are required on every outgoing
    * sequence flow. This operation will check if all sequence flow (excluding the default
    * sequence flow) have such a condition defined.
-   * 
+   *
    * Also the reference from the default attribute is verified if it points to an existing
    * sequence flow defined in the process.
-   * 
+   *
    * The operation will add problems to the given {@link Parse} object if problems are found.
-   * Also the 'valid' boolean wil be changed if needed. 
+   * Also the 'valid' boolean wil be changed if needed.
    */
   protected void validateConditionOnAllSequenceFlow(Parse parse, Element element) {
     boolean defaultExists = false;
     for (Element outSeqFlow : outSequenceFlows) {
-      
+
       String sourceRef = outSeqFlow.getAttribute("sourceRef");
       Element conditionalExpression = XmlUtil.element(outSeqFlow, "conditionExpression");
-      
+
       if (id.equals(sourceRef)) {
-        
+
         if (outSeqFlow.getAttribute("id").equals(default_)) {
           defaultExists = true;
         } else if (default_ != null && conditionalExpression == null) {  // All but the 'default' sequenceFlow need to have a condition
-          parse.addProblem("exclusiveGateway '" + name + "' has default sequenceFlow '" + default_ 
+          parse.addProblem("exclusiveGateway '" + name + "' has default sequenceFlow '" + default_
                   + "' but " + outSeqFlow.getAttribute("id")
                   + " does not have a required conditionExpression", element);
           valid = false; // do not break. Parsing may find other issues;
         }
       }
-      
+
     }
-      
+
     if (default_ != null && !defaultExists) {
-      parse.addProblem("exclusiveGateway '" + name + "' default sequenceFlow '" + default_ 
+      parse.addProblem("exclusiveGateway '" + name + "' default sequenceFlow '" + default_
               + "' does not exist or is not related to this node", element);
       valid = false;
     }
-      
+
   }
 
 }
\ No newline at end of file

Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractTaskBinding.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractTaskBinding.java	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractTaskBinding.java	2010-11-09 16:41:18 UTC (rev 6807)
@@ -12,10 +12,10 @@
 
 /**
  * The AbstractTask is the task superclass and doesn't define own Behavior.
- * 
+ *
  * Spec: A Task which is not further specified is called Abstract Task (this was
  * referred to as the None Task in BPMN 1.2).
- * 
+ *
  * @author bernd.ruecker at camunda.com
  */
 public class AbstractTaskBinding extends BpmnBinding {
@@ -27,7 +27,7 @@
   public AbstractTaskBinding(String tagName) {
     super(tagName);
   }
-  
+
   public Object parse(Element element, Parse parse, BpmnParser bpmnParser) {
     ManualTaskActivity manualTaskActivity = new ManualTaskActivity();
     manualTaskActivity.setDefault(getDefault());
@@ -53,11 +53,11 @@
   }
 
   private ActivityResource addPerformer(TaskDefinitionImpl taskDefinition, String type, Element performer, Parse parse) {
+    Element resourceRefElement = XmlUtil.element(performer, "resourceRef");
+    String resourceRef = resourceRefElement.getTextContent();
 
-    String resourceRef = XmlUtil.attribute(performer, "resourceRef", parse);
-    
     BpmnProcessDefinition bpmnProcessDefinition = parse.contextStackFind(BpmnProcessDefinition.class);
-    
+
     ActivityResource activityResource = new ActivityResource();
     activityResource.setResourceRef(bpmnProcessDefinition.getResource(resourceRef));
 
@@ -72,7 +72,7 @@
         taskDefinition.setAssigneeExpression(expression);
       } else if (POTENTIAL_OWNER.equals(type) && "user".equals(scope)) { // default is group
         taskDefinition.setCandidateUsersExpression(expression);
-      } else { 
+      } else {
         taskDefinition.setCandidateGroupsExpression(expression);
       }
     }

Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -17,11 +17,12 @@
 
         <userTask id="requestVacation" name="Request Vacation"
             implementation="other">
-            <potentialOwner resourceRef="user" jbpm:type="group">
-        <resourceAssignmentExpression>
-          <formalExpression>user</formalExpression>
-        </resourceAssignmentExpression>
-      </potentialOwner>
+            <potentialOwner jbpm:type="group">
+              <resourceRef>user</resourceRef>
+              <resourceAssignmentExpression>
+                <formalExpression>user</formalExpression>
+              </resourceAssignmentExpression>
+            </potentialOwner>
             <rendering id="requestForm">
                 <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl</jbpm:form>
             </rendering>
@@ -33,11 +34,12 @@
 
         <userTask id="verifyRequest" name="Verify Request"
             implementation="other">
-            <potentialOwner resourceRef="user" jbpm:type="group">
-        <resourceAssignmentExpression>
-          <formalExpression>manager</formalExpression>
-        </resourceAssignmentExpression>
-      </potentialOwner>
+            <potentialOwner jbpm:type="group">
+              <resourceRef>user</resourceRef>
+              <resourceAssignmentExpression>
+                <formalExpression>manager</formalExpression>
+              </resourceAssignmentExpression>
+            </potentialOwner>
             <rendering id="verifyForm">
                 <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl</jbpm:form>
             </rendering>

Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_user.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_user.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_user.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -17,7 +17,8 @@
     <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" />
 
     <userTask id="myTask" name="My User task">
-      <humanPerformer resourceRef="employee">
+      <humanPerformer>
+        <resourceRef>employee</resourceRef>
         <resourceAssignmentExpression>
           <formalExpression>mary</formalExpression>
         </resourceAssignmentExpression>

Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -17,7 +17,8 @@
     <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" />
 
     <userTask id="myTask" name="My User task">
-      <humanPerformer resourceRef="employee">
+      <humanPerformer>
+        <resourceRef>employee</resourceRef>
         <resourceAssignmentExpression>
           <formalExpression>${user}</formalExpression>
         </resourceAssignmentExpression>

Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_group.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_group.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_group.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -17,7 +17,8 @@
     <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" />
 
     <userTask id="myTask" name="My User task">
-      <potentialOwner resourceRef="manager" jbpm:type="group">
+      <potentialOwner jbpm:type="group">
+        <resourceRef>manager</resourceRef>
         <resourceAssignmentExpression>
           <formalExpression>management</formalExpression>
         </resourceAssignmentExpression>

Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_user.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_user.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_user.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -17,7 +17,8 @@
     <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" />
 
     <userTask id="myTask" name="My User task">
-      <potentialOwner resourceRef="employee" jbpm:type="user">
+      <potentialOwner jbpm:type="user">
+        <resourceRef>employee</resourceRef>
         <resourceAssignmentExpression>
           <formalExpression>peter</formalExpression>
         </resourceAssignmentExpression>

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ExclusiveGatewayTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ExclusiveGatewayTest.java	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ExclusiveGatewayTest.java	2010-11-09 16:41:18 UTC (rev 6807)
@@ -249,7 +249,7 @@
     if ((problems == null) || (problems.isEmpty())) {
       fail("expected problems during parse");
     } else {
-      assertTextPresent("exclusiveGateway 'Just a gateway' has the wrong number of incomming (1) and outgoing (2) transitions for gatewayDirection='mixed'", problems.get(0).getMsg());
+      assertTextPresent("exclusiveGateway 'Just a gateway' has the wrong number of incomming (1) and outgoing (2) transitions for gatewayDirection='Mixed'", problems.get(0).getMsg());
     }
   }
   
@@ -260,7 +260,7 @@
     if ((problems == null) || (problems.isEmpty())) {
       fail("expected problems during parse");
     } else {
-      assertTextPresent("Gateway 'Just a gateway' has the wrong number of incomming (1) and outgoing (2) transitions for gatewayDirection='converging'", problems.get(0).getMsg());
+      assertTextPresent("Gateway 'Just a gateway' has the wrong number of incomming (1) and outgoing (2) transitions for gatewayDirection='Converging'", problems.get(0).getMsg());
     }
   }
 
@@ -271,7 +271,7 @@
     if ((problems == null) || (problems.isEmpty())) {
       fail("expected problems during parse");
     } else {
-      assertTextPresent("exclusiveGateway 'Just a gateway' has the wrong number of incomming (2) and outgoing (2) transitions for gatewayDirection='diverging'", problems.get(0).getMsg());
+      assertTextPresent("exclusiveGateway 'Just a gateway' has the wrong number of incomming (2) and outgoing (2) transitions for gatewayDirection='Diverging'", problems.get(0).getMsg());
     }
   }
   

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ParallelGatewayTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ParallelGatewayTest.java	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/ParallelGatewayTest.java	2010-11-09 16:41:18 UTC (rev 6807)
@@ -102,7 +102,7 @@
     if ((problems == null) || (problems.isEmpty())) {
       fail("expected problems during parse");
     } else {
-      assertTextPresent("parallelGateway 'The Fork' has the wrong number of incomming (1) and outgoing (2) transitions for gatewayDirection='converging'", problems.get(0).getMsg());
+      assertTextPresent("parallelGateway 'The Fork' has the wrong number of incomming (1) and outgoing (2) transitions for gatewayDirection='Converging'", problems.get(0).getMsg());
     }
   }
 }

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskGroup.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskGroup.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskGroup.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="UserTaskGroup"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/"
-	xmlns:jbpm="http://jbpm.org/4.0/bpmn2">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/"
+    xmlns:jbpm="http://jbpm.org/4.0/bpmn2">
 
-	<bpmn:resource name="sampleHumanResource" />
+    <bpmn:resource name="sampleHumanResource" />
 
-	<bpmn:process id="UserTaskGroupProcess" name="Simple process with user task for group">
+    <bpmn:process id="UserTaskGroupProcess" name="Simple process with user task for group">
 
 
-		<bpmn:startEvent id="Start" />
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" name="fromStartToUserTask"
-			sourceRef="Start" targetRef="UserTask" />
+        <bpmn:sequenceFlow id="flow1" name="fromStartToUserTask"
+            sourceRef="Start" targetRef="UserTask" />
 
-		<bpmn:userTask id="UserTask" name="user task"
-			implementation="other">
-			<!-- use jbpm internal task management -->
-			<bpmn:potentialOwner id="myPerformer" resourceRef="sampleResource" jbpm:type="group">
-				<bpmn:resourceAssignmentExpression
-					id="rae">
-					<bpmn:formalExpression language="juel">
-						${assignedGroup}</bpmn:formalExpression>
-				</bpmn:resourceAssignmentExpression>
-			</bpmn:potentialOwner>
-						<bpmn:potentialOwner id="myPerformer2" resourceRef="sampleResource">
-				<bpmn:resourceAssignmentExpression
-					id="rae2">
-					<bpmn:formalExpression language="juel">
-						${assignedGroup}</bpmn:formalExpression>
-				</bpmn:resourceAssignmentExpression>
-			</bpmn:potentialOwner>
-			<bpmn:rendering id="myRendering">
-				<jbpm:form>MyForm.ftl</jbpm:form>
-			</bpmn:rendering>
-		</bpmn:userTask>
+        <bpmn:userTask id="UserTask" name="user task"
+            implementation="other">
+            <!-- use jbpm internal task management -->
+            <bpmn:potentialOwner id="myPerformer" resourceRef="sampleResource" jbpm:type="group">
+                <bpmn:resourceAssignmentExpression
+                    id="rae">
+                    <bpmn:formalExpression language="juel">
+                        ${assignedGroup}</bpmn:formalExpression>
+                </bpmn:resourceAssignmentExpression>
+            </bpmn:potentialOwner>
+                        <bpmn:potentialOwner id="myPerformer2" resourceRef="sampleResource">
+                <bpmn:resourceAssignmentExpression
+                    id="rae2">
+                    <bpmn:formalExpression language="juel">
+                        ${assignedGroup}</bpmn:formalExpression>
+                </bpmn:resourceAssignmentExpression>
+            </bpmn:potentialOwner>
+            <bpmn:rendering id="myRendering">
+                <jbpm:form>MyForm.ftl</jbpm:form>
+            </bpmn:rendering>
+        </bpmn:userTask>
 
-		<bpmn:sequenceFlow id="flow2" name="fromUserTaskToEnd"
-			sourceRef="UserTask" targetRef="End" />
+        <bpmn:sequenceFlow id="flow2" name="fromUserTaskToEnd"
+            sourceRef="UserTask" targetRef="End" />
 
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSequenceFlowCondition.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSequenceFlowCondition.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSequenceFlowCondition.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,42 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="UserTaskSequenceFlowCondition"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:resource name="sampleHumanResource" />
+    <bpmn:resource name="sampleHumanResource" />
 
-	<bpmn:process id="UserTaskSequenceFlowConditionProcess"
-		name="Simple process with user task and condition on sequenceFlow">
+    <bpmn:process id="UserTaskSequenceFlowConditionProcess"
+        name="Simple process with user task and condition on sequenceFlow">
 
-		<bpmn:startEvent id="Start" />
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" name="fromStartToUserTask"
-			sourceRef="Start" targetRef="UserTask" />
+        <bpmn:sequenceFlow id="flow1" name="fromStartToUserTask"
+            sourceRef="Start" targetRef="UserTask" />
 
-		<bpmn:userTask id="UserTask" name="user task"
-			implementation="other">
-			<!-- use jbpm internal task management -->
-			<bpmn:performer id="myPerformer" resourceRef="sampleResource" />
-		</bpmn:userTask>
+        <bpmn:userTask id="UserTask" name="user task"
+            implementation="other">
+            <!-- use jbpm internal task management -->
+            <bpmn:performer id="myPerformer" resourceRef="sampleResource" />
+        </bpmn:userTask>
 
-		<bpmn:sequenceFlow id="flow2" name="fromUserTaskToUSerTask2"
-			sourceRef="UserTask" targetRef="UserTask2">
-			<bpmn:conditionExpression id="flow2Cond"
-				xsi:type="bpmn:tFormalExpression">${jbpm_outcome == 'flow'}</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" name="fromUserTaskToUSerTask2"
+            sourceRef="UserTask" targetRef="UserTask2">
+            <bpmn:conditionExpression id="flow2Cond"
+                xsi:type="bpmn:tFormalExpression">${jbpm_outcome == 'flow'}</bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="UserTask2" name="another user task"
-			implementation="other">
-			<!-- use jbpm internal task management -->
-			<bpmn:performer id="myPerformer2" resourceRef="sampleResource" />
-		</bpmn:userTask>
+        <bpmn:userTask id="UserTask2" name="another user task"
+            implementation="other">
+            <!-- use jbpm internal task management -->
+            <bpmn:performer id="myPerformer2" resourceRef="sampleResource" />
+        </bpmn:userTask>
 
-		<bpmn:sequenceFlow id="flow3" name="fromUserTask2ToEnd"
-			sourceRef="UserTask2" targetRef="End">
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" name="fromUserTask2ToEnd"
+            sourceRef="UserTask2" targetRef="End">
+        </bpmn:sequenceFlow>
 
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSimple.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSimple.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSimple.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,38 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="UserTaskSimple"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/"
-	xmlns:jbpm="http://jbpm.org/4.0/bpmn2">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/"
+    xmlns:jbpm="http://jbpm.org/4.0/bpmn2">
 
-	<bpmn:resource name="sampleHumanResource" />
+    <bpmn:resource name="sampleHumanResource" />
 
-	<bpmn:process id="UserTaskSimpleProcess" name="Simple process with user task">
+    <bpmn:process id="UserTaskSimpleProcess" name="Simple process with user task">
 
-		<bpmn:startEvent id="Start" />
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" name="fromStartToUserTask"
-			sourceRef="Start" targetRef="UserTask" />
+        <bpmn:sequenceFlow id="flow1" name="fromStartToUserTask"
+            sourceRef="Start" targetRef="UserTask" />
 
-		<bpmn:userTask id="UserTask" name="user task"
-			implementation="other">
-			<!-- use jbpm internal task management -->
-			<bpmn:performer id="myPerformer" resourceRef="sampleResource">
-				<bpmn:resourceAssignmentExpression
-					id="rae">
-					<bpmn:formalExpression language="juel">
-						${assignedUser}</bpmn:formalExpression>
-				</bpmn:resourceAssignmentExpression>
-			</bpmn:performer>
-			<bpmn:rendering id="myRendering">
-				<jbpm:form>MyForm.ftl</jbpm:form>
-			</bpmn:rendering>
-		</bpmn:userTask>
+        <bpmn:userTask id="UserTask" name="user task"
+            implementation="other">
+            <!-- use jbpm internal task management -->
+            <bpmn:performer id="myPerformer" resourceRef="sampleResource">
+                <bpmn:resourceAssignmentExpression
+                    id="rae">
+                    <bpmn:formalExpression language="juel">
+                        ${assignedUser}</bpmn:formalExpression>
+                </bpmn:resourceAssignmentExpression>
+            </bpmn:performer>
+            <bpmn:rendering id="myRendering">
+                <jbpm:form>MyForm.ftl</jbpm:form>
+            </bpmn:rendering>
+        </bpmn:userTask>
 
-		<bpmn:sequenceFlow id="flow2" name="fromUserTaskToEnd"
-			sourceRef="UserTask" targetRef="End" />
+        <bpmn:sequenceFlow id="flow2" name="fromUserTaskToEnd"
+            sourceRef="UserTask" targetRef="End" />
 
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGateway.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGateway.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGateway.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,41 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+<bpmn:definitions
+    id="ExclusiveGatewayNormal"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="ExclusiveGateway" name="ExclusiveGateway">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="ExclusiveGateway" name="ExclusiveGateway">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGatewayDecision" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGatewayDecision" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGatewayDecision"
-			name="Just a gateway" default="flow3"/>
+        <bpmn:exclusiveGateway id="exclusiveGatewayDecision"
+            name="Just a gateway" default="flow3"/>
 
-		<!-- Sequence Flow -->
+        <!-- Sequence Flow -->
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGatewayDecision"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${test == 'value'}</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGatewayDecision"
-			targetRef="doSomethingElse">
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGatewayDecision"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${test == 'value'}</bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGatewayDecision"
+            targetRef="doSomethingElse">
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayConvergingInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayConvergingInvalid.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayConvergingInvalid.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGateway" default="flow5"
-			name="Just a gateway" gatewayDirection="converging"/>
+        <bpmn:exclusiveGateway id="exclusiveGateway" default="flow5"
+            name="Just a gateway" gatewayDirection="Converging"/>
 
-		<!-- Sequence Flow -->
+        <!-- Sequence Flow -->
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tExpression">
-				Has to be valid
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
-			targetRef="doSomethingElse">
-			<bpmn:conditionExpression xsi:type="bpmn:tExpression">
-				Otherwise this one
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tExpression">
+                Has to be valid
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
+            targetRef="doSomethingElse">
+            <bpmn:conditionExpression xsi:type="bpmn:tExpression">
+                Otherwise this one
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayDivergingInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayDivergingInvalid.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayDivergingInvalid.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,53 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGatewayPre" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGatewayPre" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGatewayPre"
-			name="Just a dummy gateway"/>
+        <bpmn:exclusiveGateway id="exclusiveGatewayPre"
+            name="Just a dummy gateway"/>
 
-		<bpmn:sequenceFlow id="flow6" sourceRef="exclusiveGatewayPre"
-			targetRef="exclusiveGateway" name="exclusiveGateway->exclusiveGatewayPre" />
+        <bpmn:sequenceFlow id="flow6" sourceRef="exclusiveGatewayPre"
+            targetRef="exclusiveGateway" name="exclusiveGateway->exclusiveGatewayPre" />
 
-		<bpmn:sequenceFlow id="flow7" sourceRef="exclusiveGatewayPre"
-			targetRef="exclusiveGateway" name="exclusiveGateway->exclusiveGatewayPre" />
+        <bpmn:sequenceFlow id="flow7" sourceRef="exclusiveGatewayPre"
+            targetRef="exclusiveGateway" name="exclusiveGateway->exclusiveGatewayPre" />
 
-		<bpmn:exclusiveGateway id="exclusiveGateway"
-			name="Just a gateway" gatewayDirection="diverging"/>
+        <bpmn:exclusiveGateway id="exclusiveGateway"
+            name="Just a gateway" gatewayDirection="Diverging"/>
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tExpression">
-				Has to be valid
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
-			targetRef="doSomethingElse">
-			<bpmn:conditionExpression xsi:type="bpmn:tExpression">
-				Otherwise this one
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tExpression">
+                Has to be valid
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
+            targetRef="doSomethingElse">
+            <bpmn:conditionExpression xsi:type="bpmn:tExpression">
+                Otherwise this one
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayInvalidConditionExpression.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayInvalidConditionExpression.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayInvalidConditionExpression.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGateway"
-			name="Just a gateway" />
+        <bpmn:exclusiveGateway id="exclusiveGateway"
+            name="Just a gateway" />
 
-		<!-- Sequence Flow -->
+        <!-- Sequence Flow -->
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tExpression">
-				getDataObject('lieferungVariable')/confirmationRequired=true
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
-			targetRef="doSomethingElse">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression" >not(
-				getDataObject('lieferungVariable')/confirmationRequired=true )
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tExpression">
+                getDataObject('lieferungVariable')/confirmationRequired=true
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
+            targetRef="doSomethingElse">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression" >not(
+                getDataObject('lieferungVariable')/confirmationRequired=true )
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedInvalid.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedInvalid.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGateway" default="flow5"
-			name="Just a gateway" gatewayDirection="mixed"/>
+        <bpmn:exclusiveGateway id="exclusiveGateway" default="flow5"
+            name="Just a gateway" gatewayDirection="Mixed"/>
 
-		<!-- Sequence Flow -->
+        <!-- Sequence Flow -->
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tExpression">
-				Has to be valid
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
-			targetRef="doSomethingElse">
-			<bpmn:conditionExpression xsi:type="bpmn:tExpression">
-				Otherwise this one
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tExpression">
+                Has to be valid
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
+            targetRef="doSomethingElse">
+            <bpmn:conditionExpression xsi:type="bpmn:tExpression">
+                Otherwise this one
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedValid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedValid.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedValid.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,53 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGatewayPre" name="Start->exclusiveGatewayPre" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGatewayPre" name="Start->exclusiveGatewayPre" />
 
-		<bpmn:exclusiveGateway id="exclusiveGatewayPre"
-			name="Just a dummy gateway"/>
+        <bpmn:exclusiveGateway id="exclusiveGatewayPre"
+            name="Just a dummy gateway"/>
 
-		<bpmn:sequenceFlow id="flow6" sourceRef="exclusiveGatewayPre"
-			targetRef="exclusiveGateway" name="exclusiveGatewayPre->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow6" sourceRef="exclusiveGatewayPre"
+            targetRef="exclusiveGateway" name="exclusiveGatewayPre->exclusiveGateway" />
 
-		<bpmn:sequenceFlow id="flow7" sourceRef="exclusiveGatewayPre"
-			targetRef="exclusiveGateway" name="exclusiveGatewayPre->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow7" sourceRef="exclusiveGatewayPre"
+            targetRef="exclusiveGateway" name="exclusiveGatewayPre->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGateway"
-			name="Just a gateway" gatewayDirection="mixed"/>
+        <bpmn:exclusiveGateway id="exclusiveGateway"
+            name="Just a gateway" gatewayDirection="Mixed"/>
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
-				Has to be valid
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
-			targetRef="doSomethingElse">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
-				Otherwise this one
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
+                Has to be valid
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
+            targetRef="doSomethingElse">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
+                Otherwise this one
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonBoundDefault.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonBoundDefault.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonBoundDefault.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGateway" default="flow5"
-			name="Just a gateway" />
+        <bpmn:exclusiveGateway id="exclusiveGateway" default="flow5"
+            name="Just a gateway" />
 
-		<!-- Sequence Flow -->
+        <!-- Sequence Flow -->
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
-				getDataObject('lieferungVariable')/confirmationRequired=true
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
-			targetRef="doSomethingElse">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not(
-				getDataObject('lieferungVariable')/confirmationRequired=true )
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
+                getDataObject('lieferungVariable')/confirmationRequired=true
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
+            targetRef="doSomethingElse">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not(
+                getDataObject('lieferungVariable')/confirmationRequired=true )
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonExistingDefault.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonExistingDefault.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonExistingDefault.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGateway" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGateway" default="flow666"
-			name="Just a gateway" />
+        <bpmn:exclusiveGateway id="exclusiveGateway" default="flow666"
+            name="Just a gateway" />
 
-		<!-- Sequence Flow -->
+        <!-- Sequence Flow -->
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
-				getDataObject('lieferungVariable')/confirmationRequired=true
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
-			targetRef="doSomethingElse">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not(
-				getDataObject('lieferungVariable')/confirmationRequired=true )
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGateway"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">
+                getDataObject('lieferungVariable')/confirmationRequired=true
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGateway"
+            targetRef="doSomethingElse">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not(
+                getDataObject('lieferungVariable')/confirmationRequired=true )
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayTwoTransitions.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayTwoTransitions.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayTwoTransitions.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,43 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions id="testComplexSituationExecuteDecisionConditionProcesses" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 BPMN20.xsd"
-	xmlns="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://vitras.com/rwar"
-	xmlns:jbpm="http://jbpm.org/bpmn2">
+<definitions id="testComplexSituationExecuteDecisionConditionProcesses"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://vitras.com/rwar"
+    xmlns:jbpm="http://jbpm.org/bpmn2">
 
-	<process id="exclusiveGatewayTwoTransitions" name="exclusiveGatewayTwoTransitions">
+    <process id="exclusiveGatewayTwoTransitions" name="exclusiveGatewayTwoTransitions">
 
-		<startEvent id="start" />
+        <startEvent id="start" />
 
-		<sequenceFlow id="initial" name="toTestTask1" sourceRef="start"
-			targetRef="testTask1" />
+        <sequenceFlow id="initial" name="toTestTask1" sourceRef="start"
+            targetRef="testTask1" />
 
-		<userTask id="testTask1" name="testTask1" implementation="other" />
+        <userTask id="testTask1" name="testTask1" implementation="other" />
 
-		<sequenceFlow id="toTestTask1" sourceRef="testTask1"
-			targetRef="testTask2" />
+        <sequenceFlow id="toTestTask1" sourceRef="testTask1"
+            targetRef="testTask2" />
 
-		<userTask id="testTask2" name="testTask2" implementation="other" />
+        <userTask id="testTask2" name="testTask2" implementation="other" />
 
-		<sequenceFlow id="toExclusiveGateway1" sourceRef="testTask2"
-			targetRef="exclusiveGateway1" />
+        <sequenceFlow id="toExclusiveGateway1" sourceRef="testTask2"
+            targetRef="exclusiveGateway1" />
 
-		<exclusiveGateway id="exclusiveGateway1" name="exclusiveGateway1" />
+        <exclusiveGateway id="exclusiveGateway1" name="exclusiveGateway1" />
 
-		<sequenceFlow id="toTestTask3" sourceRef="exclusiveGateway1" targetRef="testTask3">
-			<conditionExpression xsi:type="tFormalExpression">${variable&gt;2}</conditionExpression>
-		</sequenceFlow>
-		
-		<sequenceFlow id="toTestTask1Again" sourceRef="exclusiveGateway1"
-			targetRef="testTask1" />
+        <sequenceFlow id="toTestTask3" sourceRef="exclusiveGateway1" targetRef="testTask3">
+            <conditionExpression xsi:type="tFormalExpression">${variable&gt;2}</conditionExpression>
+        </sequenceFlow>
 
-		<userTask id="testTask3" name="TestTask3" implementation="other" />
+        <sequenceFlow id="toTestTask1Again" sourceRef="exclusiveGateway1"
+            targetRef="testTask1" />
 
-		<sequenceFlow id="toEnd" name="to End" sourceRef="testTask3"
-			targetRef="end" />
+        <userTask id="testTask3" name="TestTask3" implementation="other" />
 
-		<endEvent id="end" name="End" />
+        <sequenceFlow id="toEnd" name="to End" sourceRef="testTask3"
+            targetRef="end" />
 
-	</process>
+        <endEvent id="end" name="End" />
+
+    </process>
 </definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayXPath.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayXPath.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayXPath.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,41 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="ExclusiveGateway" name="ExclusiveGateway">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="ExclusiveGateway" name="ExclusiveGateway">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGatewayDecision" name="Start->exclusiveGateway" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="exclusiveGatewayDecision" name="Start->exclusiveGateway" />
 
-		<bpmn:exclusiveGateway id="exclusiveGatewayDecision"
-			name="Just a gateway" default="flow3"/>
+        <bpmn:exclusiveGateway id="exclusiveGatewayDecision"
+            name="Just a gateway" default="flow3"/>
 
-		<!-- Sequence Flow -->
+        <!-- Sequence Flow -->
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGatewayDecision"
-			targetRef="doSomething">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression" language="xpath">getObjectData("justadocument")/root/child1/text()=$test</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGatewayDecision"
-			targetRef="doSomethingElse">
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2" sourceRef="exclusiveGatewayDecision"
+            targetRef="doSomething">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression" language="xpath">getObjectData("justadocument")/root/child1/text()=$test</bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3" sourceRef="exclusiveGatewayDecision"
+            targetRef="doSomethingElse">
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="doSomething" name="Anything at all"
-			implementation="other"></bpmn:userTask>
-		<bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
-			targetRef="End" />
+        <bpmn:userTask id="doSomething" name="Anything at all"
+            implementation="other"></bpmn:userTask>
+        <bpmn:sequenceFlow id="flow4" sourceRef="doSomething"
+            targetRef="End" />
 
-		<bpmn:userTask id="doSomethingElse" name="But completely different"
-			implementation="other" />
-		<bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
-			targetRef="End" />
+        <bpmn:userTask id="doSomethingElse" name="But completely different"
+            implementation="other" />
+        <bpmn:sequenceFlow id="flow5" sourceRef="doSomethingElse"
+            targetRef="End" />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlow.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlow.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlow.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,49 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ForkWithUncontrolledSequenceFlow"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:resource name="sampleResource" />	
+    <bpmn:resource name="sampleResource" />
 
-	<bpmn:process id="ForkWithUncontrolledSequenceFlowProcess" name="ForkWithUncontrolledSequenceFlow">
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="ForkWithUncontrolledSequenceFlowProcess" name="ForkWithUncontrolledSequenceFlow">
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" name="fromStartToFork"
-			sourceRef="Start"
-			targetRef="forkingTask"  />
+        <bpmn:sequenceFlow id="flow1" name="fromStartToFork"
+            sourceRef="Start"
+            targetRef="forkingTask"  />
 
-		<bpmn:task id="forkingTask" name="The Fork" />
+        <bpmn:task id="forkingTask" name="The Fork" />
 
-		<bpmn:sequenceFlow id="flow2a" name="Leg 1"
-			sourceRef="forkingTask"
-			targetRef="UserTaskLeg1" />
-		<bpmn:userTask id="UserTaskLeg1" name="user task leg1" implementation="other">
-			<bpmn:potentialOwner resourceRef="sampleResource" />
-		</bpmn:userTask>
-		<bpmn:sequenceFlow id="flow2b" name="Leg 1 -> Join"
-			sourceRef="UserTaskLeg1"
-			targetRef="parallelGatewayJoin"  />
-			
-		<bpmn:sequenceFlow id="flow3a" name="Leg 2" 
-			sourceRef="forkingTask"
-			targetRef="UserTaskLeg2" />
-		<bpmn:userTask id="UserTaskLeg2" name="user task leg2" implementation="other">
-			<bpmn:potentialOwner resourceRef="sampleResource" />
-		</bpmn:userTask>
-		<bpmn:sequenceFlow id="flow3b" name="Leg 2 -> Join"
-			sourceRef="UserTaskLeg2"
-			targetRef="parallelGatewayJoin"  />
-			
+        <bpmn:sequenceFlow id="flow2a" name="Leg 1"
+            sourceRef="forkingTask"
+            targetRef="UserTaskLeg1" />
+        <bpmn:userTask id="UserTaskLeg1" name="user task leg1" implementation="other">
+            <bpmn:potentialOwner resourceRef="sampleResource" />
+        </bpmn:userTask>
+        <bpmn:sequenceFlow id="flow2b" name="Leg 1 -> Join"
+            sourceRef="UserTaskLeg1"
+            targetRef="parallelGatewayJoin"  />
 
-		<bpmn:parallelGateway id="parallelGatewayJoin" name="The Join" 
-			gatewayDirection="converging"/>
-		<bpmn:sequenceFlow id="flow4" 
-			sourceRef="parallelGatewayJoin"
-			targetRef="End">
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3a" name="Leg 2"
+            sourceRef="forkingTask"
+            targetRef="UserTaskLeg2" />
+        <bpmn:userTask id="UserTaskLeg2" name="user task leg2" implementation="other">
+            <bpmn:potentialOwner resourceRef="sampleResource" />
+        </bpmn:userTask>
+        <bpmn:sequenceFlow id="flow3b" name="Leg 2 -> Join"
+            sourceRef="UserTaskLeg2"
+            targetRef="parallelGatewayJoin"  />
 
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+
+        <bpmn:parallelGateway id="parallelGatewayJoin" name="The Join"
+            gatewayDirection="converging"/>
+        <bpmn:sequenceFlow id="flow4"
+            sourceRef="parallelGatewayJoin"
+            targetRef="End">
+        </bpmn:sequenceFlow>
+
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlowCondition.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlowCondition.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlowCondition.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,51 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ForkWithUncontrolledSequenceFlowCondition"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:resource name="sampleResource" />
+    <bpmn:resource name="sampleResource" />
 
-	<bpmn:process id="ForkWithUncontrolledSequenceFlowConditionProcess"
-		name="ForkWithUncontrolledSequenceFlowCondition">
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="ForkWithUncontrolledSequenceFlowConditionProcess"
+        name="ForkWithUncontrolledSequenceFlowCondition">
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" name="fromStartToForkingTask"
-			sourceRef="Start" targetRef="forkingTask" />
+        <bpmn:sequenceFlow id="flow1" name="fromStartToForkingTask"
+            sourceRef="Start" targetRef="forkingTask" />
 
-		<bpmn:userTask id="forkingTask" name="The Fork" />
+        <bpmn:userTask id="forkingTask" name="The Fork" />
 
-		<bpmn:sequenceFlow id="flow2a" name="Leg 1"
-			sourceRef="forkingTask" targetRef="UserTaskLeg1">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${jbpm_outcome == 'flow'}</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow2a" name="Leg 1"
+            sourceRef="forkingTask" targetRef="UserTaskLeg1">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${jbpm_outcome == 'flow'}</bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
 
-		<bpmn:userTask id="UserTaskLeg1" name="user task leg1"
-			implementation="other">
-			<bpmn:potentialOwner resourceRef="sampleResource" />
-		</bpmn:userTask>
+        <bpmn:userTask id="UserTaskLeg1" name="user task leg1"
+            implementation="other">
+            <bpmn:potentialOwner resourceRef="sampleResource" />
+        </bpmn:userTask>
 
-		<bpmn:sequenceFlow id="flow2b" name="Leg 1 -> Join"
-			sourceRef="UserTaskLeg1" targetRef="parallelGatewayJoin" />
+        <bpmn:sequenceFlow id="flow2b" name="Leg 1 -> Join"
+            sourceRef="UserTaskLeg1" targetRef="parallelGatewayJoin" />
 
-		<bpmn:sequenceFlow id="flow3a" name="Leg 2"
-			sourceRef="forkingTask" targetRef="UserTaskLeg2" />
-		<bpmn:userTask id="UserTaskLeg2" name="user task leg2"
-			implementation="other">
-			<bpmn:potentialOwner resourceRef="sampleResource" />
-		</bpmn:userTask>
+        <bpmn:sequenceFlow id="flow3a" name="Leg 2"
+            sourceRef="forkingTask" targetRef="UserTaskLeg2" />
+        <bpmn:userTask id="UserTaskLeg2" name="user task leg2"
+            implementation="other">
+            <bpmn:potentialOwner resourceRef="sampleResource" />
+        </bpmn:userTask>
 
-		<bpmn:sequenceFlow id="flow3b" name="Leg 2 -> Join"
-			sourceRef="UserTaskLeg2" targetRef="parallelGatewayJoin" />
+        <bpmn:sequenceFlow id="flow3b" name="Leg 2 -> Join"
+            sourceRef="UserTaskLeg2" targetRef="parallelGatewayJoin" />
 
 
-		<bpmn:parallelGateway id="parallelGatewayJoin"
-			name="The Join" gatewayDirection="converging" />
-		<bpmn:sequenceFlow id="flow4" sourceRef="parallelGatewayJoin"
-			targetRef="End">
-		</bpmn:sequenceFlow>
+        <bpmn:parallelGateway id="parallelGatewayJoin"
+            name="The Join" gatewayDirection="converging" />
+        <bpmn:sequenceFlow id="flow4" sourceRef="parallelGatewayJoin"
+            targetRef="End">
+        </bpmn:sequenceFlow>
 
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/manualTask.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/manualTask.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/manualTask.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,29 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <definitions id="sid-e471f2be-74cc-4f20-a201-09327449efdf"
-	typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
-	targetNamespace="http://www.omg.org/bpmn20" xmlns="http://schema.omg.org/spec/BPMN/2.0"
-	xmlns:jbpm="http://jbpm.org/bpmn2">
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    targetNamespace="http://www.omg.org/bpmn20"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    xmlns:jbpm="http://jbpm.org/bpmn2">
     <process id="manualTaskProcess" name="manualTaskProcess">
         <laneSet id="laneSet">
             <lane name="DefaultLane" id="lane">
-                <flowElementRef>start</flowElementRef>
-                <flowElementRef>manualTask</flowElementRef>
-                <flowElementRef>userTask</flowElementRef>
-                <flowElementRef>end</flowElementRef>
+                <flowNodeRef>start</flowNodeRef>
+                <flowNodeRef>manualTask</flowNodeRef>
+                <flowNodeRef>userTask</flowNodeRef>
+                <flowNodeRef>end</flowNodeRef>
             </lane>
         </laneSet>
         <startEvent name="Process start" id="start"/>
-	    <manualTask name="Do it manually" id="manualTask"/>
-		<userTask implementation="other" name="Sales operation" id="userTask">
-			<potentialOwner resourceRef="sales" jbpm:type="group">
-				<resourceAssignmentExpression>
-					<formalExpression>sales</formalExpression>
-				</resourceAssignmentExpression>
-			</potentialOwner>
-		</userTask>        
+        <manualTask name="Do it manually" id="manualTask"/>
+        <userTask implementation="other" name="Sales operation" id="userTask">
+            <potentialOwner jbpm:type="group">
+                <resourceRef>sales</resourceRef>
+                <resourceAssignmentExpression>
+                    <formalExpression>sales</formalExpression>
+                </resourceAssignmentExpression>
+            </potentialOwner>
+        </userTask>
         <endEvent name="Process end" id="end"/>
         <sequenceFlow targetRef="manualTask" sourceRef="start" name="flow2Manual" id="flow1"/>
         <sequenceFlow targetRef="userTask" sourceRef="manualTask" name="flow2user" id="flow2"/>
-    	<sequenceFlow targetRef="end" sourceRef="userTask" name="flow2End" id="flow3"/>
+        <sequenceFlow targetRef="end" sourceRef="userTask" name="flow2End" id="flow3"/>
     </process>
 </definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/newLineConditionExpression.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/newLineConditionExpression.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/newLineConditionExpression.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -2,9 +2,11 @@
 
 <definitions id="newLineConditionExpressionProcesses"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 BPMN20.xsd"
-    xmlns="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-    expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://vitras.com/rwar"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://vitras.com/rwar"
     xmlns:jbpm="http://jbpm.org/bpmn2">
 
     <process id="newLineConditionExpression" name="newLineConditionExpression">

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGateway.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGateway.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGateway.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,50 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="ParallelGateway" name="ParallelGateway">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="ParallelGateway" name="ParallelGateway">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" name="fromStartToFork"
-			sourceRef="Start"
-			targetRef="parallelGatewayFork"  />
+        <bpmn:sequenceFlow id="flow1" name="fromStartToFork"
+            sourceRef="Start"
+            targetRef="parallelGatewayFork"  />
 
-		<bpmn:parallelGateway id="parallelGatewayFork" name="The Fork" 
-			gatewayDirection="diverging"/>
+        <bpmn:parallelGateway id="parallelGatewayFork" name="The Fork"
+            gatewayDirection="Diverging"/>
 
-		<bpmn:sequenceFlow id="flow2a" name="Leg 1"
-			sourceRef="parallelGatewayFork"
-			targetRef="UserTaskLeg1" />
-		<bpmn:userTask id="UserTaskLeg1" name="user task leg1" implementation="other">
-			<bpmn:potentialOwner resourceRef="sampleResource" />
-		</bpmn:userTask>
-		<bpmn:sequenceFlow id="flow2b" name="Leg 1 -> Join"
-			sourceRef="UserTaskLeg1"
-			targetRef="parallelGatewayJoin"  />
-			
-		<bpmn:sequenceFlow id="flow3a" name="Leg 2" 
-			sourceRef="parallelGatewayFork"
-			targetRef="UserTaskLeg2" />
-		<bpmn:userTask id="UserTaskLeg2" name="user task leg2" implementation="other">
-			<bpmn:potentialOwner resourceRef="sampleResource" />
-		</bpmn:userTask>
-		<bpmn:sequenceFlow id="flow3b" name="Leg 2 -> Join"
-			sourceRef="UserTaskLeg2"
-			targetRef="parallelGatewayJoin"  />
-			
+        <bpmn:sequenceFlow id="flow2a" name="Leg 1"
+            sourceRef="parallelGatewayFork"
+            targetRef="UserTaskLeg1" />
+        <bpmn:userTask id="UserTaskLeg1" name="user task leg1" implementation="other">
+            <bpmn:potentialOwner>
+              <bpmn:resourceRef>sampleResource</bpmn:resourceRef>
+            </bpmn:potentialOwner>
+        </bpmn:userTask>
+        <bpmn:sequenceFlow id="flow2b" name="Leg 1 -> Join"
+            sourceRef="UserTaskLeg1"
+            targetRef="parallelGatewayJoin"  />
 
-		<bpmn:parallelGateway id="parallelGatewayJoin" name="The Join" 
-			gatewayDirection="converging"/>
-		<bpmn:sequenceFlow id="flow4" 
-			sourceRef="parallelGatewayJoin"
-			targetRef="End">
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow3a" name="Leg 2"
+            sourceRef="parallelGatewayFork"
+            targetRef="UserTaskLeg2" />
+        <bpmn:userTask id="UserTaskLeg2" name="user task leg2" implementation="other">
+            <bpmn:potentialOwner>
+              <bpmn:resourceRef>sampleResource</bpmn:resourceRef>
+            </bpmn:potentialOwner>
+        </bpmn:userTask>
+        <bpmn:sequenceFlow id="flow3b" name="Leg 2 -> Join"
+            sourceRef="UserTaskLeg2"
+            targetRef="parallelGatewayJoin"  />
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+
+        <bpmn:parallelGateway id="parallelGatewayJoin" name="The Join"
+            gatewayDirection="Converging"/>
+        <bpmn:sequenceFlow id="flow4"
+            sourceRef="parallelGatewayJoin"
+            targetRef="End">
+        </bpmn:sequenceFlow>
+
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGatewayInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGatewayInvalid.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGatewayInvalid.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ExclusiveGatewayNormal"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<bpmn:process id="Shipment" name="Shipment">
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start" />
+    <bpmn:process id="Shipment" name="Shipment">
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start" />
 
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="parallelGatewayFork" name="fromStartToFork" />
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="parallelGatewayFork" name="fromStartToFork" />
 
-		<bpmn:parallelGateway id="parallelGatewayFork"
-			name="The Fork" gatewayDirection="converging"/>
+        <bpmn:parallelGateway id="parallelGatewayFork"
+            name="The Fork" gatewayDirection="Converging"/>
 
-		<bpmn:sequenceFlow id="flow2" sourceRef="parallelGatewayFork"
-			targetRef="parallelGatewayJoin" name="Leg 1" />
+        <bpmn:sequenceFlow id="flow2" sourceRef="parallelGatewayFork"
+            targetRef="parallelGatewayJoin" name="Leg 1" />
 
-		<bpmn:sequenceFlow id="flow3" sourceRef="parallelGatewayFork"
-			targetRef="parallelGatewayJoin" name="Leg 2" />
+        <bpmn:sequenceFlow id="flow3" sourceRef="parallelGatewayFork"
+            targetRef="parallelGatewayJoin" name="Leg 2" />
 
-		<bpmn:parallelGateway id="parallelGatewayJoin"
-			name="The Join" gatewayDirection="diverging"/>
+        <bpmn:parallelGateway id="parallelGatewayJoin"
+            name="The Join" gatewayDirection="Diverging"/>
 
-		<bpmn:sequenceFlow id="flow4" sourceRef="parallelGatewayJoin"
-			targetRef="End">
-		</bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow4" sourceRef="parallelGatewayJoin"
+            targetRef="End">
+        </bpmn:sequenceFlow>
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
-	</bpmn:process>
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
+    </bpmn:process>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.java.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.java.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.java.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,187 +1,190 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions id="ShipmentDefinitions"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
-	xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" xmlns:sample="http://sample.bpmn.camunda.com/"
-	xmlns:xbpmn="http://bpmn.camunda.com/" xmlns:tns="http://sample.bpmn.camunda.com/"
-	typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
-	targetNamespace="http://sample.bpmn.camunda.com/">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    xmlns:sample="http://sample.bpmn.camunda.com/"
+    xmlns:xbpmn="http://bpmn.camunda.com/"
+    xmlns:tns="http://sample.bpmn.camunda.com/"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-	<!-- imports -->
-	<bpmn:import namespace="http://sample.bpmn.camunda.com/"
-		location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.xsd"
-		importType="http://www.w3.org/2001/XMLSchema" />
-	<bpmn:import namespace="http://sample.bpmn.camunda.com/"
-		location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/soap/" />
-	<bpmn:import namespace="http://sample.bpmn.camunda.com/"
-		location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\ShipmentProcessService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/soap/" />
+    <!-- imports -->
+    <bpmn:import namespace="http://sample.bpmn.camunda.com/"
+        location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.xsd"
+        importType="http://www.w3.org/2001/XMLSchema" />
+    <bpmn:import namespace="http://sample.bpmn.camunda.com/"
+        location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.wsdl"
+        importType="http://schemas.xmlsoap.org/wsdl/soap/" />
+    <bpmn:import namespace="http://sample.bpmn.camunda.com/"
+        location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\ShipmentProcessService.wsdl"
+        importType="http://schemas.xmlsoap.org/wsdl/soap/" />
 
-	<!-- definition structures for process variables -->
-	<bpmn:itemDefinition id="lieferungDef" itemKind="Information"
-		structureRef="sample:shipment" />
+    <!-- definition structures for process variables -->
+    <bpmn:itemDefinition id="lieferungDef" itemKind="Information"
+        structureRef="sample:shipment" />
 
-	<!-- definition structures for messages -->
-	<bpmn:itemDefinition id="ProzessStartenDef"
-		itemKind="Information" structureRef="sample:startShipmentProces" />
-	<bpmn:itemDefinition id="LieferungAnlegenDef"
-		itemKind="Information" structureRef="sample:createShipment" />
-	<bpmn:itemDefinition id="KommissioniertDef"
-		itemKind="Information" structureRef="sample:notifyShipmentConsigned" />
+    <!-- definition structures for messages -->
+    <bpmn:itemDefinition id="ProzessStartenDef"
+        itemKind="Information" structureRef="sample:startShipmentProces" />
+    <bpmn:itemDefinition id="LieferungAnlegenDef"
+        itemKind="Information" structureRef="sample:createShipment" />
+    <bpmn:itemDefinition id="KommissioniertDef"
+        itemKind="Information" structureRef="sample:notifyShipmentConsigned" />
 
-	<!-- messages -->
-	<bpmn:message name="ProzessStarten" id="ProzessStartenNachricht"
-		structureRef="tns:ProzessStartenDef" />
-	<bpmn:message name="LieferungAnlegen" id="LieferungAnlegenNachricht"
-		structureRef="tns:LieferungAnlegenDef" />
-	<bpmn:message name="Kommissioniert" id="KommissioniertNachricht"
-		structureRef="tns:KommissioniertDef" />
+    <!-- messages -->
+    <bpmn:message name="ProzessStarten" id="ProzessStartenNachricht"
+        structureRef="tns:ProzessStartenDef" />
+    <bpmn:message name="LieferungAnlegen" id="LieferungAnlegenNachricht"
+        structureRef="tns:LieferungAnlegenDef" />
+    <bpmn:message name="Kommissioniert" id="KommissioniertNachricht"
+        structureRef="tns:KommissioniertDef" />
 
-	<!-- Services -->
-	<!-- serivceReference ?? -->
-	<!-- conversation? Participant? -->
+    <!-- Services -->
+    <!-- serivceReference ?? -->
+    <!-- conversation? Participant? -->
 
-	<bpmn:endPoint id="ProzessEndpoint">
-		<xbpmn:url />
-	</bpmn:endPoint>
-	<bpmn:endPoint id="LiefersystemEndpoint">
-		<xbpmn:url />
-	</bpmn:endPoint>
+    <bpmn:endPoint id="ProzessEndpoint">
+        <xbpmn:url />
+    </bpmn:endPoint>
+    <bpmn:endPoint id="LiefersystemEndpoint">
+        <xbpmn:url />
+    </bpmn:endPoint>
 
-	<!-- interfaces -->
-	<bpmn:interface id="ProzessInterface" name="Lieferprozess Schnittstelle">
-		<bpmn:operation name="startShipmentProcess">
-			<bpmn:inMessageRef>tns:ProzessStartenNachricht</bpmn:inMessageRef>
-		</bpmn:operation>
-		<bpmn:operation name="notifyShipmentConsigned">
-			<bpmn:inMessageRef>tns:KommissioniertNachricht</bpmn:inMessageRef>
-		</bpmn:operation>
-	</bpmn:interface>
-	<bpmn:interface id="LiefersystemInterface" name="Liefersystem Schnittstelle">
-		<bpmn:operation name="createShiptment">
-			<bpmn:inMessageRef>tns:LieferungAnlegenNachricht</bpmn:inMessageRef>
-		</bpmn:operation>
-	</bpmn:interface>
-	<!-- Resources / Performers -->
-	<bpmn:resource id="VertriebResource" name="Vertrieb" />
-	<!-- process definition -->
-	<bpmn:process id="Shipment" name="Shipment">
-		<bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation>
+    <!-- interfaces -->
+    <bpmn:interface id="ProzessInterface" name="Lieferprozess Schnittstelle">
+        <bpmn:operation name="startShipmentProcess">
+            <bpmn:inMessageRef>tns:ProzessStartenNachricht</bpmn:inMessageRef>
+        </bpmn:operation>
+        <bpmn:operation name="notifyShipmentConsigned">
+            <bpmn:inMessageRef>tns:KommissioniertNachricht</bpmn:inMessageRef>
+        </bpmn:operation>
+    </bpmn:interface>
+    <bpmn:interface id="LiefersystemInterface" name="Liefersystem Schnittstelle">
+        <bpmn:operation name="createShiptment">
+            <bpmn:inMessageRef>tns:LieferungAnlegenNachricht</bpmn:inMessageRef>
+        </bpmn:operation>
+    </bpmn:interface>
+    <!-- Resources / Performers -->
+    <bpmn:resource id="VertriebResource" name="Vertrieb" />
+    <!-- process definition -->
+    <bpmn:process id="Shipment" name="Shipment">
+        <bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation>
 
-		<!-- process variables -->
-		<bpmn:dataObject id="lieferungVariable" name="Lieferung"
-			itemSubjectRef="tns:lieferungDef" />
+        <!-- process variables -->
+        <bpmn:dataObject id="lieferungVariable" name="Lieferung"
+            itemSubjectRef="tns:lieferungDef" />
 
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start">
-			<bpmn:dataOutput id="ProzessStartOutput"
-				itemSubjectRef="tns:ProzessStartenNachricht" />
-			<bpmn:dataOutputAssociation>
-				<bpmn:assignment>
-					<bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('ProzessStartOutput')/shipment</bpmn:from>
-					<bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
-				</bpmn:assignment>
-				<bpmn:sourceRef>ProzessStartOutput</bpmn:sourceRef>
-				<bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
-			</bpmn:dataOutputAssociation>
-			<bpmn:messageEventDefinition messageRef="tns:ProzessStartenNachricht">
-				<bpmn:operationRef>tns:startShipmentProcess</bpmn:operationRef>
-			</bpmn:messageEventDefinition>
-		</bpmn:startEvent>
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start">
+            <bpmn:dataOutput id="ProzessStartOutput"
+                itemSubjectRef="tns:ProzessStartenNachricht" />
+            <bpmn:dataOutputAssociation>
+                <bpmn:assignment>
+                    <bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('ProzessStartOutput')/shipment</bpmn:from>
+                    <bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
+                </bpmn:assignment>
+                <bpmn:sourceRef>ProzessStartOutput</bpmn:sourceRef>
+                <bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
+            </bpmn:dataOutputAssociation>
+            <bpmn:messageEventDefinition messageRef="tns:ProzessStartenNachricht">
+                <bpmn:operationRef>tns:startShipmentProcess</bpmn:operationRef>
+            </bpmn:messageEventDefinition>
+        </bpmn:startEvent>
 
-		<!-- Activity 1: Service Task -->
-		<bpmn:serviceTask id="LieferungBuchen" name="Lieferung buchen"
-			implementation="WebService" operationRef="createShipment">
-			<xbpmn:url />
-			<bpmn:ioSpecification>
-				<bpmn:dataInput id="LieferungBuchenInput"
-					isCollection="false" itemSubjectRef="tns:LieferungAnlegenNachricht" />
-				<bpmn:inputSet>
-					<bpmn:dataInputRefs>LieferungBuchenInput</bpmn:dataInputRefs>
-				</bpmn:inputSet>
-				<bpmn:outputSet />
-			</bpmn:ioSpecification>
-			<bpmn:dataInputAssociation>
-				<bpmn:assignment>
-					<bpmn:from xsi:type="bpmn:tFormalExpression">bpmn:getDataObject('lieferungVariable')</bpmn:from>
-					<bpmn:to xsi:type="bpmn:tFormalExpression">bpmn:getDataInput('LieferungBuchenInput'/shipment/</bpmn:to>
-				</bpmn:assignment>
-				<bpmn:sourceRef>tns:lieferungVariable</bpmn:sourceRef>
-				<bpmn:targetRef>LieferungBuchenInput</bpmn:targetRef>
-			</bpmn:dataInputAssociation>
-		</bpmn:serviceTask>
+        <!-- Activity 1: Service Task -->
+        <bpmn:serviceTask id="LieferungBuchen" name="Lieferung buchen"
+            implementation="WebService" operationRef="createShipment">
+            <xbpmn:url />
+            <bpmn:ioSpecification>
+                <bpmn:dataInput id="LieferungBuchenInput"
+                    isCollection="false" itemSubjectRef="tns:LieferungAnlegenNachricht" />
+                <bpmn:inputSet>
+                    <bpmn:dataInputRefs>LieferungBuchenInput</bpmn:dataInputRefs>
+                </bpmn:inputSet>
+                <bpmn:outputSet />
+            </bpmn:ioSpecification>
+            <bpmn:dataInputAssociation>
+                <bpmn:assignment>
+                    <bpmn:from xsi:type="bpmn:tFormalExpression">bpmn:getDataObject('lieferungVariable')</bpmn:from>
+                    <bpmn:to xsi:type="bpmn:tFormalExpression">bpmn:getDataInput('LieferungBuchenInput'/shipment/</bpmn:to>
+                </bpmn:assignment>
+                <bpmn:sourceRef>tns:lieferungVariable</bpmn:sourceRef>
+                <bpmn:targetRef>LieferungBuchenInput</bpmn:targetRef>
+            </bpmn:dataInputAssociation>
+        </bpmn:serviceTask>
 
-		<!-- Activity 2: Receive Task -->
-		<bpmn:receiveTask id="WartenAufLieferung" name="Warten auf Lieferung"
-			instantiate="false" implementation="WebService" operationRef="notifyShipmentConsigned"
-			messageRef="tns:Kommissioniert">
-			<bpmn:ioSpecification>
-				<bpmn:dataOutput id="KommissioniertOutput"
-					itemSubjectRef="tns:KommissioniertNachricht" />
-				<bpmn:inputSet />
-				<bpmn:outputSet>
-					<bpmn:dataOutputRefs>KommissioniertOutput</bpmn:dataOutputRefs>
-				</bpmn:outputSet>
-			</bpmn:ioSpecification>
+        <!-- Activity 2: Receive Task -->
+        <bpmn:receiveTask id="WartenAufLieferung" name="Warten auf Lieferung"
+            instantiate="false" implementation="WebService" operationRef="notifyShipmentConsigned"
+            messageRef="tns:Kommissioniert">
+            <bpmn:ioSpecification>
+                <bpmn:dataOutput id="KommissioniertOutput"
+                    itemSubjectRef="tns:KommissioniertNachricht" />
+                <bpmn:inputSet />
+                <bpmn:outputSet>
+                    <bpmn:dataOutputRefs>KommissioniertOutput</bpmn:dataOutputRefs>
+                </bpmn:outputSet>
+            </bpmn:ioSpecification>
 
-			<bpmn:dataOutputAssociation>
-				<bpmn:assignment>
-					<bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('KommissioniertOutput')/shipment</bpmn:from>
-					<bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
-				</bpmn:assignment>
-				<bpmn:sourceRef>KommissioniertOutput</bpmn:sourceRef>
-				<bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
-			</bpmn:dataOutputAssociation>
-		</bpmn:receiveTask>
+            <bpmn:dataOutputAssociation>
+                <bpmn:assignment>
+                    <bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('KommissioniertOutput')/shipment</bpmn:from>
+                    <bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
+                </bpmn:assignment>
+                <bpmn:sourceRef>KommissioniertOutput</bpmn:sourceRef>
+                <bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
+            </bpmn:dataOutputAssociation>
+        </bpmn:receiveTask>
 
-		<!-- Gateway -->
-		<bpmn:exclusiveGateway id="PruefeAvisierung"
-			name="Avisierung benoetigt?" />
+        <!-- Gateway -->
+        <bpmn:exclusiveGateway id="PruefeAvisierung"
+            name="Avisierung benoetigt?" />
 
-		<!-- Activity 3: User Task -->
-		<bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren"
-			implementation="other">
-			<!--
-				<bpmn:humanPerformer
-				resourceRef="tns:Vertrieb"></bpmn:humanPerformer>
-			-->
-			<bpmn:potentialOwner resourceRef="tns:VertriebResource" />
-		</bpmn:userTask>
+        <!-- Activity 3: User Task -->
+        <bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren"
+            implementation="other">
+            <!--
+                <bpmn:humanPerformer
+                resourceRef="tns:Vertrieb"></bpmn:humanPerformer>
+            -->
+            <bpmn:potentialOwner resourceRef="tns:VertriebResource" />
+        </bpmn:userTask>
 
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End" />
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End" />
 
-		<!-- Sequence Flow -->
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="LieferungBuchen" name="Start->LieferungBuchen" />
-		<bpmn:sequenceFlow id="flow2" sourceRef="LieferungBuchen"
-			targetRef="WartenAufLieferung" />
-		<bpmn:sequenceFlow id="flow3" sourceRef="WartenAufLieferung"
-			targetRef="PruefeAvisierung" />
-		<bpmn:sequenceFlow id="flow4" sourceRef="PruefeAvisierung"
-			targetRef="LieferterminAvisieren">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')/confirmationRequired=true
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow5" sourceRef="PruefeAvisierung"
-			targetRef="End">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not(
-				getDataObject('lieferungVariable')/confirmationRequired=true )
-			</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow6" sourceRef="LieferterminAvisieren"
-			targetRef="End" />
-	</bpmn:process>
+        <!-- Sequence Flow -->
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start"
+            targetRef="LieferungBuchen" name="Start->LieferungBuchen" />
+        <bpmn:sequenceFlow id="flow2" sourceRef="LieferungBuchen"
+            targetRef="WartenAufLieferung" />
+        <bpmn:sequenceFlow id="flow3" sourceRef="WartenAufLieferung"
+            targetRef="PruefeAvisierung" />
+        <bpmn:sequenceFlow id="flow4" sourceRef="PruefeAvisierung"
+            targetRef="LieferterminAvisieren">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')/confirmationRequired=true
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow5" sourceRef="PruefeAvisierung"
+            targetRef="End">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not(
+                getDataObject('lieferungVariable')/confirmationRequired=true )
+            </bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow6" sourceRef="LieferterminAvisieren"
+            targetRef="End" />
+    </bpmn:process>
 
-	<!--
-		<bpmn:correlationSubscription> </bpmn:correlationSubscription>
-	-->
+    <!--
+        <bpmn:correlationSubscription> </bpmn:correlationSubscription>
+    -->
 
-	<!-- TODO: Correlation / Conversation -->
-	<bpmn:conversation>
-		<bpmn:correlationKey>
-			<bpmn:correlationPropertyRef>test</bpmn:correlationPropertyRef>
-		</bpmn:correlationKey>
-	</bpmn:conversation>
+    <!-- TODO: Correlation / Conversation -->
+    <bpmn:conversation>
+        <bpmn:correlationKey>
+            <bpmn:correlationPropertyRef>test</bpmn:correlationPropertyRef>
+        </bpmn:correlationKey>
+    </bpmn:conversation>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.ws.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.ws.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.ws.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,148 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions id="ShipmentDefinitions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\BPMN20.xsd" xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" xmlns:sample="http://sample.bpmn.camunda.com/" xmlns:xbpmn="http://bpmn.camunda.com/" xmlns:tns="http://sample.bpmn.camunda.com/" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
-	
-	<!-- imports -->
-	<bpmn:import namespace="http://sample.bpmn.camunda.com/" location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.xsd" importType="http://www.w3.org/2001/XMLSchema"/>
-	<bpmn:import namespace="http://sample.bpmn.camunda.com/" location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.wsdl" importType="http://schemas.xmlsoap.org/wsdl/soap/"/>
-	<bpmn:import namespace="http://sample.bpmn.camunda.com/" location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\ShipmentProcessService.wsdl" importType="http://schemas.xmlsoap.org/wsdl/soap/"/>
-	
-	<!-- definition structures for process variables -->
-	<bpmn:itemDefinition id="lieferungDef" itemKind="Information" structureRef="sample:shipment"/>
-	
-	<!-- definition structures for messages -->
-	<bpmn:itemDefinition id="ProzessStartenDef" itemKind="Information" structureRef="sample:startShipmentProces"/>
-	<bpmn:itemDefinition id="LieferungAnlegenDef" itemKind="Information" structureRef="sample:createShipment"/>
-	<bpmn:itemDefinition id="KommissioniertDef" itemKind="Information" structureRef="sample:notifyShipmentConsigned"/>
-	
-	<!-- messages -->
-	<bpmn:message name="ProzessStarten" id="ProzessStartenNachricht" structureRef="tns:ProzessStartenDef"/>
-	<bpmn:message name="LieferungAnlegen" id="LieferungAnlegenNachricht" structureRef="tns:LieferungAnlegenDef"/>
-	<bpmn:message name="Kommissioniert" id="KommissioniertNachricht" structureRef="tns:KommissioniertDef"/>
-	
-	<!-- Services -->
-	<!-- serivceReference ?? -->
-	<!-- conversation? Participant? -->
-	
-	<bpmn:endPoint id="ProzessEndpoint">
-		<xbpmn:url/>
-	</bpmn:endPoint>
-	<bpmn:endPoint id="LiefersystemEndpoint">
-		<xbpmn:url/>
-	</bpmn:endPoint>
-	
-	<!-- interfaces -->
-	<bpmn:interface id="ProzessInterface" name="Lieferprozess Schnittstelle">
-		<bpmn:operation name="startShipmentProcess">
-			<bpmn:inMessageRef>tns:ProzessStartenNachricht</bpmn:inMessageRef>
-		</bpmn:operation>
-		<bpmn:operation name="notifyShipmentConsigned">
-			<bpmn:inMessageRef>tns:KommissioniertNachricht</bpmn:inMessageRef>
-		</bpmn:operation>
-	</bpmn:interface>
-	<bpmn:interface id="LiefersystemInterface" name="Liefersystem Schnittstelle">
-		<bpmn:operation name="createShiptment">
-			<bpmn:inMessageRef>tns:LieferungAnlegenNachricht</bpmn:inMessageRef>
-		</bpmn:operation>
-	</bpmn:interface>
-	<!-- Resources / Performers -->
-	<bpmn:resource id="VertriebResource" name="Vertrieb"/>
-	<!-- process definition -->
-	<bpmn:process id="Shipment" name="Shipment">
-		<bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation>
-		
-		<!-- process variables -->
-		<bpmn:dataObject id="lieferungVariable" name="Lieferung" itemSubjectRef="tns:lieferungDef"/>
-		
-		<!-- Start-Event -->
-		<bpmn:startEvent id="Start">
-			<bpmn:dataOutput id="ProzessStartOutput" itemSubjectRef="tns:ProzessStartenNachricht"/>
-			<bpmn:dataOutputAssociation>
-				<bpmn:assignment>
-					<bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('ProzessStartOutput')/shipment</bpmn:from>
-					<bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
-				</bpmn:assignment>
-				<bpmn:sourceRef>ProzessStartOutput</bpmn:sourceRef>
-				<bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
-			</bpmn:dataOutputAssociation>
-			<bpmn:messageEventDefinition messageRef="tns:ProzessStartenNachricht">
-				<bpmn:operationRef>tns:startShipmentProcess</bpmn:operationRef>
-			</bpmn:messageEventDefinition>
-		</bpmn:startEvent>
-		
-		<!-- Activity 1: Service Task -->
-		<bpmn:serviceTask id="LieferungBuchen" name="Lieferung buchen" implementation="WebService" operationRef="createShipment">
-			<xbpmn:url/>
-			<bpmn:ioSpecification>
-				<bpmn:dataInput id="LieferungBuchenInput" isCollection="false" itemSubjectRef="tns:LieferungAnlegenNachricht"/>
-				<bpmn:inputSet>
-					<bpmn:dataInputRefs>LieferungBuchenInput</bpmn:dataInputRefs>
-				</bpmn:inputSet>
-				<bpmn:outputSet/>
-			</bpmn:ioSpecification>
-			<bpmn:dataInputAssociation>
-				<bpmn:assignment>
-					<bpmn:from xsi:type="bpmn:tFormalExpression">bpmn:getDataObject('lieferungVariable')</bpmn:from>
-					<bpmn:to xsi:type="bpmn:tFormalExpression">bpmn:getDataInput('LieferungBuchenInput'/shipment/</bpmn:to>
-				</bpmn:assignment>
-				<bpmn:sourceRef>tns:lieferungVariable</bpmn:sourceRef>
-				<bpmn:targetRef>LieferungBuchenInput</bpmn:targetRef>
-			</bpmn:dataInputAssociation>
-		</bpmn:serviceTask>
-		
-		<!-- Activity 2: Receive Task -->
-		<bpmn:receiveTask id="WartenAufLieferung" name="Warten auf Lieferung" instantiate="false" implementation="WebService" operationRef="notifyShipmentConsigned" messageRef="tns:Kommissioniert">
-			<bpmn:ioSpecification>
-				<bpmn:dataOutput id="KommissioniertOutput" itemSubjectRef="tns:KommissioniertNachricht"/>
-				<bpmn:inputSet/>
-				<bpmn:outputSet>
-					<bpmn:dataOutputRefs>KommissioniertOutput</bpmn:dataOutputRefs>
-				</bpmn:outputSet>
-			</bpmn:ioSpecification>
+<bpmn:definitions id="ShipmentDefinitions"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    xmlns:sample="http://sample.bpmn.camunda.com/"
+    xmlns:xbpmn="http://bpmn.camunda.com/"
+    xmlns:tns="http://sample.bpmn.camunda.com/"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://sample.bpmn.camunda.com/">
 
-			<bpmn:dataOutputAssociation>
-				<bpmn:assignment>
-					<bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('KommissioniertOutput')/shipment</bpmn:from>
-					<bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
-				</bpmn:assignment>
-				<bpmn:sourceRef>KommissioniertOutput</bpmn:sourceRef>
-				<bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
-			</bpmn:dataOutputAssociation>
-		</bpmn:receiveTask>
-		
-		<!-- Gateway -->
-		<bpmn:exclusiveGateway id="PruefeAvisierung" name="Avisierung benoetigt?"/>
-		
-		<!-- Activity 3: User Task -->
-		<bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren" implementation="other">
-			<!--		<bpmn:humanPerformer resourceRef="tns:Vertrieb"></bpmn:humanPerformer>-->
-			<bpmn:potentialOwner resourceRef="tns:VertriebResource"/>
-		</bpmn:userTask>
-		
-		<!-- End Events -->
-		<bpmn:endEvent id="End" name="End"/>
-		
-		<!-- Sequence Flow -->
-		<bpmn:sequenceFlow id="flow1" sourceRef="Start" targetRef="LieferungBuchen" name="Start->LieferungBuchen"/>
-		<bpmn:sequenceFlow id="flow2" sourceRef="LieferungBuchen" targetRef="WartenAufLieferung"/>
-		<bpmn:sequenceFlow id="flow3" sourceRef="WartenAufLieferung" targetRef="PruefeAvisierung"/>
-		<bpmn:sequenceFlow id="flow4" sourceRef="PruefeAvisierung" targetRef="LieferterminAvisieren">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')/confirmationRequired=true</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow5" sourceRef="PruefeAvisierung" targetRef="End">
-			<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not( getDataObject('lieferungVariable')/confirmationRequired=true )</bpmn:conditionExpression>
-		</bpmn:sequenceFlow>
-		<bpmn:sequenceFlow id="flow6" sourceRef="LieferterminAvisieren" targetRef="End"/>
-	</bpmn:process>
+    <!-- imports -->
+    <bpmn:import namespace="http://sample.bpmn.camunda.com/" location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.xsd" importType="http://www.w3.org/2001/XMLSchema"/>
+    <bpmn:import namespace="http://sample.bpmn.camunda.com/" location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\SampleService.wsdl" importType="http://schemas.xmlsoap.org/wsdl/soap/"/>
+    <bpmn:import namespace="http://sample.bpmn.camunda.com/" location="D:\Projekte\workspace\jbpm4\BPMN-2.0\src\resource\ShipmentProcessService.wsdl" importType="http://schemas.xmlsoap.org/wsdl/soap/"/>
 
-<!--	
-	<bpmn:correlationSubscription>
-	</bpmn:correlationSubscription>
+    <!-- definition structures for process variables -->
+    <bpmn:itemDefinition id="lieferungDef" itemKind="Information" structureRef="sample:shipment"/>
+
+    <!-- definition structures for messages -->
+    <bpmn:itemDefinition id="ProzessStartenDef" itemKind="Information" structureRef="sample:startShipmentProces"/>
+    <bpmn:itemDefinition id="LieferungAnlegenDef" itemKind="Information" structureRef="sample:createShipment"/>
+    <bpmn:itemDefinition id="KommissioniertDef" itemKind="Information" structureRef="sample:notifyShipmentConsigned"/>
+
+    <!-- messages -->
+    <bpmn:message name="ProzessStarten" id="ProzessStartenNachricht" structureRef="tns:ProzessStartenDef"/>
+    <bpmn:message name="LieferungAnlegen" id="LieferungAnlegenNachricht" structureRef="tns:LieferungAnlegenDef"/>
+    <bpmn:message name="Kommissioniert" id="KommissioniertNachricht" structureRef="tns:KommissioniertDef"/>
+
+    <!-- Services -->
+    <!-- serivceReference ?? -->
+    <!-- conversation? Participant? -->
+
+    <bpmn:endPoint id="ProzessEndpoint">
+        <xbpmn:url/>
+    </bpmn:endPoint>
+    <bpmn:endPoint id="LiefersystemEndpoint">
+        <xbpmn:url/>
+    </bpmn:endPoint>
+
+    <!-- interfaces -->
+    <bpmn:interface id="ProzessInterface" name="Lieferprozess Schnittstelle">
+        <bpmn:operation name="startShipmentProcess">
+            <bpmn:inMessageRef>tns:ProzessStartenNachricht</bpmn:inMessageRef>
+        </bpmn:operation>
+        <bpmn:operation name="notifyShipmentConsigned">
+            <bpmn:inMessageRef>tns:KommissioniertNachricht</bpmn:inMessageRef>
+        </bpmn:operation>
+    </bpmn:interface>
+    <bpmn:interface id="LiefersystemInterface" name="Liefersystem Schnittstelle">
+        <bpmn:operation name="createShiptment">
+            <bpmn:inMessageRef>tns:LieferungAnlegenNachricht</bpmn:inMessageRef>
+        </bpmn:operation>
+    </bpmn:interface>
+    <!-- Resources / Performers -->
+    <bpmn:resource id="VertriebResource" name="Vertrieb"/>
+    <!-- process definition -->
+    <bpmn:process id="Shipment" name="Shipment">
+        <bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation>
+
+        <!-- process variables -->
+        <bpmn:dataObject id="lieferungVariable" name="Lieferung" itemSubjectRef="tns:lieferungDef"/>
+
+        <!-- Start-Event -->
+        <bpmn:startEvent id="Start">
+            <bpmn:dataOutput id="ProzessStartOutput" itemSubjectRef="tns:ProzessStartenNachricht"/>
+            <bpmn:dataOutputAssociation>
+                <bpmn:assignment>
+                    <bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('ProzessStartOutput')/shipment</bpmn:from>
+                    <bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
+                </bpmn:assignment>
+                <bpmn:sourceRef>ProzessStartOutput</bpmn:sourceRef>
+                <bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
+            </bpmn:dataOutputAssociation>
+            <bpmn:messageEventDefinition messageRef="tns:ProzessStartenNachricht">
+                <bpmn:operationRef>tns:startShipmentProcess</bpmn:operationRef>
+            </bpmn:messageEventDefinition>
+        </bpmn:startEvent>
+
+        <!-- Activity 1: Service Task -->
+        <bpmn:serviceTask id="LieferungBuchen" name="Lieferung buchen" implementation="WebService" operationRef="createShipment">
+            <xbpmn:url/>
+            <bpmn:ioSpecification>
+                <bpmn:dataInput id="LieferungBuchenInput" isCollection="false" itemSubjectRef="tns:LieferungAnlegenNachricht"/>
+                <bpmn:inputSet>
+                    <bpmn:dataInputRefs>LieferungBuchenInput</bpmn:dataInputRefs>
+                </bpmn:inputSet>
+                <bpmn:outputSet/>
+            </bpmn:ioSpecification>
+            <bpmn:dataInputAssociation>
+                <bpmn:assignment>
+                    <bpmn:from xsi:type="bpmn:tFormalExpression">bpmn:getDataObject('lieferungVariable')</bpmn:from>
+                    <bpmn:to xsi:type="bpmn:tFormalExpression">bpmn:getDataInput('LieferungBuchenInput'/shipment/</bpmn:to>
+                </bpmn:assignment>
+                <bpmn:sourceRef>tns:lieferungVariable</bpmn:sourceRef>
+                <bpmn:targetRef>LieferungBuchenInput</bpmn:targetRef>
+            </bpmn:dataInputAssociation>
+        </bpmn:serviceTask>
+
+        <!-- Activity 2: Receive Task -->
+        <bpmn:receiveTask id="WartenAufLieferung" name="Warten auf Lieferung" instantiate="false" implementation="WebService" operationRef="notifyShipmentConsigned" messageRef="tns:Kommissioniert">
+            <bpmn:ioSpecification>
+                <bpmn:dataOutput id="KommissioniertOutput" itemSubjectRef="tns:KommissioniertNachricht"/>
+                <bpmn:inputSet/>
+                <bpmn:outputSet>
+                    <bpmn:dataOutputRefs>KommissioniertOutput</bpmn:dataOutputRefs>
+                </bpmn:outputSet>
+            </bpmn:ioSpecification>
+
+            <bpmn:dataOutputAssociation>
+                <bpmn:assignment>
+                    <bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('KommissioniertOutput')/shipment</bpmn:from>
+                    <bpmn:to xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')</bpmn:to>
+                </bpmn:assignment>
+                <bpmn:sourceRef>KommissioniertOutput</bpmn:sourceRef>
+                <bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef>
+            </bpmn:dataOutputAssociation>
+        </bpmn:receiveTask>
+
+        <!-- Gateway -->
+        <bpmn:exclusiveGateway id="PruefeAvisierung" name="Avisierung benoetigt?"/>
+
+        <!-- Activity 3: User Task -->
+        <bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren" implementation="other">
+            <!--        <bpmn:humanPerformer resourceRef="tns:Vertrieb"></bpmn:humanPerformer>-->
+            <bpmn:potentialOwner resourceRef="tns:VertriebResource"/>
+        </bpmn:userTask>
+
+        <!-- End Events -->
+        <bpmn:endEvent id="End" name="End"/>
+
+        <!-- Sequence Flow -->
+        <bpmn:sequenceFlow id="flow1" sourceRef="Start" targetRef="LieferungBuchen" name="Start->LieferungBuchen"/>
+        <bpmn:sequenceFlow id="flow2" sourceRef="LieferungBuchen" targetRef="WartenAufLieferung"/>
+        <bpmn:sequenceFlow id="flow3" sourceRef="WartenAufLieferung" targetRef="PruefeAvisierung"/>
+        <bpmn:sequenceFlow id="flow4" sourceRef="PruefeAvisierung" targetRef="LieferterminAvisieren">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">getDataObject('lieferungVariable')/confirmationRequired=true</bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow5" sourceRef="PruefeAvisierung" targetRef="End">
+            <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not( getDataObject('lieferungVariable')/confirmationRequired=true )</bpmn:conditionExpression>
+        </bpmn:sequenceFlow>
+        <bpmn:sequenceFlow id="flow6" sourceRef="LieferterminAvisieren" targetRef="End"/>
+    </bpmn:process>
+
+<!--
+    <bpmn:correlationSubscription>
+    </bpmn:correlationSubscription>
 -->
-	
-	<!-- TODO: Correlation / Conversation -->
-	<bpmn:conversation>
-		<bpmn:correlationKey>
-			<bpmn:correlationPropertyRef>test</bpmn:correlationPropertyRef>
-		</bpmn:correlationKey>
-	</bpmn:conversation>
+
+    <!-- TODO: Correlation / Conversation -->
+    <bpmn:conversation>
+        <bpmn:correlationKey>
+            <bpmn:correlationPropertyRef>test</bpmn:correlationPropertyRef>
+        </bpmn:correlationKey>
+    </bpmn:conversation>
 </bpmn:definitions>

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml	2010-11-09 15:30:38 UTC (rev 6806)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml	2010-11-09 16:41:18 UTC (rev 6807)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="simplestProcessDefinition"
-	xmlns="http://schema.omg.org/spec/BPMN/2.0" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 BPMN20.xsd"
-	typeLanguage="http://www.w3.org/2001/XMLSchema"
-	expressionLanguage="http://www.w3.org/1999/XPath"
-	targetNamespace="http://www.jbpm.org/bpmn2/example" >
+    xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+    xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    typeLanguage="http://www.w3.org/2001/XMLSchema"
+    expressionLanguage="http://www.w3.org/1999/XPath"
+    targetNamespace="http://www.jbpm.org/bpmn2/example" >
 
-	<process id="simplestProcess" processType="executable"> 
-	
-		<startEvent id="theStart" />
-			
-		<endEvent id="theEnd" />
-		
-		<sequenceFlow id="startToEnd" sourceRef="theStart" targetRef="theEnd" />
-	
-	</process>
-	
+    <process id="simplestProcess" processType="executable">
 
+        <startEvent id="theStart" />
+
+        <endEvent id="theEnd" />
+
+        <sequenceFlow id="startToEnd" sourceRef="theStart" targetRef="theEnd" />
+
+    </process>
+
+
 </definitions>



More information about the jbpm-commits mailing list