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

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 --> <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"?> -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> +<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"> -<!-- $Id: pom.xml 5319 2009-07-17 10:03:46Z tom.baeyens(a)jboss.com $ --> + <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 --> + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.3-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> - <!-- 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>