December 2009 - jbpm-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-28 04:33:56 -0500 (Mon, 28 Dec 2009) New Revision: 6045 Added: jbpm4/tags/jbpm-4.3/ Log: creating release tag for jbpm-4.3 Copied: jbpm4/tags/jbpm-4.3 (from rev 6044, jbpm4/trunk)

14 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-28 04:23:10 -0500 (Mon, 28 Dec 2009) New Revision: 6044 Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html Log: release notes updates Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-12-24 12:32:25 UTC (rev 6043) +++ jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-12-28 09:23:10 UTC (rev 6044) @@ -35,17 +35,25 @@ </tr> </table> -<h1>Release Notes for jBPM 4.3</h1> +<h1 id="4.3">Release Notes for jBPM 4.3</h1> -<h2>Known Limitation</h2> +<h2>Main improvements</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> + <li>Added <b>BPMN 2.0</b> runtime engine!</li> + <li>Extended <span style="font-family:courier new; font-weight:bold;">java</span> activity with ejb method invocation. <a href="https://jira.jboss.org/jira/browse/JBPM-2412">JBPM-2412</a></li> + <li>Added <span style="font-family:courier new; font-weight:bold;">jms</span> activity (including test facilities) <a href="https://jira.jboss.org/jira/browse/JBPM-2300">JBPM-2300</a></li> + <li>Added integrated rules deployment and activities <span style="font-family:courier new; font-weight:bold;">rules</span> and <span style="font-family:courier new; font-weight:bold;">rules-decision</span> <a href="https://jira.jboss.org/jira/browse/JBPM-2006">JBPM-2006</a></li> + <li>Added enhanced spring integration and created continuous integration for it <a href="https://jira.jboss.org/jira/browse/JBPM-2529">JBPM-2529</a> & <a href="https://jira.jboss.org/jira/browse/JBPM-2631">JBPM-2631</a></li> + <li>Automatic saving of updated deserialized variables <a href="https://jira.jboss.org/jira/browse/JBPM-2684">JBPM-2684</a></li> + <li>Added <span style="font-family:courier new; font-weight:bold;">count()</span> capabilities to all queries in the api <a href="https://jira.jboss.org/jira/browse/JBPM-2567">JBPM-2567</a></li> + <li>Fixes various bugs</li> </ul> +<h2>DB changes</h2> + +<p>No DB upgrade necessary for upgrading from 4.2 to 4.3</p> + <h2>API changes</h2> <ul> @@ -63,6 +71,15 @@ </li> </ul> +<h2>jPDL changes</h2> + +<ul> + <li>No backward incompatible changes</li> + <li>Added <code>jms</code>, <code>rules</code> and <code>rules-decision</code> activities</li> + <li>Added attribute <code>ejb-jndi-name</code> to java activity</li> + <li>Added attribute <code>propagation</code> to all event-listeners</li> +</ul> + <h2>Configuration changes</h2> <ul> @@ -73,6 +90,16 @@ </li> </ul> +<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> Bug </h2> <ul>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6043 - in jbpm4/trunk: modules/distro/src/main/files/install/src/jboss/log and 6 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-24 07:32:25 -0500 (Thu, 24 Dec 2009) New Revision: 6043 Added: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsNonXATopicListener.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsXATopicListener.java Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml 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/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 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/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 jbpm4/trunk/qa/build.xml Log: JBPM-2695 jms split up between xa and non-xa usage 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-24 12:32:25 UTC (rev 6043) @@ -930,11 +930,21 @@ <section id="jms"> <title><literal>jms</literal> activity</title> + <para>Disclaimer: this activity is not yet stable. Two aspects will be revisisted + in following releases:</para> + <itemizedlist> + <listitem>Binding the non-xa use of JMS to the standard transaction</listitem> + <listitem>We're still figuring out why in JBoss the java:JmsXA connection + factory doesn't implement XAConnectionFactory. And that we have to use the + non-XA JMS API's for sending and retrieving messages. That is why we've + put <literal>transacted="false"</literal> in our enterprise QA run processes + (used for docs here). And that is why we use method <literal>jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE);</literal> + in our test cases that run on JBoss (also used in docs here)</listitem> + </itemizedlist> <para> The <literal>jms</literal> activity provides users with convenience for sending JMS messages. At this moment the sending of three different types of JMS messages is possible: text, object and map. Specifying message properties is not yet supported. - In the future the functionality may be elaborated to cover this and more of the JMS specification. </para> <table><title><literal>jms</literal> attributes:</title> @@ -993,7 +1003,14 @@ that will be used to lookup the corresponding objects in JNDI. The lookup is done like this: </para> <programlisting>InitialContext initialContext = new InitialContext(); -Destination destination = (Destination) initialContext.lookup(destinationName);</programlisting> +Destination destination = (Destination) initialContext.lookup(destinationName); +Object connectionFactory = initialContext.lookup(connectionFactoryName);</programlisting> + <para>The <literal>jms</literal> activity will use the JMS queue apis if the destination + is an <literal>instanceof</literal> Queue. Analogue for topics. + </para> + <para>The <literal>jms</literal> activity will use the XA JMS apis if the connectionFactory + is an <literal>instanceof</literal> XAConnectionFactory. Analogue for plain ConnectionFactory's. + </para> <para>So if you're running inside an appserver, then the <literal>new InitialContext()</literal> will see the queue's and topics configured in the appserver.</para> <para>When your're using the JMS mocking @@ -1002,9 +1019,6 @@ <para>When you're running as a remote application client, then you have to <ulink url="http://java.sun.com/products/jndi/tutorial/beyond/env/source.html">specify the jndi environment with system properties</ulink>.</para> - <para>The <literal>jms</literal> activity will use the JMS queue apis if the destination - is an <literal>instanceof</literal> Queue. Analogue for topics. - </para> <table><title><literal>jms</literal> elements:</title> <tgroup cols="3" rowsep="1" colsep="1"> @@ -1060,10 +1074,14 @@ <para>Following test helper methods are based solely on plain JMS apis and hence they work in a standalone environment as well as in an appserver environment:</para> <itemizedlist> - <listitem>JbpmTestCase.jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName)</listitem> - <listitem>JbpmTestCase.jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout)</listitem> - <listitem>JbpmTestCase.jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName)</listitem> + <listitem>JbpmTestCase.jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName) + with defaults 1000, true, Session.AUTO_ACKNOWLEDGE for parameters timeout, transacted and acknowledgeMode respectively</listitem> + <listitem>JbpmTestCase.jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode)</listitem> + <listitem>JbpmTestCase.jmsConsumeMessageFromQueueXA(String connectionFactoryJndiName, String queueJndiName, long timeout)</listitem> + <listitem>JbpmTestCase.jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode)</listitem> + <listitem>JbpmTestCase.jmsAssertQueueEmptyXA(String connectionFactoryJndiName, String queueJndiName, long timeout)</listitem> <listitem>JbpmTestCase.jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode)</listitem> + <listitem>JbpmTestCase.jmsStartTopicListenerXA(String connectionFactoryJndiName, String topicJndiName)</listitem> <listitem>JmsTopicListener.getNextMesssage(long timeout)</listitem> <listitem>JmsTopicListener.stop()</listitem> </itemizedlist> @@ -1108,7 +1126,8 @@ <emphasis role="bold"><jms name="send message" connection-factory="java:JmsXA" - destination="queue/jbpm-test-queue"> + destination="queue/jbpm-test-queue" + transacted="false"> <text>This is the body</text> <transition to="wait"/> </jms></emphasis> @@ -1125,7 +1144,7 @@ <programlisting>executionService.startProcessInstanceByKey("JmsQueueText"); TextMessage textMessage = (TextMessage) - jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); + jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); assertEquals("This is the body", textMessage.getText());</programlisting> <para> The relevant code is shown above in boldface. The rest of the method is boilerplate code needed to @@ -1148,7 +1167,8 @@ <emphasis role="bold"><jms name="send message" connection-factory="java:JmsXA" - destination="queue/jbpm-test-queue"> + destination="queue/jbpm-test-queue" + transacted="false"> <object expr="${object}"/> <transition to="wait"/> </jms></emphasis> @@ -1167,7 +1187,7 @@ executionService.startProcessInstanceByKey("JmsQueueObject", variables); ObjectMessage objectMessage = (ObjectMessage) - jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); + jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); assertEquals("this is the object", objectMessage.getObject());</programlisting> </section> @@ -1186,7 +1206,8 @@ <emphasis role="bold"><jms name="send message" connection-factory="java:JmsXA" - destination="queue/jbpm-test-queue"> + destination="queue/jbpm-test-queue" + transacted="false"> <map> <entry> <key><string value="x"/></key> @@ -1208,15 +1229,13 @@ <programlisting>executionService.startProcessInstanceByKey("JmsQueueMap"); MapMessage mapMessage = (MapMessage) - jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); + jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); assertTrue(mapMessage.itemExists("x")); assertEquals("foo", mapMessage.getObject("x"));</programlisting> </section> </section> - - <section> <title>History session chain</title> <para> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml 2009-12-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml 2009-12-24 12:32:25 UTC (rev 6043) @@ -30,7 +30,7 @@ so the full JBoss system property format is not supported; e.g. setting a default via ${jboss.server.log.threshold:WARN} will not work. --> - <param name="Threshold" value="${jboss.server.log.threshold}"/> + <param name="Threshold" value="TRACE"/>  <param name="DatePattern" value="'.'yyyy-MM-dd"/> @@ -41,7 +41,7 @@ <layout class="org.apache.log4j.PatternLayout">  - <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -27,6 +27,7 @@ import javax.jms.Destination; import javax.jms.MapMessage; import javax.jms.Message; +import javax.jms.MessageProducer; import javax.jms.ObjectMessage; import javax.jms.Queue; import javax.jms.QueueConnection; @@ -40,6 +41,13 @@ import javax.jms.TopicConnectionFactory; import javax.jms.TopicPublisher; import javax.jms.TopicSession; +import javax.jms.XAConnectionFactory; +import javax.jms.XAQueueConnection; +import javax.jms.XAQueueConnectionFactory; +import javax.jms.XAQueueSession; +import javax.jms.XATopicConnection; +import javax.jms.XATopicConnectionFactory; +import javax.jms.XATopicSession; import javax.naming.InitialContext; import org.jbpm.api.JbpmException; @@ -74,16 +82,39 @@ InitialContext initialContext = new InitialContext(); Destination destination = (Destination) initialContext.lookup(destinationName); - if (destination instanceof Queue) { - QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) initialContext.lookup(connectionFactoryName); - sendToQueue((Queue) destination, queueConnectionFactory); + Object connectionFactory = initialContext.lookup(connectionFactoryName); - } else if (destination instanceof Topic) { - TopicConnectionFactory topicConnectionFactory = (TopicConnectionFactory) initialContext.lookup(connectionFactoryName); - sendToTopic((Topic) destination, topicConnectionFactory); - - } else { - throw new JbpmException("invalid destination type for '"+destinationName+"': "+destination.getClass().getName()); + if (connectionFactory instanceof XAConnectionFactory) { + log.debug("connection factory '"+connectionFactoryName+"' is a XAConnectionFactory: using xa jms apis"); + if (destination instanceof Queue) { + log.debug("destination '"+destinationName+"' is a Queue: using xa queue jms apis"); + XAQueueConnectionFactory xaQueueConnectionFactory = (XAQueueConnectionFactory) connectionFactory; + sendToQueueXA((Queue) destination, xaQueueConnectionFactory); + + } else if (destination instanceof Topic) { + log.debug("destination '"+destinationName+"' is a Topic: using xa topic jms apis"); + XATopicConnectionFactory xaTopicConnectionFactory = (XATopicConnectionFactory) connectionFactory; + sendToTopicXA((Topic) destination, xaTopicConnectionFactory); + + } else { + throw new JbpmException("invalid destination type for '"+destinationName+"': "+destination.getClass().getName()); + } + + } else { // non-XA + log.debug("connection factory '"+connectionFactoryName+"' is a ConnectionFactory: using non-xa jms apis"); + if (destination instanceof Queue) { + log.debug("destination '"+destinationName+"' is a Queue: using non-xa queue jms apis"); + QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) connectionFactory; + sendToQueue((Queue) destination, queueConnectionFactory); + + } else if (destination instanceof Topic) { + log.debug("destination '"+destinationName+"' is a Topic: using non-xa topic jms apis"); + TopicConnectionFactory topicConnectionFactory = (TopicConnectionFactory) connectionFactory; + sendToTopic((Topic) destination, topicConnectionFactory); + + } else { + throw new JbpmException("invalid destination type for '"+destinationName+"': "+destination.getClass().getName()); + } } } catch (RuntimeException e) { @@ -96,7 +127,69 @@ } } - private void sendToQueue(Queue queue, QueueConnectionFactory queueConnectionFactory) throws Exception { + protected void sendToQueueXA(Queue queue, XAQueueConnectionFactory xaQueueConnectionFactory) throws Exception { + XAQueueConnection xaQueueConnection = null; + XAQueueSession xaQueueSession = null; + MessageProducer messageProducer = null; + + try { + xaQueueConnection = xaQueueConnectionFactory.createXAQueueConnection(); + xaQueueSession = xaQueueConnection.createXAQueueSession(); + messageProducer = xaQueueSession.createProducer(queue); + Message message = createMessage(xaQueueSession); + messageProducer.send(message); + + } finally { + try { + messageProducer.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + xaQueueSession.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + xaQueueConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + protected void sendToTopicXA(Topic topic, XATopicConnectionFactory xaTopicConnectionFactory) throws Exception { + XATopicConnection xaTopicConnection = null; + XATopicSession xaTopicSession = null; + MessageProducer messageProducer = null; + + try { + xaTopicConnection = xaTopicConnectionFactory.createXATopicConnection(); + xaTopicSession = xaTopicConnection.createXATopicSession(); + messageProducer = xaTopicSession.createProducer(topic); + Message message = createMessage(xaTopicSession); + messageProducer.send(message); + + } finally { + try { + messageProducer.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + xaTopicSession.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + xaTopicConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + protected void sendToQueue(Queue queue, QueueConnectionFactory queueConnectionFactory) throws Exception { QueueConnection queueConnection = null; QueueSession queueSession = null; QueueSender queueSender = null; @@ -107,6 +200,9 @@ queueSender = queueSession.createSender(queue); Message message = createMessage(queueSession); queueSender.send(message); + if (transacted) { + queueSession.commit(); + } } finally { try { @@ -127,7 +223,7 @@ } } - private void sendToTopic(Topic topic, TopicConnectionFactory topicConnectionFactory) throws Exception { + protected void sendToTopic(Topic topic, TopicConnectionFactory topicConnectionFactory) throws Exception { TopicConnection topicConnection = null; TopicSession topicSession = null; TopicPublisher topicPublisher = null; @@ -138,6 +234,9 @@ topicPublisher = topicSession.createPublisher(topic); Message message = createMessage(topicSession); topicPublisher.send(message); + if (transacted) { + topicSession.commit(); + } } finally { try { @@ -158,7 +257,7 @@ } } - private Message createMessage(Session session) throws Exception { + protected Message createMessage(Session session) throws Exception { if ("text".equals(type)) { return createTextMessage(session); } else if ("object".equals(type)) { 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -57,7 +57,7 @@ jmsActivity.setDestinationName(destinationName); Boolean transacted = XmlUtil.attributeBoolean(element, "transacted", false, parse, null); - if (transacted != null) { + if (transacted!=null) { jmsActivity.setTransacted(transacted); } 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -111,21 +111,25 @@ } public static Object jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName) { - return jmsConsumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, true, Session.AUTO_ACKNOWLEDGE, 1000); + return jmsConsumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, 1000, true, Session.AUTO_ACKNOWLEDGE); } - public static Object jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout) { - return JmsExtensions.consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, transacted, acknowledgeMode, timeout); + public static Object jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { + return JmsExtensions.consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, timeout, transacted, acknowledgeMode); } - public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName) { - jmsAssertQueueEmpty(connectionFactoryJndiName, queueJndiName, true, Session.AUTO_ACKNOWLEDGE, 1000); + public static Object jmsConsumeMessageFromQueueXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { + return JmsExtensions.consumeMessageFromQueueXA(connectionFactoryJndiName, queueJndiName, timeout); } - - public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout) { - JmsExtensions.jmsAssertQueueEmpty(connectionFactoryJndiName, queueJndiName, transacted, acknowledgeMode, timeout); + + public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { + JmsExtensions.jmsAssertQueueEmpty(connectionFactoryJndiName, queueJndiName, timeout, transacted, acknowledgeMode); } + public static void jmsAssertQueueEmptyXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { + JmsExtensions.jmsAssertQueueEmptyXA(connectionFactoryJndiName, queueJndiName, timeout); + } + public static void jmsRemoveQueue(String connectionFactoryJndiName, String queueJndiName) { JmsExtensions.removeQueue(connectionFactoryJndiName, queueJndiName); } @@ -134,12 +138,12 @@ JmsExtensions.createTopic(connectionFactoryJndiName, topicJndiName); } - public static JmsTopicListener jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName) { - return jmsStartTopicListener(connectionFactoryJndiName, topicJndiName, true, 1); + public static JmsTopicListener jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode) { + return new JmsNonXATopicListener(connectionFactoryJndiName, topicJndiName, transacted, acknowledgeMode); } - public static JmsTopicListener jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode) { - return new JmsTopicListener(connectionFactoryJndiName, topicJndiName, transacted, acknowledgeMode); + public static JmsTopicListener jmsStartTopicListenerXA(String connectionFactoryJndiName, String topicJndiName) { + return new JmsXATopicListener(connectionFactoryJndiName, topicJndiName); } public static void jmsRemoveTopic(String connectionFactoryJndiName, String 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -29,8 +29,10 @@ import javax.jms.Queue; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; import javax.jms.QueueSession; +import javax.jms.XAQueueConnection; +import javax.jms.XAQueueConnectionFactory; +import javax.jms.XAQueueSession; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -140,30 +142,77 @@ return jmsMockObjectFactory; } - public static Object consumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout) { + public static Object consumeMessageFromQueueXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { try { InitialContext context = new InitialContext(); + Queue queue = (Queue)context.lookup(queueJndiName); + XAQueueConnectionFactory xaQueueConnectionFactory = (XAQueueConnectionFactory) context.lookup(connectionFactoryJndiName); + + XAQueueConnection xaQueueConnection = null; + XAQueueSession queueSession = null; + MessageConsumer messageConsumer = null; + try { + xaQueueConnection = xaQueueConnectionFactory.createXAQueueConnection(); + xaQueueConnection.start(); + queueSession = xaQueueConnection.createXAQueueSession(); + messageConsumer = queueSession.createConsumer(queue); + Message message = messageConsumer.receive(timeout); + if (message==null) { + throw new AssertionFailedError("no message on queue "+queueJndiName); + } + return message; + + } finally { + try { + messageConsumer.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + queueSession.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + xaQueueConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new JbpmException("couldn't receive message from queue: "+e.getMessage(), e); + } + } + + public static Message consumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { + try { + InitialContext context = new InitialContext(); QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) context.lookup(connectionFactoryJndiName); Queue queue = (Queue)context.lookup(queueJndiName); QueueConnection queueConnection = null; QueueSession queueSession = null; - QueueSender queueSender = null; - + MessageConsumer messageConsumer = null; + try { queueConnection = queueConnectionFactory.createQueueConnection(); queueConnection.start(); queueSession = queueConnection.createQueueSession(transacted, acknowledgeMode); - MessageConsumer messageConsumer = queueSession.createConsumer(queue); + messageConsumer = queueSession.createConsumer(queue); Message message = messageConsumer.receive(timeout); if (message==null) { throw new AssertionFailedError("no message on queue "+queueJndiName); } + if (transacted) { + queueSession.commit(); + } return message; - + } finally { try { - queueSender.close(); + messageConsumer.close(); } catch (Exception e) { e.printStackTrace(); } @@ -185,9 +234,9 @@ } } - public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout) { + public static void jmsAssertQueueEmptyXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { try { - consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, transacted, acknowledgeMode, timeout); + consumeMessageFromQueueXA(connectionFactoryJndiName, queueJndiName, timeout); } catch (AssertionFailedError e) { if (e.getMessage().startsWith("no message on queue")) { return; @@ -195,4 +244,15 @@ } throw new AssertionFailedError("message available on queue "+queueJndiName); } + + public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { + try { + consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, timeout, transacted, acknowledgeMode); + } catch (AssertionFailedError e) { + if (e.getMessage().startsWith("no message on queue")) { + return; + } + } + throw new AssertionFailedError("message available on queue "+queueJndiName); + } } Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsNonXATopicListener.java (from rev 6037, jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.java) =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsNonXATopicListener.java (rev 0) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsNonXATopicListener.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -0,0 +1,152 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Topic; +import javax.jms.TopicConnection; +import javax.jms.TopicConnectionFactory; +import javax.jms.TopicSession; +import javax.jms.TopicSubscriber; +import javax.naming.InitialContext; + +import junit.framework.TestCase; + +import org.jbpm.internal.log.Log; + + +/** + * @author Tom Baeyens + */ +public class JmsNonXATopicListener implements JmsTopicListener { + + private static Log log = Log.getLog(JmsNonXATopicListener.class.getName()); + + String topicJndiName = null; + String connectionFactoryJndiName = null; + boolean transacted; + int acknowledgeMode; + TopicConnectionFactory topicConnectionFactory = null; + Topic topic = null; + TopicConnection topicConnection = null; + TopicSession topicSession = null; + TopicSubscriber topicSubscriber = null; + + List<Message> messages = null; + + JmsNonXATopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode) { + this.connectionFactoryJndiName = connectionFactoryJndiName; + this.topicJndiName = topicJndiName; + this.transacted = transacted; + this.acknowledgeMode = acknowledgeMode; + start(); + } + + void start() { + try { + messages = Collections.synchronizedList(new ArrayList<Message>()); + + InitialContext context = new InitialContext(); + topicConnectionFactory = (TopicConnectionFactory) context.lookup(connectionFactoryJndiName); + topic = (Topic) context.lookup(topicJndiName); + topicConnection = topicConnectionFactory.createTopicConnection(); + topicSession = topicConnection.createTopicSession(transacted, acknowledgeMode); + topicSubscriber = topicSession.createSubscriber(topic); + topicSubscriber.setMessageListener(new Listener()); + + topicConnection.start(); + + } catch (Exception e) { + stop(); + throw new RuntimeException("couldn't subscribe message listener to topic '"+topicJndiName+"': "+e.getMessage(), e); + } + } + + private class Listener implements MessageListener { + public void onMessage(Message message) { + messages.add(message); + } + } + + public void stop() { + if ( transacted && (topicSession!=null)) { + try { + topicSession.commit(); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (topicConnection!=null) { + try { + topicConnection.stop(); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (topicSubscriber!=null) { + try { + topicSubscriber.close(); + } catch (Exception e) { + e.printStackTrace(); + } + topicSubscriber = null; + } + if (topicSession!=null) { + try { + topicSession.close(); + } catch (Exception e) { + e.printStackTrace(); + } + topicSession = null; + } + if (topicConnection!=null) { + try { + topicConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } + topicConnection = null; + } + } + + 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"); + } + } + } +} Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsNonXATopicListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -21,141 +21,14 @@ */ package org.jbpm.test; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; -import javax.naming.InitialContext; -import junit.framework.TestCase; - -import org.jbpm.internal.log.Log; - - /** * @author Tom Baeyens */ -public class JmsTopicListener { - - private static Log log = Log.getLog(JmsTopicListener.class.getName()); +public interface JmsTopicListener { - static Map<Object, JmsTopicListener> topicListeners = new HashMap<Object, JmsTopicListener>(); - - String topicJndiName = null; - String connectionFactoryJndiName = null; - boolean transacted; - int acknowledgeMode; - TopicConnectionFactory topicConnectionFactory = null; - Topic topic = null; - TopicConnection topicConnection = null; - TopicSession topicSession = null; - TopicSubscriber topicSubscriber = null; - - List<Message> messages = null; + Message getNextMessage(long timeout); - static Object createJmsTopicListenerKey(String connectionFactoryJndiName, String topicJndiName) { - List<String> topicListenerKey = new ArrayList<String>(); - topicListenerKey.add(connectionFactoryJndiName); - topicListenerKey.add(topicJndiName); - return topicListenerKey; - } - - static JmsTopicListener getJmsTopicListener(String connectionFactoryJndiName, String topicJndiName) { - return topicListeners.get(createJmsTopicListenerKey(connectionFactoryJndiName, topicJndiName)); - } - - JmsTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode) { - this.connectionFactoryJndiName = connectionFactoryJndiName; - this.topicJndiName = topicJndiName; - this.transacted = transacted; - this.acknowledgeMode = acknowledgeMode; - topicListeners.put(createJmsTopicListenerKey(connectionFactoryJndiName, topicJndiName), this); - start(); - } - - void start() { - try { - messages = Collections.synchronizedList(new ArrayList<Message>()); - - InitialContext context = new InitialContext(); - topicConnectionFactory = (TopicConnectionFactory) context.lookup(connectionFactoryJndiName); - topic = (Topic) context.lookup(topicJndiName); - topicConnection = topicConnectionFactory.createTopicConnection(); - topicSession = topicConnection.createTopicSession(transacted, acknowledgeMode); - topicSubscriber = topicSession.createSubscriber(topic); - topicSubscriber.setMessageListener(new Listener()); - - topicConnection.start(); - - } catch (Exception e) { - stop(); - throw new RuntimeException("couldn't subscribe message listener to topic '"+topicJndiName+"': "+e.getMessage(), e); - } - } - - private class Listener implements MessageListener { - public void onMessage(Message message) { - messages.add(message); - } - } - - public void stop() { - if (topicConnection!=null) { - try { - topicConnection.stop(); - } catch (Exception e) { - e.printStackTrace(); - } - } - if (topicSubscriber!=null) { - try { - topicSubscriber.close(); - } catch (Exception e) { - e.printStackTrace(); - } - topicSubscriber = null; - } - if (topicSession!=null) { - try { - topicSession.close(); - } catch (Exception e) { - e.printStackTrace(); - } - topicSession = null; - } - if (topicConnection!=null) { - try { - topicConnection.close(); - } catch (Exception e) { - e.printStackTrace(); - } - topicConnection = null; - } - } - - 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"); - } - } - } -} + void stop(); +} \ No newline at end of file Added: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsXATopicListener.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsXATopicListener.java (rev 0) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsXATopicListener.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -0,0 +1,141 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +import javax.jms.Topic; +import javax.jms.XATopicConnection; +import javax.jms.XATopicConnectionFactory; +import javax.jms.XATopicSession; +import javax.naming.InitialContext; + +import junit.framework.TestCase; + +import org.jbpm.internal.log.Log; + + +/** + * @author Tom Baeyens + */ +public class JmsXATopicListener implements JmsTopicListener { + + private static Log log = Log.getLog(JmsXATopicListener.class.getName()); + + String topicJndiName = null; + String connectionFactoryJndiName = null; + Topic topic = null; + XATopicConnectionFactory topicConnectionFactory = null; + XATopicConnection topicConnection = null; + XATopicSession topicSession = null; + MessageConsumer messageConsumer = null; + + List<Message> messages = null; + + JmsXATopicListener(String connectionFactoryJndiName, String topicJndiName) { + this.connectionFactoryJndiName = connectionFactoryJndiName; + this.topicJndiName = topicJndiName; + start(); + } + + void start() { + try { + messages = Collections.synchronizedList(new ArrayList<Message>()); + + InitialContext context = new InitialContext(); + topicConnectionFactory = (XATopicConnectionFactory) context.lookup(connectionFactoryJndiName); + topic = (Topic) context.lookup(topicJndiName); + topicConnection = topicConnectionFactory.createXATopicConnection(); + topicSession = topicConnection.createXATopicSession(); + messageConsumer = topicSession.createConsumer(topic); + messageConsumer.setMessageListener(new Listener()); + + topicConnection.start(); + + } catch (Exception e) { + stop(); + throw new RuntimeException("couldn't subscribe message listener to topic '"+topicJndiName+"': "+e.getMessage(), e); + } + } + + private class Listener implements MessageListener { + public void onMessage(Message message) { + messages.add(message); + } + } + + public void stop() { + if (topicConnection!=null) { + try { + topicConnection.stop(); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (messageConsumer!=null) { + try { + messageConsumer.close(); + } catch (Exception e) { + e.printStackTrace(); + } + messageConsumer = null; + } + if (topicSession!=null) { + try { + topicSession.close(); + } catch (Exception e) { + e.printStackTrace(); + } + topicSession = null; + } + if (topicConnection!=null) { + try { + topicConnection.close(); + } catch (Exception e) { + e.printStackTrace(); + } + topicConnection = null; + } + } + + 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"); + } + } + } +} Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsXATopicListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsTopicTest.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -22,6 +22,7 @@ package org.jbpm.test.jms; import javax.jms.MapMessage; +import javax.jms.Session; import org.jbpm.test.JbpmCustomCfgTestCase; import org.jbpm.test.JmsTopicListener; @@ -43,7 +44,7 @@ .deploy(); jmsCreateTopic("jms/ConnectionFactory", "topic/ProductTopic"); - jmsTopicListener = jmsStartTopicListener("jms/ConnectionFactory", "topic/ProductTopic"); + jmsTopicListener = jmsStartTopicListener("jms/ConnectionFactory", "topic/ProductTopic", true, Session.AUTO_ACKNOWLEDGE); } protected void tearDown() throws Exception { Modified: 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 2009-12-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -53,7 +53,7 @@ // OK } - jmsAssertQueueEmpty("java:JmsXA", "queue/jbpm-test-queue"); + jmsAssertQueueEmptyXA("java:JmsXA", "queue/jbpm-test-queue", 1000); assertEquals(0, executionService.createProcessInstanceQuery().list().size()); } 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -22,6 +22,7 @@ package org.jbpm.test.jms; import javax.jms.MapMessage; +import javax.jms.Session; import junit.framework.Test; @@ -44,7 +45,7 @@ public void testQueueMapMessage() throws Exception { executionService.startProcessInstanceByKey("JmsQueueMap"); - MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); + MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -25,6 +25,7 @@ import java.util.Map; import javax.jms.ObjectMessage; +import javax.jms.Session; import junit.framework.Test; @@ -51,7 +52,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("object", "this is the object"); executionService.startProcessInstanceByKey("JmsQueueObject", variables); - ObjectMessage objectMessage = (ObjectMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); + ObjectMessage objectMessage = (ObjectMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-24 12:32:25 UTC (rev 6043) @@ -21,11 +21,13 @@ */ package org.jbpm.test.jms; +import javax.jms.Session; import javax.jms.TextMessage; import junit.framework.Test; import org.apache.cactus.ServletTestSuite; +import org.jbpm.pvm.internal.tx.JtaTransaction; import org.jbpm.test.JbpmTestCase; public class QueueTextMessageTest extends JbpmTestCase { @@ -45,7 +47,7 @@ public void testQueueTextMessage() throws Exception { executionService.startProcessInstanceByKey("JmsQueueText"); - TextMessage textMessage = (TextMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); + TextMessage textMessage = (TextMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); assertEquals("This is the body", textMessage.getText()); } } 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.map.process.jpdl.xml 2009-12-24 12:32:25 UTC (rev 6043) @@ -9,6 +9,7 @@ <jms name="send message" connection-factory="java:JmsXA" destination="queue/jbpm-test-queue" + transacted="false" g="96,16,83,52"> <map> <entry> 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.object.process.jpdl.xml 2009-12-24 12:32:25 UTC (rev 6043) @@ -9,6 +9,7 @@ <jms name="send message" connection-factory="java:JmsXA" destination="queue/jbpm-test-queue" + transacted="false" g="96,16,83,52"> <object expr="${object}"/> <transition to="wait" /> 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-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/queue.text.process.jpdl.xml 2009-12-24 12:32:25 UTC (rev 6043) @@ -9,6 +9,7 @@ <jms name="send message" connection-factory="java:JmsXA" destination="queue/jbpm-test-queue" + transacted="false" g="96,16,83,52"> <text>This is the body</text> <transition to="wait" /> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-12-24 11:46:37 UTC (rev 6042) +++ jbpm4/trunk/qa/build.xml 2009-12-24 12:32:25 UTC (rev 6043) @@ -187,6 +187,7 @@ description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> + <ant antfile="${jbpm.home}/install/build.xml" target="enable.jboss.debug" /> <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" /> </target>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6042 - jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-24 06:46:37 -0500 (Thu, 24 Dec 2009) New Revision: 6042 Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java Log: Fix for Hudson Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-24 10:16:10 UTC (rev 6041) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-24 11:46:37 UTC (rev 6042) @@ -48,7 +48,7 @@ // After process start, peter should be a candidate for the task Task requestTasktask = taskService.createTaskQuery().candidate("peter").uniqueResult(); assertNotNull(requestTasktask); - assertEquals("org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl", requestTasktask.getFormResourceName()); + assertEquals("org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl", requestTasktask.getFormResourceName()); // After this task is completed, a manager should be able to see the 'verify' task TaskQuery verifyTaskQuery = taskService.createTaskQuery().candidate("alex"); @@ -56,7 +56,7 @@ taskService.completeTask(requestTasktask.getId()); Task verifyTask = verifyTaskQuery.uniqueResult(); - assertEquals("org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl", verifyTask.getFormResourceName()); + assertEquals("org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl", verifyTask.getFormResourceName()); assertNotNull(verifyTask); // When completing the verification task, we also need to store the result of the decision

14 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-24 05:16:10 -0500 (Thu, 24 Dec 2009) New Revision: 6041 Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml Log: Minor fixes for console Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-24 09:58:24 UTC (rev 6040) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-24 10:16:10 UTC (rev 6041) @@ -81,6 +81,7 @@ <exclude name="org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml" /> <exclude name="org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml" /> <exclude name="org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml" /> + <exclude name="org/jbpm/examples/bpmn/task/script/script_task.bpmn.xml" /> </fileset> </jar> <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" classpathref="jbpm.libs.incl.dependencies" />

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6040 - 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-24 04:58:24 -0500 (Thu, 24 Dec 2009) New Revision: 6040 Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml Log: Minor fixes for console Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-23 15:54:26 UTC (rev 6039) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-24 09:58:24 UTC (rev 6040) @@ -80,6 +80,7 @@ <exclude name="org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway_default_seq_flow.bpmn.xml" /> <exclude name="org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml" /> <exclude name="org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml" /> + <exclude name="org/jbpm/examples/bpmn/task/usertask/user_task_human_performer_variable.bpmn.xml" /> </fileset> </jar> <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" classpathref="jbpm.libs.incl.dependencies" /> 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 15:54:26 UTC (rev 6039) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml 2009-12-24 09:58:24 UTC (rev 6040) @@ -21,7 +21,7 @@ </resourceAssignmentExpression> </potentialOwner> <rendering id="requestForm"> - <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl</jbpm:form> + <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl</jbpm:form> </rendering> </userTask> @@ -37,7 +37,7 @@ </resourceAssignmentExpression> </potentialOwner> <rendering id="verifyForm"> - <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl</jbpm:form> + <jbpm:form>org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl</jbpm:form> </rendering> </userTask>

14 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-23 10:54:26 -0500 (Wed, 23 Dec 2009) New Revision: 6039 Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html Log: Added release notes for 4.3 Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-12-23 15:32:25 UTC (rev 6038) +++ jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-12-23 15:54:26 UTC (rev 6039) @@ -50,13 +50,131 @@ <ul> <li> - DeploymentQuery.PROPERTY_NAME has been removed due to errors when sorting on name on Oracle. + <i>DeploymentQuery.PROPERTY_NAME</i> has been removed due to errors when sorting on name on Oracle + (was already deprecated in a previous release). </li> <li> - DeploymentQuery.deploymentDbId(long dbid) has been changed to DeploymentQuery.deploymentId(String id) + <i>DeploymentQuery.deploymentDbId(long dbid)</i> has been changed to <i>DeploymentQuery.deploymentId(String id)</i> to be conistent with the query API. </li> + <li> + The behaviour of <i>taskService.getOutcomes(taskId)</i> have been changed. See issue + <a href="https://jira.jboss.org/jira/browse/JBPM-2492">[JBPM-2492]</a>. + </li> </ul> + +<h2>Configuration changes</h2> + +<ul> + <li> + <b>Spring integration</b>: Creating a processEngine bean is now done through the + <i>org.jbpm.pvm.internal.processengine.SpringHelper</i> class (instead of the <i>SpringConfiguration</i> class). + See the Spring chapter in the developers guide for more information. + </li> +</ul> + +<h2> Bug +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2491'>JBPM-2491</a>] - Deleting a ProcessInstance having a running Sub-ProcessInstance fails +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2492'>JBPM-2492</a>] - improve task outcomes +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2529'>JBPM-2529</a>] - jBPM-Spring Integration doesn't work for EvenListener-s +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2575'>JBPM-2575</a>] - event-listener propagation attribute not in jpdl-4.0.xsd +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2577'>JBPM-2577</a>] - QuerySyntaxException in HistoryService +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2618'>JBPM-2618</a>] - Source level problem running Ant script: /examples/build.xml +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2628'>JBPM-2628</a>] - Calling executionService.startProcessInstanceByKey with a non-existent key throws an unhelful exception +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2639'>JBPM-2639</a>] - Task with taskform and timer leads to NPE +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2643'>JBPM-2643</a>] - adding tasks not belonging to an execution breaks the console +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2649'>JBPM-2649</a>] - HistoryActivityInstanceQueryImpl references wrong property for processDefinitionId +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2651'>JBPM-2651</a>] - Error on executing a process with sub processes +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2654'>JBPM-2654</a>] - instal.jbpm.into.jboss does not copy the MySQL driver +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2657'>JBPM-2657</a>] - No override of convenience methods in SpringConfiguration +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2683'>JBPM-2683</a>] - Upgrade 4.1 to 4.2 Breaks subprocess - integrity constraint (JBPM_DEV.FK_EXEC_SUBPI) violated - child record found +</li> +</ul> + +<h2> Feature Request +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2412'>JBPM-2412</a>] - extend java activity targets with ejb +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2538'>JBPM-2538</a>] - Make a TaskQuery resuable +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2558'>JBPM-2558</a>] - SpringTransactionInterceptor: Resolve transactionManager by name +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2567'>JBPM-2567</a>] - TaskQuery Should allow to .count() Tasks in addition of .list() them +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2576'>JBPM-2576</a>] - Extending HistorySession - add public getters in HistoryEvents +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2661'>JBPM-2661</a>] - BPMN2: Exclusive gateway +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2662'>JBPM-2662</a>] - BPMN2: parallel gateway +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2663'>JBPM-2663</a>] - BPMN2: service task (Java based) +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2664'>JBPM-2664</a>] - BPMN2: Manual task +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2665'>JBPM-2665</a>] - BPMN2: receive task (java message only) +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2666'>JBPM-2666</a>] - BPMN2: script task +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2667'>JBPM-2667</a>] - BPMN2: User task +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2668'>JBPM-2668</a>] - BPMN2: none start/end event +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2669'>JBPM-2669</a>] - BPMN2: terminate end event +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2670'>JBPM-2670</a>] - BPMN2: sequence flow +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2671'>JBPM-2671</a>] - BPMN2: conditional sequence flow +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2673'>JBPM-2673</a>] - BPMN2: Interface (basic: Java only) +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2674'>JBPM-2674</a>] - BPMN2: resource +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2675'>JBPM-2675</a>] - BPMN2: document 'getting started' +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2676'>JBPM-2676</a>] - BPMN: default sequence flow +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2006'>JBPM-2006</a>] - drools integration +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2300'>JBPM-2300</a>] - jms activity +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2616'>JBPM-2616</a>] - clean up JpdlDeployer +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2623'>JBPM-2623</a>] - remove duplicate inclusion of xsd docs in the distro +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2631'>JBPM-2631</a>] - set up spring hudson job +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2632'>JBPM-2632</a>] - move XPathScriptEngine classes from bpmn to pvm +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2660'>JBPM-2660</a>] - BPMN2: create basic example and document it +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2680'>JBPM-2680</a>] - core.jar creates exception in some nested deployment on jboss +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2684'>JBPM-2684</a>] - automatic saving of updates to serializable variables +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2695'>JBPM-2695</a>] - investigate user testibility of java ejb invoke activity and jms +</li> +</ul> <h1>Release Notes for jBPM 4.2</h1> @@ -218,7 +336,7 @@ <ul> <li> - Calling <i>taskService.completeTask(String taskId, String outcome)</i>i> with an unexisting outcome will + Calling <i>taskService.completeTask(String taskId, String outcome)</i> with an unexisting outcome will throw an exception instead of suspending the process instance. (see <a href="https://jira.jboss.org/jira/browse/JBPM-2425">[JBPM-2425]</a>) </li> </ul>

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6038 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-12-23 10:32:25 -0500 (Wed, 23 Dec 2009) New Revision: 6038 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java Log: Quick fix for count() on ProcessDefinitionQuery Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-12-23 15:18:07 UTC (rev 6037) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-12-23 15:32:25 UTC (rev 6038) @@ -144,6 +144,11 @@ public ProcessDefinition uniqueResult() { return (ProcessDefinition) untypedUniqueResult(); } + + @Override + public long count() { + return list().size(); // TODO: change this to a real db count, as with the other query types + } public ProcessDefinitionQuery processDefinitionId(String id) { this.id = id;

14 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-23 10:18:07 -0500 (Wed, 23 Dec 2009) New Revision: 6037 Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.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/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 Log: JBPM-2695 jms docs refinements 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-23 15:17:13 UTC (rev 6036) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-23 15:18:07 UTC (rev 6037) @@ -953,18 +953,36 @@ <entry>connection-factory</entry> <entry>jndi name</entry> <entry></entry> - <entry>true</entry> - <entry>the jndi name of the jms connection factory. + <entry><emphasis role="bold">required</emphasis></entry> + <entry>the JNDI name of the jms connection factory. </entry> </row> <row> <entry>destination</entry> <entry>jndi name</entry> <entry></entry> + <entry><emphasis role="bold">required</emphasis></entry> + <entry>the JNDI name of the jms queue or topic. + </entry> + </row> + <row> + <entry>transacted</entry> + <entry>boolean: {true, false}</entry> <entry>true</entry> - <entry>the jndi name of the jms queue or topic. + <entry>optional</entry> + <entry>Specifies if JMS message send should happen transactional. + @see QueueConnection.createQueueSession(boolean transactional, int acknowledgeMode) </entry> </row> + <row> + <entry>acknowledge</entry> + <entry>{ auto | client | dups-ok }</entry> + <entry>auto</entry> + <entry>optional</entry> + <entry>Specifies the acknowledge mode + <ulink url="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueConnection.html#crea...">@see QueueConnection.createQueueSession(boolean transactional, int acknowledgeMode)</ulink> + </entry> + </row> </tbody> </tgroup> </table> @@ -1042,13 +1060,17 @@ <para>Following test helper methods are based solely on plain JMS apis and hence they work in a standalone environment as well as in an appserver environment:</para> <itemizedlist> - <listitem>Object jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName)</listitem> - <listitem>TODO jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName)</listitem> - <listitem>void jmsStopTopicListener(String connectionFactoryJndiName, String topicJndiName)</listitem> + <listitem>JbpmTestCase.jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName)</listitem> + <listitem>JbpmTestCase.jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, boolean transacted, int acknowledgeMode, long timeout)</listitem> + <listitem>JbpmTestCase.jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName)</listitem> + <listitem>JbpmTestCase.jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode)</listitem> + <listitem>JmsTopicListener.getNextMesssage(long timeout)</listitem> + <listitem>JmsTopicListener.stop()</listitem> </itemizedlist> <para>For example, after the process execution has executed the <literal>jms</literal> activity, messages can be asserted like this:</para> - <programlisting>MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("jms/ConnectionFactory", "queue/ProductQueue"); + <programlisting>MapMessage mapMessage = (MapMessage) + jmsConsumeMessageFromQueue("java:/JmsXA", "queue/ProductQueue"); assertEquals("shampoo", mapMessage.getString("product"));</programlisting> <para>The following jms helper methods are based on mockrunner and hence they only work in a standalone environment:</para> @@ -1062,32 +1084,30 @@ <para>For example, a queue can be created and removed in the setup and tearDown methods of a test like this:</para> <programlisting>protected void setUp() throws Exception { super.setUp(); - jmsCreateQueue("jms/ConnectionFactory", "queue/ProductQueue"); + jmsCreateQueue("java:/JmsXA", "queue/ProductQueue"); } protected void tearDown() throws Exception { - jmsRemoveQueue("jms/ConnectionFactory", "queue/ProductQueue"); + jmsRemoveQueue("java:/JmsXA", "queue/ProductQueue"); super.tearDown(); }</programlisting> </section> - <section id="jms.text"> + <section id="testmessages"> <title>Text messages</title> - <para> The first possibility of sending JMS messages is to use text as its payload. In this case a JMS <literal>TextMessage</literal> will be created and sent to the specified destination. Consider the following process definition: </para> - - <programlisting><process name="JMS_text_queue"> + <programlisting><process name="JmsQueueText"> <start> <transition to="send message"/> </start> <emphasis role="bold"><jms name="send message" - connection-factory="ConnectionFactory" + connection-factory="java:JmsXA" destination="queue/jbpm-test-queue"> <text>This is the body</text> <transition to="wait"/> @@ -1096,56 +1116,38 @@ <state name="wait"/> </process></programlisting> - <para> As you may expect and as is shown in the following test case starting this process will cause the JMS node to send a message to the queue with the name "queue/jbpm-test-queue". - The factory used to create a connection to connect to this queue is named "ConnectionFactory". + The factory used to create a connection to connect to this queue is named "java:JmsXA". The payload of the message is the text string "This is the body". </para> - - <programlisting>public void testTextMessage() throws Exception { - Context context = new InitialContext(); - Connection connection = (Connection)context.lookup("ConnectionFactory"); - connection.start(); - Session session = connection.createSession(false, QueueSession.AUTO_ACKNOWLEDGE); - Queue queue = (Queue)context.lookup("queue/jbpm-test-queue"); - MessageConsumer messageConsumer = session.createConsumer(queue); - - <emphasis role="bold">executionService.startProcessInstanceByKey("JMS_text_queue"); - TextMessage textMessage = (TextMessage)messageConsumer.receive(); - assertEquals("This is the body", textMessage.getText());</emphasis> - - connection.stop(); - session.close(); - connection.close(); -}</programlisting> + <programlisting>executionService.startProcessInstanceByKey("JmsQueueText"); +TextMessage textMessage = (TextMessage) + jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); +assertEquals("This is the body", textMessage.getText());</programlisting> <para> The relevant code is shown above in boldface. The rest of the method is boilerplate code needed to setup a message consumer. We will omit this code in the subsequent examples. </para> - </section> - <section id="jms.object"> - + <section id="objectmessages"> <title>Object messages</title> - <para> The second possibility is to use a serializable object as the payload of the message. In this case a JMS <literal>ObjectMessage</literal> will be created and sent to the specified destination. Consider the following process definition: </para> + <programlisting><process name="JmsQueueObject"> - <programlisting><process name="JMS_object_queue"> - <start> <transition to="send message"/> </start> <emphasis role="bold"><jms name="send message" - connection-factory="ConnectionFactory" + connection-factory="java:JmsXA" destination="queue/jbpm-test-queue"> <object expr="${object}"/> <transition to="wait"/> @@ -1154,48 +1156,36 @@ <state name="wait"/> </process></programlisting> - <para> As in the previous case a message will be sent to the queue with the name "queue/jbpm-test-queue". - Also again a factory used to create a connection to connect to this queue is named "ConnectionFactory". + Also again a factory used to create a connection to connect to this queue is named "java:JmsXA". But in this case the payload of the message is the serializable object that is obtained by evaluating the expression specified by the <literal>expr</literal> attribute. This is illustrated in the test case below. </para> - - <programlisting>public void testQueueMessage() throws Exception -{ - // as before - ... - <emphasis role="bold">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());</emphasis> - - // as before - ... -}</programlisting> + <programlisting>Map<String, Object> variables = new HashMap<String, Object>(); +variables.put("object", "this is the object"); +executionService.startProcessInstanceByKey("JmsQueueObject", variables); +ObjectMessage objectMessage = (ObjectMessage) + jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); +assertEquals("this is the object", objectMessage.getObject());</programlisting> </section> - <section id="jms.map"> - + <section id="mapmessages"> <title>Map messages</title> - <para> In this third possibility the payload is constituted by the key-value entries of a map. This time a JMS <literal>MapMessage</literal> will be created and sent to the specified destination. Consider the following process definition: </para> + <programlisting><process name="JmsQueueMap"> - <programlisting><process name="JMS_map_queue"> - <start> <transition to="send message"/> </start> <emphasis role="bold"><jms name="send message" - connection-factory="ConnectionFactory" + connection-factory="java:JmsXA" destination="queue/jbpm-test-queue"> <map> <entry> @@ -1209,27 +1199,18 @@ <state name="wait"/> </process></programlisting> - <para> Again a message will be sent to the queue with the name "queue/jbpm-test-queue" and the - factory used to create a connection to connect to this queue is named "ConnectionFactory". + factory used to create a connection to connect to this queue is named "java:JmsXA". In this case the payload of the message are the specified key-value pairs of the map. It is illustrated in the test case below. </para> - - <programlisting>public void testMapMessage() throws Exception -{ - // as before - ... - <emphasis role="bold">executionService.startProcessInstanceByKey("JMS_map_queue"); - MapMessage mapMessage = (MapMessage)messageConsumer.receive(); - assertTrue(mapMessage.itemExists("x")); - assertEquals("foo", mapMessage.getObject("x"));</emphasis> - - // as before - ... -}</programlisting> + <programlisting>executionService.startProcessInstanceByKey("JmsQueueMap"); +MapMessage mapMessage = (MapMessage) + jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); +assertTrue(mapMessage.itemExists("x")); +assertEquals("foo", mapMessage.getObject("x"));</programlisting> </section> </section> 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 15:17:13 UTC (rev 6036) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-12-23 15:18:07 UTC (rev 6037) @@ -135,9 +135,13 @@ } public static JmsTopicListener jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName) { - return new JmsTopicListener(connectionFactoryJndiName, topicJndiName); + return jmsStartTopicListener(connectionFactoryJndiName, topicJndiName, true, 1); } + public static JmsTopicListener jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode) { + return new JmsTopicListener(connectionFactoryJndiName, topicJndiName, transacted, acknowledgeMode); + } + public static void jmsRemoveTopic(String connectionFactoryJndiName, String topicJndiName) { JmsExtensions.removeTopic(connectionFactoryJndiName, topicJndiName); } 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 15:17:13 UTC (rev 6036) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsTopicListener.java 2009-12-23 15:18:07 UTC (rev 6037) @@ -29,7 +29,6 @@ import javax.jms.Message; import javax.jms.MessageListener; -import javax.jms.QueueSession; import javax.jms.Topic; import javax.jms.TopicConnection; import javax.jms.TopicConnectionFactory; @@ -52,6 +51,9 @@ static Map<Object, JmsTopicListener> topicListeners = new HashMap<Object, JmsTopicListener>(); String topicJndiName = null; + String connectionFactoryJndiName = null; + boolean transacted; + int acknowledgeMode; TopicConnectionFactory topicConnectionFactory = null; Topic topic = null; TopicConnection topicConnection = null; @@ -71,21 +73,24 @@ return topicListeners.get(createJmsTopicListenerKey(connectionFactoryJndiName, topicJndiName)); } - JmsTopicListener(String connectionFactoryJndiName, String topicJndiName) { - start(connectionFactoryJndiName, topicJndiName); + JmsTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode) { + this.connectionFactoryJndiName = connectionFactoryJndiName; + this.topicJndiName = topicJndiName; + this.transacted = transacted; + this.acknowledgeMode = acknowledgeMode; topicListeners.put(createJmsTopicListenerKey(connectionFactoryJndiName, topicJndiName), this); + start(); } - void start(String connectionFactoryJndiName, String topicJndiName) { + void start() { try { messages = Collections.synchronizedList(new ArrayList<Message>()); - this.topicJndiName = topicJndiName; InitialContext context = new InitialContext(); topicConnectionFactory = (TopicConnectionFactory) context.lookup(connectionFactoryJndiName); topic = (Topic) context.lookup(topicJndiName); topicConnection = topicConnectionFactory.createTopicConnection(); - topicSession = topicConnection.createTopicSession(true, QueueSession.AUTO_ACKNOWLEDGE); + topicSession = topicConnection.createTopicSession(transacted, acknowledgeMode); topicSubscriber = topicSession.createSubscriber(topic); topicSubscriber.setMessageListener(new Listener()); Modified: 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 2009-12-23 15:17:13 UTC (rev 6036) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java 2009-12-23 15:18:07 UTC (rev 6037) @@ -45,7 +45,7 @@ .deploy()); } - public void testQueueMessage() throws Exception { + public void testQueueMessageException() throws Exception { try { executionService.startProcessInstanceByKey("JmsQueueException"); fail("expected exception"); 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 15:17:13 UTC (rev 6036) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2009-12-23 15:18:07 UTC (rev 6037) @@ -42,7 +42,7 @@ registerDeployment(repositoryService.createDeployment().addResourceFromClasspath("org/jbpm/test/jms/queue.map.process.jpdl.xml").deploy()); } - public void testJmsText() throws Exception { + public void testQueueMapMessage() throws Exception { executionService.startProcessInstanceByKey("JmsQueueMap"); MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertTrue(mapMessage.itemExists("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 15:17:13 UTC (rev 6036) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2009-12-23 15:18:07 UTC (rev 6037) @@ -47,7 +47,7 @@ .deploy()); } - public void testQueueMessage() throws Exception { + public void testQueueObjectMessage() throws Exception { Map<String, Object> variables = new HashMap<String, Object>(); variables.put("object", "this is the object"); executionService.startProcessInstanceByKey("JmsQueueObject", variables); 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 15:17:13 UTC (rev 6036) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2009-12-23 15:18:07 UTC (rev 6037) @@ -43,7 +43,7 @@ .deploy()); } - public void testQueueMessage() throws Exception { + public void testQueueTextMessage() throws Exception { executionService.startProcessInstanceByKey("JmsQueueText"); TextMessage textMessage = (TextMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue"); assertEquals("This is the body", textMessage.getText());

14 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r6036 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/api/history and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-12-23 10:17:13 -0500 (Wed, 23 Dec 2009) New Revision: 6036 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java Log: JBPM-2567 changed return type of queries .count() from Long to long Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -38,17 +38,26 @@ /** only select suspended deployments */ DeploymentQuery suspended(); + /** only select non-suspended deployments */ DeploymentQuery notSuspended(); + /** order results ascending for property {@link #PROPERTY_TIMESTAMP} + * or {@link #PROPERTY_STATE} */ DeploymentQuery orderAsc(String property); + + /** order results descending for property {@link #PROPERTY_TIMESTAMP} + * or {@link #PROPERTY_STATE} */ DeploymentQuery orderDesc(String property); + /** only select a specific page */ DeploymentQuery page(int firstResult, int maxResults); + /** execute the query and get the result list */ List<Deployment> list(); + /** execute the query and get the unique result */ Deployment uniqueResult(); - /** Returns the count for this query. */ - Long count(); + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -70,7 +70,6 @@ /** execute the query and get the unique result */ Job uniqueResult(); - /** Returns the count for the query. */ - Long count(); - + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -77,4 +77,6 @@ /** execute the query and obtain the unique {@link ProcessDefinition} */ ProcessDefinition uniqueResult(); + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -63,7 +63,6 @@ /** execute the query and obtain the unique {@link ProcessInstance} */ ProcessInstance uniqueResult(); - /** execute the query and return the count */ - Long count(); - + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -83,8 +83,8 @@ /** order selected tasks descending for certain {@link #PROPERTY_NAME properties} */ TaskQuery orderDesc(String property); - /** does a count(*) on the given query. */ - Long count(); + /** execute a count(*) query and returns number of results */ + long count(); /** execute the query and obtain the list of {@link Task}s */ List<Task> list(); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -79,6 +79,6 @@ /** execute the query and obtain the unique {@link HistoryActivityInstance} */ HistoryActivityInstance uniqueResult(); - /** Returns the count of this query. */ - Long count(); + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -70,4 +70,6 @@ /** execute the query and obtain the unique {@link HistoryDetail} */ HistoryDetail uniqueResult(); + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -70,7 +70,6 @@ /** execute the query and obtain the unique {@link HistoryProcessInstance} */ HistoryProcessInstance uniqueResult(); - /** Return the count of the query. */ - Long count(); - + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -90,7 +90,6 @@ /** execute the query and obtain the unique {@link HistoryTask} */ HistoryTask uniqueResult(); - /** Return the count for this query. */ - Long count(); - + /** execute a count(*) query and returns number of results */ + long count(); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -118,7 +118,7 @@ * - add the operation signature to their interface * - use the 'count' variable in their hql() method. */ - public Long count() { + public long count() { count = true; // Page and count cannot be used together, because paging is applied after the query is formed Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -99,16 +99,16 @@ public void testCount() { List<String> deploymentIds = deployTestProcesses(); - assertEquals(new Long(3L), repositoryService.createDeploymentQuery().count()); + assertEquals(3, repositoryService.createDeploymentQuery().count()); for (String deploymentId : deploymentIds) { - assertEquals(new Long(1L), repositoryService.createDeploymentQuery().deploymentId(deploymentId).count()); + assertEquals(1, repositoryService.createDeploymentQuery().deploymentId(deploymentId).count()); } Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0)).uniqueResult(); repositoryService.suspendDeployment(deployment.getId()); - assertEquals(new Long(1L), repositoryService.createDeploymentQuery().suspended().count()); - assertEquals(new Long(2L), repositoryService.createDeploymentQuery().notSuspended().count()); + assertEquals(1, repositoryService.createDeploymentQuery().suspended().count()); + assertEquals(2, repositoryService.createDeploymentQuery().notSuspended().count()); deleteCascade(deploymentIds); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -175,22 +175,22 @@ public void testCount() { List<String> procInstIds = deployStartAndSignalTestProcesses(); - assertEquals(new Long(9L), historyService.createHistoryActivityInstanceQuery().count()); - assertEquals(new Long(4L), historyService.createHistoryActivityInstanceQuery().activityName("a").count()); - assertEquals(new Long(3L), historyService.createHistoryActivityInstanceQuery().activityName("b").count()); - assertEquals(new Long(2L), historyService.createHistoryActivityInstanceQuery().activityName("c").count()); - assertEquals(new Long(0L), historyService.createHistoryActivityInstanceQuery().activityName("d").count()); + assertEquals(9, historyService.createHistoryActivityInstanceQuery().count()); + assertEquals(4, historyService.createHistoryActivityInstanceQuery().activityName("a").count()); + assertEquals(3, historyService.createHistoryActivityInstanceQuery().activityName("b").count()); + assertEquals(2, historyService.createHistoryActivityInstanceQuery().activityName("c").count()); + assertEquals(0, historyService.createHistoryActivityInstanceQuery().activityName("d").count()); - assertEquals(new Long(3L), historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(0)).count()); - assertEquals(new Long(3L), historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(1)).count()); - assertEquals(new Long(2L), historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(2)).count()); - assertEquals(new Long(1L), historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(3)).count()); + assertEquals(3, historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(0)).count()); + assertEquals(3, historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(1)).count()); + assertEquals(2, historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(2)).count()); + assertEquals(1, historyService.createHistoryActivityInstanceQuery().executionId(procInstIds.get(3)).count()); - assertEquals(new Long(1L), historyService.createHistoryActivityInstanceQuery() + assertEquals(1, historyService.createHistoryActivityInstanceQuery() .executionId(procInstIds.get(0)).activityName("a").count()); - assertEquals(new Long(1L), historyService.createHistoryActivityInstanceQuery() + assertEquals(1, historyService.createHistoryActivityInstanceQuery() .executionId(procInstIds.get(0)).activityName("b").count()); - assertEquals(new Long(1L), historyService.createHistoryActivityInstanceQuery() + assertEquals(1, historyService.createHistoryActivityInstanceQuery() .executionId(procInstIds.get(0)).activityName("c").count()); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -64,12 +64,12 @@ public void testCount() { List<String> procInstIds = createTestHistoryProcessInstances(7); - assertEquals(new Long(0L), historyService.createHistoryProcessInstanceQuery().processDefinitionId("-1").count()); + assertEquals(0, historyService.createHistoryProcessInstanceQuery().processDefinitionId("-1").count()); - assertEquals(new Long(7L), historyService.createHistoryProcessInstanceQuery().count()); + assertEquals(7, historyService.createHistoryProcessInstanceQuery().count()); for (String id : procInstIds) { - assertEquals(new Long(1L), historyService.createHistoryProcessInstanceQuery().processInstanceId(id).count()); + assertEquals(1, historyService.createHistoryProcessInstanceQuery().processInstanceId(id).count()); } } @@ -138,7 +138,5 @@ procInstIds.add(executionService.startProcessInstanceByKey("theProcess", "theProcess-" + i).getId()); } return procInstIds; - } - } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -89,18 +89,18 @@ public void testCount() { List<String> taskIds = createTestHistoryTasks(); - assertEquals(new Long(3L), historyService.createHistoryTaskQuery().count()); - assertEquals(new Long(1L), historyService.createHistoryTaskQuery().assignee("Tom").count()); + assertEquals(3, historyService.createHistoryTaskQuery().count()); + assertEquals(1, historyService.createHistoryTaskQuery().assignee("Tom").count()); for (String taskid : taskIds) { - assertEquals(new Long(1L), historyService.createHistoryTaskQuery().taskId(taskid).count()); + assertEquals(1, historyService.createHistoryTaskQuery().taskId(taskid).count()); } - assertEquals(new Long(0L), historyService.createHistoryTaskQuery().startedBefore(new Date(CLOCK_TEST_TIME - 10000L)).count()); - assertEquals(new Long(1L), + assertEquals(0, historyService.createHistoryTaskQuery().startedBefore(new Date(CLOCK_TEST_TIME - 10000L)).count()); + assertEquals(1, historyService.createHistoryTaskQuery().startedAfter(new Date(CLOCK_TEST_TIME - 10000L)) .taskId(taskIds.get(0)).count()); - assertEquals(new Long(0L), + assertEquals(0, historyService.createHistoryTaskQuery().startedAfter(new Date(CLOCK_TEST_TIME - 10000L)) .taskId("-1").count()); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -133,12 +133,12 @@ public void testCount() { List<String> procInstIds = startTestProcessInstances(6); - assertEquals(new Long(6L), managementService.createJobQuery().count()); - assertEquals(new Long(6L), managementService.createJobQuery().timers().count()); + assertEquals(6, managementService.createJobQuery().count()); + assertEquals(6, managementService.createJobQuery().timers().count()); for (String id : procInstIds) { - assertEquals(new Long(1L), managementService.createJobQuery().processInstanceId(id).count()); - assertEquals(new Long(1L), managementService.createJobQuery().processInstanceId(id).timers().count()); + assertEquals(1, managementService.createJobQuery().processInstanceId(id).count()); + assertEquals(1, managementService.createJobQuery().processInstanceId(id).timers().count()); } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -199,14 +199,14 @@ Map<String, ArrayList<String>> processInstanceIds = startTestProcesses(4, 6); List<String> idsForTestProcess1 = processInstanceIds.get(TEST_PROCESS_1_KEY); - assertEquals(new Long(10L), executionService.createProcessInstanceQuery().count()); + assertEquals(10, executionService.createProcessInstanceQuery().count()); for (String processInstanceId : idsForTestProcess1) { - assertEquals(new Long(1L), executionService.createProcessInstanceQuery().processInstanceId(processInstanceId).count()); + assertEquals(1, executionService.createProcessInstanceQuery().processInstanceId(processInstanceId).count()); } for (int i = 0; i < 6; i++) { - assertEquals(new Long(1L), executionService.createProcessInstanceQuery().processInstanceKey(TEST_PROCESS_2_KEY + "-" + i).count()); + assertEquals(1, executionService.createProcessInstanceQuery().processInstanceKey(TEST_PROCESS_2_KEY + "-" + i).count()); } try { Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java 2009-12-23 15:14:21 UTC (rev 6035) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java 2009-12-23 15:17:13 UTC (rev 6036) @@ -126,8 +126,8 @@ } TaskQuery taskQuery = taskService.createTaskQuery(); - assertEquals(new Long(30L), taskQuery.count()); - assertEquals(new Long(15L), taskQuery.assignee(assignee).count()); + assertEquals(30, taskQuery.count()); + assertEquals(15, taskQuery.assignee(assignee).count()); deleteTasks(tasks); }

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