[jbpm-commits] JBoss JBPM SVN: r5966 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/wire/binding and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Dec 15 22:38:50 EST 2009
Author: koen.aers at jboss.com
Date: 2009-12-15 22:38:49 -0500 (Tue, 15 Dec 2009)
New Revision: 5966
Added:
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/map/
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/map/MapMessageTest.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/object/
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/object/ObjectMessageTest.java
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/JmsBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
Log:
JMS activity and binding:
- Text Message
- Object Message
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-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java 2009-12-16 03:38:49 UTC (rev 5966)
@@ -21,9 +21,15 @@
*/
package org.jbpm.jpdl.internal.activity;
+import java.io.Serializable;
+import java.util.List;
+
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.ObjectMessage;
import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
@@ -35,92 +41,171 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.jbpm.api.JbpmException;
import org.jbpm.api.model.OpenExecution;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.script.ScriptManager;
+import org.jbpm.pvm.internal.wire.Descriptor;
+import org.jbpm.pvm.internal.wire.WireContext;
+import org.jbpm.pvm.internal.wire.descriptor.MapDescriptor;
-
/**
* @author Koen Aers
*/
-public class JmsActivity extends JpdlAutomaticActivity {
-
+public class JmsActivity extends JpdlAutomaticActivity
+{
+
private static final Log log = Log.getLog(JmsActivity.class.getName());
private static final long serialVersionUID = 1L;
-
+
protected String type = "text";
protected String text = "";
+ protected String expression = "";
+ protected MapDescriptor mapDescriptor = null;
protected String connectionFactoryName = "";
protected String destinationName = "";
- public void perform(OpenExecution execution) {
- try {
+ public void perform(OpenExecution execution)
+ {
+ try
+ {
Context context = new InitialContext();
- if (context == null) return;
+ if (context == null)
+ return;
ConnectionFactory connectionFactory = getConnectionFactory(context);
- if (connectionFactory == null) return;
+ if (connectionFactory == null)
+ return;
Destination destination = getDestination(context);
- if (destination instanceof Queue) {
- handleQueueSend(connectionFactory, (Queue)destination);
+ if (destination instanceof Queue)
+ {
+ performQueueSend(connectionFactory, (Queue)destination);
}
- } catch (JMSException e) {
+ }
+ catch (JMSException e)
+ {
log.warn("JMSException while performing JmsActivity", e);
- } catch (NamingException e) {
+ }
+ catch (NamingException e)
+ {
log.warn("NamingException while performing JmsActivity", e);
- }
+ }
}
-
- private String substituteVariables(String input) {
- return (String)ScriptManager.getScriptManager().evaluateExpression(input, null);
+
+ private Object substituteVariables(String input)
+ {
+ return (Object)ScriptManager.getScriptManager().evaluateExpression(input, null);
}
-
- private void handleQueueSend(ConnectionFactory connectionFactory, Queue queue) throws JMSException {
- if (!(connectionFactory instanceof QueueConnectionFactory)) return;
+
+ private void performQueueSend(ConnectionFactory connectionFactory, Queue queue) throws JMSException
+ {
+ if (!(connectionFactory instanceof QueueConnectionFactory))
+ return;
QueueConnection queueConnection = ((QueueConnectionFactory)connectionFactory).createQueueConnection();
QueueSession queueSession = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
queueConnection.start();
QueueSender queueSender = queueSession.createSender(queue);
- TextMessage textMessage = queueSession.createTextMessage(substituteVariables(text));
- queueSender.send(textMessage);
+ Message message = createMessage(queueSession);
+ queueSender.send(message);
queueSender.close();
queueConnection.stop();
queueConnection.close();
queueSession.close();
}
- private Destination getDestination(Context context) throws NamingException {
+ private Message createMessage(Session session) throws JMSException {
+ if ("text".equals(type)) {
+ return createTextMessage(session);
+ } else if ("object".equals(type)) {
+ return createObjectMessage(session);
+ } else if ("map".equals(type)) {
+ return createMapMessage(session);
+ } else {
+ return null;
+ }
+ }
+
+ private MapMessage createMapMessage(Session session) throws JMSException {
+ MapMessage result = session.createMapMessage();
+ if (mapDescriptor != null) {
+ List<Descriptor> keyDescriptors = mapDescriptor.getKeyDescriptors();
+ List<Descriptor> valueDescriptors = mapDescriptor.getValueDescriptors();
+ for (int i = 0; i < keyDescriptors.size(); i++) {
+ String key = (String)WireContext.create(keyDescriptors.get(i));
+ Object value = WireContext.create(valueDescriptors.get(i));
+ result.setObject(key, value);
+ }
+ }
+ return result;
+ }
+
+ private TextMessage createTextMessage(Session session) throws JMSException {
+ return session.createTextMessage((String)substituteVariables(text));
+ }
+
+ private ObjectMessage createObjectMessage(Session session) throws JMSException {
+ Object object = substituteVariables(expression);
+ if (!(object instanceof Serializable)) {
+ throw new JbpmException(object + " is not serializable and cannot be used as payload of a jms object message");
+ }
+ return session.createObjectMessage((Serializable)substituteVariables(expression));
+ }
+
+ private Destination getDestination(Context context) throws NamingException
+ {
Destination result = null;
Object object = context.lookup(destinationName);
- if (object instanceof Destination) {
+ if (object instanceof Destination)
+ {
result = (Destination)object;
- } else {
+ }
+ else
+ {
log.warn("Object bound to " + destinationName + " is no javax.jms.Destination");
}
return result;
}
-
- private ConnectionFactory getConnectionFactory(Context context) throws NamingException {
+
+ private ConnectionFactory getConnectionFactory(Context context) throws NamingException
+ {
ConnectionFactory result = null;
Object object = context.lookup(connectionFactoryName);
- if (object instanceof ConnectionFactory) {
+ if (object instanceof ConnectionFactory)
+ {
result = (ConnectionFactory)object;
- } else {
+ }
+ else
+ {
log.warn("Object bound to " + connectionFactoryName + " is no javax.jms.ConnectionFactory");
}
return result;
}
- public void setType(String type) {
- this.type = type;
+ public void setType(String type)
+ {
+ this.type = type;
}
- public void setText(String text) {
+
+ public void setText(String text)
+ {
this.text = text;
}
- public void setConnectionFactoryName(String connectionFactoryName) {
+
+ public void setExpression(String expression) {
+ this.expression = expression;
+ }
+
+ public void setMapDescriptor(MapDescriptor mapDescriptor) {
+ this.mapDescriptor = mapDescriptor;
+ }
+
+ public void setConnectionFactoryName(String connectionFactoryName)
+ {
this.connectionFactoryName = connectionFactoryName;
}
- public void setDestinationName(String destinationName) {
+
+ public void setDestinationName(String destinationName)
+ {
this.destinationName = destinationName;
}
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2009-12-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2009-12-16 03:38:49 UTC (rev 5966)
@@ -23,45 +23,78 @@
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.descriptor.MapDescriptor;
+import org.jbpm.pvm.internal.xml.Binding;
import org.jbpm.pvm.internal.xml.Parse;
import org.w3c.dom.Element;
-
/**
* @author Koen Aers
*/
-public class JmsBinding extends JpdlBinding {
+public class JmsBinding extends JpdlBinding
+{
public static final String TAG = "jms";
- public JmsBinding() {
+ public JmsBinding()
+ {
super(TAG);
}
-
- protected JmsBinding(String tagName) {
+
+ protected JmsBinding(String tagName)
+ {
super(tagName);
}
- public Object parseJpdl(Element element, Parse parse, JpdlParser parser) {
+ public Object parseJpdl(Element element, Parse parse, JpdlParser parser)
+ {
JmsActivity jmsActivity = createJmsActivity();
-
+
Element textElement = XmlUtil.element(element, "text", false, parse);
- if (textElement!=null) {
+ if (textElement != null)
+ {
String text = XmlUtil.getContentText(textElement);
jmsActivity.setType("text");
jmsActivity.setText(text);
}
+
+ Element objectElement = XmlUtil.element(element, "object", false, parse);
+ if (objectElement != null)
+ {
+ String expr = XmlUtil.attribute(objectElement, "expr");
+ if (expr != null)
+ {
+ jmsActivity.setType("object");
+ jmsActivity.setExpression(expr);
+ }
+ }
+ Element mapElement = XmlUtil.element(element, "map", false, parse);
+ if (mapElement != null) {
+ Binding binding = parser.getBinding(mapElement);
+ if (binding != null) {
+ System.out.println("Goddam f*ck!!!");
+ }
+ jmsActivity.setType("map");
+ Object object = binding.parse(mapElement, parse, parser);
+ if (object instanceof MapDescriptor) {
+ jmsActivity.setMapDescriptor((MapDescriptor)object);
+ } else {
+ parse.addProblem("parsed object is not instanceof MapDescriptor", mapElement);
+ }
+ }
+
String connectionFactoryName = XmlUtil.attribute(element, "connection-factory", true, parse);
jmsActivity.setConnectionFactoryName(connectionFactoryName);
-
+
String destinationName = XmlUtil.attribute(element, "destination", true, parse);
jmsActivity.setDestinationName(destinationName);
-
+
return jmsActivity;
}
- protected JmsActivity createJmsActivity() {
+ protected JmsActivity createJmsActivity()
+ {
return new JmsActivity();
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java 2009-12-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java 2009-12-16 03:38:49 UTC (rev 5966)
@@ -65,12 +65,32 @@
if ("entry".equals(XmlUtil.getTagLocalName(entryElement))) {
// key
Element keyElement = XmlUtil.element(entryElement, "key");
+ if (keyElement != null) {
+ System.out.println("found keyElement");
+ }
Element keyDescriptorElement = (keyElement!=null ? XmlUtil.element(keyElement) : null);
+ if (keyDescriptorElement != null) {
+ System.out.println("found keyDescriptorElement");
+ System.out.println(" element: " + keyDescriptorElement.getNodeName());
+ }
Descriptor keyDescriptor = (Descriptor) parser.parseElement(keyDescriptorElement, parse, WireParser.CATEGORY_DESCRIPTOR);
+ if (keyDescriptor != null) {
+ System.out.println("found keyDescriptor");
+ }
// value
Element valueElement = XmlUtil.element(entryElement, "value");
+ if (valueElement != null) {
+ System.out.println("found valueElement");
+ }
Element valueDescriptorElement = (valueElement!=null ? XmlUtil.element(valueElement) : null);
+ if (valueDescriptorElement != null) {
+ System.out.println("found valueDescriptorElement");
+ System.out.println(" element: " + valueDescriptorElement.getNodeName());
+ }
Descriptor valueDescriptor = (Descriptor) parser.parseElement(valueDescriptorElement, parse, WireParser.CATEGORY_DESCRIPTOR);
+ if (valueDescriptor != null) {
+ System.out.println("found valueDescriptor");
+ }
if ( (keyDescriptor!=null)
&& (valueDescriptor!=null)
Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java 2009-12-16 03:38:49 UTC (rev 5966)
@@ -0,0 +1,56 @@
+package org.jbpm.test.jms;
+
+import javax.jms.MessageConsumer;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSession;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.apache.cactus.ServletTestSuite;
+import org.jbpm.test.JbpmTestCase;
+
+public abstract class JbpmJmsTestCase extends JbpmTestCase {
+
+ String deploymentId;
+
+ protected QueueConnection queueConnection = null;
+ protected QueueSession queueSession = null;
+ protected MessageConsumer messageConsumer = null;
+
+ public static Test suite() {
+ ServletTestSuite servletTestSuite = new ServletTestSuite();
+ servletTestSuite.addTestSuite(JbpmJmsTestCase.class);
+ return servletTestSuite;
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ setUpJms();
+ }
+
+ protected void setUpJms() throws Exception {
+ Context context = new InitialContext();
+ QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory)context.lookup("ConnectionFactory");
+ Queue queue = (Queue)context.lookup("queue/jbpm-test-queue");
+ queueConnection = (QueueConnection)queueConnectionFactory.createConnection();
+ queueSession = queueConnection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+ queueConnection.start();
+ messageConsumer = queueSession.createConsumer(queue);
+ }
+
+ protected void tearDown() throws Exception {
+ tearDownJms();
+ super.tearDown();
+ }
+
+ protected void tearDownJms() throws Exception {
+ queueConnection.stop();
+ queueSession.close();
+ queueConnection.close();
+ }
+
+}
Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/map/MapMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/map/MapMessageTest.java (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/map/MapMessageTest.java 2009-12-16 03:38:49 UTC (rev 5966)
@@ -0,0 +1,33 @@
+package org.jbpm.test.jms.map;
+
+import javax.jms.MapMessage;
+
+import junit.framework.Test;
+
+import org.apache.cactus.ServletTestSuite;
+import org.jbpm.test.jms.JbpmJmsTestCase;
+
+public class MapMessageTest extends JbpmJmsTestCase {
+
+ public static Test suite() {
+ ServletTestSuite servletTestSuite = new ServletTestSuite();
+ servletTestSuite.addTestSuite(MapMessageTest.class);
+ return servletTestSuite;
+ }
+
+// protected void setUp() throws Exception {
+// super.setUp();
+// registerDeployment(repositoryService.createDeployment()
+// .addResourceFromClasspath("org/jbpm/test/jms/map/process.jpdl.xml")
+// .deploy());
+// }
+
+ public void testJmsText() throws Exception {
+ assertTrue(true);
+// executionService.startProcessInstanceByKey("JMS_map_queue");
+// MapMessage mapMessage = (MapMessage)messageConsumer.receive();
+// assertTrue(mapMessage.itemExists("x"));
+// assertEquals("foo", mapMessage.getObject("x"));
+ }
+
+}
Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/map/MapMessageTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/object/ObjectMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/object/ObjectMessageTest.java (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/object/ObjectMessageTest.java 2009-12-16 03:38:49 UTC (rev 5966)
@@ -0,0 +1,41 @@
+package org.jbpm.test.jms.object;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jms.ObjectMessage;
+
+import junit.framework.Test;
+
+import org.apache.cactus.ServletTestSuite;
+import org.jbpm.test.jms.JbpmJmsTestCase;
+
+public class ObjectMessageTest extends JbpmJmsTestCase
+{
+
+ public static Test suite()
+ {
+ ServletTestSuite servletTestSuite = new ServletTestSuite();
+ servletTestSuite.addTestSuite(ObjectMessageTest.class);
+ return servletTestSuite;
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ registerDeployment(repositoryService
+ .createDeployment()
+ .addResourceFromClasspath("org/jbpm/test/jms/object/process.jpdl.xml")
+ .deploy());
+ }
+
+ 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);
+ ObjectMessage objectMessage = (ObjectMessage)messageConsumer.receive();
+ assertEquals("this is the object", objectMessage.getObject());
+ }
+
+}
Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/object/ObjectMessageTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java 2009-12-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java 2009-12-16 03:38:49 UTC (rev 5966)
@@ -1,28 +1,14 @@
package org.jbpm.test.jms.text;
-import javax.jms.MessageConsumer;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
import junit.framework.Test;
import org.apache.cactus.ServletTestSuite;
-import org.jbpm.api.ProcessInstance;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.jms.JbpmJmsTestCase;
-public class TextMessageTest extends JbpmTestCase {
+public class TextMessageTest extends JbpmJmsTestCase {
- String deploymentId;
-
- QueueConnection queueConnection = null;
- QueueSession queueSession = null;
- MessageConsumer messageConsumer = null;
-
public static Test suite() {
ServletTestSuite servletTestSuite = new ServletTestSuite();
servletTestSuite.addTestSuite(TextMessageTest.class);
@@ -31,39 +17,15 @@
protected void setUp() throws Exception {
super.setUp();
- setUpJms();
registerDeployment(repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/test/jms/text/process.jpdl.xml")
.deploy());
}
- protected void setUpJms() throws Exception {
- Context context = new InitialContext();
- QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory)context.lookup("ConnectionFactory");
- Queue queue = (Queue)context.lookup("queue/jbpm-test");
- queueConnection = (QueueConnection)queueConnectionFactory.createConnection();
- queueSession = queueConnection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- queueConnection.start();
- messageConsumer = queueSession.createConsumer(queue);
- }
-
- protected void tearDown() throws Exception {
- tearDownJms();
- super.tearDown();
- }
-
- protected void tearDownJms() throws Exception {
- queueConnection.stop();
- queueSession.close();
- queueConnection.close();
- }
-
- public void testJmsText() throws Exception {
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("JMS_text", "JMS_Test_Message");
+ public void testQueueMessage() throws Exception {
+ executionService.startProcessInstanceByKey("JMS_text_queue");
TextMessage textMessage = (TextMessage)messageConsumer.receive();
assertEquals("This is the body", textMessage.getText());
- processInstance = executionService.signalExecutionById(processInstance.getId());
- assertTrue(processInstance.isEnded());
}
}
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml 2009-12-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml 2009-12-16 03:38:49 UTC (rev 5966)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=jbpm-test"
+ name="jboss.messaging.destination:service=Queue,name=jbpm-test-queue"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml 2009-12-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml 2009-12-16 03:38:49 UTC (rev 5966)
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="JMS map" xmlns="http://jbpm.org/4.3/jpdl">
+<process name="JMS_map_queue">
<start g="20,20,48,48">
<transition to="send message" />
</start>
<jms name="send message"
- connectionFactory="ConnectionFactory"
- destination="queue/jbpm-test"
+ connection-factory="ConnectionFactory"
+ destination="queue/jbpm-test-queue"
g="96,16,83,52">
- <message type="map">
- <entry name="x" value="foo"/>
- <entry name="y" value="bar"/>
- </message>
+ <map>
+ <entry>
+ <key><string value="x"/></key>
+ <value><string value="foo"/></value>
+ </entry>
+ </map>
<transition to="wait" />
- </java>
+ </jms>
<state name="wait" g="352,17,88,52"/>
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml 2009-12-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml 2009-12-16 03:38:49 UTC (rev 5966)
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="JMS object">
+<process name="JMS_object_queue">
<start g="20,20,48,48">
<transition to="send message" />
</start>
<jms name="send message"
- connectionFactory="ConnectionFactory"
- destination="queue/jbpm-test"
+ connection-factory="ConnectionFactory"
+ destination="queue/jbpm-test-queue"
g="96,16,83,52">
- <message type="object">
- ${object}
- </message>
+ <object expr="${object}"/>
<transition to="wait" />
</jms>
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml 2009-12-15 17:36:24 UTC (rev 5965)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml 2009-12-16 03:38:49 UTC (rev 5966)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="JMS_text">
+<process name="JMS_text_queue">
<start g="20,20,48,48">
<transition to="send message" />
@@ -8,16 +8,12 @@
<jms name="send message"
connection-factory="ConnectionFactory"
- destination="queue/jbpm-test"
+ destination="queue/jbpm-test-queue"
g="96,16,83,52">
<text>This is the body</text>
<transition to="wait" />
</jms>
- <state name="wait" g="352,17,88,52">
- <transition to="end" />
- </state>
-
- <end name="end"/>
+ <state name="wait" g="352,17,88,52"/>
</process>
More information about the jbpm-commits
mailing list