[jbpm-commits] JBoss JBPM SVN: r5906 - in jbpm4/trunk/modules: test-db/src/test/java/org/jbpm/bpmn and 1 other directories.

Author: jbarrez Date: 2009-12-03 04:15:55 -0500 (Thu, 03 Dec 2009) New Revision: 5906 Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/SimplestProcessTest.java jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/ServiceTaskJava.bpmn.xml 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/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/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/scriptTask.bpmn.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.java.bpmn.xml Log: Fix for failing Hudson (changed assigneeExpression to CandidateGroupExpression - must be revised later on) 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-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-03 09:15:55 UTC (rev 5906) @@ -354,7 +354,8 @@ if (potentialOwner != null) { String potentialOwnerRef = XmlUtil.attribute(potentialOwner, "resourceRef"); // set to fixed expression, more evaluation needed for real BPMN 2.0 - taskDefinition.setAssigneeExpression(processDefinition.getResource(potentialOwnerRef).getName()); + //taskDefinition.setAssigneeExpression(potentialOwnerRef); + taskDefinition.setCandidateGroupsExpression(potentialOwnerRef); } return taskDefinition; } Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/SimplestProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/SimplestProcessTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/SimplestProcessTest.java 2009-12-03 09:15:55 UTC (rev 5906) @@ -0,0 +1,27 @@ +package org.jbpm.bpmn; + +import org.jbpm.test.JbpmTestCase; + +/** + * Test for the most basic process there is: just a start and end. + * + * @author Joram Barrez + */ +public class SimplestProcessTest extends JbpmTestCase { + + private static final String PROCESS_NAME = "simplestProcess"; + + private static final String PROCESS_LOCATION = "org/jbpm/bpmn/simplestProcess.bpmn.xml"; + + @Override + protected void setUp() throws Exception { + super.setUp(); + registerDeployment(repositoryService.createDeployment() + .addResourceFromClasspath(PROCESS_LOCATION).deploy()); + } + + public void testProcessStart() { + executionService.startProcessInstanceByKey(PROCESS_NAME); + } + +} Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/ServiceTaskJava.bpmn.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/ServiceTaskJava.bpmn.xml 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/ServiceTaskJava.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <bpmn:definitions id="ServiceTaskJava" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../main/resources/BPMN20.xsd" + 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"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskGroup.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -1,7 +1,7 @@ <?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 ../../../../../../main/resources/BPMN20.xsd" + 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"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSequenceFlowCondition.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -1,7 +1,7 @@ <?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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/UserTaskSimple.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -1,7 +1,7 @@ <?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" + 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"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGateway.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayConvergingInvalid.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayDivergingInvalid.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayInvalidConditionExpression.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedInvalid.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayMixedValid.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonBoundDefault.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayNonExistingDefault.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/exclusiveGatewayXPath.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlow.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -1,7 +1,7 @@ <?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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/forkWithUncontrolledSequenceFlowCondition.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -1,7 +1,7 @@ <?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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGateway.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/parallelGatewayInvalid.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/scriptTask.bpmn.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/scriptTask.bpmn.xml 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/scriptTask.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -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 ../../../../../../main/resources/BPMN20.xsd" + 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/"> 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 2009-12-03 04:04:57 UTC (rev 5905) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/shipment.java.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -1,35 +1,54 @@ <?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/"> - +<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/"> + <!-- 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: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"/> - + <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"/> - + <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"/> - + <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/> + <xbpmn:url /> </bpmn:endPoint> <bpmn:endPoint id="LiefersystemEndpoint"> - <xbpmn:url/> + <xbpmn:url /> </bpmn:endPoint> - + <!-- interfaces --> <bpmn:interface id="ProzessInterface" name="Lieferprozess Schnittstelle"> <bpmn:operation name="startShipmentProcess"> @@ -45,17 +64,19 @@ </bpmn:operation> </bpmn:interface> <!-- Resources / Performers --> - <bpmn:resource id="VertriebResource" name="Vertrieb"/> + <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"/> - + <bpmn:dataObject id="lieferungVariable" name="Lieferung" + itemSubjectRef="tns:lieferungDef" /> + <!-- Start-Event --> <bpmn:startEvent id="Start"> - <bpmn:dataOutput id="ProzessStartOutput" itemSubjectRef="tns:ProzessStartenNachricht"/> + <bpmn:dataOutput id="ProzessStartOutput" + itemSubjectRef="tns:ProzessStartenNachricht" /> <bpmn:dataOutputAssociation> <bpmn:assignment> <bpmn:from xsi:type="bpmn:tFormalExpression">getDataOutput('ProzessStartOutput')/shipment</bpmn:from> @@ -68,16 +89,18 @@ <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:serviceTask id="LieferungBuchen" name="Lieferung buchen" + implementation="WebService" operationRef="createShipment"> + <xbpmn:url /> <bpmn:ioSpecification> - <bpmn:dataInput id="LieferungBuchenInput" isCollection="false" itemSubjectRef="tns:LieferungAnlegenNachricht"/> + <bpmn:dataInput id="LieferungBuchenInput" + isCollection="false" itemSubjectRef="tns:LieferungAnlegenNachricht" /> <bpmn:inputSet> <bpmn:dataInputRefs>LieferungBuchenInput</bpmn:dataInputRefs> </bpmn:inputSet> - <bpmn:outputSet/> + <bpmn:outputSet /> </bpmn:ioSpecification> <bpmn:dataInputAssociation> <bpmn:assignment> @@ -88,12 +111,15 @@ <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: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:dataOutput id="KommissioniertOutput" + itemSubjectRef="tns:KommissioniertNachricht" /> + <bpmn:inputSet /> <bpmn:outputSet> <bpmn:dataOutputRefs>KommissioniertOutput</bpmn:dataOutputRefs> </bpmn:outputSet> @@ -108,37 +134,50 @@ <bpmn:targetRef>tns:lieferungVariable</bpmn:targetRef> </bpmn:dataOutputAssociation> </bpmn:receiveTask> - + <!-- Gateway --> - <bpmn:exclusiveGateway id="PruefeAvisierung" name="Avisierung benoetigt?"/> - + <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 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"/> - + <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 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 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:sequenceFlow id="flow6" sourceRef="LieferterminAvisieren" + targetRef="End" /> </bpmn:process> -<!-- - <bpmn:correlationSubscription> - </bpmn:correlationSubscription> ---> - + <!-- + <bpmn:correlationSubscription> </bpmn:correlationSubscription> + --> + <!-- TODO: Correlation / Conversation --> <bpmn:conversation> <bpmn:correlationKey> Added: 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 (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml 2009-12-03 09:15:55 UTC (rev 5906) @@ -0,0 +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" > + + <process id="simplestProcess" name="The Simplest Process" processType="executable"> + + <startEvent id="theStart" /> + + <endEvent id="theEnd" /> + + <sequenceFlow id="startToEnd" sourceRef="theStart" targetRef="theEnd" /> + + </process> + + +</definitions>