November 2010 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r6808 - in jbpm4/trunk/modules: bpmn/src/main/java/org/jbpm/bpmn/parser and 4 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-09 11:42:36 -0500 (Tue, 09 Nov 2010) New Revision: 6808 Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryErrorEvent.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/error/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/error/BoundaryErrorEventTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/error/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/error/boundary_error_event.bpmn.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java Log: JBPM-2926 boundary error event Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryErrorEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryErrorEvent.java (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryErrorEvent.java 2010-11-09 16:42:36 UTC (rev 6808) @@ -0,0 +1,66 @@ +/* + * 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.ArrayList; +import java.util.List; + +import org.jbpm.api.Execution; +import org.jbpm.api.listener.EventListener; +import org.jbpm.api.listener.EventListenerExecution; +import org.jbpm.api.model.Transition; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.model.op.AtomicOperation; + +/** + * boundary error event. + * + * @author Huisheng Xu + */ +public class BoundaryErrorEvent extends BpmnActivity implements EventListener, BpmnEvent { + + protected String boundaryErrorEventActivityName; + + @SuppressWarnings("unchecked") + public void execute(ExecutionImpl execution) { + ExecutionImpl parent = execution.destroyScope(execution.getActivity()); + this.executeBoundaryEventBranch(parent); + } + + protected void executeBoundaryEventBranch(ExecutionImpl execution) { + ProcessDefinitionImpl processDefinitionImpl = execution.getProcessDefinition(); + ActivityImpl activityImpl = processDefinitionImpl.getActivity(boundaryErrorEventActivityName); + execution.moveTo(activityImpl); + execution.take(activityImpl.getOutgoingTransitions().get(0)); + } + + public void notify(EventListenerExecution execution) { + this.execute((ExecutionImpl) execution); + } + + public void setBoundaryErrorEventActivityName(String boundaryErrorEventActivityName) { + this.boundaryErrorEventActivityName = boundaryErrorEventActivityName; + } + +} Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-09 16:41:18 UTC (rev 6807) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-09 16:42:36 UTC (rev 6808) @@ -68,7 +68,13 @@ } else { execution.setActivity(parentActivity); - execution.signal(); + + ExecutionImpl parent = (ExecutionImpl) execution.getParent(); // save parent before it is nullified + if (parent != null && errorCode != null) { + parent.fire(errorCode, (ActivityImpl) activity.getParentActivity()); + } else { + execution.signal(); + } } } else { 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 2010-11-09 16:41:18 UTC (rev 6807) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-11-09 16:42:36 UTC (rev 6808) @@ -39,6 +39,7 @@ import org.jbpm.bpmn.common.Resource; import org.jbpm.bpmn.common.ResourceParameter; import org.jbpm.bpmn.flownodes.BpmnActivity; +import org.jbpm.bpmn.flownodes.BoundaryErrorEvent; import org.jbpm.bpmn.flownodes.BoundaryTimerEvent; import org.jbpm.bpmn.model.BpmnProcessDefinition; import org.jbpm.bpmn.model.SequenceflowCondition; @@ -277,9 +278,9 @@ Element timerEventDefinition = XmlUtil.element(boundaryEventElement, "timerEventDefinition"); Element errorEventDefinition = XmlUtil.element(boundaryEventElement, "errorEventDefinition"); if (timerEventDefinition != null) { - parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity, refActivity, parse); + this.parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity, refActivity, parse); } else if (errorEventDefinition != null) { - // TODO: error event boundary + this.parseBoundaryErrorEventDefinition(errorEventDefinition, nestedActivity, refActivity, parse); } else { parse.addProblem("Unsupported boundary event type : " + boundaryEventElement); } @@ -315,6 +316,25 @@ timerActivity.setActivityBehaviour(boundaryTimerEvent); } + public void parseBoundaryErrorEventDefinition(Element errorEventDefinition, + ActivityImpl errorActivity, + ActivityImpl refActivity, + Parse parse) { + + BoundaryErrorEvent boundaryErrorEvent = new BoundaryErrorEvent(); + boundaryErrorEvent.setBoundaryErrorEventActivityName(errorActivity.getName()); + + String eventName = XmlUtil.attribute(errorEventDefinition, "errorRef"); + + EventImpl event = refActivity.getEvent(eventName); + if (event == null) { + event = refActivity.createEvent(eventName); + } + EventListenerReference eventListenerReference = event.createEventListenerReference(boundaryErrorEvent); + + errorActivity.setActivityBehaviour(boundaryErrorEvent); + } + public void parseSequenceFlow(Element element, Parse parse, BpmnProcessDefinition processDefinition) { List<Element> transitionElements = XmlUtil.elements(element, "sequenceFlow"); for (Element transitionElement : transitionElements) { Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/error/BoundaryErrorEventTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/error/BoundaryErrorEventTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/error/BoundaryErrorEventTest.java 2010-11-09 16:42:36 UTC (rev 6808) @@ -0,0 +1,52 @@ +/* + * 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.examples.bpmn.event.error; + +import org.jbpm.api.NewDeployment; +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.history.HistoryProcessInstance; +import org.jbpm.test.JbpmTestCase; + +/** + * + * @author Huisheng Xu + */ +public class BoundaryErrorEventTest extends JbpmTestCase { + + @Override + protected void setUp() throws Exception { + super.setUp(); + NewDeployment deployment = repositoryService.createDeployment(); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/error/boundary_error_event.bpmn.xml"); + registerDeployment(deployment.deploy()); + } + + public void testProcessStartToEnd() { + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_error_event"); + assertProcessInstanceEnded(processInstance); + + HistoryProcessInstance hip = historyService.createHistoryProcessInstanceQuery().uniqueResult(); + assertNotNull(hip); + } + +} Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/error/boundary_error_event.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/error/boundary_error_event.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/error/boundary_error_event.bpmn.xml 2010-11-09 16:42:36 UTC (rev 6808) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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://jbpm.org/example/bpmn2/boundary_error_event" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <error id="MyError" errorCode="MyError" /> + + <process id="boundary_error_event" name="Error Boundary Event Process"> + <startEvent id="startEvent" name="StartProcess"/> + <sequenceFlow id="flow1" sourceRef="startEvent" targetRef="subProcess"/> + <subProcess id="subProcess" name="Hello" > + <startEvent id="sub-start" name="StartSubProcess"/> + <sequenceFlow id="flow2" sourceRef="sub-start" targetRef="sub-parallel"/> + <parallelGateway id="sub-parallel" gatewayDirection="Diverging"/> + <sequenceFlow id="flow3" sourceRef="sub-parallel" targetRef="sub-error"/> + <endEvent id="sub-error" name="ErrorEvent"> + <errorEventDefinition errorRef="MyError"/> + </endEvent> + <sequenceFlow id="flow4" sourceRef="sub-parallel" targetRef="sub-task"/> + <userTask id="sub-task" name="Task" /> + <sequenceFlow id="flow5" sourceRef="sub-task" targetRef="sub-end"/> + <endEvent id="sub-end" name="EndEvent"/> + </subProcess> + <sequenceFlow id="flow6" sourceRef="subProcess" targetRef="terminateEnd"/> + <endEvent id="terminateEnd" name="EndProcess"> + <terminateEventDefinition/> + </endEvent> + <boundaryEvent id="errorEvent" name="ErrorEvent" attachedToRef="subProcess" > + <errorEventDefinition errorRef="MyError" /> + </boundaryEvent> + <sequenceFlow id="flow7" sourceRef="errorEvent" targetRef="task"/> + <scriptTask id="task" name="Goodbye"> + <script>System.out.println("Error handled");</script> + </scriptTask> + <sequenceFlow id="flow8" sourceRef="task" targetRef="endEvent"/> + <endEvent id="endEvent" name="EndProcess"/> + </process> +</definitions>

15 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

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(a)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"> -  - <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"> +  + <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"> -  - <bpmn:performer id="myPerformer" resourceRef="sampleResource" /> - </bpmn:userTask> + <bpmn:userTask id="UserTask" name="user task" + implementation="other"> +  + <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"> -  - <bpmn:performer id="myPerformer2" resourceRef="sampleResource" /> - </bpmn:userTask> + <bpmn:userTask id="UserTask2" name="another user task" + implementation="other"> +  + <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"> -  - <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"> +  + <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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="ExclusiveGateway" name="ExclusiveGateway"> +  + <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"/> -  +  - <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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"/> -  +  - <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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" /> -  +  - <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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"/> -  +  - <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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" /> -  +  - <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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" /> -  +  - <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" /> -  - <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/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>2}</conditionExpression> - </sequenceFlow> - - <sequenceFlow id="toTestTask1Again" sourceRef="exclusiveGateway1" - targetRef="testTask1" /> + <sequenceFlow id="toTestTask3" sourceRef="exclusiveGateway1" targetRef="testTask3"> + <conditionExpression xsi:type="tFormalExpression">${variable>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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="ExclusiveGateway" name="ExclusiveGateway"> +  + <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"/> -  +  - <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="ParallelGateway" name="ParallelGateway"> +  + <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" /> -  - <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/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"> -  - <bpmn:startEvent id="Start" /> + <bpmn:process id="Shipment" name="Shipment"> +  + <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> -  - <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/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/"> -  - <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/" /> -  - <bpmn:itemDefinition id="lieferungDef" itemKind="Information" - structureRef="sample:shipment" /> +  + <bpmn:itemDefinition id="lieferungDef" itemKind="Information" + structureRef="sample:shipment" /> -  - <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" /> -  - <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" /> -  -  -  +  +  +  - <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> -  - <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> -  - <bpmn:resource id="VertriebResource" name="Vertrieb" /> -  - <bpmn:process id="Shipment" name="Shipment"> - <bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation> +  + <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> +  + <bpmn:resource id="VertriebResource" name="Vertrieb" /> +  + <bpmn:process id="Shipment" name="Shipment"> + <bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation> -  - <bpmn:dataObject id="lieferungVariable" name="Lieferung" - itemSubjectRef="tns:lieferungDef" /> +  + <bpmn:dataObject id="lieferungVariable" name="Lieferung" + itemSubjectRef="tns:lieferungDef" /> -  - <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> +  + <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> -  - <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> +  + <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> -  - <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: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> -  - <bpmn:exclusiveGateway id="PruefeAvisierung" - name="Avisierung benoetigt?" /> +  + <bpmn:exclusiveGateway id="PruefeAvisierung" + name="Avisierung benoetigt?" /> -  - <bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren" - implementation="other"> -  - <bpmn:potentialOwner resourceRef="tns:VertriebResource" /> - </bpmn:userTask> +  + <bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren" + implementation="other"> +  + <bpmn:potentialOwner resourceRef="tns:VertriebResource" /> + </bpmn:userTask> -  - <bpmn:endEvent id="End" name="End" /> +  + <bpmn:endEvent id="End" name="End" /> -  - <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: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:conversation> - <bpmn:correlationKey> - <bpmn:correlationPropertyRef>test</bpmn:correlationPropertyRef> - </bpmn:correlationKey> - </bpmn: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/"> - -  - <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:itemDefinition id="lieferungDef" itemKind="Information" structureRef="sample:shipment"/> - -  - <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: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:endPoint id="ProzessEndpoint"> - <xbpmn:url/> - </bpmn:endPoint> - <bpmn:endPoint id="LiefersystemEndpoint"> - <xbpmn:url/> - </bpmn:endPoint> - -  - <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> -  - <bpmn:resource id="VertriebResource" name="Vertrieb"/> -  - <bpmn:process id="Shipment" name="Shipment"> - <bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation> - -  - <bpmn:dataObject id="lieferungVariable" name="Lieferung" itemSubjectRef="tns:lieferungDef"/> - -  - <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> - -  - <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> - -  - <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> - -  - <bpmn:exclusiveGateway id="PruefeAvisierung" name="Avisierung benoetigt?"/> - -  - <bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren" implementation="other"> -  - <bpmn:potentialOwner resourceRef="tns:VertriebResource"/> - </bpmn:userTask> - -  - <bpmn:endEvent id="End" name="End"/> - -  - <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: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:itemDefinition id="lieferungDef" itemKind="Information" structureRef="sample:shipment"/> + +  + <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: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:endPoint id="ProzessEndpoint"> + <xbpmn:url/> + </bpmn:endPoint> + <bpmn:endPoint id="LiefersystemEndpoint"> + <xbpmn:url/> + </bpmn:endPoint> + +  + <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> +  + <bpmn:resource id="VertriebResource" name="Vertrieb"/> +  + <bpmn:process id="Shipment" name="Shipment"> + <bpmn:documentation id="doc1">Teilprozess der Lieferung</bpmn:documentation> + +  + <bpmn:dataObject id="lieferungVariable" name="Lieferung" itemSubjectRef="tns:lieferungDef"/> + +  + <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> + +  + <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> + +  + <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:exclusiveGateway id="PruefeAvisierung" name="Avisierung benoetigt?"/> + +  + <bpmn:userTask id="LieferterminAvisieren" name="Liefertermin avisieren" implementation="other"> +  + <bpmn:potentialOwner resourceRef="tns:VertriebResource"/> + </bpmn:userTask> + +  + <bpmn:endEvent id="End" name="End"/> + +  + <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:conversation> - <bpmn:correlationKey> - <bpmn:correlationPropertyRef>test</bpmn:correlationPropertyRef> - </bpmn:correlationKey> - </bpmn: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>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6806 - in projects/migration_tool/trunk: src/main/java/org/jbpm/migration and 1 other directories.

by do-not-reply＠jboss.org

Author: eschabell Date: 2010-11-09 10:30:38 -0500 (Tue, 09 Nov 2010) New Revision: 6806 Removed: projects/migration_tool/trunk/notes.txt projects/migration_tool/trunk/src/main/java/org/jbpm/migration/BpmnValidator.java projects/migration_tool/trunk/src/main/java/org/jbpm/migration/JpdlValidator.java projects/migration_tool/trunk/src/main/java/org/jbpm/migration/Migrator.java projects/migration_tool/trunk/src/main/java/org/jbpm/migration/ProcessTransformer.java projects/migration_tool/trunk/src/main/java/org/jbpm/migration/util/ projects/migration_tool/trunk/src/test/java/org/jbpm/migration/ Modified: projects/migration_tool/trunk/readme.txt Log: Cleaned out sources you find in the new project location, marked the readme with a fwding address! Deleted: projects/migration_tool/trunk/notes.txt =================================================================== --- projects/migration_tool/trunk/notes.txt 2010-11-09 15:23:03 UTC (rev 6805) +++ projects/migration_tool/trunk/notes.txt 2010-11-09 15:30:38 UTC (rev 6806) @@ -1,18 +0,0 @@ -Some interesting points to take a look at, this file will bookmark them for this projects: - -Some conversion tooling that exists for v3 jPDL -> v4 jPDL: -- http://docs.jboss.org/jbpm/v4/devguide/html_single/#processconversiontool - - -03.03.2010 - waiting a bit on this project to get oriented with reactions to my ideas (migration strategy) that I will be - presenting to some developer organizations. I want to see how they respond. - -21.10.2010 - team together, looking at code generated by previous member. jBPM5 alpha code examined and decided that due to - lack of maturity to start working on this tooling as follows: - - - validate jPDL3 input file against jPDL3 XSD - - transform jPDL3 to BPMN2 via XSLT - - validate BPMN2 output file against BPMN2 XSD - - at this point, up to the engine to run validated BPMN2 process def's! - - Updated existing project XSD's with BPMN2 found in the world (now they exist in a finalized form). \ No newline at end of file Modified: projects/migration_tool/trunk/readme.txt =================================================================== --- projects/migration_tool/trunk/readme.txt 2010-11-09 15:23:03 UTC (rev 6805) +++ projects/migration_tool/trunk/readme.txt 2010-11-09 15:30:38 UTC (rev 6806) @@ -1,5 +1,10 @@ This is the start sign for the jBPM migration tool that should provide us with a path to migrate from jBPM v3.2.x jPDL -> BPMN2 as -supported in jBPM v4.x. Stay tuned as this will be expanded with the projects guidelines and goals. +supported in jBPM v5.x. -Eric D. Schabell +Please refer to the project site for more information: +https://sourceforge.net/apps/trac/jbpmmigration + +Regards, +Maurice de Chateau +Eric D. Schabell \ No newline at end of file Deleted: projects/migration_tool/trunk/src/main/java/org/jbpm/migration/BpmnValidator.java =================================================================== --- projects/migration_tool/trunk/src/main/java/org/jbpm/migration/BpmnValidator.java 2010-11-09 15:23:03 UTC (rev 6805) +++ projects/migration_tool/trunk/src/main/java/org/jbpm/migration/BpmnValidator.java 2010-11-09 15:30:38 UTC (rev 6806) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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.migration; - -import java.io.File; -import java.net.URISyntaxException; - -import org.apache.log4j.Logger; -import org.jbpm.migration.util.XmlUtils; -import org.w3c.dom.Document; - -/** - * This class validates a resulting jDPL definition against the applicable XML schema. - * - * @author Eric D. Schabell - * @author Maurice de Chateau - */ -public final class BpmnValidator { - /* XML Schema file for BPMN version 2.0 on the classpath. */ - private static final String BPMN_2_0_SCHEMA = "Schemas/BPMN/BPMN20.xsd"; - - /** Logging facility. */ - private static final Logger LOGGER = Logger.getLogger(BpmnValidator.class); - - /** Private constructor to enforce non-instantiability. */ - private BpmnValidator() { - } - - /** - * Validate a given BPMN process definition against the applicable schema. - * - * @param bpmn - * The process definition. - * @param gpd - * The graphical positioning for the process definition. - * @return The concatenated document containing both process definition and positioning, or null if (one of) the validations was - * not successful. - */ - public static boolean validateDefinition(Document bpmn) { - // Validate against the jPDL schema. - File schema = null; - try { - schema = new File(BpmnValidator.class.getClassLoader().getResource(BPMN_2_0_SCHEMA).toURI()); - } catch (URISyntaxException usEx) { - LOGGER.error("Cannot locate BPMN schema.", usEx); - return false; - } - return XmlUtils.validate(bpmn, schema); - } -} Deleted: projects/migration_tool/trunk/src/main/java/org/jbpm/migration/JpdlValidator.java =================================================================== --- projects/migration_tool/trunk/src/main/java/org/jbpm/migration/JpdlValidator.java 2010-11-09 15:23:03 UTC (rev 6805) +++ projects/migration_tool/trunk/src/main/java/org/jbpm/migration/JpdlValidator.java 2010-11-09 15:30:38 UTC (rev 6806) @@ -1,122 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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.migration; - -import java.io.File; -import java.net.URISyntaxException; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.jbpm.migration.util.XmlUtils; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -/** - * This class validates an original jDPL definition against the applicable XML schema. - * <p> - * TODO: Make jPDL version flexible (now only 3.2 is supported).<br> - * TODO: Include validation for GPD. - * - * @author Eric D. Schabell - * @author Maurice de Chateau - */ -public final class JpdlValidator { - /* XML Schema file for jPDL version 3.2 on the classpath. */ - private static final String JPDL_3_2_SCHEMA = "Schemas/jPDL/jpdl-3.2.xsd"; - - /** Tag name for the root node (document element) of the concatenated document. */ - private static final String CONCATENATED_ROOT_NODE = "concatenated-root"; - - /** Logging facility. */ - private static final Logger LOGGER = Logger.getLogger(JpdlValidator.class); - - /** Private constructor to enforce non-instantiability. */ - private JpdlValidator() { - } - - /** - * Parse and validate a given jDPL/GPD process definition against the applicable schema. - * - * @param jpdl - * The process definition. - * @param gpd - * The graphical positioning for the process definition. - * @return The concatenated document containing both process definition and positioning, or null if (one of) the validations was - * not successful. - */ - public static Document validateDefinition(File jpdl, File gpd) { - Document jpdlDoc = validateProcess(jpdl); - Document gpdDoc = validatePositioning(gpd); - - Document concatenated = null; - if (jpdlDoc != null && gpdDoc != null) { - try { - concatenated = XmlUtils.createEmptyDocument(); - Node rootNode = concatenated.createElement(CONCATENATED_ROOT_NODE); - concatenated.appendChild(rootNode); - Node jpdlNode = concatenated.importNode(jpdlDoc.getDocumentElement(), true); - rootNode.appendChild(jpdlNode); - Node gpdNode = concatenated.importNode(gpdDoc.getDocumentElement(), true); - rootNode.appendChild(gpdNode); - } catch (Exception ex) { - LOGGER.error("Problem concatenating the jDPL and GPD definitions.", ex); - } - } - return concatenated; - } - - private static Document validateProcess(File jpdl) { - // Parse the jDPL definition into a DOM tree. - Document document = XmlUtils.parseFile(jpdl); - if (document == null) { - return null; - } - - // Get the jPDL version from the process definition. - Node xmlnsNode = document.getFirstChild().getAttributes().getNamedItem("xmlns"); - if (xmlnsNode != null && StringUtils.isNotBlank(xmlnsNode.getNodeValue())) { - String version = xmlnsNode.getNodeValue().substring(xmlnsNode.getNodeValue().length() - 3); - LOGGER.info("jPDL version == " + version); - } - - // Validate against the jPDL schema. - File schema = null; - try { - schema = new File(JpdlValidator.class.getClassLoader().getResource(JPDL_3_2_SCHEMA).toURI()); - } catch (URISyntaxException usEx) { - LOGGER.error("Cannot locate jPDL schema.", usEx); - return null; - } - return XmlUtils.validate(document, schema) ? document : null; - } - - private static Document validatePositioning(File gpd) { - // Parse the GPD definition into a DOM tree. - Document document = XmlUtils.parseFile(gpd); - if (document == null) { - return null; - } - - // TODO: Validate the document before returning it. - return document; - } -} Deleted: projects/migration_tool/trunk/src/main/java/org/jbpm/migration/Migrator.java =================================================================== --- projects/migration_tool/trunk/src/main/java/org/jbpm/migration/Migrator.java 2010-11-09 15:23:03 UTC (rev 6805) +++ projects/migration_tool/trunk/src/main/java/org/jbpm/migration/Migrator.java 2010-11-09 15:30:38 UTC (rev 6806) @@ -1,67 +0,0 @@ -/* - * 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.migration; - -import java.io.File; - -import org.apache.commons.lang.StringUtils; -import org.jbpm.migration.util.XmlUtils; -import org.w3c.dom.Document; - -/** - * This class migrate a jPDL process definition to an equivalent BPMN 2.0 process definition. - * - * @author Eric D. Schabell - * @author Maurice de Chateau - */ -public class Migrator { - /** - * @param args - * The input for this method:<br> - * <ul> - * <li>args[0]: The (full) path of the jPDL process definition that's to be migrated.</li> - * <li>args[1]: The (full) path of the corresponding GPD positioning file.</li> - * </ul> - * Any further arguments are ignored. - */ - public static void main(String[] args) { - // Check the input. - if (args.length != 2 || StringUtils.isBlank(args[0]) || StringUtils.isBlank(args[1])) { - throw new IllegalArgumentException("Insufficient arguments for the migrator (must be 2)."); - } - File jpdl = new File(args[0]); - File gpd = new File(args[1]); - if (!jpdl.isFile() || !gpd.isFile()) { - throw new IllegalArgumentException("Both of the input arguments must be files."); - } - - // Validate the jPDL and GPD files. - Document input = JpdlValidator.validateDefinition(jpdl, gpd); - System.out.println(XmlUtils.format(input)); - - // Transform the process. - Document output = ProcessTransformer.transform(input); - System.out.println(XmlUtils.format(output)); - - // TODO: Validate the BPMN file. - } -} Deleted: projects/migration_tool/trunk/src/main/java/org/jbpm/migration/ProcessTransformer.java =================================================================== --- projects/migration_tool/trunk/src/main/java/org/jbpm/migration/ProcessTransformer.java 2010-11-09 15:23:03 UTC (rev 6805) +++ projects/migration_tool/trunk/src/main/java/org/jbpm/migration/ProcessTransformer.java 2010-11-09 15:30:38 UTC (rev 6806) @@ -1,58 +0,0 @@ -/* - * 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.migration; - -import java.io.File; -import java.net.URISyntaxException; - -import org.apache.log4j.Logger; -import org.jbpm.migration.util.XmlUtils; -import org.w3c.dom.Document; - -/** - * Transforms a given jPDL/GPD definition to an equivalent BPMN 2.0 definition. - * - * @author Eric D. Schabell - * @author Maurice de Chateau - */ -public final class ProcessTransformer { - /* XSL Transformation file for jPDL version 3.2 on the classpath. */ - private static final String MIGRATION_STYLE_SHEET = "jpdl3-bpmn2.xsl"; - - /** Logging facility. */ - private static final Logger LOGGER = Logger.getLogger(ProcessTransformer.class); - - /** Private contractor to prevent instantiation. */ - private ProcessTransformer() { - } - - public static Document transform(Document jpdl) { - File styleSheet = null; - try { - styleSheet = new File(JpdlValidator.class.getClassLoader().getResource(MIGRATION_STYLE_SHEET).toURI()); - } catch (URISyntaxException usEx) { - LOGGER.error("Cannot locate jPDL to BPMN style sheet.", usEx); - return null; - } - return XmlUtils.transform(jpdl, styleSheet); - } -}

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6805 - jbpm4/trunk/modules/bpmn/src/main/resources.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-09 10:23:03 -0500 (Tue, 09 Nov 2010) New Revision: 6805 Added: jbpm4/trunk/modules/bpmn/src/main/resources/BPMNDI.xsd Log: JBPM-2741 remove BpmnDi.xsd to BPMNDI.xsd Added: jbpm4/trunk/modules/bpmn/src/main/resources/BPMNDI.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/BPMNDI.xsd (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/resources/BPMNDI.xsd 2010-11-09 15:23:03 UTC (rev 6805) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.omg.org/spec/BPMN/20100524/DI" elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DC" schemaLocation="DC.xsd" /> + <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DI" schemaLocation="DI.xsd" /> + + <xsd:element name="BPMNDiagram" type="bpmndi:BPMNDiagram" /> + <xsd:element name="BPMNPlane" type="bpmndi:BPMNPlane" /> + <xsd:element name="BPMNLabelStyle" type="bpmndi:BPMNLabelStyle" /> + <xsd:element name="BPMNShape" type="bpmndi:BPMNShape" substitutionGroup="di:DiagramElement" /> + <xsd:element name="BPMNLabel" type="bpmndi:BPMNLabel" /> + <xsd:element name="BPMNEdge" type="bpmndi:BPMNEdge" substitutionGroup="di:DiagramElement" /> + + <xsd:complexType name="BPMNDiagram"> + <xsd:complexContent> + <xsd:extension base="di:Diagram"> + <xsd:sequence> + <xsd:element ref="bpmndi:BPMNPlane" /> + <xsd:element ref="bpmndi:BPMNLabelStyle" maxOccurs="unbounded" minOccurs="0" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNPlane"> + <xsd:complexContent> + <xsd:extension base="di:Plane"> + <xsd:attribute name="bpmnElement" type="xsd:QName" /> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNEdge"> + <xsd:complexContent> + <xsd:extension base="di:LabeledEdge"> + <xsd:sequence> + <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="bpmnElement" type="xsd:QName" /> + <xsd:attribute name="sourceElement" type="xsd:QName" /> + <xsd:attribute name="targetElement" type="xsd:QName" /> + <xsd:attribute name="messageVisibleKind" type="bpmndi:MessageVisibleKind" /> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNShape"> + <xsd:complexContent> + <xsd:extension base="di:LabeledShape"> + <xsd:sequence> + <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="bpmnElement" type="xsd:QName" /> + <xsd:attribute name="isHorizontal" type="xsd:boolean" /> + <xsd:attribute name="isExpanded" type="xsd:boolean" /> + <xsd:attribute name="isMarkerVisible" type="xsd:boolean" /> + <xsd:attribute name="isMessageVisible" type="xsd:boolean" /> + <xsd:attribute name="participantBandKind" type="bpmndi:ParticipantBandKind" /> + <xsd:attribute name="choreographyActivityShape" type="xsd:QName"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNLabel"> + <xsd:complexContent> + <xsd:extension base="di:Label"> + <xsd:attribute name="labelStyle" type="xsd:QName" /> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNLabelStyle"> + <xsd:complexContent> + <xsd:extension base="di:Style"> + <xsd:sequence> + <xsd:element ref="dc:Font" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:simpleType name="ParticipantBandKind"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="top_initiating" /> + <xsd:enumeration value="middle_initiating" /> + <xsd:enumeration value="bottom_initiating" /> + <xsd:enumeration value="top_non_initiating" /> + <xsd:enumeration value="middle_non_initiating" /> + <xsd:enumeration value="bottom_non_initiating" /> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="MessageVisibleKind"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="initiating" /> + <xsd:enumeration value="non_initiating" /> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6804 - in jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn: parser and 1 other directory.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-07 13:05:42 -0500 (Sun, 07 Nov 2010) New Revision: 6804 Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java Log: JBPM-2725 error end event Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-07 17:24:08 UTC (rev 6803) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-07 18:05:42 UTC (rev 6804) @@ -33,30 +33,36 @@ /** + * end event. + * * @author Tom Baeyens + * @author Huisheng Xu */ public class EndActivity extends BpmnActivity implements BpmnEvent { private static final long serialVersionUID = 1L; - + protected boolean endProcessInstance = true; + protected String state = null; + protected String errorCode = null; + public void execute(ActivityExecution execution) { execute((ExecutionImpl)execution); } - + public void execute(ExecutionImpl execution) { Activity activity = execution.getActivity(); List<? extends Transition> outgoingTransitions = activity.getOutgoingTransitions(); ActivityImpl parentActivity = (ActivityImpl) activity.getParentActivity(); if (parentActivity != null && "subProcess".equals(parentActivity.getType())) { - // if the end activity itself has an outgoing transition + // if the end activity itself has an outgoing transition // (such end activities should be drawn on the border of the group) if (outgoingTransitions != null && outgoingTransitions.size() == 1) { Transition outgoingTransition = outgoingTransitions.get(0); - // taking the transition that goes over the group boundaries will + // taking the transition that goes over the group boundaries will // destroy the scope automatically (see atomic operation TakeTransition) execution.take(outgoingTransition); @@ -64,7 +70,7 @@ execution.setActivity(parentActivity); execution.signal(); } - + } else { OpenExecution executionToEnd = null; if (endProcessInstance) { @@ -72,29 +78,38 @@ } else { executionToEnd = execution; } - + ExecutionImpl parent = (ExecutionImpl) executionToEnd.getParent(); // save parent before it is nullified - - if (state==null) { + + if (state == null) { execution.end(executionToEnd); } else { execution.end(executionToEnd, state); } - + + if (parent != null && errorCode != null) { + parent.fire(errorCode, (ActivityImpl) activity.getParentActivity()); + } + // Special case: if during concurrent execution all child executions are ended, // then the parent execution must be ended too. if (parent != null && parent.getExecutions().isEmpty() && Execution.STATE_INACTIVE_CONCURRENT_ROOT.equals(parent.getState()) ) { parent.end(); } - } - + } + } - + public void setEndProcessInstance(boolean endProcessInstance) { this.endProcessInstance = endProcessInstance; } + public void setState(String state) { this.state = state; } + + public void setErrorCode(String errorCode) { + this.errorCode = errorCode; + } } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java 2010-11-07 17:24:08 UTC (rev 6803) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java 2010-11-07 18:05:42 UTC (rev 6804) @@ -29,6 +29,7 @@ /** * @author Tom Baeyens + * @author Huisheng Xu */ public class EndEventBinding extends BpmnBinding { @@ -39,17 +40,22 @@ protected EndEventBinding(String tag) { super(tag); } - + public Object parse(Element element, Parse parse, BpmnParser bpmnParser) { -EndActivity endActivity = new EndActivity(); - + EndActivity endActivity = new EndActivity(); + Element terminateEventDefinition = XmlUtil.element(element, "terminateEventDefinition"); if (terminateEventDefinition != null) { - endActivity.setEndProcessInstance(true); + endActivity.setEndProcessInstance(true); } else { - endActivity.setEndProcessInstance(false); // default is to end execution, not the process instance + endActivity.setEndProcessInstance(false); // default is to end execution, not the process instance } - + + Element errorEventDefinition = XmlUtil.element(element, "errorEventDefinition"); + if (errorEventDefinition != null) { + endActivity.setErrorCode(XmlUtil.attribute(errorEventDefinition, "errorRef")); + } + return endActivity; } 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 2010-11-07 17:24:08 UTC (rev 6803) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-11-07 18:05:42 UTC (rev 6804) @@ -224,7 +224,7 @@ TagBinding activityBinding = (TagBinding) getBinding(nestedElement, CATEGORY_ACTIVITY); if (activityBinding == null) { - if (!"sequenceFlow".equals(tagName)) { + if (!"sequenceFlow".equals(tagName) && !"boundaryEvent".equals(tagName)) { log.debug("unrecognized activity: " + tagName); } continue; @@ -275,8 +275,11 @@ boolean interrupting = cancelActivity.equals("true"); Element timerEventDefinition = XmlUtil.element(boundaryEventElement, "timerEventDefinition"); + Element errorEventDefinition = XmlUtil.element(boundaryEventElement, "errorEventDefinition"); if (timerEventDefinition != null) { parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity, refActivity, parse); + } else if (errorEventDefinition != null) { + // TODO: error event boundary } else { parse.addProblem("Unsupported boundary event type : " + boundaryEventElement); }

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6803 - in jbpm4/trunk/modules: bpmn/src/main/java/org/jbpm/bpmn/parser and 14 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-07 12:24:08 -0500 (Sun, 07 Nov 2010) New Revision: 6803 Added: jbpm4/trunk/modules/bpmn/src/main/resources/DC.xsd jbpm4/trunk/modules/bpmn/src/main/resources/DI.xsd Removed: jbpm4/trunk/modules/bpmn/src/main/resources/BpmnDi.xsd jbpm4/trunk/modules/bpmn/src/main/resources/DiagramDefinition.xsd jbpm4/trunk/modules/bpmn/src/main/resources/DiagramInterchange.xsd Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java jbpm4/trunk/modules/bpmn/src/main/resources/BPMN20.xsd jbpm4/trunk/modules/bpmn/src/main/resources/Semantic.xsd jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/nonestartend/none_start_end_event.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/terminateend/terminate_end_event.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/intermediate_catch_timer_event.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timerstart/timer_start_event.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway_default_seq_flow.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/inclusive/inclusive_gateway.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/sequenceflow/conditional_sequence_flow.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/receive/receive_task_java.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/script/script_task.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml 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 Log: JBPM-2741 update xsd, change path in process definition Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java 2010-11-07 17:24:08 UTC (rev 6803) @@ -30,14 +30,16 @@ public abstract class BpmnBinding extends TagBinding { + public static final String BPMN2_NAMESPACE = "http://www.omg.org/spec/BPMN/20100524/MODEL"; + protected static final WireParser wireParser = WireParser.getInstance(); protected String default_; public BpmnBinding(String tagName) { - super(tagName, "http://schema.omg.org/spec/BPMN/2.0", null); + super(tagName, BPMN2_NAMESPACE, null); } - + public Object parse(Element element, Parse parse, Parser parser) { this.default_ = null; if (element.hasAttribute("default")) { @@ -45,7 +47,7 @@ } return parse(element, parse, (BpmnParser) parser); } - + public abstract Object parse(Element element, Parse parse, BpmnParser bpmnParser); public String getDefault() { 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 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-11-07 17:24:08 UTC (rev 6803) @@ -75,8 +75,7 @@ private static final String[] DEFAULT_ACTIVITIES_RESOURCES = { "jbpm.bpmn.flownodes.xml" }; private static final String CATEGORY_ACTIVITY = "activity"; - private static final String[] SCHEMA_RESOURCES = { "BPMN20.xsd", "DiagramDefinition.xsd", - "DiagramInterchange.xsd", "BpmnDi.xsd" }; + private static final String[] SCHEMA_RESOURCES = { "BPMN20.xsd", "BPMNDI.xsd", "DC.xsd", "DI.xsd" }; static BindingsParser bindingsParser = new BindingsParser(); @@ -139,6 +138,7 @@ // activities parseActivities(processElement, parse, processDefinition); + // boundary events parseBoundaryEvents(processElement, parse, processDefinition); // bind activities to their destinations @@ -162,7 +162,9 @@ if (resourceUrls.hasMoreElements()) { while (resourceUrls.hasMoreElements()) { URL resourceUrl = resourceUrls.nextElement(); - log.trace("loading bpmn activities from resource: " + resourceUrl); + if (log.isTraceEnabled()) { + log.trace("loading bpmn activities from resource: " + resourceUrl); + } List<?> activityBindings = (List<?>) bindingsParser.createParse() .setUrl(resourceUrl) .execute() @@ -344,6 +346,10 @@ parse.addProblem("TargetRef '" + targetRef + "' cannot be found"); } + if (sourceActivity == null || destinationActivity == null) { + return; + } + // Set default sequence flow if applicable try { // If something went wrong parsing the activity, there is no behaviour and an exception is thrown in .getBehaviour() @@ -352,7 +358,7 @@ BpmnActivity bpmnActivity = (BpmnActivity) behaviour; String defaultSeqFlow = bpmnActivity.getDefault(); if (bpmnActivity.isDefaultEnabled() && defaultSeqFlow != null) { - if (transitionId.equals(defaultSeqFlow)) { + if (defaultSeqFlow.equals(transitionId)) { processDefinition.findActivity(sourceRef).setDefaultOutgoingTransition(transition); } } else { Modified: jbpm4/trunk/modules/bpmn/src/main/resources/BPMN20.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/BPMN20.xsd 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/resources/BPMN20.xsd 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns="http://schema.omg.org/spec/BPMN/2.0" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:di="http://bpmndi.org" - targetNamespace="http://schema.omg.org/spec/BPMN/2.0"> + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" + targetNamespace="http://www.omg.org/spec/BPMN/20100524/MODEL"> - <xsd:import namespace="http://bpmndi.org" schemaLocation="BpmnDi.xsd"/> -  + <xsd:import namespace="http://www.omg.org/spec/BPMN/20100524/DI" schemaLocation="BPMNDI.xsd"/> <xsd:include schemaLocation="Semantic.xsd"/> <xsd:element name="definitions" type="tDefinitions"/> @@ -15,13 +14,16 @@ <xsd:element ref="import" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="extension" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="rootElement" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="di:diagram" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="bpmndi:BPMNDiagram" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="relationship" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> + <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="targetNamespace" type="xsd:anyURI" use="required"/> <xsd:attribute name="expressionLanguage" type="xsd:anyURI" use="optional" default="http://www.w3.org/1999/XPath"/> <xsd:attribute name="typeLanguage" type="xsd:anyURI" use="optional" default="http://www.w3.org/2001/XMLSchema"/> + <xsd:attribute name="exporter" type="xsd:string"/> + <xsd:attribute name="exporterVersion" type="xsd:string"/> <xsd:anyAttribute namespace="##other" processContents="lax"/> </xsd:complexType> Deleted: jbpm4/trunk/modules/bpmn/src/main/resources/BpmnDi.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/BpmnDi.xsd 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/resources/BpmnDi.xsd 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,273 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema xmlns="http://bpmndi.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://bpmndi.org" elementFormDefault="qualified" attributeFormDefault="unqualified"> - <xs:element name="bpmndi"> - <xs:annotation> - <xs:documentation>Comment describing your root element</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element ref="diagram" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="diagram" type="diagramType"/> - <xs:complexType name="diagramType"> - <xs:attribute name="id" type="xs:ID" use="required"/> - <xs:attribute name="name" type="xs:string"/> - <xs:anyAttribute namespace="##other"/> - </xs:complexType> - <xs:element name="processDiagram" type="processDiagramType" substitutionGroup="diagram"/> - <xs:complexType name="processDiagramType"> - <xs:complexContent> - <xs:extension base="diagramType"> - <xs:sequence> - <xs:element ref="laneCompartment" maxOccurs="unbounded"/> - <xs:element ref="sequenceFlowConnector" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="associationConnector" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="dataAssociationConnector" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="processRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="collaborationDiagram" type="collaborationDiagramType" substitutionGroup="diagram"/> - <xs:complexType name="collaborationDiagramType"> - <xs:complexContent> - <xs:extension base="diagramType"> - <xs:sequence> - <xs:element name="pool" type="poolCompartmentType" minOccurs="2" maxOccurs="unbounded"/> - <xs:element ref="messageFlowConnector" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="collaborationRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="bpmnNode" type="bpmnNodeType"/> - <xs:complexType name="bpmnNodeType"> - <xs:attribute name="id" type="xs:ID" use="required"/> - <xs:attribute name="name" type="xs:string"/> - <xs:attribute name="x"/> - <xs:attribute name="y"/> - <xs:attribute name="width"/> - <xs:attribute name="height"/> - </xs:complexType> - <xs:element name="bpmnCompartment" type="bpmnCompartmentType" substitutionGroup="bpmnNode"/> - <xs:complexType name="bpmnCompartmentType"> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="isVisible" type="xs:boolean"/> - <xs:attribute name="orientation"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="horizontal"/> - <xs:enumeration value="vertical"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="laneCompartment" type="laneCompartmentType_1" substitutionGroup="bpmnCompartment"/> - <xs:complexType name="laneCompartmentType"> - <xs:complexContent> - <xs:extension base="bpmnCompartmentType"> - <xs:sequence> - <xs:element ref="bpmnShape" minOccurs="0" maxOccurs="unbounded"/> - <xs:element name="subLane" type="laneCompartmentType_1" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="laneRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="poolCompartment" type="poolCompartmentType" substitutionGroup="bpmnCompartment"/> - <xs:complexType name="poolCompartmentType"> - <xs:complexContent> - <xs:extension base="bpmnCompartmentType"> - <xs:sequence> - <xs:element name="laneCompRef" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="participantRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="bpmnShape" type="bpmnNodeType" substitutionGroup="bpmnNode"/> - <xs:element name="bpmnLabel" substitutionGroup="bpmnNode"/> - <xs:element name="activityShape" type="activityShapeType_1" substitutionGroup="bpmnShape"/> - <xs:complexType name="activityShapeType"> - <xs:attribute name="activityRef" type="xs:IDREF"/> - </xs:complexType> - <xs:complexType name="activityShapeType_1"> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="activityRef"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="subprocessShape" type="subprocessShapeType" substitutionGroup="activityShape"/> - <xs:complexType name="subprocessShapeType"> - <xs:complexContent> - <xs:extension base="activityShapeType_1"> - <xs:sequence> - <xs:element name="laneCompRef" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="isExpanded" type="xs:boolean"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="calledSubprocessShape" type="calledSubprocessShapeType" substitutionGroup="activityShape"/> - <xs:complexType name="calledSubprocessShapeType"> - <xs:complexContent> - <xs:extension base="activityShapeType_1"> - <xs:attribute name="isExpanded" type="xs:boolean"/> - <xs:attribute name="diagramLink" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="taskShape" type="activityShapeType_1" substitutionGroup="activityShape"/> - <xs:element name="gatewayShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="gatewayRef"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="eventShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="eventRef"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="dataObjectShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="dataObjectRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="dataStoreShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="dataStoreRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="dataInputShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="dataInputRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="dataOutputShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="dataOutputRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="messageShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="messageRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="groupShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="categoryRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="textAnnotationShape" substitutionGroup="bpmnShape"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnNodeType"> - <xs:attribute name="annotationRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="bpmnConnector" type="bpmnConnectorType"/> - <xs:complexType name="bpmnConnectorType"> - <xs:sequence> - <xs:element name="bendpoint" minOccurs="0" maxOccurs="unbounded"> - <xs:complexType> - <xs:attribute name="x" type="xs:double"/> - <xs:attribute name="y" type="xs:double"/> - </xs:complexType> - </xs:element> - </xs:sequence> - <xs:attribute name="id" type="xs:ID" use="required"/> - <xs:attribute name="sourceRef" type="xs:IDREF" use="required"/> - <xs:attribute name="targetRef" type="xs:IDREF" use="required"/> - <xs:attribute name="label" type="xs:string"/> - </xs:complexType> - <xs:element name="sequenceFlowConnector" substitutionGroup="bpmnConnector"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnConnectorType"> - <xs:attribute name="sequenceFlowRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="messageFlowConnector"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="bpmnConnectorType"> - <xs:attribute name="messageFlowRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="dataAssociationConnector" substitutionGroup="bpmnConnector"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="associationConnectorType"> - <xs:attribute name="dataAssociationRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="associationConnector" type="associationConnectorType_1" substitutionGroup="bpmnConnector"/> - <xs:complexType name="associationConnectorType"> - <xs:complexContent> - <xs:extension base="bpmnConnectorType"> - <xs:attribute name="isDirectional" type="xs:boolean"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:element name="compensationFlowConnector" type="associationConnectorType_1" substitutionGroup="associationConnector"/> - <xs:element name="lane" type="laneCompartmentType"/> - <xs:complexType name="laneCompartmentType_1"> - <xs:complexContent> - <xs:extension base="laneCompartmentType"/> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="associationConnectorType_1"> - <xs:complexContent> - <xs:extension base="associationConnectorType"> - <xs:attribute name="associationRef" type="xs:IDREF"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> -</xs:schema> Added: jbpm4/trunk/modules/bpmn/src/main/resources/DC.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/DC.xsd (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/resources/DC.xsd 2010-11-07 17:24:08 UTC (rev 6803) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" targetNamespace="http://www.omg.org/spec/DD/20100524/DC" elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xsd:element name="Font" type="dc:Font" /> + <xsd:element name="Point" type="dc:Point" /> + <xsd:element name="Bounds" type="dc:Bounds" /> + + <xsd:complexType name="Font"> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="size" type="xsd:double" /> + <xsd:attribute name="isBold" type="xsd:boolean" /> + <xsd:attribute name="isItalic" type="xsd:boolean" /> + <xsd:attribute name="isUnderline" type="xsd:boolean" /> + <xsd:attribute name="isStrikeThrough" type="xsd:boolean" /> + </xsd:complexType> + + <xsd:complexType name="Point"> + <xsd:attribute name="x" type="xsd:double" use="required" /> + <xsd:attribute name="y" type="xsd:double" use="required" /> + </xsd:complexType> + + <xsd:complexType name="Bounds"> + <xsd:attribute name="x" type="xsd:double" use="required" /> + <xsd:attribute name="y" type="xsd:double" use="required" /> + <xsd:attribute name="width" type="xsd:double" use="required" /> + <xsd:attribute name="height" type="xsd:double" use="required" /> + </xsd:complexType> + +</xsd:schema> Added: jbpm4/trunk/modules/bpmn/src/main/resources/DI.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/DI.xsd (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/resources/DI.xsd 2010-11-07 17:24:08 UTC (rev 6803) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.omg.org/spec/DD/20100524/DI" elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DC" schemaLocation="DC.xsd" /> + + <xsd:element name="DiagramElement" type="di:DiagramElement" /> + <xsd:element name="Diagram" type="di:Diagram" /> + <xsd:element name="Style" type="di:Style" /> + <xsd:element name="Node" type="di:Node" /> + <xsd:element name="Edge" type="di:Edge" /> + <xsd:element name="Shape" type="di:Shape" /> + <xsd:element name="Plane" type="di:Plane" /> + <xsd:element name="LabeledEdge" type="di:LabeledEdge" /> + <xsd:element name="Label" type="di:Label" /> + <xsd:element name="LabeledShape" type="di:LabeledShape" /> + + <xsd:complexType abstract="true" name="DiagramElement"> + <xsd:sequence> + <xsd:element name="extension" minOccurs="0"> + <xsd:complexType> + <xsd:sequence> + <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID" /> + <xsd:anyAttribute namespace="##other" processContents="lax" /> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Diagram"> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="documentation" type="xsd:string" /> + <xsd:attribute name="resolution" type="xsd:double" /> + <xsd:attribute name="id" type="xsd:ID" /> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Node"> + <xsd:complexContent> + <xsd:extension base="di:DiagramElement" /> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Edge"> + <xsd:complexContent> + <xsd:extension base="di:DiagramElement"> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="2" name="waypoint" type="dc:Point" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="LabeledEdge"> + <xsd:complexContent> + <xsd:extension base="di:Edge" /> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Shape"> + <xsd:complexContent> + <xsd:extension base="di:Node"> + <xsd:sequence> + <xsd:element ref="dc:Bounds" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="LabeledShape"> + <xsd:complexContent> + <xsd:extension base="di:Shape" /> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Label"> + <xsd:complexContent> + <xsd:extension base="di:Node"> + <xsd:sequence> + <xsd:element ref="dc:Bounds" minOccurs="0" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Plane"> + <xsd:complexContent> + <xsd:extension base="di:Node"> + <xsd:sequence> + <xsd:element ref="di:DiagramElement" maxOccurs="unbounded" minOccurs="0" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Style"> + <xsd:attribute name="id" type="xsd:ID" /> + </xsd:complexType> + +</xsd:schema> Deleted: jbpm4/trunk/modules/bpmn/src/main/resources/DiagramDefinition.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/DiagramDefinition.xsd 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/resources/DiagramDefinition.xsd 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema targetNamespace="http://www.omg.com/dd/1.0.0" xmlns:dd="http://www.omg.com/dd/1.0.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:element name="namedElement" type="dd:NamedElement"/> - <xsd:element name="package" type="dd:Package"/> - <xsd:element name="viewDefinition" type="dd:ViewDefinition" abstract="true"/> - <xsd:element name="nodeDefinition" type="dd:NodeDefinition" substitutionGroup="dd:viewDefinition"/> - <xsd:element name="connectorDefinition" type="dd:ConnectorDefinition" substitutionGroup="dd:viewDefinition"/> - <xsd:element name="diagramDefinition" type="dd:DiagramDefinition" substitutionGroup="dd:viewDefinition"/> - <xsd:element name="childDefinition" type="dd:ChildDefinition"/> - <xsd:element name="styleDefinition" type="dd:StyleDefinition"/> - <xsd:element name="constraint" type="dd:Constraint"/> - - <xsd:complexType abstract="true" name="NamedElement"> - <xsd:attribute name="name" type="xsd:NCName" use="required"/> - </xsd:complexType> - - <xsd:complexType name="Package"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:viewDefinition"/> - </xsd:sequence> - <xsd:attribute name="nsURI" type="xsd:anyURI" use="required"/> - <xsd:attribute name="nsPrefix" type="xsd:NCName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType abstract="true" name="ViewDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:constraint"/> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:styleDefinition"/> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:childDefinition"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:NCName" use="required"/> - <xsd:attribute name="abstract" type="xsd:boolean"/> - <xsd:attribute name="superDefinition" type="xsd:QName"/> - <xsd:attribute name="contextType" type="xsd:QName"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="NodeDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:ViewDefinition"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="ConnectorDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:ViewDefinition"> - <xsd:attribute name="sourceDefinition" type="xsd:QName" use="required"/> - <xsd:attribute name="targetDefinition" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="DiagramDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:ViewDefinition"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="ChildDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:attribute name="lowerBound" type="xsd:int" default="0" /> - <xsd:attribute name="upperBound" type="xsd:int" default="-1"/> - <xsd:attribute name="typeDefinition" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="StyleDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:attribute name="default" type="xsd:string"/> - <xsd:attribute name="inherited" type="xsd:boolean" default="false"/> - <xsd:attribute name="type" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Constraint"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:attribute name="condition" type="xsd:string" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - -</xsd:schema> \ No newline at end of file Deleted: jbpm4/trunk/modules/bpmn/src/main/resources/DiagramInterchange.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/DiagramInterchange.xsd 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/resources/DiagramInterchange.xsd 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema targetNamespace="http://www.omg.com/di/1.0.0" xmlns:dd="http://www.omg.com/dd/1.0.0" xmlns:di="http://www.omg.com/di/1.0.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:import namespace="http://www.omg.com/dd/1.0.0" schemaLocation="DiagramDefinition.xsd"/> - - <xsd:element name="view" type="di:View"/> - <xsd:element name="diagram" type="di:Diagram" substitutionGroup="di:view"/> - <xsd:element name="node" type="di:Node" substitutionGroup="di:view"/> - <xsd:element name="connector" type="di:Connector" substitutionGroup="di:view"/> - <xsd:element name="style" type="di:Style"/> - <xsd:element name="bendpoint" type="di:Bendpoint"/> - - <xsd:complexType abstract="true" name="View"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="di:style"/> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="child" type="di:Node" form="qualified"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:NCName" use="required"/> - <xsd:attribute name="context" type="xsd:anyURI"/> - <xsd:attribute name="definition" use="required"> - <xsd:simpleType> - <xsd:list itemType="xsd:QName"/> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="targetConnector"> - <xsd:simpleType> - <xsd:list itemType="xsd:anyURI"/> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="sourceConnector"> - <xsd:simpleType> - <xsd:list itemType="xsd:anyURI"/> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - - <xsd:complexType name="Diagram"> - <xsd:complexContent> - <xsd:extension base="di:View"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="di:connector"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Node"> - <xsd:complexContent> - <xsd:extension base="di:View"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Connector"> - <xsd:complexContent> - <xsd:extension base="di:View"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="di:bendpoint"/> - </xsd:sequence> - <xsd:attribute name="source" type="xsd:anyURI" use="required"/> - <xsd:attribute name="target" type="xsd:anyURI" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Style"> - <xsd:attribute name="name" type="xsd:NCName" use="required"/> - <xsd:attribute name="value" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:complexType name="Bendpoint"> - <xsd:attribute name="sourceX" type="xsd:int" use="required"/> - <xsd:attribute name="sourceY" type="xsd:int" use="required"/> - <xsd:attribute name="targetX" type="xsd:int" use="required"/> - <xsd:attribute name="targetY" type="xsd:int" use="required"/> - </xsd:complexType> - -</xsd:schema> \ No newline at end of file Modified: jbpm4/trunk/modules/bpmn/src/main/resources/Semantic.xsd =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/Semantic.xsd 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/resources/Semantic.xsd 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns="http://schema.omg.org/spec/BPMN/2.0" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://schema.omg.org/spec/BPMN/2.0"> + targetNamespace="http://www.omg.org/spec/BPMN/20100524/MODEL"> <xsd:element name="activity" type="tActivity"/> <xsd:complexType name="tActivity" abstract="true"> @@ -13,7 +13,7 @@ <xsd:element ref="property" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="dataInputAssociation" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="dataOutputAssociation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="activityResource" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="loopCharacteristics" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="isForCompensation" type="xsd:boolean" default="false"/> @@ -24,19 +24,6 @@ </xsd:complexContent> </xsd:complexType> - <xsd:element name="activityResource" type="tActivityResource"/> - <xsd:complexType name="tActivityResource"> - <xsd:complexContent> - <xsd:extension base="tBaseElement"> - <xsd:sequence> - <xsd:element ref="resourceAssignmentExpression" minOccurs="0" maxOccurs="1"/> - <xsd:element ref="resourceParameterBinding" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="resourceRef" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:element name="adHocSubProcess" type="tAdHocSubProcess" substitutionGroup="flowElement"/> <xsd:complexType name="tAdHocSubProcess"> <xsd:complexContent> @@ -52,8 +39,8 @@ <xsd:simpleType name="tAdHocOrdering"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="parallel"/> - <xsd:enumeration value="sequential"/> + <xsd:enumeration value="Parallel"/> + <xsd:enumeration value="Sequential"/> </xsd:restriction> </xsd:simpleType> @@ -69,10 +56,9 @@ <xsd:complexContent> <xsd:extension base="tBaseElement"> <xsd:sequence> - <xsd:element name="from" type="tBaseElementWithMixedContent" minOccurs="1" maxOccurs="1"/> - <xsd:element name="to" type="tBaseElementWithMixedContent" minOccurs="1" maxOccurs="1"/> + <xsd:element name="from" type="tExpression" minOccurs="1" maxOccurs="1"/> + <xsd:element name="to" type="tExpression" minOccurs="1" maxOccurs="1"/> </xsd:sequence> - <xsd:attribute name="language" type="xsd:anyURI"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -83,16 +69,16 @@ <xsd:extension base="tArtifact"> <xsd:attribute name="sourceRef" type="xsd:QName" use="required"/> <xsd:attribute name="targetRef" type="xsd:QName" use="required"/> - <xsd:attribute name="associationDirection" type="tAssociationDirection" default="none"/> + <xsd:attribute name="associationDirection" type="tAssociationDirection" default="None"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:simpleType name="tAssociationDirection"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="one"/> - <xsd:enumeration value="both"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="One"/> + <xsd:enumeration value="Both"/> </xsd:restriction> </xsd:simpleType> @@ -107,7 +93,7 @@ <xsd:complexType name="tBaseElement" abstract="true"> <xsd:sequence> <xsd:element ref="documentation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="extensionElements" minOccurs="0" maxOccurs="1" /> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> <xsd:anyAttribute namespace="##other" processContents="lax"/> @@ -117,8 +103,7 @@ <xsd:complexType name="tBaseElementWithMixedContent" abstract="true" mixed="true"> <xsd:sequence> <xsd:element ref="documentation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="category" minOccurs="0" maxOccurs="unbounded"/> - <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="extensionElements" minOccurs="0" maxOccurs="1" /> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> <xsd:anyAttribute namespace="##other" processContents="lax"/> @@ -137,7 +122,9 @@ <xsd:element name="businessRuleTask" type="tBusinessRuleTask" substitutionGroup="flowElement"/> <xsd:complexType name="tBusinessRuleTask"> <xsd:complexContent> - <xsd:extension base="tTask"/> + <xsd:extension base="tTask"> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -164,14 +151,14 @@ </xsd:complexContent> </xsd:complexType> - <xsd:element name="callChoreographyActivity" type="tCallChoreographyActivity" substitutionGroup="flowElement"/> - <xsd:complexType name="tCallChoreographyActivity"> + <xsd:element name="callChoreography" type="tCallChoreography" substitutionGroup="flowElement"/> + <xsd:complexType name="tCallChoreography"> <xsd:complexContent> <xsd:extension base="tChoreographyActivity"> <xsd:sequence> <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="calledElement" type="xsd:QName" use="optional"/> + </xsd:sequence> + <xsd:attribute name="calledChoreographyRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -183,7 +170,7 @@ <xsd:sequence> <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="calledElementRef" type="xsd:QName" use="optional"/> + <xsd:attribute name="calledCollaborationRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -218,6 +205,7 @@ <xsd:sequence> <xsd:element ref="categoryValue" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -230,22 +218,14 @@ </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="choreography" type="tChoreography" substitutionGroup="rootElement"/> + + <xsd:element name="choreography" type="tChoreography" substitutionGroup="collaboration"/> <xsd:complexType name="tChoreography"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> + <xsd:extension base="tCollaboration"> <xsd:sequence> <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="conversation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="conversationAssociation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlowAssociation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="isClosed" type="xsd:boolean" default="false"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -256,31 +236,30 @@ <xsd:extension base="tFlowNode"> <xsd:sequence> <xsd:element name="participantRef" type="xsd:QName" minOccurs="2" maxOccurs="unbounded"/> + <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="initiatingParticipantRef" type="xsd:QName" use="required"/> + <xsd:attribute name="loopType" type="tChoreographyLoopType" default="None"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:element name="choreographySubProcess" type="tChoreographySubProcess" substitutionGroup="flowElement"/> - <xsd:complexType name="tChoreographySubProcess"> - <xsd:complexContent> - <xsd:extension base="tChoreographyActivity"> - <xsd:sequence> - <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - + <xsd:simpleType name="tChoreographyLoopType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Standard"/> + <xsd:enumeration value="MultiInstanceSequential"/> + <xsd:enumeration value="MultiInstanceParallel"/> + </xsd:restriction> + </xsd:simpleType> + <xsd:element name="choreographyTask" type="tChoreographyTask" substitutionGroup="flowElement"/> <xsd:complexType name="tChoreographyTask"> <xsd:complexContent> <xsd:extension base="tChoreographyActivity"> <xsd:sequence> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> + <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="1" maxOccurs="2"/> + </xsd:sequence> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -293,30 +272,20 @@ <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="conversation" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="conversationAssociation" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="messageFlowAssociation" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="choreographyRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="conversationLink" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="isClosed" type="xsd:boolean" default="false"/> - <xsd:attribute name="choreographyRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="communication" type="tCommunication" substitutionGroup="conversationNode"/> - <xsd:complexType name="tCommunication"> - <xsd:complexContent> - <xsd:extension base="tConversationNode"> - <xsd:sequence> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="correlationKeyRef" type="xsd:QName" use="optional"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - + <xsd:element name="compensateEventDefinition" type="tCompensateEventDefinition" substitutionGroup="eventDefinition"/> <xsd:complexType name="tCompensateEventDefinition"> <xsd:complexContent> @@ -344,7 +313,7 @@ <xsd:complexContent> <xsd:extension base="tGateway"> <xsd:sequence> - <xsd:element name="activationCondition" type="tExpression" minOccurs="0" maxOccurs="1"/> + <xsd:element name="activationCondition" type="tExpression" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="default" type="xsd:IDREF"/> </xsd:extension> @@ -361,20 +330,11 @@ </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="conversation" type="tConversation" substitutionGroup="rootElement"/> + + <xsd:element name="conversation" type="tConversation" substitutionGroup="conversationNode"/> <xsd:complexType name="tConversation"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> - <xsd:sequence> - <xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tConversationNode"/> </xsd:complexContent> </xsd:complexType> @@ -382,21 +342,31 @@ <xsd:complexType name="tConversationAssociation"> <xsd:complexContent> <xsd:extension base="tBaseElement"> - <xsd:sequence> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="conversationRef" type="xsd:QName"/> - <xsd:attribute name="correlationKeyRef" type="xsd:QName"/> + <xsd:attribute name="innerConversationNodeRef" type="xsd:QName" use="required"/> + <xsd:attribute name="outerConversationNodeRef" type="xsd:QName" use="required"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> + <xsd:element name="conversationLink" type="tConversationLink"/> + <xsd:complexType name="tConversationLink"> + <xsd:complexContent> + <xsd:extension base="tBaseElement"> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + <xsd:attribute name="sourceRef" type="xsd:QName" use="required"/> + <xsd:attribute name="targetRef" type="xsd:QName" use="required"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="conversationNode" type="tConversationNode"/> <xsd:complexType name="tConversationNode" abstract="true"> <xsd:complexContent> <xsd:extension base="tBaseElement"> <xsd:sequence> <xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> @@ -410,6 +380,7 @@ <xsd:sequence> <xsd:element name="correlationPropertyRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -421,6 +392,8 @@ <xsd:sequence> <xsd:element ref="correlationPropertyRetrievalExpression" minOccurs="1" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + <xsd:attribute name="type" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -456,17 +429,18 @@ <xsd:sequence> <xsd:element ref="correlationPropertyBinding" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="process" type="xsd:QName" use="required"/> <xsd:attribute name="correlationKeyRef" type="xsd:QName" use="required"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:element name="dataAssociation" type="tDataAssociation" /> - <xsd:complexType name="tDataAssociation" abstract="true"> + <xsd:complexType name="tDataAssociation"> <xsd:complexContent> <xsd:extension base="tBaseElement"> <xsd:sequence> + <xsd:element name="sourceRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="targetRef" type="xsd:IDREF" minOccurs="1" maxOccurs="1"/> <xsd:element name="transformation" type="tFormalExpression" minOccurs="0" maxOccurs="1"/> <xsd:element ref="assignment" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> @@ -491,12 +465,7 @@ <xsd:element name="dataInputAssociation" type="tDataInputAssociation" /> <xsd:complexType name="tDataInputAssociation"> <xsd:complexContent> - <xsd:extension base="tDataAssociation"> - <xsd:sequence> - <xsd:element name="sourceRef" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/> - <xsd:element name="targetRef" type="xsd:QName" minOccurs="1" maxOccurs="1"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tDataAssociation"/> </xsd:complexContent> </xsd:complexType> @@ -513,6 +482,19 @@ </xsd:complexContent> </xsd:complexType> + <xsd:element name="dataObjectReference" type="tDataObjectReference" substitutionGroup="flowElement"/> + <xsd:complexType name="tDataObjectReference"> + <xsd:complexContent> + <xsd:extension base="tFlowElement"> + <xsd:sequence> + <xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="itemSubjectRef" type="xsd:QName"/> + <xsd:attribute name="dataObjectRef" type="xsd:IDREF"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="dataOutput" type="tDataOutput" /> <xsd:complexType name="tDataOutput"> <xsd:complexContent> @@ -530,12 +512,7 @@ <xsd:element name="dataOutputAssociation" type="tDataOutputAssociation" /> <xsd:complexType name="tDataOutputAssociation"> <xsd:complexContent> - <xsd:extension base="tDataAssociation"> - <xsd:sequence> - <xsd:element name="sourceRef" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/> - <xsd:element name="targetRef" type="xsd:QName" minOccurs="1" maxOccurs="1"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tDataAssociation"/> </xsd:complexContent> </xsd:complexType> @@ -582,6 +559,7 @@ <xsd:any namespace="##any" processContents="lax" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> + <xsd:attribute name="textFormat" type="xsd:string" default="text/plain"/> </xsd:complexType> <xsd:element name="endEvent" type="tEndEvent" substitutionGroup="flowElement"/> @@ -602,6 +580,8 @@ <xsd:complexType name="tError"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="errorCode" type="xsd:string"/> <xsd:attribute name="structureRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -611,7 +591,6 @@ <xsd:complexType name="tErrorEventDefinition"> <xsd:complexContent> <xsd:extension base="tEventDefinition"> - <xsd:attribute name="errorCode" type="xsd:string"/> <xsd:attribute name="errorRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -621,6 +600,8 @@ <xsd:complexType name="tEscalation"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="escalationCode" type="xsd:string"/> <xsd:attribute name="structureRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -630,7 +611,6 @@ <xsd:complexType name="tEscalationEventDefinition"> <xsd:complexContent> <xsd:extension base="tEventDefinition"> - <xsd:attribute name="escalationCode" type="xsd:string"/> <xsd:attribute name="escalationRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -639,7 +619,11 @@ <xsd:element name="event" type="tEvent" substitutionGroup="flowElement"/> <xsd:complexType name="tEvent" abstract="true"> <xsd:complexContent> - <xsd:extension base="tFlowNode"/> + <xsd:extension base="tFlowNode"> + <xsd:sequence> + <xsd:element ref="property" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -692,6 +676,13 @@ <xsd:attribute name="mustUnderstand" type="xsd:boolean" use="optional" default="false"/> </xsd:complexType> + <xsd:element name="extensionElements" type="tExtensionElements" /> + <xsd:complexType name="tExtensionElements"> + <xsd:sequence> + <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + <xsd:element name="flowElement" type="tFlowElement"/> <xsd:complexType name="tFlowElement" abstract="true"> <xsd:complexContent> @@ -719,7 +710,7 @@ </xsd:complexType> <xsd:element name="formalExpression" type="tFormalExpression" substitutionGroup="expression"/> - <xsd:complexType name="tFormalExpression" mixed="true"> + <xsd:complexType name="tFormalExpression"> <xsd:complexContent> <xsd:extension base="tExpression"> <xsd:attribute name="language" type="xsd:anyURI" use="optional"/> @@ -732,50 +723,41 @@ <xsd:complexType name="tGateway"> <xsd:complexContent> <xsd:extension base="tFlowNode"> - <xsd:attribute name="gatewayDirection" type="tGatewayDirection" default="unspecified"/> + <xsd:attribute name="gatewayDirection" type="tGatewayDirection" default="Unspecified"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:simpleType name="tGatewayDirection"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="unspecified"/> - <xsd:enumeration value="converging"/> - <xsd:enumeration value="diverging"/> - <xsd:enumeration value="mixed"/> + <xsd:enumeration value="Unspecified"/> + <xsd:enumeration value="Converging"/> + <xsd:enumeration value="Diverging"/> + <xsd:enumeration value="Mixed"/> </xsd:restriction> </xsd:simpleType> <xsd:element name="globalBusinessRuleTask" type="tGlobalBusinessRuleTask" substitutionGroup="rootElement"/> <xsd:complexType name="tGlobalBusinessRuleTask"> <xsd:complexContent> - <xsd:extension base="tGlobalTask"/> + <xsd:extension base="tGlobalTask"> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="globalChoreographyTask" type="tGlobalChoreographyTask" substitutionGroup="rootElement"/> + + <xsd:element name="globalChoreographyTask" type="tGlobalChoreographyTask" substitutionGroup="choreography"/> <xsd:complexType name="tGlobalChoreographyTask"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> - <xsd:sequence> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> + <xsd:extension base="tChoreography"> <xsd:attribute name="initiatingParticipantRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> - </xsd:complexType> - - <xsd:element name="globalCommunication" type="tGlobalCommunication" substitutionGroup="rootElement"/> - <xsd:complexType name="tGlobalCommunication"> + </xsd:complexType> + <xsd:element name="globalConversation" type="tGlobalConversation" substitutionGroup="collaboration"/> + <xsd:complexType name="tGlobalConversation"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> - <xsd:sequence> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tCollaboration"/> </xsd:complexContent> </xsd:complexType> @@ -803,7 +785,7 @@ <xsd:complexContent> <xsd:extension base="tCallableElement"> <xsd:sequence> - <xsd:element ref="performer" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:extension> </xsd:complexContent> @@ -816,7 +798,7 @@ <xsd:sequence> <xsd:element ref="rendering" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="implementation" type="tUserTaskImplementation" default="unspecified"/> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -825,7 +807,7 @@ <xsd:complexType name="tGroup"> <xsd:complexContent> <xsd:extension base="tArtifact"> - <xsd:attribute name="categoryRef" type="xsd:QName" use="optional"/> + <xsd:attribute name="categoryValueRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -837,6 +819,17 @@ </xsd:complexContent> </xsd:complexType> + <xsd:simpleType name="tImplementation"> + <xsd:union memberTypes="xsd:anyURI"> + <xsd:simpleType> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="##unspecified" /> + <xsd:enumeration value="##WebService" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:union> + </xsd:simpleType> + <xsd:element name="implicitThrowEvent" type="tImplicitThrowEvent" substitutionGroup="flowElement"/> <xsd:complexType name="tImplicitThrowEvent"> <xsd:complexContent> @@ -876,6 +869,7 @@ <xsd:element ref="operation" minOccurs="1" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="implementationRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -943,11 +937,11 @@ <xsd:extension base="tBaseElement"> <xsd:sequence> <xsd:element name="partitionElement" type="tBaseElement" minOccurs="0" maxOccurs="1"/> - <xsd:element name="flowElementRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="flowNodeRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="childLaneSet" type="tLaneSet" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="partitionElementRef" type="xsd:IDREF"/> + <xsd:attribute name="partitionElementRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -959,6 +953,7 @@ <xsd:sequence> <xsd:element ref="lane" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -967,6 +962,10 @@ <xsd:complexType name="tLinkEventDefinition"> <xsd:complexContent> <xsd:extension base="tEventDefinition"> + <xsd:sequence> + <xsd:element name="source" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="target" type="xsd:QName" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> </xsd:extension> </xsd:complexContent> @@ -991,7 +990,7 @@ <xsd:complexContent> <xsd:extension base="tRootElement"> <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="structureRef" type="xsd:QName"/> + <xsd:attribute name="itemRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1043,15 +1042,15 @@ <xsd:extension base="tLoopCharacteristics"> <xsd:sequence> <xsd:element name="loopCardinality" type="tExpression" minOccurs="0" maxOccurs="1"/> - <xsd:element name="loopDataInput" type="tDataInput" minOccurs="0" maxOccurs="1"/> - <xsd:element name="loopDataOutput" type="tDataOutput" minOccurs="0" maxOccurs="1"/> - <xsd:element name="inputDataItem" type="tProperty" minOccurs="0" maxOccurs="1"/> - <xsd:element name="outputDataItem" type="tProperty" minOccurs="0" maxOccurs="1"/> + <xsd:element name="loopDataInputRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/> + <xsd:element name="loopDataOutputRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/> + <xsd:element name="inputDataItem" type="tDataInput" minOccurs="0" maxOccurs="1"/> + <xsd:element name="outputDataItem" type="tDataOutput" minOccurs="0" maxOccurs="1"/> <xsd:element ref="complexBehaviorDefinition" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="completionCondition" type="tExpression" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="isSequential" type="xsd:boolean" default="false"/> - <xsd:attribute name="behavior" type="tMultiInstanceFlowCondition" default="all"/> + <xsd:attribute name="behavior" type="tMultiInstanceFlowCondition" default="All"/> <xsd:attribute name="oneBehaviorEventRef" type="xsd:QName" use="optional"/> <xsd:attribute name="noneBehaviorEventRef" type="xsd:QName" use="optional"/> </xsd:extension> @@ -1060,12 +1059,12 @@ <xsd:simpleType name="tMultiInstanceFlowCondition"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="one"/> - <xsd:enumeration value="all"/> - <xsd:enumeration value="complex"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="One"/> + <xsd:enumeration value="All"/> + <xsd:enumeration value="Complex"/> </xsd:restriction> - </xsd:simpleType> + </xsd:simpleType> <xsd:element name="operation" type="tOperation"/> <xsd:complexType name="tOperation"> @@ -1077,6 +1076,7 @@ <xsd:element name="errorRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="implementationRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1113,8 +1113,6 @@ <xsd:element ref="participantMultiplicity" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="partnerRoleRef" type="xsd:QName" use="optional"/> - <xsd:attribute name="partnerEntityRef" type="xsd:QName" use="optional"/> <xsd:attribute name="processRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> @@ -1136,8 +1134,8 @@ <xsd:complexType name="tParticipantMultiplicity"> <xsd:complexContent> <xsd:extension base="tBaseElement"> - <xsd:attribute name="minimum" type="xsd:int"/> - <xsd:attribute name="maximum" type="xsd:int"/> + <xsd:attribute name="minimum" type="xsd:int" default="0"/> + <xsd:attribute name="maximum" type="xsd:int" default="1"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1146,6 +1144,9 @@ <xsd:complexType name="tPartnerEntity"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:sequence> + <xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> @@ -1155,15 +1156,18 @@ <xsd:complexType name="tPartnerRole"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:sequence> + <xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:element name="performer" type="tPerformer" substitutionGroup="activityResource"/> + <xsd:element name="performer" type="tPerformer" substitutionGroup="resourceRole"/> <xsd:complexType name="tPerformer"> <xsd:complexContent> - <xsd:extension base="tActivityResource"/> + <xsd:extension base="tResourceRole"/> </xsd:complexContent> </xsd:complexType> @@ -1185,10 +1189,13 @@ <xsd:element ref="laneSet" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="correlationSubscription" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="supports" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="processType" type="tProcessType" default="none"/> + <xsd:attribute name="processType" type="tProcessType" default="None"/> <xsd:attribute name="isClosed" type="xsd:boolean" default="false"/> + <xsd:attribute name="isExecutable" type="xsd:boolean"/> <xsd:attribute name="definitionalCollaborationRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> @@ -1196,10 +1203,9 @@ <xsd:simpleType name="tProcessType"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="executable"/> - <xsd:enumeration value="non-executable"/> - <xsd:enumeration value="public"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Public"/> + <xsd:enumeration value="Private"/> </xsd:restriction> </xsd:simpleType> @@ -1220,7 +1226,7 @@ <xsd:complexType name="tReceiveTask"> <xsd:complexContent> <xsd:extension base="tTask"> - <xsd:attribute name="implementation" type="tServiceImplementation" default="WebService"/> + <xsd:attribute name="implementation" type="tImplementation" default="##WebService"/> <xsd:attribute name="instantiate" type="xsd:boolean" default="false"/> <xsd:attribute name="messageRef" type="xsd:QName" use="optional"/> <xsd:attribute name="operationRef" type="xsd:QName" use="optional"/> @@ -1244,10 +1250,10 @@ <xsd:simpleType name="tRelationshipDirection"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="forward"/> - <xsd:enumeration value="backward"/> - <xsd:enumeration value="both"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Forward"/> + <xsd:enumeration value="Backward"/> + <xsd:enumeration value="Both"/> </xsd:restriction> </xsd:simpleType> @@ -1304,6 +1310,22 @@ </xsd:complexContent> </xsd:complexType> + <xsd:element name="resourceRole" type="tResourceRole"/> + <xsd:complexType name="tResourceRole"> + <xsd:complexContent> + <xsd:extension base="tBaseElement"> + <xsd:choice> + <xsd:sequence> + <xsd:element name="resourceRef" type="xsd:QName"/> + <xsd:element ref="resourceParameterBinding" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:element ref="resourceAssignmentExpression" minOccurs="0" maxOccurs="1"/> + </xsd:choice> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="rootElement" type="tRootElement"/> <xsd:complexType name="tRootElement" abstract="true"> <xsd:complexContent> @@ -1318,7 +1340,7 @@ <xsd:sequence> <xsd:element ref="script" minOccurs="0" maxOccurs="1"/> </xsd:sequence> - <xsd:attribute name="scriptLanguage" type="xsd:anyURI"/> + <xsd:attribute name="scriptFormat" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1334,7 +1356,7 @@ <xsd:complexType name="tSendTask"> <xsd:complexContent> <xsd:extension base="tTask"> - <xsd:attribute name="implementation" type="tServiceImplementation" default="WebService"/> + <xsd:attribute name="implementation" type="tImplementation" default="##WebService"/> <xsd:attribute name="messageRef" type="xsd:QName" use="optional"/> <xsd:attribute name="operationRef" type="xsd:QName" use="optional"/> </xsd:extension> @@ -1350,7 +1372,7 @@ </xsd:sequence> <xsd:attribute name="sourceRef" type="xsd:IDREF" use="required"/> <xsd:attribute name="targetRef" type="xsd:IDREF" use="required"/> - <xsd:attribute name="isImmediate" type="xsd:boolean" default="true"/> + <xsd:attribute name="isImmediate" type="xsd:boolean" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1359,20 +1381,12 @@ <xsd:complexType name="tServiceTask"> <xsd:complexContent> <xsd:extension base="tTask"> - <xsd:attribute name="implementation" type="tServiceImplementation" default="WebService"/> + <xsd:attribute name="implementation" type="tImplementation" default="##WebService"/> <xsd:attribute name="operationRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:simpleType name="tServiceImplementation"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="WebService"/> - <xsd:enumeration value="Other"/> - <xsd:enumeration value="Unspecified"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:element name="signal" type="tSignal" substitutionGroup="rootElement"/> <xsd:complexType name="tSignal"> <xsd:complexContent> @@ -1409,20 +1423,30 @@ <xsd:complexType name="tStartEvent"> <xsd:complexContent> <xsd:extension base="tCatchEvent"> - <xsd:attribute name="isInterrupting" type="xsd:boolean" default="false"/> + <xsd:attribute name="isInterrupting" type="xsd:boolean" default="true"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> + <xsd:element name="subChoreography" type="tSubChoreography" substitutionGroup="flowElement"/> + <xsd:complexType name="tSubChoreography"> + <xsd:complexContent> + <xsd:extension base="tChoreographyActivity"> + <xsd:sequence> + <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="subConversation" type="tSubConversation" substitutionGroup="conversationNode"/> <xsd:complexType name="tSubConversation"> <xsd:complexContent> <xsd:extension base="tConversationNode"> <xsd:sequence> <xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="correlationKeyRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1432,6 +1456,7 @@ <xsd:complexContent> <xsd:extension base="tActivity"> <xsd:sequence> + <xsd:element ref="laneSet" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> @@ -1461,6 +1486,7 @@ <xsd:sequence> <xsd:element ref="text" minOccurs="0" maxOccurs="1"/> </xsd:sequence> + <xsd:attribute name="textFormat" type="xsd:string" default="text/plain"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1493,6 +1519,7 @@ <xsd:extension base="tEventDefinition"> <xsd:choice> <xsd:element name="timeDate" type="tExpression" minOccurs="0" maxOccurs="1"/> + <xsd:element name="timeDuration" type="tExpression" minOccurs="0" maxOccurs="1"/> <xsd:element name="timeCycle" type="tExpression" minOccurs="0" maxOccurs="1"/> </xsd:choice> </xsd:extension> @@ -1502,20 +1529,24 @@ <xsd:element name="transaction" type="tTransaction" substitutionGroup="flowElement"/> <xsd:complexType name="tTransaction"> <xsd:complexContent> - <xsd:extension base="tActivity"> - <xsd:attribute name="method" type="tTransactionMethod" default="compensate"/> + <xsd:extension base="tSubProcess"> + <xsd:attribute name="method" type="tTransactionMethod" default="##Compensate"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:simpleType name="tTransactionMethod"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="compensate"/> - <xsd:enumeration value="image"/> - <xsd:enumeration value="store"/> - </xsd:restriction> - </xsd:simpleType> - + <xsd:union memberTypes="xsd:anyURI"> + <xsd:simpleType> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="##Compensate" /> + <xsd:enumeration value="##Image" /> + <xsd:enumeration value="##Store" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:union> + </xsd:simpleType> + <xsd:element name="userTask" type="tUserTask" substitutionGroup="flowElement"/> <xsd:complexType name="tUserTask"> <xsd:complexContent> @@ -1523,18 +1554,9 @@ <xsd:sequence> <xsd:element ref="rendering" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="implementation" type="tUserTaskImplementation" default="unspecified"/> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:simpleType name="tUserTaskImplementation"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="unspecified"/> - <xsd:enumeration value="other"/> - <xsd:enumeration value="webService"/> - <xsd:enumeration value="humanTaskWebService"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:schema> \ No newline at end of file Modified: jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,28 +1,28 @@ <activities> - -  - <activity binding="org.jbpm.bpmn.flownodes.StartEventBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.EndEventBinding" /> - -  - <activity binding="org.jbpm.bpmn.flownodes.IntermediateCatchEventBinding" /> - -  - <activity binding="org.jbpm.bpmn.flownodes.ExclusiveGatewayBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.ParallelGatewayBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.InclusiveGatewayBinding" /> - -  - <activity binding="org.jbpm.bpmn.flownodes.ReceiveBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.SubProcessBinding" /> - -  - <activity binding="org.jbpm.bpmn.flownodes.ManualTaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.ScriptTaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.ServiceTaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.TaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.UserTaskBinding" /> +  + <activity binding="org.jbpm.bpmn.flownodes.StartEventBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.EndEventBinding" /> + +  + <activity binding="org.jbpm.bpmn.flownodes.IntermediateCatchEventBinding" /> + +  + <activity binding="org.jbpm.bpmn.flownodes.ExclusiveGatewayBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.ParallelGatewayBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.InclusiveGatewayBinding" /> + +  + <activity binding="org.jbpm.bpmn.flownodes.ReceiveBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.SubProcessBinding" /> + +  + <activity binding="org.jbpm.bpmn.flownodes.ManualTaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.ScriptTaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.ServiceTaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.TaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.UserTaskBinding" /> + </activities> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/nonestartend/none_start_end_event.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/nonestartend/none_start_end_event.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/nonestartend/none_start_end_event.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions +<definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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" + expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/none_start_end_event" xmlns:jbpm="http://jbpm.org/bpmn2"> @@ -18,5 +18,5 @@ <endEvent id="end" name="End" /> </process> - + </definitions> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/terminateend/terminate_end_event.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/terminateend/terminate_end_event.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/terminateend/terminate_end_event.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions +<definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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" + expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/terminate_end_event" xmlns:jbpm="http://jbpm.org/bpmn2"> @@ -17,23 +17,23 @@ <sequenceFlow id="flow2" name="fromStartToTask2" sourceRef="start" targetRef="task2" /> - + <userTask id="task1" name="task1" /> - + <sequenceFlow id="flow3" name="fromTask1ToTerminateEnd" sourceRef="task1" targetRef="terminateEnd" /> - + <endEvent id="terminateEnd" name="terminateEnd"> <terminateEventDefinition/> </endEvent> - + <userTask id="task2" name="task2" /> - + <sequenceFlow id="flow4" name="fromTask2ToEnd" sourceRef="task2" targetRef="noneEnd" /> <endEvent id="noneEnd" name="noneEnd" /> </process> - + </definitions> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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://jbpm.org/example/bpmn2/boundary_event_timer_interrupting" Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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://jbpm.org/example/bpmn2/boundary_event_timer_none_interrupting" Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/intermediate_catch_timer_event.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/intermediate_catch_timer_event.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/intermediate_catch_timer_event.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,25 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions - 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/intermediateTimerCatch"> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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://jbpm.org/example/bpmn2/intermediateTimerCatch"> - <process id="intermediateTimerCatch"> + <process id="intermediateTimerCatch"> - <startEvent id="theStart" /> - - <sequenceFlow id="flow1" sourceRef="theStart" targetRef="myTimer" /> - - <intermediateCatchEvent id="myTimer" name="Wait for an hour"> - <timerEventDefinition> - <timeCycle xsi:type="tFormalExpression">1 hour</timeCycle> - </timerEventDefinition> - </intermediateCatchEvent> - - <sequenceFlow id="flow2" sourceRef="myTimer" targetRef="theEnd" /> + <startEvent id="theStart" /> - <endEvent id="theEnd" /> - - </process> + <sequenceFlow id="flow1" sourceRef="theStart" targetRef="myTimer" /> + + <intermediateCatchEvent id="myTimer" name="Wait for an hour"> + <timerEventDefinition> + <timeCycle xsi:type="tFormalExpression">1 hour</timeCycle> + </timerEventDefinition> + </intermediateCatchEvent> + + <sequenceFlow id="flow2" sourceRef="myTimer" targetRef="theEnd" /> + + <endEvent id="theEnd" /> + + </process> </definitions> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timerstart/timer_start_event.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timerstart/timer_start_event.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timerstart/timer_start_event.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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://jbpm.org/example/bpmn2/timer_start_end_event" Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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://jbpm.org/example/bpmn2/exclusive_gateway" Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway_default_seq_flow.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway_default_seq_flow.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway_default_seq_flow.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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://jbpm.org/example/bpmn2/exclusive_gateway" Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/inclusive/inclusive_gateway.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/inclusive/inclusive_gateway.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/inclusive/inclusive_gateway.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions 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="http://schema.omg.org/spec/BPMN/2.0" + 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://jbpm.org/example/bpmn2/inclusive_gatewat" Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,50 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> <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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/parallel_gateway"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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://jbpm.org/example/bpmn2/parallel_gateway"> - <process id="parallelGateway"> - - <startEvent id="Start" /> + <process id="parallelGateway"> - <sequenceFlow id="flow1" name="fromStartToSplit" - sourceRef="Start" - targetRef="parallelGatewaySplit" /> + <startEvent id="Start" /> - <parallelGateway id="parallelGatewaySplit" name="Split" - gatewayDirection="diverging"/> + <sequenceFlow id="flow1" name="fromStartToSplit" + sourceRef="Start" + targetRef="parallelGatewaySplit" /> - <sequenceFlow id="flow2a" name="Leg 1" - sourceRef="parallelGatewaySplit" - targetRef="prepareShipment" /> - - <userTask id="prepareShipment" name="Prepare shipment" implementation="other" /> - - <sequenceFlow id="flow2b" name="fromPrepareShipmentToJoin" - sourceRef="prepareShipment" - targetRef="parallelGatewayJoin" /> - - <sequenceFlow id="flow3a" name="Leg 2" - sourceRef="parallelGatewaySplit" - targetRef="billCustomer" /> - - <userTask id="billCustomer" name="Bill customer" implementation="other" /> - - <sequenceFlow id="flow3b" name="fromLeg2ToJoin" - sourceRef="billCustomer" - targetRef="parallelGatewayJoin" /> + <parallelGateway id="parallelGatewaySplit" name="Split" + gatewayDirection="diverging"/> - <parallelGateway id="parallelGatewayJoin" name="Join" - gatewayDirection="converging"/> - - <sequenceFlow id="flow4" - sourceRef="parallelGatewayJoin" - targetRef="End"> - </sequenceFlow> + <sequenceFlow id="flow2a" name="Leg 1" + sourceRef="parallelGatewaySplit" + targetRef="prepareShipment" /> - <endEvent id="End" name="End" /> - - </process> + <userTask id="prepareShipment" name="Prepare shipment" implementation="other" /> + + <sequenceFlow id="flow2b" name="fromPrepareShipmentToJoin" + sourceRef="prepareShipment" + targetRef="parallelGatewayJoin" /> + + <sequenceFlow id="flow3a" name="Leg 2" + sourceRef="parallelGatewaySplit" + targetRef="billCustomer" /> + + <userTask id="billCustomer" name="Bill customer" implementation="other" /> + + <sequenceFlow id="flow3b" name="fromLeg2ToJoin" + sourceRef="billCustomer" + targetRef="parallelGatewayJoin" /> + + <parallelGateway id="parallelGatewayJoin" name="Join" + gatewayDirection="converging"/> + + <sequenceFlow id="flow4" + sourceRef="parallelGatewayJoin" + targetRef="End"> + </sequenceFlow> + + <endEvent id="End" name="End" /> + + </process> </definitions> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/sequenceflow/conditional_sequence_flow.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/sequenceflow/conditional_sequence_flow.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/sequenceflow/conditional_sequence_flow.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,43 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions id="vacationRequest" - 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/conditional_sequence_flow" - xmlns:jbpm="http://jbpm.org/bpmn2"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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://jbpm.org/example/bpmn2/conditional_sequence_flow" + xmlns:jbpm="http://jbpm.org/bpmn2"> - <process id="conditionalSequenceFlow"> + <process id="conditionalSequenceFlow"> - <startEvent id="start" /> + <startEvent id="start" /> - <sequenceFlow id="flow1" sourceRef="start" targetRef="task1" /> + <sequenceFlow id="flow1" sourceRef="start" targetRef="task1" /> - <userTask id="task1" default="flow4" name="First task" /> + <userTask id="task1" default="flow4" name="First task" /> - <sequenceFlow id='flow2' sourceRef='task1' targetRef='task2' >" + + <sequenceFlow id='flow2' sourceRef='task1' targetRef='task2' >" + <conditionExpression xsi:type='tFormalExpression'>${var > 10}</conditionExpression> </sequenceFlow> - + <sequenceFlow id='flow3' sourceRef='task1' targetRef='task3' >" + <conditionExpression xsi:type='tFormalExpression'>${var > 100}</conditionExpression> </sequenceFlow> - + <sequenceFlow id="flow4" sourceRef="task1" targetRef="task4" /> - + <userTask id="task2" name="Second task" /> - + <sequenceFlow id="flow5" sourceRef="task2" targetRef="theEnd" /> - + <userTask id="task3" name="Third task" /> - + <sequenceFlow id="flow5" sourceRef="task2" targetRef="theEnd" /> - + <userTask id="task4" name="Fourth task" /> - + <sequenceFlow id="flow5" sourceRef="task2" targetRef="theEnd" /> - <endEvent id="theEnd" name="End" /> + <endEvent id="theEnd" name="End" /> - </process> + </process> </definitions> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/receive/receive_task_java.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/receive/receive_task_java.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/receive/receive_task_java.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,23 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions - 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/receiveTaskJava"> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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://jbpm.org/example/bpmn2/receiveTaskJava"> - <process id="receiveTaskJava"> + <process id="receiveTaskJava"> - <startEvent id="Start" /> + <startEvent id="Start" /> - <sequenceFlow id="flow1" sourceRef="Start" - targetRef="receiveTask" /> + <sequenceFlow id="flow1" sourceRef="Start" + targetRef="receiveTask" /> - <receiveTask id="receiveTask" name="wait" /> - - <sequenceFlow id="flow2" sourceRef="receiveTask" - targetRef="End" /> + <receiveTask id="receiveTask" name="wait" /> - <endEvent id="End" name="End" /> - - </process> + <sequenceFlow id="flow2" sourceRef="receiveTask" + targetRef="End" /> + + <endEvent id="End" name="End" /> + + </process> </definitions> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/script/script_task.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/script/script_task.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/script/script_task.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,29 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/scriptTask"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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://jbpm.org/example/bpmn2/scriptTask"> - <process id="ScriptTask" name="ScriptTask"> + <process id="ScriptTask" name="ScriptTask"> - <startEvent id="Start" /> + <startEvent id="Start" /> - <sequenceFlow id="flow1" sourceRef="Start" - targetRef="scriptTask" name="Start->ScriptTask" /> + <sequenceFlow id="flow1" sourceRef="Start" + targetRef="scriptTask" name="Start->ScriptTask" /> - <scriptTask id="scriptTask" name="Script Task" scriptLanguage="bsh"> - <script><![CDATA[ + <scriptTask id="scriptTask" name="Script Task" scriptLanguage="bsh"> + <script><![CDATA[ for(int i=0; i < input.length; i++){ System.out.println(input[i] + " x 2 = " + (input[i]*2)); }]]> - </script> - </scriptTask> - - <sequenceFlow id="flow2" sourceRef="scriptTask" - targetRef="End" /> + </script> + </scriptTask> - <endEvent id="End" name="End" /> - - </process> + <sequenceFlow id="flow2" sourceRef="scriptTask" + targetRef="End" /> + + <endEvent id="End" name="End" /> + + </process> </definitions> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,55 +1,57 @@ <?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 ../../../../../../../../../../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:itemDefinition id="itemDefinition1" > - <jbpm:arg> - <jbpm:object expr="#{var1}" /> - </jbpm:arg> - </bpmn:itemDefinition> - - <bpmn:itemDefinition id="itemDefinition2"> - <jbpm:var name="returnVar" /> - </bpmn:itemDefinition> - - <bpmn:message id="inputMessage" name="input message" - structureRef="itemDefinition1"></bpmn:message> + <bpmn:itemDefinition id="itemDefinition1" > + <jbpm:arg> + <jbpm:object expr="#{var1}" /> + </jbpm:arg> + </bpmn:itemDefinition> - <bpmn:message id="outputMessage" name="output message" - structureRef="itemDefinition2"> - </bpmn:message> + <bpmn:itemDefinition id="itemDefinition2"> + <jbpm:var name="returnVar" /> + </bpmn:itemDefinition> - <bpmn:interface id="myInterface" name="org.jbpm.examples.bpmn.task.service.JavaService"> - <bpmn:operation id="myOperation" name="myMethod"> - <bpmn:inMessageRef>inputMessage</bpmn:inMessageRef> - <bpmn:outMessageRef>outputMessage</bpmn:outMessageRef> - </bpmn:operation> - </bpmn:interface> + <bpmn:message id="inputMessage" name="input message" + structureRef="itemDefinition1"></bpmn:message> - <bpmn:process id="ServiceTaskJavaProcess"> + <bpmn:message id="outputMessage" name="output message" + structureRef="itemDefinition2"> + </bpmn:message> - <bpmn:startEvent id="Start" /> + <bpmn:interface id="myInterface" name="org.jbpm.examples.bpmn.task.service.JavaService"> + <bpmn:operation id="myOperation" name="myMethod"> + <bpmn:inMessageRef>inputMessage</bpmn:inMessageRef> + <bpmn:outMessageRef>outputMessage</bpmn:outMessageRef> + </bpmn:operation> + </bpmn:interface> - <bpmn:sequenceFlow id="flow1" name="fromStartToServiceTask" - sourceRef="Start" targetRef="ServiceTask" /> + <bpmn:process id="ServiceTaskJavaProcess"> - <bpmn:serviceTask id="ServiceTask" name="service task" - implementation="Other" operationRef="myOperation"> - </bpmn:serviceTask> + <bpmn:startEvent id="Start" /> - <bpmn:sequenceFlow id="flow2" name="fromServiceTaskToUT1" - sourceRef="ServiceTask" targetRef="UT1" /> + <bpmn:sequenceFlow id="flow1" name="fromStartToServiceTask" + sourceRef="Start" targetRef="ServiceTask" /> - <bpmn:userTask id="UT1" name="bla" implementation="other" /> + <bpmn:serviceTask id="ServiceTask" name="service task" + implementation="Other" operationRef="myOperation"> + </bpmn:serviceTask> - <bpmn:sequenceFlow id="flow3" name="fromUT1toEnd" - sourceRef="UT1" targetRef="End" /> + <bpmn:sequenceFlow id="flow2" name="fromServiceTaskToUT1" + sourceRef="ServiceTask" targetRef="UT1" /> - <bpmn:endEvent id="End" name="End" /> + <bpmn:userTask id="UT1" name="bla" implementation="other" /> - </bpmn:process> + <bpmn:sequenceFlow id="flow3" name="fromUT1toEnd" + sourceRef="UT1" targetRef="End" /> + + <bpmn:endEvent id="End" name="End" /> + + </bpmn:process> </bpmn:definitions> 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-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,70 +1,72 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions id="vacationRequest" - 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/vacation_request" - xmlns:jbpm="http://jbpm.org/bpmn2"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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://jbpm.org/example/bpmn2/vacation_request" + xmlns:jbpm="http://jbpm.org/bpmn2"> - <process id="vacationRequestProcess"> + <process id="vacationRequestProcess"> - <startEvent id="start" /> + <startEvent id="start" /> - <sequenceFlow id="flow1" name="fromStartToRequestVacation" - sourceRef="start" targetRef="requestVacation" /> + <sequenceFlow id="flow1" name="fromStartToRequestVacation" + sourceRef="start" targetRef="requestVacation" /> - <userTask id="requestVacation" name="Request Vacation" - implementation="other"> - <potentialOwner resourceRef="user" jbpm:type="group"> + <userTask id="requestVacation" name="Request Vacation" + implementation="other"> + <potentialOwner resourceRef="user" jbpm:type="group"> <resourceAssignmentExpression> <formalExpression>user</formalExpression> </resourceAssignmentExpression> </potentialOwner> - <rendering id="requestForm"> - <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl</jbpm:form> - </rendering> - </userTask> + <rendering id="requestForm"> + <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl</jbpm:form> + </rendering> + </userTask> - <sequenceFlow id="flow2" - name="fromRequestVacationToVerifyRequest" sourceRef="requestVacation" - targetRef="verifyRequest" /> + <sequenceFlow id="flow2" + name="fromRequestVacationToVerifyRequest" sourceRef="requestVacation" + targetRef="verifyRequest" /> - <userTask id="verifyRequest" name="Verify Request" - implementation="other"> - <potentialOwner resourceRef="user" jbpm:type="group"> + <userTask id="verifyRequest" name="Verify Request" + implementation="other"> + <potentialOwner resourceRef="user" jbpm:type="group"> <resourceAssignmentExpression> <formalExpression>manager</formalExpression> </resourceAssignmentExpression> </potentialOwner> - <rendering id="verifyForm"> - <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl</jbpm:form> - </rendering> - </userTask> + <rendering id="verifyForm"> + <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl</jbpm:form> + </rendering> + </userTask> - <sequenceFlow id="flow3" name="fromVerifyRequestToEnd" - sourceRef="verifyRequest" targetRef="theEnd"> - <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'OK'}</conditionExpression> - </sequenceFlow> + <sequenceFlow id="flow3" name="fromVerifyRequestToEnd" + sourceRef="verifyRequest" targetRef="theEnd"> + <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'OK'}</conditionExpression> + </sequenceFlow> - <sequenceFlow id="flow4" - name="fromVerifyRequestToSendRejectionMessage" sourceRef="verifyRequest" - targetRef="sendRejectionMessage"> - <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'Not OK'}</conditionExpression> - </sequenceFlow> + <sequenceFlow id="flow4" + name="fromVerifyRequestToSendRejectionMessage" sourceRef="verifyRequest" + targetRef="sendRejectionMessage"> + <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'Not OK'}</conditionExpression> + </sequenceFlow> - <scriptTask id="sendRejectionMessage" name="Send rejection Message" - scriptLanguage="bsh"> - <script> + <scriptTask id="sendRejectionMessage" name="Send rejection Message" + scriptLanguage="bsh"> + <script> <![CDATA[System.out.println("Vacation request refused!");]]> - </script> - </scriptTask> + </script> + </scriptTask> - <sequenceFlow id="flow5" - name="fromSendRejectionMessageToEnd" sourceRef="sendRejectionMessage" - targetRef="theEnd" /> + <sequenceFlow id="flow5" + name="fromSendRejectionMessageToEnd" sourceRef="sendRejectionMessage" + targetRef="theEnd" /> - <endEvent id="theEnd" name="End" /> + <endEvent id="theEnd" name="End" /> - </process> + </process> </definitions> 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-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_user.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions +<definitions 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" + 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://jbpm.org/example/bpmn2/human_performer" xmlns:jbpm="http://jbpm.org/bpmn2"> - + <resource id="employee" name="employee" /> <process id="userTaskHumanPerformerUser"> <startEvent id="start" /> - + <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" /> - + <userTask id="myTask" name="My User task"> <humanPerformer resourceRef="employee"> <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-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions +<definitions 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" + 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://jbpm.org/example/bpmn2/human_performer" xmlns:jbpm="http://jbpm.org/bpmn2"> - + <resource id="employee" name="employee" /> <process id="userTaskHumanPerformerVariable"> <startEvent id="start" /> - + <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" /> - + <userTask id="myTask" name="My User task"> <humanPerformer resourceRef="employee"> <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-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_group.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions +<definitions 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" + 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://jbpm.org/example/bpmn2/potential_owner" xmlns:jbpm="http://jbpm.org/bpmn2"> - + <resource id="manager" name="manager" /> <process id="userTaskPotentialOwnerGroup"> <startEvent id="start" /> - + <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" /> - + <userTask id="myTask" name="My User task"> <potentialOwner resourceRef="manager" jbpm:type="group"> <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-07 10:07:28 UTC (rev 6802) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_user.bpmn.xml 2010-11-07 17:24:08 UTC (rev 6803) @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions +<definitions 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="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" + 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://jbpm.org/example/bpmn2/potential_owner" xmlns:jbpm="http://jbpm.org/bpmn2"> - + <resource id="employee" name="employee" /> <process id="userTaskPotentialOwnerUser"> <startEvent id="start" /> - + <sequenceFlow id="flow1" sourceRef="start" targetRef="myTask" /> - + <userTask id="myTask" name="My User task"> <potentialOwner resourceRef="employee" jbpm:type="user"> <resourceAssignmentExpression>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6802 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/bpmn/event/timer and 1 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-07 05:07:28 -0500 (Sun, 07 Nov 2010) New Revision: 6802 Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml Log: JBPM-2729 non interrupting boundary timer event Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java 2010-11-07 09:44:19 UTC (rev 6801) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java 2010-11-07 10:07:28 UTC (rev 6802) @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; +import org.jbpm.api.Execution; import org.jbpm.api.listener.EventListener; import org.jbpm.api.listener.EventListenerExecution; import org.jbpm.api.model.Transition; @@ -44,17 +45,25 @@ @SuppressWarnings("unchecked") public void execute(ExecutionImpl execution) { - ProcessDefinitionImpl processDefinitionImpl = execution.getProcessDefinition(); - ActivityImpl activityImpl = processDefinitionImpl.getActivity(boundaryTimerEventActivityName); if (interrupting) { ExecutionImpl parent = execution.destroyScope(execution.getActivity()); - parent.moveTo(activityImpl); - parent.take(activityImpl.getOutgoingTransitions().get(0)); + this.executeBoundaryEventBranch(parent); } else { - execution.takeDefaultTransition(); + ExecutionImpl parent = execution.getParent(); + ExecutionImpl childExecution = parent.createExecution(); + childExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); + this.executeBoundaryEventBranch(childExecution); + this.proceed(execution, this.findOutgoingSequenceFlow(execution, true)); } } + protected void executeBoundaryEventBranch(ExecutionImpl execution) { + ProcessDefinitionImpl processDefinitionImpl = execution.getProcessDefinition(); + ActivityImpl activityImpl = processDefinitionImpl.getActivity(boundaryTimerEventActivityName); + execution.moveTo(activityImpl); + execution.take(activityImpl.getOutgoingTransitions().get(0)); + } + public void notify(EventListenerExecution execution) { this.execute((ExecutionImpl) execution); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java 2010-11-07 09:44:19 UTC (rev 6801) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java 2010-11-07 10:07:28 UTC (rev 6802) @@ -22,6 +22,7 @@ package org.jbpm.examples.bpmn.event.timer; import java.util.Date; +import java.util.List; import org.jbpm.api.NewDeployment; import org.jbpm.api.ProcessInstance; @@ -50,7 +51,20 @@ super.tearDown(); } - public void testIntermediateTimerWithDuration() { + public void testWithoutTimerEvent() { + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_event_timer_interrupting"); + + Task task = taskService.createTaskQuery().uniqueResult(); + taskService.completeTask(task.getId()); + assertProcessInstanceEnded(processInstance); + + List timerJobs = managementService.createJobQuery() + .processInstanceId(processInstance.getId()) + .list(); + assertEquals(0, timerJobs.size()); + } + + public void testTimerEvent() { Clock.setExplicitTime(new Date(0)); ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_event_timer_interrupting"); Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java 2010-11-07 10:07:28 UTC (rev 6802) @@ -0,0 +1,80 @@ +/* + * 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.examples.bpmn.event.timer; + +import java.util.Date; +import java.util.List; + +import org.jbpm.api.NewDeployment; +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.job.Job; +import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.util.Clock; +import org.jbpm.test.JbpmTestCase; + +/** + * + * @author Huisheng Xu + */ +public class BoundaryEventTimerNoneInterruptingTest extends JbpmTestCase { + + @Override + protected void setUp() throws Exception { + super.setUp(); + NewDeployment deployment = repositoryService.createDeployment(); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml"); + registerDeployment(deployment.deploy()); + } + + @Override + protected void tearDown() throws Exception { + Clock.setExplicitTime(null); + super.tearDown(); + } + + public void testWithoutTimerEvent() { + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_event_timer_none_interrupting"); + + Task task = taskService.createTaskQuery().uniqueResult(); + taskService.completeTask(task.getId()); + assertProcessInstanceEnded(processInstance); + + List timerJobs = managementService.createJobQuery() + .processInstanceId(processInstance.getId()) + .list(); + assertEquals(0, timerJobs.size()); + } + + public void testTimerEvent() { + Clock.setExplicitTime(new Date(0)); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_event_timer_none_interrupting"); + Job timerJob = managementService.createJobQuery() + .processInstanceId(processInstance.getId()) + .uniqueResult(); + assertEquals(new Date(60 * 60 * 1000).getTime(), timerJob.getDueDate().getTime()); + managementService.executeJob(timerJob.getId()); + + assertProcessInstanceEnded(processInstance); + } + +} Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml 2010-11-07 09:44:19 UTC (rev 6801) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) @@ -5,7 +5,7 @@ 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://jbpm.org/example/bpmn2/terminate_end_event" + targetNamespace="http://jbpm.org/example/bpmn2/boundary_event_timer_interrupting" xmlns:jbpm="http://jbpm.org/bpmn2"> <process id="boundary_event_timer_interrupting" name="Timer escalation example"> Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml 2010-11-07 10:07:28 UTC (rev 6802) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + 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="http://schema.omg.org/spec/BPMN/2.0" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" + targetNamespace="http://jbpm.org/example/bpmn2/boundary_event_timer_none_interrupting" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <process id="boundary_event_timer_none_interrupting" name="Timer escalation example"> + + <startEvent id="theStart" /> + + <sequenceFlow id="flow1" sourceRef="theStart" targetRef="firstLineSupport" /> + + <userTask id="firstLineSupport" name="First line support"> + <documentation>Fix issue raised by customer</documentation> + </userTask> + + <sequenceFlow id="flow2" sourceRef="firstLineSupport" targetRef="normalEnd" /> + + <endEvent id="normalEnd" /> + + <boundaryEvent id="escalationTimer" cancelActivity="false" attachedToRef="firstLineSupport"> + <timerEventDefinition> + <timeDate xsi:type="tFormalExpression">01/01/1970 09:00:00</timeDate> + </timerEventDefinition> + </boundaryEvent> + + <sequenceFlow id="flow3" sourceRef="escalationTimer" targetRef="secondLineSupport" /> + + <userTask id="secondLineSupport" name="Second line support"> + <documentation>Escalation: issue was not fixed in time by first level support</documentation> + </userTask> + + <sequenceFlow id="flow4" sourceRef="secondLineSupport" targetRef="escalatedEnd" /> + + <endEvent id="escalatedEnd" /> + + </process> + +</definitions> \ No newline at end of file

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6801 - in jbpm4/trunk/modules: bpmn/src/main/java/org/jbpm/bpmn/parser and 2 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-07 04:44:19 -0500 (Sun, 07 Nov 2010) New Revision: 6801 Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java Log: JBPM-2728 interrupting boundary timer event. Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java 2010-11-07 09:44:19 UTC (rev 6801) @@ -0,0 +1,74 @@ +/* + * 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.ArrayList; +import java.util.List; + +import org.jbpm.api.listener.EventListener; +import org.jbpm.api.listener.EventListenerExecution; +import org.jbpm.api.model.Transition; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.model.op.AtomicOperation; + +/** + * boundary timer event. + * + * @author Huisheng Xu + */ +public class BoundaryTimerEvent extends BpmnActivity implements EventListener, BpmnEvent { + + protected String boundaryTimerEventActivityName; + protected boolean interrupting; + + @SuppressWarnings("unchecked") + public void execute(ExecutionImpl execution) { + ProcessDefinitionImpl processDefinitionImpl = execution.getProcessDefinition(); + ActivityImpl activityImpl = processDefinitionImpl.getActivity(boundaryTimerEventActivityName); + if (interrupting) { + ExecutionImpl parent = execution.destroyScope(execution.getActivity()); + parent.moveTo(activityImpl); + parent.take(activityImpl.getOutgoingTransitions().get(0)); + } else { + execution.takeDefaultTransition(); + } + } + + public void notify(EventListenerExecution execution) { + this.execute((ExecutionImpl) execution); + } + + public boolean isInterrupting() { + return interrupting; + } + + public void setInterrupting(boolean interrupting) { + this.interrupting = interrupting; + } + + public void setBoundaryTimerEventActivityName(String boundaryTimerEventActivityName) { + this.boundaryTimerEventActivityName = boundaryTimerEventActivityName; + } + +} 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 2010-11-07 04:43:17 UTC (rev 6800) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-11-07 09:44:19 UTC (rev 6801) @@ -35,9 +35,11 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.activity.ActivityBehaviour; +import org.jbpm.api.listener.EventListener; import org.jbpm.bpmn.common.Resource; import org.jbpm.bpmn.common.ResourceParameter; import org.jbpm.bpmn.flownodes.BpmnActivity; +import org.jbpm.bpmn.flownodes.BoundaryTimerEvent; import org.jbpm.bpmn.model.BpmnProcessDefinition; import org.jbpm.bpmn.model.SequenceflowCondition; import org.jbpm.internal.log.Log; @@ -46,6 +48,8 @@ import org.jbpm.pvm.internal.env.EnvironmentImpl; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.CompositeElementImpl; +import org.jbpm.pvm.internal.model.EventImpl; +import org.jbpm.pvm.internal.model.EventListenerReference; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.model.ScopeElementImpl; import org.jbpm.pvm.internal.model.TimerDefinitionImpl; @@ -135,6 +139,8 @@ // activities parseActivities(processElement, parse, processDefinition); + parseBoundaryEvents(processElement, parse, processDefinition); + // bind activities to their destinations parseSequenceFlow(processElement, parse, processDefinition); @@ -241,6 +247,69 @@ } } + public void parseBoundaryEvents(Element element, Parse parse, CompositeElementImpl compositeElement) { + List<Element> elements = XmlUtil.elements(element, "boundaryEvent"); + for (Element boundaryEventElement : elements) { + + String attachedToRef = XmlUtil.attribute(boundaryEventElement, "attachedToRef"); + if (attachedToRef == null || attachedToRef.equals("")) { + parse.addProblem("AttachedToRef is required when using a timerEventDefinition : " + boundaryEventElement); + } + + String id = XmlUtil.attribute(boundaryEventElement, "id"); + if (log.isTraceEnabled()) { + log.trace("Parsing boundary event " + id); + } + + ActivityImpl refActivity = compositeElement.findActivity(attachedToRef); + if (refActivity == null) { + parse.addProblem("Invalid reference in boundary event. Make sure that the referenced activity is " + + "defined in the same scope as the boundary event : " + boundaryEventElement); + } + ActivityImpl nestedActivity = compositeElement.createActivity(id); + nestedActivity.setDescription(parseDocumentation(boundaryEventElement)); + + String cancelActivity = XmlUtil.attribute(boundaryEventElement, "cancelActivity", "true"); + boolean interrupting = cancelActivity.equals("true"); + + Element timerEventDefinition = XmlUtil.element(boundaryEventElement, "timerEventDefinition"); + if (timerEventDefinition != null) { + parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity, refActivity, parse); + } else { + parse.addProblem("Unsupported boundary event type : " + boundaryEventElement); + } + } + } + + public void parseBoundaryTimerEventDefinition(Element timerEventDefinition, + boolean interrupting, + ActivityImpl timerActivity, + ActivityImpl refActivity, + Parse parse) { + + BoundaryTimerEvent boundaryTimerEvent = new BoundaryTimerEvent(); + boundaryTimerEvent.setInterrupting(interrupting); + boundaryTimerEvent.setBoundaryTimerEventActivityName(timerActivity.getName()); + + // TimeDate + + // TimeCycle + + // TimeDuration + String eventName = refActivity.getName(); + TimerDefinitionImpl timerDefinitionImpl = this.parseTimerEventDefinition(timerEventDefinition, parse, eventName); + timerDefinitionImpl.setEventName(eventName); + refActivity.addTimerDefinition(timerDefinitionImpl); + + EventImpl event = refActivity.getEvent(eventName); + if (event == null) { + event = refActivity.createEvent(eventName); + } + EventListenerReference eventListenerReference = event.createEventListenerReference(boundaryTimerEvent); + + timerActivity.setActivityBehaviour(boundaryTimerEvent); + } + public void parseSequenceFlow(Element element, Parse parse, BpmnProcessDefinition processDefinition) { List<Element> transitionElements = XmlUtil.elements(element, "sequenceFlow"); for (Element transitionElement : transitionElements) { @@ -257,6 +326,7 @@ // Create new outgoing transition on sourceActivity ActivityImpl sourceActivity = processDefinition.findActivity(sourceRef); + TransitionImpl transition = null; if (sourceActivity != null) { transition = sourceActivity.createOutgoingTransition(); @@ -468,4 +538,12 @@ } + public String parseDocumentation(Element element) { + Element docElement = XmlUtil.element(element, "documentation"); + if (docElement != null) { + return docElement.getTextContent().trim(); + } + return null; + } + } Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java 2010-11-07 09:44:19 UTC (rev 6801) @@ -0,0 +1,68 @@ +/* + * 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.examples.bpmn.event.timer; + +import java.util.Date; + +import org.jbpm.api.NewDeployment; +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.job.Job; +import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.util.Clock; +import org.jbpm.test.JbpmTestCase; + +/** + * + * @author Huisheng Xu + */ +public class BoundaryEventTimerInterruptingTest extends JbpmTestCase { + + @Override + protected void setUp() throws Exception { + super.setUp(); + NewDeployment deployment = repositoryService.createDeployment(); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml"); + registerDeployment(deployment.deploy()); + } + + @Override + protected void tearDown() throws Exception { + Clock.setExplicitTime(null); + super.tearDown(); + } + + public void testIntermediateTimerWithDuration() { + Clock.setExplicitTime(new Date(0)); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_event_timer_interrupting"); + Job timerJob = managementService.createJobQuery() + .processInstanceId(processInstance.getId()) + .uniqueResult(); + assertEquals(new Date(60 * 60 * 1000).getTime(), timerJob.getDueDate().getTime()); + + managementService.executeJob(timerJob.getId()); + Task task = taskService.createTaskQuery().uniqueResult(); + taskService.completeTask(task.getId()); + assertProcessInstanceEnded(processInstance); + } + +} Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml 2010-11-07 09:44:19 UTC (rev 6801) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + 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="http://schema.omg.org/spec/BPMN/2.0" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" + targetNamespace="http://jbpm.org/example/bpmn2/terminate_end_event" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <process id="boundary_event_timer_interrupting" name="Timer escalation example"> + + <startEvent id="theStart" /> + + <sequenceFlow id="flow1" sourceRef="theStart" targetRef="firstLineSupport" /> + + <userTask id="firstLineSupport" name="First line support"> + <documentation>Fix issue raised by customer</documentation> + </userTask> + + <sequenceFlow id="flow2" sourceRef="firstLineSupport" targetRef="normalEnd" /> + + <endEvent id="normalEnd" /> + + <boundaryEvent id="escalationTimer" cancelActivity="true" attachedToRef="firstLineSupport"> + <timerEventDefinition> + <timeDate xsi:type="tFormalExpression">01/01/1970 09:00:00</timeDate> + </timerEventDefinition> + </boundaryEvent> + + <sequenceFlow id="flow3" sourceRef="escalationTimer" targetRef="secondLineSupport" /> + + <userTask id="secondLineSupport" name="Second line support"> + <documentation>Escalation: issue was not fixed in time by first level support</documentation> + </userTask> + + <sequenceFlow id="flow4" sourceRef="secondLineSupport" targetRef="escalatedEnd" /> + + <endEvent id="escalatedEnd" /> + + </process> + +</definitions> \ No newline at end of file

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6800 - jbpm4/trunk/modules/bpmn/src/main/java.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-07 00:43:17 -0400 (Sun, 07 Nov 2010) New Revision: 6800 Removed: jbpm4/trunk/modules/bpmn/src/main/java/com/ Log: remove empty directory

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r6799 - projects/migration_tool/trunk/src/test/java/org/jbpm/migration.

by do-not-reply＠jboss.org

Author: MohReece Date: 2010-11-06 23:49:09 -0400 (Sat, 06 Nov 2010) New Revision: 6799 Modified: projects/migration_tool/trunk/src/test/java/org/jbpm/migration/BpmnValidatorTest.java projects/migration_tool/trunk/src/test/java/org/jbpm/migration/JpdlValidatorTest.java projects/migration_tool/trunk/src/test/java/org/jbpm/migration/ProcessTransformerTest.java Log: Set standard level for committed tests to ERROR. Modified: projects/migration_tool/trunk/src/test/java/org/jbpm/migration/BpmnValidatorTest.java =================================================================== --- projects/migration_tool/trunk/src/test/java/org/jbpm/migration/BpmnValidatorTest.java 2010-11-07 03:40:32 UTC (rev 6798) +++ projects/migration_tool/trunk/src/test/java/org/jbpm/migration/BpmnValidatorTest.java 2010-11-07 03:49:09 UTC (rev 6799) @@ -45,7 +45,7 @@ @BeforeClass public static void oneTimeSetUp() { BasicConfigurator.configure(); - Logger.getRootLogger().setLevel(Level.DEBUG); + Logger.getRootLogger().setLevel(Level.ERROR); } @Test Modified: projects/migration_tool/trunk/src/test/java/org/jbpm/migration/JpdlValidatorTest.java =================================================================== --- projects/migration_tool/trunk/src/test/java/org/jbpm/migration/JpdlValidatorTest.java 2010-11-07 03:40:32 UTC (rev 6798) +++ projects/migration_tool/trunk/src/test/java/org/jbpm/migration/JpdlValidatorTest.java 2010-11-07 03:49:09 UTC (rev 6799) @@ -44,7 +44,7 @@ @BeforeClass public static void oneTimeSetUp() { BasicConfigurator.configure(); - Logger.getRootLogger().setLevel(Level.DEBUG); + Logger.getRootLogger().setLevel(Level.ERROR); } @Test Modified: projects/migration_tool/trunk/src/test/java/org/jbpm/migration/ProcessTransformerTest.java =================================================================== --- projects/migration_tool/trunk/src/test/java/org/jbpm/migration/ProcessTransformerTest.java 2010-11-07 03:40:32 UTC (rev 6798) +++ projects/migration_tool/trunk/src/test/java/org/jbpm/migration/ProcessTransformerTest.java 2010-11-07 03:49:09 UTC (rev 6799) @@ -46,7 +46,7 @@ @BeforeClass public static void oneTimeSetUp() { BasicConfigurator.configure(); - Logger.getRootLogger().setLevel(Level.FATAL); + Logger.getRootLogger().setLevel(Level.ERROR); } @Test

15 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits November 2010