9:36 a.m.
Author: jbarrez
Date: 2009-12-04 10:36:10 -0500 (Fri, 04 Dec 2009)
New Revision: 5917
Modified:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml
Log:
FIxing the example
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-04
06:41:43 UTC (rev 5916)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-04
15:36:10 UTC (rev 5917)
@@ -262,7 +262,7 @@
// 8.2.5 of the spec document
if (conditionElement != null) {
String type =
conditionElement.getAttributeNS("http://www.w3.org/2001/XMLSchema-in...;,
"type");
- if ("bpmn:tFormalExpression".equals(type)) {
+ if ("bpmn:tFormalExpression".equals(type) ||
"tFormalExpression".equals(type)) {
String expr = conditionElement.getTextContent();
String lang = XmlUtil.attribute(conditionElement, "language");
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml 2009-12-04
06:41:43 UTC (rev 5916)
+++
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml 2009-12-04
15:36:10 UTC (rev 5917)
@@ -6,6 +6,7 @@
<import resource="jbpm.businesscalendar.cfg.xml" />
<import resource="jbpm.tx.jta.cfg.xml" />
<import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.bpmn.cfg.xml" />
<import resource="jbpm.identity.cfg.xml" />
<import resource="jbpm.jobexecutor.cfg.xml" />
<import resource="jbpm.console.cfg.xml" />
Modified:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java
===================================================================
---
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-04
06:41:43 UTC (rev 5916)
+++
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-04
15:36:10 UTC (rev 5917)
@@ -48,7 +48,7 @@
// After process start, peter should be a candidate for the task
Task requestTasktask =
taskService.createTaskQuery().candidate("peter").uniqueResult();
assertNotNull(requestTasktask);
- assertEquals("org/jbpm/bpmn/usertask/request_vacation.ftl",
requestTasktask.getFormResourceName());
+
assertEquals("org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl",
requestTasktask.getFormResourceName());
// After this task is completed, a manager should be able to see the 'verify'
task
TaskQuery verifyTaskQuery =
taskService.createTaskQuery().candidate("alex");
@@ -56,7 +56,7 @@
taskService.completeTask(requestTasktask.getId());
Task verifyTask = verifyTaskQuery.uniqueResult();
- assertEquals("org/jbpm/bpmn/usertask/verify_request.ftl",
verifyTask.getFormResourceName());
+ assertEquals("org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl",
verifyTask.getFormResourceName());
assertNotNull(verifyTask);
// When completing the verification task, we also need to store the result of the
decision
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml
===================================================================
---
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml 2009-12-04
06:41:43 UTC (rev 5916)
+++
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml 2009-12-04
15:36:10 UTC (rev 5917)
@@ -1,62 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions id="vacationRequest"
+<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:bpmn="http://schema.omg.org/spec/BPMN/2.0"
typeLanguage="http://www.w3.org/2001/XMLSchema"
+ 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">
- <bpmn:process id="vacationRequestProcess" name="BPMN2 Example process
using task forms">
+ <process id="vacationRequestProcess" name="BPMN2 Example process using
task forms">
- <bpmn:startEvent id="start" />
+ <startEvent id="start" />
- <bpmn:sequenceFlow id="flow1" name="fromStartToRequestVacation"
+ <sequenceFlow id="flow1" name="fromStartToRequestVacation"
sourceRef="start" targetRef="requestVacation" />
- <bpmn:userTask id="requestVacation" name="Request Vacation"
+ <userTask id="requestVacation" name="Request Vacation"
implementation="other">
- <bpmn:potentialOwner resourceRef="user" />
- <bpmn:rendering id="requestForm">
+ <potentialOwner resourceRef="user" />
+ <rendering id="requestForm">
<jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl</jbpm:form>
- </bpmn:rendering>
- </bpmn:userTask>
+ </rendering>
+ </userTask>
- <bpmn:sequenceFlow id="flow2"
+ <sequenceFlow id="flow2"
name="fromRequestVacationToVerifyRequest"
sourceRef="requestVacation"
targetRef="verifyRequest" />
- <bpmn:userTask id="verifyRequest" name="Verify Request"
+ <userTask id="verifyRequest" name="Verify Request"
implementation="other">
- <bpmn:potentialOwner resourceRef="manager" />
- <bpmn:rendering id="verifyForm">
+ <potentialOwner resourceRef="manager" />
+ <rendering id="verifyForm">
<jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl</jbpm:form>
- </bpmn:rendering>
- </bpmn:userTask>
+ </rendering>
+ </userTask>
- <bpmn:sequenceFlow id="flow3" name="fromVerifyRequestToEnd"
+ <sequenceFlow id="flow3" name="fromVerifyRequestToEnd"
sourceRef="verifyRequest" targetRef="theEnd">
- <bpmn:conditionExpression
xsi:type="bpmn:tFormalExpression">${verificationResult ==
'OK'}</bpmn:conditionExpression>
- </bpmn:sequenceFlow>
+ <conditionExpression xsi:type="tFormalExpression">${verificationResult
== 'OK'}</conditionExpression>
+ </sequenceFlow>
- <bpmn:sequenceFlow id="flow4"
+ <sequenceFlow id="flow4"
name="fromVerifyRequestToSendRejectionMessage"
sourceRef="verifyRequest"
targetRef="sendRejectionMessage">
- <bpmn:conditionExpression
xsi:type="bpmn:tFormalExpression">${verificationResult == 'Not
OK'}</bpmn:conditionExpression>
- </bpmn:sequenceFlow>
+ <conditionExpression xsi:type="tFormalExpression">${verificationResult
== 'Not OK'}</conditionExpression>
+ </sequenceFlow>
- <bpmn:scriptTask id="sendRejectionMessage" name="Send rejection
Message"
+ <scriptTask id="sendRejectionMessage" name="Send rejection
Message"
scriptLanguage="bsh">
- <bpmn:script>
+ <script>
<![CDATA[System.out.println("Vacation request refused!");]]>
- </bpmn:script>
- </bpmn:scriptTask>
+ </script>
+ </scriptTask>
- <bpmn:sequenceFlow id="flow5"
+ <sequenceFlow id="flow5"
name="fromSendRejectionMessageToEnd"
sourceRef="sendRejectionMessage"
targetRef="theEnd" />
- <bpmn:endEvent id="theEnd" name="End" />
+ <endEvent id="theEnd" name="End" />
- </bpmn:process>
-</bpmn:definitions>
+ </process>
+</definitions>