[jbpm-commits] JBoss JBPM SVN: r6131 - in jbpm4/trunk/modules: devguide/src/main/docbook/en/modules and 14 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jan 26 06:30:19 EST 2010
Author: jbarrez
Date: 2010-01-26 06:30:19 -0500 (Tue, 26 Jan 2010)
New Revision: 6131
Added:
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
Modified:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.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/intermediate_catch_timer_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/task/receive/receive_task_java.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/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ExclusiveGatewayMergeTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/InclusiveGatewayTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ParallelGatewayMergeTest.java
jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml
Log:
Refactored name/key usage in BPMN2: the id is mapped to the procDef name (ie required) and the name is mapped to the key.
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-01-26 11:30:19 UTC (rev 6131)
@@ -111,18 +111,14 @@
parse.contextStackPush(processDefinition);
try {
- // process attribues
+ String id = XmlUtil.attribute(processElement, "id", false, parse);
String name = XmlUtil.attribute(processElement, "name", false, parse);
- processDefinition.setName(name);
+
+ processDefinition.setName(id);
- String key = XmlUtil.attribute(processElement, "id", false, parse);
- if (key != null) {
- processDefinition.setKey(key);
+ if (name != null) {
+ processDefinition.setKey(name);
}
-
- if (name == null) {
- processDefinition.setName(key);
- }
Element descriptionElement = XmlUtil.element(processElement, "documentation");
if (descriptionElement != null) {
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml 2010-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -219,8 +219,8 @@
The root of an BPMN 2.0 XML process is the <emphasis role="bold">definitions</emphasis>
elements. As the name states, the subelements will contain the actual definitions of
the business process(es). Every <emphasis role="bold">process</emphasis> child
- will be able to have an <emphasis role="bold">id</emphasis> and
- <emphasis role="bold">name</emphasis>. An empty business process in BPMN 2.0
+ will be able to have an <emphasis role="bold">id (required)</emphasis> and
+ <emphasis role="bold">name (optional)</emphasis>. An empty business process in BPMN 2.0
looks as follows. Also note that it is handy to have the BPMN2.xsd on the classpath, to
enable XML completion.
<programlisting>
@@ -232,16 +232,18 @@
expressionLanguage="http://www.w3.org/1999/XPath"
targetNamespace="http://jbpm.org/example/bpmn2">
- <process id="myBusinessProcess" name="My business processs">
+ <process id="My business processs" name="myBusinessProcess">
...
</process>
<definitions>
</programlisting>
- If an id is defined for a process element, it will be used as business key for that
- process (ie. starting a process can be done by calling executionService.startProcessInstanceByKey("myBusinessProcess"),
- otherwise the jBPM engine will create a unique process key (same mechanism as for JPDL).
+ If a name is defined for the process element, it is be used as <emphasis role="bold">key</emphasis>
+ for that process (ie. starting a process can be done by calling executionService.startProcessInstanceByKey("myBusinessProcess").
+ If no name is defined, the id will be used as key. So having only an id defined, will allow
+ to start a process instance using that id. Note that for a key the same rules apply as with
+ JPDL: whitespace and non alpha-numeric characters are replace by an underscore.
</para>
</section>
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/nonestartend/none_start_end_event.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -8,7 +8,7 @@
targetNamespace="http://jbpm.org/example/bpmn2/none_start_end_event"
xmlns:jbpm="http://jbpm.org/bpmn2">
- <process id="noneStartEndEvent" name="BPMN2 Example none start and end event">
+ <process id="noneStartEndEvent">
<startEvent id="start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/terminateend/terminate_end_event.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -8,7 +8,7 @@
targetNamespace="http://jbpm.org/example/bpmn2/terminate_end_event"
xmlns:jbpm="http://jbpm.org/bpmn2">
- <process id="terminateEndEvent" name="BPMN2 Example terminate end event">
+ <process id="terminateEndEvent">
<startEvent id="start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/intermediate_catch_timer_event.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -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/intermediateTimerCatch">
- <process id="intermediateTimerCatch" name="Bpmn 2.0 example intermediate timer catch event">
+ <process id="intermediateTimerCatch">
<startEvent id="theStart" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -8,7 +8,7 @@
targetNamespace="http://jbpm.org/example/bpmn2/exclusive_gateway"
xmlns:jbpm="http://jbpm.org/bpmn2">
- <process id="exclusiveGateway" name="BPMN2 Example exclusive gateway">
+ <process id="exclusiveGateway">
<startEvent id="start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway_default_seq_flow.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -8,7 +8,7 @@
targetNamespace="http://jbpm.org/example/bpmn2/exclusive_gateway"
xmlns:jbpm="http://jbpm.org/bpmn2">
- <process id="exclusiveGatewayDefaultSeqFlow" name="BPMN2 Example exclusive gateway with a default sequence flow">
+ <process id="exclusiveGatewayDefaultSeqFlow">
<startEvent id="start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/inclusive/inclusive_gateway.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -8,7 +8,7 @@
targetNamespace="http://jbpm.org/example/bpmn2/inclusive_gatewat"
xmlns:jbpm="http://jbpm.org/bpmn2">
- <process id="inclusiveGateway" name="BPMN2 Example inclusive gateway">
+ <process id="inclusiveGateway">
<startEvent id="start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -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/parallel_gateway">
- <process id="parallelGateway" name="BPMN2 example parallel gateway">
+ <process id="parallelGateway">
<startEvent id="Start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/receive/receive_task_java.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -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/receiveTaskJava">
- <process id="receiveTaskJava" name="Bpmn 2.0 example receive task Java">
+ <process id="receiveTaskJava">
<startEvent id="Start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -30,7 +30,7 @@
</bpmn:operation>
</bpmn:interface>
- <bpmn:process id="ServiceTaskJavaProcess" name="BPMN 2.0 example java service task">
+ <bpmn:process id="ServiceTaskJavaProcess">
<bpmn:startEvent id="Start" />
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -6,7 +6,7 @@
expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/vacation_request"
xmlns:jbpm="http://jbpm.org/bpmn2">
- <process id="vacationRequestProcess" name="BPMN2 Example process using task forms">
+ <process id="vacationRequestProcess">
<startEvent id="start" />
Added: 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 (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_user.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -0,0 +1,32 @@
+<?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/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>
+ <formalExpression>mary</formalExpression>
+ </resourceAssignmentExpression>
+ </humanPerformer>
+ </userTask>
+
+ <sequenceFlow id="flow2" sourceRef="myTask" targetRef="end" />
+
+ <endEvent id="end" name="End" />
+
+
+ </process>
+</definitions>
Added: 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 (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -0,0 +1,32 @@
+<?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/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>
+ <formalExpression>${user}</formalExpression>
+ </resourceAssignmentExpression>
+ </humanPerformer>
+ </userTask>
+
+ <sequenceFlow id="flow2" sourceRef="myTask" targetRef="end" />
+
+ <endEvent id="end" name="End" />
+
+
+ </process>
+</definitions>
Added: 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 (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_group.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -0,0 +1,32 @@
+<?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/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>
+ <formalExpression>management</formalExpression>
+ </resourceAssignmentExpression>
+ </potentialOwner>
+ </userTask>
+
+ <sequenceFlow id="flow2" sourceRef="myTask" targetRef="end" />
+
+ <endEvent id="end" name="End" />
+
+
+ </process>
+</definitions>
Added: 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 (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/user_task_potential_owner_user.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -0,0 +1,32 @@
+<?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/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>
+ <formalExpression>peter</formalExpression>
+ </resourceAssignmentExpression>
+ </potentialOwner>
+ </userTask>
+
+ <sequenceFlow id="flow2" sourceRef="myTask" targetRef="end" />
+
+ <endEvent id="end" name="End" />
+
+
+ </process>
+</definitions>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2010-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2010-01-26 11:30:19 UTC (rev 6131)
@@ -137,7 +137,7 @@
for (ProcessDefinition existingProcess: existingProcesses) {
if (!processDefinitionKey.equals(existingProcess.getKey())) {
- deployment.addProblem("invalid key '"+processDefinitionKey+"' in process "+processDefinition.getName()+". Existing process has name '"+processDefinitionName+"' and key '"+processDefinitionKey+"'");
+ deployment.addProblem("invalid key '"+processDefinitionKey+"' in process "+processDefinition.getName()+". Existing process has name '"+processDefinitionName+"' and key '"+existingProcess.getKey()+"'");
}
}
@@ -147,7 +147,7 @@
for (ProcessDefinition existingProcess: existingProcesses) {
if (!processDefinitionName.equals(existingProcess.getName())) {
- deployment.addProblem("invalid name '"+processDefinitionName+"' in process "+processDefinition.getName()+". Existing process has name '"+processDefinitionName+"' and key '"+processDefinitionKey+"'");
+ deployment.addProblem("invalid name '"+processDefinitionName+"' in process "+processDefinition.getName()+". Existing process has name '"+existingProcess.getName()+"' and key '"+processDefinitionKey+"'");
}
}
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ExclusiveGatewayMergeTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ExclusiveGatewayMergeTest.java 2010-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ExclusiveGatewayMergeTest.java 2010-01-26 11:30:19 UTC (rev 6131)
@@ -38,7 +38,7 @@
private static final String TEST_PROCESS =
"<definitions xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
- " <process id='testProcess' name='exclusiveMerge' >" +
+ " <process id='exclusiverMerge' >" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='decision' />" +
" <sequenceFlow id='flow2' sourceRef='theStart' targetRef='decision' />" +
@@ -63,7 +63,7 @@
public void testExclusiveMerge() {
Map<String, Object> vars = new HashMap<String, Object>();
vars.put("var", 5);
- executionService.startProcessInstanceByKey("testProcess", vars);
+ executionService.startProcessInstanceByKey("exclusiverMerge", vars);
HistoryActivityInstanceQuery query = historyService.createHistoryActivityInstanceQuery().activityName("decision");
List<HistoryActivityInstance> historyActivities = query.list();
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/InclusiveGatewayTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/InclusiveGatewayTest.java 2010-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/InclusiveGatewayTest.java 2010-01-26 11:30:19 UTC (rev 6131)
@@ -38,7 +38,7 @@
*/
private static final String SIMPLE_SPLIT =
"<definitions xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
- " <process id='simpleInclusiveSplit' name='inclusiveSplit' >" +
+ " <process id='simpleInclusiveSplit' >" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='inclusiveGateway' />" +
" <inclusiveGateway id='inclusiveGateway' />" +
@@ -67,7 +67,7 @@
*/
private static final String SIMPLE_SPLIT_WITH_DEFAULT =
"<definitions xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
- " <process id='simpleInclusiveSplitWithDefault' name='inclusiveSplitWithDefault' >" +
+ " <process id='simpleInclusiveSplitWithDefault' >" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='inclusiveGateway' />" +
" <inclusiveGateway id='inclusiveGateway' default='flow3' />" +
@@ -97,7 +97,7 @@
*/
private static final String SIMPLE_SPLIT_AND_MERGE =
"<definitions xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
- " <process id='simpleSplitAndMerge' name='inclusiveSplitAndMerge' >" +
+ " <process id='simpleSplitAndMerge' >" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='inclusiveSplit' />" +
" <inclusiveGateway id='inclusiveSplit' default='flow3' />" +
@@ -125,7 +125,7 @@
*/
private static final String NESTED_INCLUSIVE_SPLIT =
"<definitions xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
- " <process id='nestedInclusiveSplit' name='nestedInclusiveSplit' >" +
+ " <process id='nestedInclusiveSplit' >" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='inclusiveSplit' />" +
// Inclusive Split
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ParallelGatewayMergeTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ParallelGatewayMergeTest.java 2010-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/gateway/ParallelGatewayMergeTest.java 2010-01-26 11:30:19 UTC (rev 6131)
@@ -37,7 +37,7 @@
/* Test process with parallel gateway that has 3 incoming and 2 outgoing sequence flow */
private static final String TEST_SIMPLE_MERGE_PROCESS =
"<definitions>" +
- " <process id='simpleMerge' name='parallelMerge' >" +
+ " <process id='simpleMerge'>" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='parallelGateway' />" +
" <sequenceFlow id='flow2' sourceRef='theStart' targetRef='parallelGateway' />" +
@@ -62,7 +62,7 @@
*/
private static final String TEST_NESTED_MERGE_PROCESS =
"<definitions>" +
- " <process id='nestedMerge' name='parallelNestedMerge' >" +
+ " <process id='nestedMerge'>" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='outerFork' />" +
" <parallelGateway id='outerFork' />" +
@@ -89,7 +89,7 @@
*/
private static final String TEST_NESTED_MERGE_PROCESS_2 =
"<definitions>" +
- " <process id='nestedMerge2' name='parallelNestedMerge2' >" +
+ " <process id='nestedMerge2' >" +
" <startEvent id='theStart' />" +
" <sequenceFlow id='flow1' sourceRef='theStart' targetRef='outerFork' />" +
" <parallelGateway id='outerFork' />" +
Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2010-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -7,11 +7,23 @@
<hibernate-configuration>
<session-factory>
+ <!-- MySQL
+ <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
+ <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
+ <property name="hibernate.connection.url">jdbc:mysql://localhost:3306/jbpm</property>
+ <property name="hibernate.connection.username">jbpm</property>
+ <property name="hibernate.connection.password">jbpm</property>
+ -->
+
+ <!-- HSQLDB -->
<property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
<property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
<property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property>
<property name="hibernate.connection.username">sa</property>
<property name="hibernate.connection.password"></property>
+
+
+
<property name="hibernate.hbm2ddl.auto">create-drop</property>
<property name="hibernate.format_sql">true</property>
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-01-26 09:05:57 UTC (rev 6130)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/bpmn/simplestProcess.bpmn.xml 2010-01-26 11:30:19 UTC (rev 6131)
@@ -7,7 +7,7 @@
expressionLanguage="http://www.w3.org/1999/XPath"
targetNamespace="http://www.jbpm.org/bpmn2/example" >
- <process id="simplestProcess" name="The Simplest Process" processType="executable">
+ <process id="simplestProcess" processType="executable">
<startEvent id="theStart" />
More information about the jbpm-commits
mailing list