[jbpm-commits] JBoss JBPM SVN: r5381 - in jbpm4/trunk/modules/bpmn/src: test/java/org/jbpm/bpmn/flownodes and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Jul 29 11:12:21 EDT 2009


Author: camunda
Date: 2009-07-29 11:12:21 -0400 (Wed, 29 Jul 2009)
New Revision: 5381

Added:
   jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/test/shipment.pdf
Modified:
   jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
   jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/test/ShipmentTest.java
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGateway.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayConvergingInvalid.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayDivergingInvalid.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedInvalid.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedValid.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonBoundDefault.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonExistingDefault.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGateway.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGatewayInvalid.bpmn.xml
   jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/test/shipment.bpmn.xml
Log:
made schema path to relative
added first test case for user task (still pretty simple)
added diagram of shipment example process

Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java	2009-07-29 15:12:21 UTC (rev 5381)
@@ -51,6 +51,7 @@
 
 /**
  * @author Tom Baeyens
+ * @author Bernd Ruecker (bernd.ruecker at camunda.com)
  */
 public class BpmnParser extends Parser {
 
@@ -70,7 +71,6 @@
     parseBindings();
     List<String> schemaResources = new ArrayList<String>();
     schemaResources.add("BPMN20.xsd");
-    // schemaResources.add("Semantic.xsd");
     setSchemaResources(schemaResources);
   }
 

Added: jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java	                        (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java	2009-07-29 15:12:21 UTC (rev 5381)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.bpmn.flownodes;
+
+import java.util.List;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.task.Task;
+import org.jbpm.bpmn.model.BpmnProcessDefinition;
+import org.jbpm.bpmn.parser.BpmnParser;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Problem;
+import org.jbpm.test.JbpmTestCase;
+
+/**
+ * @author Bernd Ruecker (bernd.ruecker at camunda.com)
+ */
+public class UserTaskTest extends JbpmTestCase {
+
+    static BpmnParser bpmnParser = new BpmnParser();
+
+    public void testParsing() {
+	Parse parse = bpmnParser.createParse().setResource("org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml").execute();
+
+	if (!parse.getProblems().isEmpty()) {
+	    fail("No problems should have occured. Problems: " + parse.getProblems());
+	}
+
+	List<BpmnProcessDefinition> processDefinitions = (List<BpmnProcessDefinition>) parse.getDocumentObject();
+
+	assertEquals(1, processDefinitions.size());
+
+	BpmnProcessDefinition pd = processDefinitions.get(0);
+	assertNotNull(pd);
+	assertEquals("UserTaskSimpleProcess", pd.getKey());
+    }
+
+    public void testNormal() {
+	String deploymentId = repositoryService.createDeployment().addResourceFromClasspath("org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml").deploy();
+
+	try {
+	    ProcessInstance pi = executionService.startProcessInstanceByKey("UserTaskSimpleProcess");
+	    assertEquals("UserTask", ((ExecutionImpl)pi).getActivityName());
+	    
+	    TaskQuery taskQuery = taskService.createTaskQuery();
+	    List<Task> allTasks = taskQuery.list();
+	    assertEquals(1, allTasks.size());
+	    assertEquals("UserTask", allTasks.get(0).getActivityName());
+//	    assertEquals("UserTask", allTasks.get(0));
+//	    
+//	    
+//	    List<Task> groupTasks = taskService.findGroupTasks("sampleResource");
+//	    assertEquals(1, groupTasks.size());
+//	    assertEquals("UserTask", groupTasks.get(0).getActivityName());
+	    
+	    // speciifiing a transition is unnecessary, BPMN has outgoing AND semantic!
+	    // TODO: fix
+	    taskService.completeTask( allTasks.get(0).getId(), "fromUserTaskToEnd" );
+
+	    pi = executionService.findProcessInstanceById(pi.getId());
+	    
+	    // process instance is ended
+	    assertNull(pi);
+	}
+	finally {
+	    repositoryService.deleteDeploymentCascade(deploymentId);
+	}
+    }
+
+}

Modified: jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/test/ShipmentTest.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/test/ShipmentTest.java	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/test/ShipmentTest.java	2009-07-29 15:12:21 UTC (rev 5381)
@@ -21,6 +21,7 @@
  */
 package org.jbpm.bpmn.test;
 
+import org.jbpm.api.ProcessInstance;
 import org.jbpm.test.JbpmTestCase;
 
 
@@ -29,11 +30,26 @@
  */
 public class ShipmentTest extends JbpmTestCase {
 
-  public void testShipment() {
+  public void testDeployment() {
     String deploymentId = repositoryService.createDeployment()
       .addResourceFromClasspath("org/jbpm/bpmn/test/shipment.bpmn.xml")
       .deploy();
     
     repositoryService.deleteDeploymentCascade(deploymentId);
+  }    
+    
+  public void testHappyPath() {
+      String deploymentId = repositoryService.createDeployment()
+      .addResourceFromClasspath("org/jbpm/bpmn/test/shipment.bpmn.xml")
+      .deploy();
+    
+    ProcessInstance pi = executionService.startProcessInstanceByKey("Shipment");
+    System.out.println(pi);
+    
+    pi = executionService.signalExecutionById(pi.getId());
+    
+    System.out.println(pi);
+    
+    repositoryService.deleteDeploymentCascade(deploymentId);
   }
 }

Added: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml	                        (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -0,0 +1,31 @@
+<?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 ../../../../../../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:resource name="sampleResource">	
+	</bpmn:resource>
+
+	<bpmn:process id="UserTaskSimpleProcess" name="Simple process with user task">
+		<bpmn:startEvent id="Start" />
+
+		<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 resourceRef="sampleResource">
+			</bpmn:potentialOwner>
+		</bpmn:userTask>
+
+		<bpmn:sequenceFlow id="flow2" name="fromUserTaskToEnd" 
+			sourceRef="UserTask"
+			targetRef="End" />
+
+		<bpmn:endEvent id="End" name="End" />
+	</bpmn:process>
+</bpmn:definitions>

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGateway.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGateway.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGateway.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayConvergingInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayConvergingInvalid.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayConvergingInvalid.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayDivergingInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayDivergingInvalid.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayDivergingInvalid.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedInvalid.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedInvalid.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedValid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedValid.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayMixedValid.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 
@@ -10,16 +10,16 @@
 		<bpmn:startEvent id="Start" />
 
 		<bpmn:sequenceFlow id="flow1" sourceRef="Start"
-			targetRef="exclusiveGatewayPre" name="Start->exclusiveGateway" />
+			targetRef="exclusiveGatewayPre" name="Start->exclusiveGatewayPre" />
 
 		<bpmn:exclusiveGateway id="exclusiveGatewayPre"
 			name="Just a dummy gateway"/>
 
 		<bpmn:sequenceFlow id="flow6" sourceRef="exclusiveGatewayPre"
-			targetRef="exclusiveGateway" name="exclusiveGateway->exclusiveGatewayPre" />
+			targetRef="exclusiveGateway" name="exclusiveGatewayPre->exclusiveGateway" />
 
 		<bpmn:sequenceFlow id="flow7" sourceRef="exclusiveGatewayPre"
-			targetRef="exclusiveGateway" name="exclusiveGateway->exclusiveGatewayPre" />
+			targetRef="exclusiveGateway" name="exclusiveGatewayPre->exclusiveGateway" />
 
 		<bpmn:exclusiveGateway id="exclusiveGateway"
 			name="Just a gateway" gatewayDirection="mixed"/>

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonBoundDefault.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonBoundDefault.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonBoundDefault.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonExistingDefault.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonExistingDefault.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/exclusiveGatewayNonExistingDefault.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGateway.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGateway.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGateway.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGatewayInvalid.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGatewayInvalid.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/parallelGatewayInvalid.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,7 +1,7 @@
 <?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 /home/kukel/workspace-jbpm4/jbpm/modules/bpmn/src/main/resources/BPMN20.xsd"
+	xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../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/">
 

Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/test/shipment.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/test/shipment.bpmn.xml	2009-07-29 14:02:45 UTC (rev 5380)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/test/shipment.bpmn.xml	2009-07-29 15:12:21 UTC (rev 5381)
@@ -1,28 +1,35 @@
 <?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">
@@ -42,8 +49,10 @@
 	<!-- 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"/>
@@ -59,6 +68,7 @@
 				<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/>
@@ -78,6 +88,7 @@
 				<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>
@@ -97,15 +108,19 @@
 				<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"/>

Added: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/test/shipment.pdf
===================================================================
(Binary files differ)


Property changes on: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/test/shipment.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



More information about the jbpm-commits mailing list