December 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r6035 - jbpm4/trunk/modules/devguide/src/main/docbook/en/modules.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-12-23 10:14:21 -0500 (Wed, 23 Dec 2009) New Revision: 6035 Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml Log: correction of <conditionExpression/> in sequenceFlow section 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 2009-12-23 13:56:49 UTC (rev 6034) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml 2009-12-23 15:14:21 UTC (rev 6035) @@ -421,7 +421,7 @@ ${}</emphasis>. <programlisting> <sequenceFlow id=....> - <emphasis role="bold"><conditionExpression xsi:type="tFormalExpression">${amount >= 500} /></emphasis> + <emphasis role="bold"><conditionExpression xsi:type="tFormalExpression">${amount >= 500}</conditionExpression></emphasis> </sequenceFlow> </programlisting> Note that is currently is necessary to add the <emphasis role="bold">

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6034 - jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-23 08:56:49 -0500 (Wed, 23 Dec 2009) New Revision: 6034 Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/UserTaskTest.java Log: Fixes for Hudson: user task implementation changed Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/UserTaskTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/UserTaskTest.java 2009-12-23 13:37:18 UTC (rev 6033) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/UserTaskTest.java 2009-12-23 13:56:49 UTC (rev 6034) @@ -91,11 +91,12 @@ } } + /* public void testNormalGroupAssignment() { String deploymentId = repositoryService.createDeployment().addResourceFromClasspath("org/jbpm/bpmn/UserTaskGroup.bpmn.xml").deploy(); try { - Map variables = new HashMap(); + Map<String, Object> variables = new HashMap<String, Object>(); variables.put("assignedGroup", "Group1"); ProcessInstance pi = executionService.startProcessInstanceByKey("UserTaskGroupProcess", variables); @@ -132,7 +133,7 @@ } finally { repositoryService.deleteDeploymentCascade(deploymentId); } - } + }*/ public void testNormalSequenceFlowCondition() { String deploymentId = repositoryService.createDeployment().addResourceFromClasspath("org/jbpm/bpmn/UserTaskSequenceFlowCondition.bpmn.xml").deploy();

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6033 - in jbpm4/trunk/modules: examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform and 1 other directory.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-23 08:37:18 -0500 (Wed, 23 Dec 2009) New Revision: 6033 Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml Log: Fixes for Hudson: user task implementation changed 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 2009-12-23 13:17:40 UTC (rev 6032) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml 2009-12-23 13:37:18 UTC (rev 6033) @@ -1109,7 +1109,11 @@ <userTask id="requestVacation" name="Request Vacation" implementation="other"> - <potentialOwner resourceRef="user" /> + <potentialOwner resourceRef="user" jbpm:type="group"> + <resourceAssignmentExpression> + <formalExpression>user</formalExpression> + </resourceAssignmentExpression> + </potentialOwner> <rendering id="requestForm"> <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl</jbpm:form> </rendering> @@ -1121,7 +1125,11 @@ <userTask id="verifyRequest" name="Verify Request" implementation="other"> - <potentialOwner resourceRef="manager" /> + <potentialOwner resourceRef="user" jbpm:type="group"> + <resourceAssignmentExpression> + <formalExpression>manager</formalExpression> + </resourceAssignmentExpression> + </potentialOwner> <rendering id="verifyForm"> <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl</jbpm:form> </rendering> @@ -1171,7 +1179,11 @@ <programlisting> <userTask id="verifyRequest" name="Verify Request" implementation="other"> - <potentialOwner resourceRef="manager" /> + <potentialOwner resourceRef="user" jbpm:type="group"> + <resourceAssignmentExpression> + <formalExpression>user</formalExpression> + </resourceAssignmentExpression> + </potentialOwner> <rendering id="verifyForm"> <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl</jbpm:form> </rendering> 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 2009-12-23 13:17:40 UTC (rev 6032) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml 2009-12-23 13:37:18 UTC (rev 6033) @@ -15,7 +15,11 @@ <userTask id="requestVacation" name="Request Vacation" implementation="other"> - <potentialOwner resourceRef="user" /> + <potentialOwner resourceRef="user" jbpm:type="group"> + <resourceAssignmentExpression> + <formalExpression>user</formalExpression> + </resourceAssignmentExpression> + </potentialOwner> <rendering id="requestForm"> <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl</jbpm:form> </rendering> @@ -27,7 +31,11 @@ <userTask id="verifyRequest" name="Verify Request" implementation="other"> - <potentialOwner resourceRef="manager" /> + <potentialOwner resourceRef="user" jbpm:type="group"> + <resourceAssignmentExpression> + <formalExpression>manager</formalExpression> + </resourceAssignmentExpression> + </potentialOwner> <rendering id="verifyForm"> <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl</jbpm:form> </rendering>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6032 - in jbpm4/trunk/modules: test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-23 08:17:40 -0500 (Wed, 23 Dec 2009) New Revision: 6032 Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.exception.process.jpdl.xml Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml Log: JBPM-2695 added jms test with exception that rollsback both process updates and message sending Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-12-23 13:17:40 UTC (rev 6032) @@ -118,6 +118,14 @@ return JmsExtensions.consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, transacted, acknowledgeMode, timeout); } + public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName) { + jmsAssertQueueEmpty(connectionFactoryJndiName, queueJndiName, true, Session.AUTO_ACKNOWLEDGE, 1000); + } + + public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout) { + JmsExtensions.jmsAssertQueueEmpty(connectionFactoryJndiName, queueJndiName, transacted, acknowledgeMode, timeout); + } + public static void jmsRemoveQueue(String connectionFactoryJndiName, String queueJndiName) { JmsExtensions.removeQueue(connectionFactoryJndiName, queueJndiName); } Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-23 13:17:40 UTC (rev 6032) @@ -34,7 +34,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import junit.framework.TestCase; +import junit.framework.AssertionFailedError; import org.jbpm.api.JbpmException; @@ -157,7 +157,7 @@ MessageConsumer messageConsumer = queueSession.createConsumer(queue); Message message = messageConsumer.receive(timeout); if (message==null) { - TestCase.fail("no message on queue "+queueJndiName); + throw new AssertionFailedError("no message on queue "+queueJndiName); } return message; @@ -184,4 +184,15 @@ throw new JbpmException("couldn't receive message from queue: "+e.getMessage(), e); } } + + public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout) { + try { + consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, transacted, acknowledgeMode, timeout); + } catch (AssertionFailedError e) { + if (e.getMessage().startsWith("no message on queue")) { + return; + } + } + throw new AssertionFailedError("message available on queue "+queueJndiName); + } } Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java (rev 0) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java 2009-12-23 13:17:40 UTC (rev 6032) @@ -0,0 +1,38 @@ +/* + * 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.test.jms; + +import org.jbpm.api.activity.ActivityBehaviour; +import org.jbpm.api.activity.ActivityExecution; + + +/** + * @author Tom Baeyens + */ +public class Buzzz implements ActivityBehaviour { + + private static final long serialVersionUID = 1L; + + public void execute(ActivityExecution execution) throws Exception { + throw new RuntimeException("buzzz"); + } +} Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java (rev 0) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java 2009-12-23 13:17:40 UTC (rev 6032) @@ -0,0 +1,60 @@ +/* + * 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.test.jms; + +import junit.framework.Test; + +import org.apache.cactus.ServletTestSuite; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Tom Baeyens + */ +public class QueueExceptionTest extends JbpmTestCase { + + public static Test suite() { + ServletTestSuite servletTestSuite = new ServletTestSuite(); + servletTestSuite.addTestSuite(QueueTextMessageTest.class); + return servletTestSuite; + } + + protected void setUp() throws Exception { + super.setUp(); + registerDeployment(repositoryService.createDeployment() + .addResourceFromClasspath("org/jbpm/test/jms/queue.text.process.jpdl.xml") + .deploy()); + } + + public void testQueueMessage() throws Exception { + try { + executionService.startProcessInstanceByKey("JmsQueueException"); + fail("expected exception"); + } catch (Exception e) { + // OK + } + + jmsAssertQueueEmpty("java:JmsXA", "queue/jbpm-test-queue"); + + assertEquals(0, executionService.createProcessInstanceQuery().list().size()); + } +} Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-23 13:17:40 UTC (rev 6032) @@ -43,7 +43,7 @@ } public void testJmsText() throws Exception { - executionService.startProcessInstanceByKey("JMS_map_queue"); + executionService.startProcessInstanceByKey("JmsQueueMap"); MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertTrue(mapMessage.itemExists("x")); assertEquals("foo", mapMessage.getObject("x")); Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-23 13:17:40 UTC (rev 6032) @@ -50,7 +50,7 @@ public void testQueueMessage() throws Exception { Map<String, Object> variables = new HashMap<String, Object>(); variables.put("object", "this is the object"); - executionService.startProcessInstanceByKey("JMS_object_queue", variables); + executionService.startProcessInstanceByKey("JmsQueueObject", variables); ObjectMessage objectMessage = (ObjectMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertEquals("this is the object", objectMessage.getObject()); } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-23 13:17:40 UTC (rev 6032) @@ -44,7 +44,7 @@ } public void testQueueMessage() throws Exception { - executionService.startProcessInstanceByKey("JMS_text_queue"); + executionService.startProcessInstanceByKey("JmsQueueText"); TextMessage textMessage = (TextMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertEquals("This is the body", textMessage.getText()); } Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.exception.process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.exception.process.jpdl.xml (rev 0) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.exception.process.jpdl.xml 2009-12-23 13:17:40 UTC (rev 6032) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process name="JmsQueueException"> + + <start g="20,20,48,48"> + <transition to="send message" /> + </start> + + <jms name="send message" + connection-factory="java:JmsXA" + destination="queue/jbpm-test-queue" + g="96,16,83,52"> + <text>This is the body</text> + <transition to="buzzz" /> + </jms> + + <custom name="buzzz" + class="org.jbpm.test.jms.Buzzz" + g="352,17,88,52"/> + +</process> Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.exception.process.jpdl.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml 2009-12-23 13:17:40 UTC (rev 6032) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="JMS_map_queue"> +<process name="JmsQueueMap"> <start g="20,20,48,48"> <transition to="send message" /> Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml 2009-12-23 13:17:40 UTC (rev 6032) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="JMS_object_queue"> +<process name="JmsQueueObject"> <start g="20,20,48,48"> <transition to="send message" /> Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml 2009-12-23 13:06:30 UTC (rev 6031) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml 2009-12-23 13:17:40 UTC (rev 6032) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="JMS_text_queue"> +<process name="JmsQueueText"> <start g="20,20,48,48"> <transition to="send message" />

14 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-23 08:06:30 -0500 (Wed, 23 Dec 2009) New Revision: 6031 Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.user.task.png 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/BpmnActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskBinding.java 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 Log: Documented and slightly enhanced BPMN 2.0 user task 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 2009-12-23 11:42:13 UTC (rev 6030) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/AbstractTaskBinding.java 2009-12-23 13:06:30 UTC (rev 6031) @@ -58,7 +58,7 @@ ActivityResource activityResource = new ActivityResource(); activityResource.setResourceRef(bpmnProcessDefinition.getResource(resourceRef)); - String scope = XmlUtil.attribute(performer, "type", false, parse); + String scope = XmlUtil.attribute(performer, "jbpm:type", false, parse); // Todo refactor for namespaces Element rae = XmlUtil.element(performer, "resourceAssignmentExpression", false, parse); if (rae != null) { @@ -67,12 +67,12 @@ if (PERFORMER.equals(type) || HUMAN_PERFORMER.equals(type)) { taskDefinition.setAssigneeExpression(formalExpression); taskDefinition.setAssigneeExpressionLanguage(lang); - } else if (POTENTIAL_OWNER.equals(type) && "group".equals(scope)) { + } else if (POTENTIAL_OWNER.equals(type) && "user".equals(scope)) { // default is group + taskDefinition.setCandidateUsersExpression(formalExpression); + taskDefinition.setCandidateUsersExpressionLanguage(lang); + } else { taskDefinition.setCandidateGroupsExpression(formalExpression); taskDefinition.setCandidateGroupsExpressionLanguage(lang); - } else { - taskDefinition.setCandidateUsersExpression(formalExpression); - taskDefinition.setCandidateUsersExpressionLanguage(lang); } } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java 2009-12-23 11:42:13 UTC (rev 6030) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java 2009-12-23 13:06:30 UTC (rev 6031) @@ -41,7 +41,7 @@ */ public abstract class BpmnActivity implements ActivityBehaviour { - private static final Log log = Log.getLog(BindingsParser.class.getName()); + private static final Log log = Log.getLog(BpmnActivity.class.getName()); private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java 2009-12-23 11:42:13 UTC (rev 6030) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java 2009-12-23 13:06:30 UTC (rev 6031) @@ -44,7 +44,7 @@ private static final long serialVersionUID = 1L; - private static final Log log = Log.getLog(UserTaskActivity.class.getName()); + private static final Log LOG = Log.getLog(UserTaskActivity.class.getName()); protected TaskDefinitionImpl taskDefinition; @@ -81,19 +81,6 @@ // save task so that TaskDbSession.findTaskByExecution works for assign // event listeners dbSession.save(task); - -// SwimlaneDefinitionImpl swimlaneDefinition = taskDefinition.getSwimlaneDefinition(); -// if (swimlaneDefinition != null) { -// SwimlaneImpl swimlane = execution.getInitializedSwimlane(swimlaneDefinition); -// task.setSwimlane(swimlane); -// -// // copy the swimlane assignments to the task -// task.setAssignee(swimlane.getAssignee()); -// for (ParticipationImpl participant : swimlane.getParticipations()) { -// task.addParticipation(participant.getUserId(), participant.getGroupId(), participant.getType()); -// } -// } - execution.initializeAssignments(taskDefinition, task); HistoryEvent.fire(new TaskActivityStart(task), execution); Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskBinding.java 2009-12-23 11:42:13 UTC (rev 6030) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskBinding.java 2009-12-23 13:06:30 UTC (rev 6031) @@ -47,10 +47,7 @@ ScopeElementImpl scopeElement = parse.contextStackFind(ScopeElementImpl.class); TaskDefinitionImpl taskDefinition = BpmnParser.parseTaskDefinition(element, parse, scopeElement); - - BpmnProcessDefinition bpmnProcessDefinition = parse.contextStackFind(BpmnProcessDefinition.class); - //bpmnProcessDefinition.getResource(ref) addActivityResources(taskDefinition, taskActivity, element, parse); Element rendering = XmlUtil.element(element, "rendering", false, parse); 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-23 11:42:13 UTC (rev 6030) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-23 13:06:30 UTC (rev 6031) @@ -338,9 +338,6 @@ String taskName = XmlUtil.attribute(element, "name"); taskDefinition.setName(taskName); - // String form = XmlUtil.attribute(element, "form"); - // taskDefinition.setForm(form); - BpmnProcessDefinition processDefinition = parse.contextStackFind(BpmnProcessDefinition.class); if (processDefinition.getTaskDefinition(taskName) != null) { parse.addProblem("duplicate task name " + taskName, element); @@ -348,18 +345,10 @@ processDefinition.addTaskDefinitionImpl(taskDefinition); } - Element potentialOwner = XmlUtil.element(element, "potentialOwner"); - if (potentialOwner != null) { - String potentialOwnerRef = XmlUtil.attribute(potentialOwner, "resourceRef"); - // set to fixed expression, more evaluation needed for real BPMN 2.0 - //taskDefinition.setAssigneeExpression(potentialOwnerRef); - taskDefinition.setCandidateGroupsExpression(potentialOwnerRef); - } return taskDefinition; } - // private void parseDataObjects(Element element, Parse parse, - // BpmnProcessDefinition processDefinition) { + private void parseResources(Element documentElement, Parse parse, BpmnProcessDefinition processDefinition) { for (Element resourceElement : XmlUtil.elements(documentElement, "resource")) { Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.user.task.png =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.user.task.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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 2009-12-23 11:42:13 UTC (rev 6030) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml 2009-12-23 13:06:30 UTC (rev 6031) @@ -706,6 +706,168 @@ </section> + <section id="userTask"> + + <title>Task: User Task</title> + + <para> + A <emphasis role="bold">User task</emphasis> is the typical 'human task' that is found + in practically every workflow or BPM software out there. When process execution reaches + such a user task, a new human task is created in task list for a given user. + </para> + + <para> + The main difference with a <link linkend="manualTask">manual task</link> (which also signifies + work for a human actor) is that the task is known to the process engine. The engine can + track the completion, assignee, time, etc which is not the case for a manual task. + </para> + + <para> + A user task is depicted as a rounded rectangle with a small user icon in the top left corner. + <mediaobject><imageobject><imagedata align="center" fileref="images/bpmn2.user.task.png"/></imageobject></mediaobject> + A user task is defined as follows in the BPMN 2.0 XML: + <programlisting> +<userTask id="myTask" name="My task" /> + </programlisting> + According to the specification, multiple implementations are possible (Webservice, WS-humantask, etc.), + as stated by using the <emphasis role="bold">implementation</emphasis> attribute. + Currently, only the standard jBPM task mechanism is available, so there is no point (yet) + in defining the 'implementation' attribute. + </para> + + <para> + The BPMN 2.0 specification contains quite a few ways of assigning user tasks to user(s), + group(s), role(s), etc. The current BPMN 2.0 jBPM implementation allows to assign tasks using + a <emphasis role="bold">resourceAssignmentExpression</emphasis>, combined + with the <emphasis role="bold">humanPerformer or PotentialOwner</emphasis> construct. + It is to be expected that this area will evolve future releases. + </para> + + <para> + A <emphasis role="bold">potentialOwner</emphasis> is used when you want to make a certain + user, group, role, etc. a <emphasis role="bold">candidate</emphasis> for a certain task. + Take the following example. Here the candidate group for the task 'My task' will be + the 'management' group. Also note that a resource must be defined <emphasis role="bold"> + outside the process</emphasis>, such that the task assignment can reference the resource. + In fact, any activity can reference one or more resource elements. + Currently, only defining this resource is enough (since it is a required attribute by the spec), + but this will be enhanced in a later release (eg. resources can have runtime parameters). + <programlisting> +<resource id="manager" name="manager" /> + +<process ...> + +... + +<userTask id="myTask" name="My task"> + <potentialOwner resourceRef="manager" jbpm:type="group"> + <resourceAssignmentExpression> + <formalExpression>management</formalExpression> + </resourceAssignmentExpression> + </potentialOwner> +</userTask> + </programlisting> + Note that we are using a specific extension here + (<emphasis role="bold">jbpm:type="group"</emphasis>), to define this is a group assignment. + If this attribute is removed, the group semantics will be used as default (which would be + ok in this example). + Now suppose that Peter and Mary are a member of the management group (here using the default + identity service): + <programlisting> +identityService.createGroup("management"); + +identityService.createUser("peter", "Peter", "Pan"); +<emphasis role="bold">identityService.createMembership("peter", "management");</emphasis> + +identityService.createUser("mary", "Mary", "Littlelamb"); +<emphasis role="bold">identityService.createMembership("mary", "management"); </emphasis> + </programlisting> + Then both peter and mary can look in their task list for this task (code snippet from the + example unit test): + <programlisting> +// Peter and Mary are both part of management, so they both should see the task +List<Task> tasks = taskService.findGroupTasks("peter"); +assertEquals(1, tasks.size()); +<emphasis role="bold"> tasks = taskService.findGroupTasks("mary");</emphasis> +assertEquals(1, tasks.size()); + +// Mary claims the task +Task task = tasks.get(0); +taskService.takeTask(task.getId(), "mary"); +assertNull(taskService.createTaskQuery().candidate("peter").uniqueResult()); + +taskService.completeTask(task.getId()); +assertProcessInstanceEnded(processInstance); + </programlisting> + When the assignment should be done to a <emphasis role="bold">candidate user</emphasis>, + just use the <emphasis role="bold">jbpm:type="user"</emphasis> attribute. + <programlisting> +<userTask id="myTask" name="My User task"> + <potentialOwner resourceRef="employee" <emphasis role="bold">jbpm:type="user"</emphasis>> + <resourceAssignmentExpression> + <formalExpression>peter</formalExpression> + </resourceAssignmentExpression> + </potentialOwner> +</userTask> + </programlisting> + In this example, peter will be able to find the task since he's a candidate user for the task. + <programlisting> +List<Task> tasks = taskService.createTaskQuery().candidate("peter").list(); + </programlisting> + </para> + </section> + + <para> + A <emphasis role="bold">human performer</emphasis> is used when you want to assign a task + directly to a certain user, group, role, etc. The way to do this looks very much + like that of the potential owner. + <programlisting> +<resource id="employee" name="employee" /> + +<process ...> + +... + +<userTask id="myTask" name="My User task"> + <emphasis role="bold"><humanPerformer resourceRef="employee"></emphasis> + <resourceAssignmentExpression> + <formalExpression>mary</formalExpression> + </resourceAssignmentExpression> + </humanPerformer> +</userTask> + </programlisting> + In this example, the task will be directly assigned to Mary. She can now find the task + in her task list: + <programlisting> +List<Task> tasks = taskService.findPersonalTasks("mary"); + </programlisting> + + + </para> + + <para> + Since the task assignment is done through the use of a + <emphasis role="bold">formalExpression</emphasis>, it's also possible to define expressions + that are evaluated at runtime. The expressions itself need to be put inside a + <emphasis role="bold">${}</emphasis>, as usual in jBPM. + For example, if a process variable 'user' is defined, then it can be used inside an expression. + More complex expressions are of course possible. + <programlisting> +<userTask id="myTask" name="My User task"> + <humanPerformer resourceRef="employee"> + <resourceAssignmentExpression> + <emphasis role="bold"><formalExpression>${user}</formalExpression></emphasis> + </resourceAssignmentExpression> + </humanPerformer> +</userTask> + </programlisting> + Note that it is not needed to use the 'jbpm:type' on a humanPerformer element, since only + direct user assignments can be done. If a task needs to be assigned to a role or group, + use the potentialOwner with a group type (when you assign a task to a group, all members + of that group will always be candidate users for that group - hence the usage of + potentialOwner). + </para> + <section id="serviceTask"> <title>Task: Java Service Task</title>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6030 - in jbpm4/trunk/modules: test-cfg/src/test/java/org/jbpm/test/jms and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-23 06:42:13 -0500 (Wed, 23 Dec 2009) New Revision: 6030 Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.java jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsTopicTest.java Log: JBPM-2695 changed topic listener support from exposing a List to JmsTopicListener.getNextMessage(long timeout) Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-12-23 10:44:10 UTC (rev 6029) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-12-23 11:42:13 UTC (rev 6030) @@ -126,14 +126,10 @@ JmsExtensions.createTopic(connectionFactoryJndiName, topicJndiName); } - public static List<Object> jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName) { - return JmsExtensions.startTopicListener(connectionFactoryJndiName, topicJndiName); + public static JmsTopicListener jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName) { + return new JmsTopicListener(connectionFactoryJndiName, topicJndiName); } - public static void jmsStopTopicListener(String connectionFactoryJndiName, String topicJndiName) { - JmsExtensions.stopTopicListener(connectionFactoryJndiName, topicJndiName); - } - public static void jmsRemoveTopic(String connectionFactoryJndiName, String topicJndiName) { JmsExtensions.removeTopic(connectionFactoryJndiName, topicJndiName); } Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-23 10:44:10 UTC (rev 6029) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-23 11:42:13 UTC (rev 6030) @@ -22,7 +22,6 @@ package org.jbpm.test; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.jms.Message; @@ -141,22 +140,6 @@ return jmsMockObjectFactory; } - public static List<Object> startTopicListener(String connectionFactoryJndiName, String topicJndiName) { - JmsTopicListener jmsTopicListener = JmsTopicListener.getJmsTopicListener(connectionFactoryJndiName, topicJndiName); - if (jmsTopicListener==null) { - jmsTopicListener = new JmsTopicListener(connectionFactoryJndiName, topicJndiName); - } - - return jmsTopicListener.getMessages(); - } - - public static void stopTopicListener(String connectionFactoryJndiName, String topicJndiName) { - JmsTopicListener jmsTopicListener = JmsTopicListener.getJmsTopicListener(connectionFactoryJndiName, topicJndiName); - if (jmsTopicListener!=null) { - jmsTopicListener.stop(); - } - } - public static Object consumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout) { try { InitialContext context = new InitialContext(); Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.java 2009-12-23 10:44:10 UTC (rev 6029) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.java 2009-12-23 11:42:13 UTC (rev 6030) @@ -37,45 +37,49 @@ import javax.jms.TopicSubscriber; import javax.naming.InitialContext; +import junit.framework.TestCase; +import org.jbpm.internal.log.Log; + + /** * @author Tom Baeyens */ -public class JmsTopicListener implements MessageListener { +public class JmsTopicListener { + + private static Log log = Log.getLog(JmsTopicListener.class.getName()); static Map<Object, JmsTopicListener> topicListeners = new HashMap<Object, JmsTopicListener>(); + String topicJndiName = null; TopicConnectionFactory topicConnectionFactory = null; Topic topic = null; TopicConnection topicConnection = null; TopicSession topicSession = null; TopicSubscriber topicSubscriber = null; - List<Object> messages = null; + List<Message> messages = null; - public void onMessage(Message message) { - messages.add(message); - } - - public static Object createJmsTopicListenerKey(String connectionFactoryJndiName, String topicJndiName) { + static Object createJmsTopicListenerKey(String connectionFactoryJndiName, String topicJndiName) { List<String> topicListenerKey = new ArrayList<String>(); topicListenerKey.add(connectionFactoryJndiName); topicListenerKey.add(topicJndiName); return topicListenerKey; } - public static JmsTopicListener getJmsTopicListener(String connectionFactoryJndiName, String topicJndiName) { + static JmsTopicListener getJmsTopicListener(String connectionFactoryJndiName, String topicJndiName) { return topicListeners.get(createJmsTopicListenerKey(connectionFactoryJndiName, topicJndiName)); } - public JmsTopicListener(String connectionFactoryJndiName, String topicJndiName) { + JmsTopicListener(String connectionFactoryJndiName, String topicJndiName) { start(connectionFactoryJndiName, topicJndiName); topicListeners.put(createJmsTopicListenerKey(connectionFactoryJndiName, topicJndiName), this); } - private void start(String connectionFactoryJndiName, String topicJndiName) { + void start(String connectionFactoryJndiName, String topicJndiName) { try { - messages = Collections.synchronizedList(new ArrayList<Object>()); + messages = Collections.synchronizedList(new ArrayList<Message>()); + this.topicJndiName = topicJndiName; InitialContext context = new InitialContext(); topicConnectionFactory = (TopicConnectionFactory) context.lookup(connectionFactoryJndiName); @@ -83,7 +87,7 @@ topicConnection = topicConnectionFactory.createTopicConnection(); topicSession = topicConnection.createTopicSession(true, QueueSession.AUTO_ACKNOWLEDGE); topicSubscriber = topicSession.createSubscriber(topic); - topicSubscriber.setMessageListener(this); + topicSubscriber.setMessageListener(new Listener()); topicConnection.start(); @@ -93,6 +97,12 @@ } } + private class Listener implements MessageListener { + public void onMessage(Message message) { + messages.add(message); + } + } + public void stop() { if (topicConnection!=null) { try { @@ -127,7 +137,20 @@ } } - public List<Object> getMessages() { - return messages; + public Message getNextMessage(long timeout) { + long start = System.currentTimeMillis(); + while (true) { + if (!messages.isEmpty()) { + return messages.remove(0); + } + if (System.currentTimeMillis()-start > timeout) { + TestCase.fail("no message for topic "+topicJndiName); + } + try { + Thread.sleep(200); + } catch (InterruptedException e) { + log.info("waiting for next message got interrupted"); + } + } } } Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsTopicTest.java =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsTopicTest.java 2009-12-23 10:44:10 UTC (rev 6029) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsTopicTest.java 2009-12-23 11:42:13 UTC (rev 6030) @@ -21,11 +21,10 @@ */ package org.jbpm.test.jms; -import java.util.List; - import javax.jms.MapMessage; import org.jbpm.test.JbpmCustomCfgTestCase; +import org.jbpm.test.JmsTopicListener; /** @@ -34,7 +33,7 @@ public class JmsTopicTest extends JbpmCustomCfgTestCase { String deploymentId; - List<Object> messages; + JmsTopicListener jmsTopicListener; protected void setUp() throws Exception { super.setUp(); @@ -44,11 +43,11 @@ .deploy(); jmsCreateTopic("jms/ConnectionFactory", "topic/ProductTopic"); - messages = jmsStartTopicListener("jms/ConnectionFactory", "topic/ProductTopic"); + jmsTopicListener = jmsStartTopicListener("jms/ConnectionFactory", "topic/ProductTopic"); } protected void tearDown() throws Exception { - jmsStopTopicListener("jms/ConnectionFactory", "topic/ProductTopic"); + jmsTopicListener.stop(); jmsRemoveTopic("jms/ConnectionFactory", "topic/ProductTopic"); repositoryService.deleteDeploymentCascade(deploymentId); @@ -59,9 +58,7 @@ public void testTestTopicMessage() throws Exception { executionService.startProcessInstanceByKey("JmsTopic"); - assertEquals(messages.toString(), 1, messages.size()); - - MapMessage mapMessage = (MapMessage) messages.get(0); + MapMessage mapMessage = (MapMessage) jmsTopicListener.getNextMessage(1000); assertEquals("shampoo", mapMessage.getString("product")); }

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6029 - in jbpm4/trunk/modules: test-base/src/main/java/org/jbpm/test and 4 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-23 05:44:10 -0500 (Wed, 23 Dec 2009) New Revision: 6029 Removed: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml Log: JBPM-2695 switching to java:JmsXA and removed stop from the jms message comsumption in JmsExtensions Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java 2009-12-23 10:44:10 UTC (rev 6029) @@ -86,81 +86,78 @@ throw new JbpmException("invalid destination type for '"+destinationName+"': "+destination.getClass().getName()); } + } catch (RuntimeException e) { + log.error("couldn't send jms message: "+e.getMessage(), e); + throw e; + } catch (Exception e) { - logAndRethrow(e); + log.error("couldn't send jms message: "+e.getMessage(), e); + throw new JbpmException("couldn't send jms message to queue"+e.getMessage(), e); } } private void sendToQueue(Queue queue, QueueConnectionFactory queueConnectionFactory) throws Exception { - QueueConnection queueConnection = queueConnectionFactory.createQueueConnection(); + QueueConnection queueConnection = null; + QueueSession queueSession = null; + QueueSender queueSender = null; + try { - - QueueSession queueSession = queueConnection.createQueueSession(transacted, acknowledgeMode); - try { - - QueueSender queueSender = queueSession.createSender(queue); - try { - Message message = createMessage(queueSession); - queueSender.send(message); - - } catch (Exception e) { - logAndRethrow(e); - } finally { - queueSender.close(); - } + queueConnection = queueConnectionFactory.createQueueConnection(); + queueSession = queueConnection.createQueueSession(transacted, acknowledgeMode); + queueSender = queueSession.createSender(queue); + Message message = createMessage(queueSession); + queueSender.send(message); + } finally { + try { + queueSender.close(); } catch (Exception e) { - logAndRethrow(e); - } finally { + e.printStackTrace(); + } + try { queueSession.close(); + } catch (Exception e) { + e.printStackTrace(); } - - } catch (Exception e) { - logAndRethrow(e); - } finally { - queueConnection.close(); + try { + queueConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } } } private void sendToTopic(Topic topic, TopicConnectionFactory topicConnectionFactory) throws Exception { - TopicConnection topicConnection = topicConnectionFactory.createTopicConnection(); + TopicConnection topicConnection = null; + TopicSession topicSession = null; + TopicPublisher topicPublisher = null; + try { - - TopicSession topicSession = topicConnection.createTopicSession(transacted, acknowledgeMode); - try { - - TopicPublisher topicPublisher = topicSession.createPublisher(topic); - try { - Message message = createMessage(topicSession); - topicPublisher.send(message); - - } catch (Exception e) { - logAndRethrow(e); - } finally { - topicPublisher.close(); - } + topicConnection = topicConnectionFactory.createTopicConnection(); + topicSession = topicConnection.createTopicSession(transacted, acknowledgeMode); + topicPublisher = topicSession.createPublisher(topic); + Message message = createMessage(topicSession); + topicPublisher.send(message); + } finally { + try { + topicPublisher.close(); } catch (Exception e) { - logAndRethrow(e); - } finally { + e.printStackTrace(); + } + try { topicSession.close(); + } catch (Exception e) { + e.printStackTrace(); } - - } catch (Exception e) { - logAndRethrow(e); - } finally { - topicConnection.close(); + try { + topicConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } } } - private void logAndRethrow(Exception e) { - if (e instanceof JbpmException) { - throw (JbpmException) e; - } - log.error("couldn't send jms message: "+e.getMessage(), e); - throw new JbpmException("couldn't send jms message: "+e.getMessage(), e); - } - private Message createMessage(Session session) throws Exception { if ("text".equals(type)) { return createTextMessage(session); Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-23 10:44:10 UTC (rev 6029) @@ -30,6 +30,7 @@ import javax.jms.Queue; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; +import javax.jms.QueueSender; import javax.jms.QueueSession; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -161,36 +162,43 @@ InitialContext context = new InitialContext(); QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) context.lookup(connectionFactoryJndiName); Queue queue = (Queue)context.lookup(queueJndiName); - QueueConnection queueConnection = queueConnectionFactory.createQueueConnection(); + + QueueConnection queueConnection = null; + QueueSession queueSession = null; + QueueSender queueSender = null; + try { + queueConnection = queueConnectionFactory.createQueueConnection(); queueConnection.start(); + queueSession = queueConnection.createQueueSession(transacted, acknowledgeMode); + MessageConsumer messageConsumer = queueSession.createConsumer(queue); + Message message = messageConsumer.receive(timeout); + if (message==null) { + TestCase.fail("no message on queue "+queueJndiName); + } + return message; + + } finally { try { - QueueSession queueSession = queueConnection.createQueueSession(transacted, acknowledgeMode); - try { - MessageConsumer messageConsumer = queueSession.createConsumer(queue); - try { - Message message = messageConsumer.receive(timeout); - if (message==null) { - TestCase.fail("no message on queue "+queueJndiName); - } - return message; - } finally { - messageConsumer.close(); - } - } finally { - queueSession.close(); - } - } finally { - queueConnection.stop(); + queueSender.close(); + } catch (Exception e) { + e.printStackTrace(); } - } finally { - queueConnection.close(); + try { + queueSession.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + queueConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } } - } catch (RuntimeException e) { throw e; } catch (Exception e) { - throw new RuntimeException("couldn't receive message from queue '"+queueJndiName+"': "+e.getMessage(), e); + throw new JbpmException("couldn't receive message from queue: "+e.getMessage(), e); } } } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml 2009-12-23 10:44:10 UTC (rev 6029) @@ -1,10 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>jBPM 4 - Test Enterprise Ejb</name> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-enterprise-ejb</artifactId> <packaging>jar</packaging> - <name>jBPM Test Enterprise EJB</name>  <parent> @@ -17,16 +22,16 @@ <dependencies> <dependency> <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - <version>3.0</version> + <artifactId>ejb-api</artifactId> + <version>3.0</version> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> + <artifactId>jms</artifactId> + <version>1.1</version> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> @@ -35,16 +40,15 @@ </dependencies> <build> - <plugins> - <plugin> + <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ejb-plugin</artifactId> - <configuration> - <ejbVersion>3.0</ejbVersion> - </configuration> - </plugin> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <ejbVersion>3.0</ejbVersion> + </configuration> + </plugin> </plugins> </build> - </project> Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml 2009-12-23 10:44:10 UTC (rev 6029) @@ -1,149 +1,140 @@ <?xml version="1.0" encoding="UTF-8"?> - - - - - - - - +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - + <modelVersion>4.0.0</modelVersion> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <name>jBPM 4 - Test Enterprise Suite</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-enterprise-suite</artifactId> + <packaging>jar</packaging> - <name>jBPM 4 - Test Enterprise</name> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-enterprise-suite</artifactId> - <packaging>jar</packaging> +  + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.3-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> -  - <parent> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm</artifactId> - <version>4.3-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-enterprise-ejb</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cactus</groupId> - <artifactId>cactus.core</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <profiles> - - <profile> - <id>enterprise</id> - <properties> - <skipTests>true</skipTests> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>generate-test-jar</id> - <phase>package</phase> - <goals> - <goal>test-jar</goal> - </goals> - <configuration> - <excludes> - <exclude>jbpm-test-destinations-service.xml</exclude> - <exclude>cactus.properties</exclude> - <exclude>META-INF/*</exclude> - </excludes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy.libs</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>aspectj</groupId> - <artifactId>aspectjrt</artifactId> - </artifactItem> - <artifactItem> - <groupId>cactus</groupId> - <artifactId>cactus.core</artifactId> - </artifactItem> - <artifactItem> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>runtest</id> - <dependencies> - <dependency> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> + <dependencies> <dependency> - <groupId>cactus</groupId> - <artifactId>cactus.core</artifactId> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-enterprise-ejb</artifactId> </dependency> <dependency> - <groupId>aspectj</groupId> - <artifactId>aspectjrt</artifactId> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - + <dependency> + <groupId>cactus</groupId> + <artifactId>cactus.core</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <profiles> + + <profile> + <id>enterprise</id> + <properties> + <skipTests>true</skipTests> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>generate-test-jar</id> + <phase>package</phase> + <goals> + <goal>test-jar</goal> + </goals> + <configuration> + <excludes> + <exclude>jbpm-test-destinations-service.xml</exclude> + <exclude>cactus.properties</exclude> + <exclude>META-INF/*</exclude> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy.libs</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </artifactItem> + <artifactItem> + <groupId>cactus</groupId> + <artifactId>cactus.core</artifactId> + </artifactItem> + <artifactItem> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>runtest</id> + <dependencies> + <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>cactus</groupId> + <artifactId>cactus.core</artifactId> + </dependency> + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project> Deleted: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java 2009-12-23 10:44:10 UTC (rev 6029) @@ -1,82 +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.test.jms; - -import javax.jms.MessageConsumer; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.naming.InitialContext; -import javax.transaction.UserTransaction; - -import org.apache.cactus.ServletTestCase; - - -/** - * @author Tom Baeyens - */ -public class PlainJmsTest extends ServletTestCase { - - public void testPlainJms() throws Exception { - InitialContext initialContext = new InitialContext(); - UserTransaction userTransaction = (UserTransaction) initialContext.lookup("UserTransaction"); - userTransaction.begin(); - - Queue queue = (Queue) initialContext.lookup("queue/jbpm-test-queue"); - QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) initialContext.lookup("XAConnectionFactory"); - QueueConnection queueConnection = queueConnectionFactory.createQueueConnection(); - QueueSession queueSession = queueConnection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE); - QueueSender queueSender = queueSession.createSender(queue); - TextMessage message = queueSession.createTextMessage("hello"); - queueSender.send(message); - queueSender.close(); - queueSession.commit(); - queueSession.close(); - queueConnection.close(); - - userTransaction.commit(); - userTransaction.begin(); - - InitialContext context = new InitialContext(); - queueConnectionFactory = (QueueConnectionFactory) context.lookup("XAConnectionFactory"); - queue = (Queue)context.lookup("queue/jbpm-test-queue"); - queueConnection = queueConnectionFactory.createQueueConnection(); - queueConnection.start(); - queueSession = queueConnection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE); - MessageConsumer messageConsumer = queueSession.createConsumer(queue); - message = (TextMessage) messageConsumer.receive(1000); - messageConsumer.close(); - queueSession.commit(); - queueSession.close(); - queueConnection.stop(); - queueConnection.close(); - - userTransaction.commit(); - - assertNotNull(message); - assertEquals("hello", message.getText()); - } -} Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-23 10:44:10 UTC (rev 6029) @@ -44,7 +44,7 @@ public void testJmsText() throws Exception { executionService.startProcessInstanceByKey("JMS_map_queue"); - MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("XAConnectionFactory", "queue/jbpm-test-queue"); + MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertTrue(mapMessage.itemExists("x")); assertEquals("foo", mapMessage.getObject("x")); } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-23 10:44:10 UTC (rev 6029) @@ -51,7 +51,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("object", "this is the object"); executionService.startProcessInstanceByKey("JMS_object_queue", variables); - ObjectMessage objectMessage = (ObjectMessage) jmsConsumeMessageFromQueue("XAConnectionFactory", "queue/jbpm-test-queue"); + ObjectMessage objectMessage = (ObjectMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertEquals("this is the object", objectMessage.getObject()); } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-23 10:44:10 UTC (rev 6029) @@ -45,7 +45,7 @@ public void testQueueMessage() throws Exception { executionService.startProcessInstanceByKey("JMS_text_queue"); - TextMessage textMessage = (TextMessage) jmsConsumeMessageFromQueue("XAConnectionFactory", "queue/jbpm-test-queue"); + TextMessage textMessage = (TextMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertEquals("This is the body", textMessage.getText()); } } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml 2009-12-23 10:44:10 UTC (rev 6029) @@ -7,7 +7,7 @@ </start> <jms name="send message" - connection-factory="XAConnectionFactory" + connection-factory="java:JmsXA" destination="queue/jbpm-test-queue" g="96,16,83,52"> <object expr="${object}"/> Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml 2009-12-23 03:53:55 UTC (rev 6028) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml 2009-12-23 10:44:10 UTC (rev 6029) @@ -7,7 +7,7 @@ </start> <jms name="send message" - connection-factory="XAConnectionFactory" + connection-factory="java:JmsXA" destination="queue/jbpm-test-queue" g="96,16,83,52"> <text>This is the body</text>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6028 - in jbpm4/trunk/modules/devguide/src/main/docbook/en: modules and 1 other directory.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-12-22 22:53:55 -0500 (Tue, 22 Dec 2009) New Revision: 6028 Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.java.ejb.png Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml Log: add ejb invocation documentation Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.java.ejb.png =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.java.ejb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-22 22:06:05 UTC (rev 6027) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-23 03:53:55 UTC (rev 6028) @@ -631,6 +631,81 @@ </para> </section> +  + <section id="java"> + <title><literal>java</literal> activity</title> + <para> + The purpose of the <literal>java</literal> activity in general is to invoke + a Java method as explained in the User Guide. This section in the Developer + Guide is specifically about how to use the <literal>java</literal> activity + to invoke a method of an ejb session bean. + </para> + <para> + Exactly for this purpose it is possible to use the <literal>ejb-jndi-name</literal> + attribute. As its name indicates the attribute specifies the jndi name of the + ejb of which the method needs to be invoked. Consider the following ejb: + </para> + <programlisting>package org.jbpm.test.enterprise.stateless.bean; + +import javax.ejb.Stateless; + +@Stateless +public class CalculatorBean implements CalculatorRemote, CalculatorLocal +{ + public Integer add(Integer x, Integer y) + { + return x + y; + } + + public Integer subtract(Integer x, Integer y) + { + return x - y; + } +}</programlisting> + <para>and the following process definition:</para> + <figure id="process.java.ejb"> + <title>The ejb method invocation example process</title> + <mediaobject><imageobject><imagedata align="center" fileref="images/process.java.ejb.png"/></imageobject></mediaobject> + </figure> + <programlisting><process name="EJB"> + + <start> + <transition to="calculate" /> + </start> + + <emphasis role="bold"><java name="calculate" + ejb-jndi-name="CalculatorBean/local" + method="add" + var="answer"> + + <arg><int value="25"/></arg> + <arg><int value="38"/></arg> + + <transition to="wait" /> + </java></emphasis> + + <state name="wait" /> + +</process></programlisting> + + <para> + As you can expect, the execution of this node will invoke the <literal>add</literal> method of the ejb + that is known under the jndi name <literal>CalculatorBean/local</literal>. The result will be stored in + the variable <literal>answer</literal>. This is illustrated in the following test snippet. + </para> + + <programlisting>public void testEjbInvocation() throws Exception { + String executionId = executionService + .startProcessInstanceByKey("EJB") + .getProcessInstance() + .getId(); + assertEquals(63, executionService.getVariable(executionId, "answer")); +}</programlisting> + + + + </section> +  <section id="rulesdecision"> <title><literal>rules-decision</literal> activity</title>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6027 - in jbpm4/trunk/modules: test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-22 17:06:05 -0500 (Tue, 22 Dec 2009) New Revision: 6027 Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml Log: JBPM-2695 jms test updates Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-22 20:53:21 UTC (rev 6026) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-22 22:06:05 UTC (rev 6027) @@ -31,7 +31,6 @@ import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; import javax.jms.QueueSession; -import javax.jms.Session; import javax.naming.InitialContext; import javax.naming.NamingException; Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java (rev 0) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java 2009-12-22 22:06:05 UTC (rev 6027) @@ -0,0 +1,82 @@ +/* + * 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.test.jms; + +import javax.jms.MessageConsumer; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.naming.InitialContext; +import javax.transaction.UserTransaction; + +import org.apache.cactus.ServletTestCase; + + +/** + * @author Tom Baeyens + */ +public class PlainJmsTest extends ServletTestCase { + + public void testPlainJms() throws Exception { + InitialContext initialContext = new InitialContext(); + UserTransaction userTransaction = (UserTransaction) initialContext.lookup("UserTransaction"); + userTransaction.begin(); + + Queue queue = (Queue) initialContext.lookup("queue/jbpm-test-queue"); + QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) initialContext.lookup("XAConnectionFactory"); + QueueConnection queueConnection = queueConnectionFactory.createQueueConnection(); + QueueSession queueSession = queueConnection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE); + QueueSender queueSender = queueSession.createSender(queue); + TextMessage message = queueSession.createTextMessage("hello"); + queueSender.send(message); + queueSender.close(); + queueSession.commit(); + queueSession.close(); + queueConnection.close(); + + userTransaction.commit(); + userTransaction.begin(); + + InitialContext context = new InitialContext(); + queueConnectionFactory = (QueueConnectionFactory) context.lookup("XAConnectionFactory"); + queue = (Queue)context.lookup("queue/jbpm-test-queue"); + queueConnection = queueConnectionFactory.createQueueConnection(); + queueConnection.start(); + queueSession = queueConnection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE); + MessageConsumer messageConsumer = queueSession.createConsumer(queue); + message = (TextMessage) messageConsumer.receive(1000); + messageConsumer.close(); + queueSession.commit(); + queueSession.close(); + queueConnection.stop(); + queueConnection.close(); + + userTransaction.commit(); + + assertNotNull(message); + assertEquals("hello", message.getText()); + } +} Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/PlainJmsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-22 20:53:21 UTC (rev 6026) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-22 22:06:05 UTC (rev 6027) @@ -1,3 +1,24 @@ +/* + * 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.test.jms; import javax.jms.MapMessage; @@ -8,21 +29,19 @@ import org.jbpm.test.JbpmTestCase; public class QueueMapMessageTest extends JbpmTestCase { - + public static Test suite() { ServletTestSuite servletTestSuite = new ServletTestSuite(); servletTestSuite.addTestSuite(QueueMapMessageTest.class); return servletTestSuite; } - + protected void setUp() throws Exception { - super.setUp(); + super.setUp(); - registerDeployment(repositoryService.createDeployment() - .addResourceFromClasspath("org/jbpm/test/jms/queue.map.process.jpdl.xml") - .deploy()); + registerDeployment(repositoryService.createDeployment().addResourceFromClasspath("org/jbpm/test/jms/queue.map.process.jpdl.xml").deploy()); } - + public void testJmsText() throws Exception { executionService.startProcessInstanceByKey("JMS_map_queue"); MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("XAConnectionFactory", "queue/jbpm-test-queue"); Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-22 20:53:21 UTC (rev 6026) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-22 22:06:05 UTC (rev 6027) @@ -1,3 +1,24 @@ +/* + * 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.test.jms; import java.util.HashMap; Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-22 20:53:21 UTC (rev 6026) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-22 22:06:05 UTC (rev 6027) @@ -1,3 +1,24 @@ +/* + * 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.test.jms; import javax.jms.TextMessage; Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml 2009-12-22 20:53:21 UTC (rev 6026) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml 2009-12-22 22:06:05 UTC (rev 6027) @@ -7,7 +7,7 @@ </start> <jms name="send message" - connection-factory="XAConnectionFactory" + connection-factory="java:JmsXA" destination="queue/jbpm-test-queue" g="96,16,83,52"> <map>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6026 - jbpm4/trunk/modules/distro/src/main/files.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-22 15:53:21 -0500 (Tue, 22 Dec 2009) New Revision: 6026 Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html Log: Added know limitation to readme: reporting on tomcat does not work Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-12-22 19:31:50 UTC (rev 6025) +++ jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-12-22 20:53:21 UTC (rev 6026) @@ -37,6 +37,15 @@ <h1>Release Notes for jBPM 4.3</h1> +<h2>Known Limitation</h2> + +<ul> + <li> + Reporting in the jBPM console does not work on Tomcat. See + [<a href='https://jira.jboss.org/jira/browse/JBPM-2627'>JBPM-2627</a>] + </li> +</ul> + <h2>API changes</h2> <ul>

14 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits December 2009