JBoss JBPM SVN: r5995 - jbpm4/trunk/modules/jpdl/src/main/resources.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-12-18 11:15:40 -0500 (Fri, 18 Dec 2009)
New Revision: 5995
Modified:
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml
Log:
JBPM-2300 added jms automatic activity as event listener
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml 2009-12-18 13:45:06 UTC (rev 5994)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml 2009-12-18 16:15:40 UTC (rev 5995)
@@ -30,5 +30,6 @@
<eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" />
<eventlistener binding="org.jbpm.jpdl.internal.activity.MailBinding" />
<eventlistener binding="org.jbpm.jpdl.internal.activity.AssignBinding" />
+ <eventlistener binding="org.jbpm.jpdl.internal.activity.JmsBinding" />
</bindings>
16 years, 4 months
JBoss JBPM SVN: r5994 - in jbpm4/trunk/modules/examples/src/test: java/org/jbpm/examples/jms and 2 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-12-18 08:45:06 -0500 (Fri, 18 Dec 2009)
New Revision: 5994
Removed:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/jms/map/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/jms/object/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/jms/text/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ejb/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/jms/map/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/jms/object/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/jms/text/
Log:
removed failing enterprise tests from examples module (should go into separate enterprise module)
16 years, 4 months
JBoss JBPM SVN: r5993 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-12-18 08:39:09 -0500 (Fri, 18 Dec 2009)
New Revision: 5993
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java
Log:
JBPM-2628 fixed a bug in RepositoryCacheImpl that resulted in a java.util.ConcurrentModificationException
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java 2009-12-18 13:32:23 UTC (rev 5992)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java 2009-12-18 13:39:09 UTC (rev 5993)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -69,7 +70,7 @@
public Set<String> getCachedDeploymentIds() {
if (deployments != null) {
- return deployments.keySet();
+ return new HashSet<String>(deployments.keySet());
}
return Collections.emptySet();
}
16 years, 4 months
JBoss JBPM SVN: r5992 - in jbpm4/trunk/modules: devguide/src/main/docbook/en/images and 1 other directories.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-18 08:32:23 -0500 (Fri, 18 Dec 2009)
New Revision: 5992
Added:
jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.default.sequence.flow.png
jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.sequence.flow.png
Modified:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml
Log:
JBPM-2676, JBPM-2671, JBPM-2670: documented sequence flow, default sequence flow and conditional sequence flow
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-18 13:16:19 UTC (rev 5991)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-18 13:32:23 UTC (rev 5992)
@@ -259,15 +259,13 @@
}
}
- // 8.2.5 of the spec document
if (conditionElement != null) {
String type = conditionElement.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "type");
if ("bpmn:tFormalExpression".equals(type) || "tFormalExpression".equals(type)) {
String expr = conditionElement.getTextContent();
String lang = XmlUtil.attribute(conditionElement, "language");
- // TODO: add looking up the default language in the document if lang
- // is null.
+ // TODO: add looking up the default language in the document under definitions if lang is null.
ExpressionCondition expressionCondition = new ExpressionCondition();
expressionCondition.setExpression(expr);
Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.default.sequence.flow.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.default.sequence.flow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.sequence.flow.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/bpmn2.sequence.flow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml 2009-12-18 13:16:19 UTC (rev 5991)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Bpmn2.xml 2009-12-18 13:32:23 UTC (rev 5992)
@@ -362,6 +362,66 @@
</section>
+ <section id="sequenceFlow">
+
+ <title>Sequence Flow</title>
+
+ <para>
+ A sequence flow is the connection between events, activities and gateways shown as a
+ solid line with an arrow in a BPMN diagram (JPDL equivalent is the transition).
+ Each sequence flow has exactly one <emphasis role="bold">source</emphasis> and exactly one
+ <emphasis role="bold">target</emphasis> reference, that contains the <emphasis role="bold">id</emphasis>
+ of an activity, event or gateway.
+ <programlisting>
+<sequenceFlow id="myFlow" name="My Flow"
+ sourceRef="sourceId" targetRef="targetId" />
+ </programlisting>
+ </para>
+
+ <para>
+ An important difference with JPDL is the behaviour of multiple outgoing sequence flows.
+ In JPDL, only one transition is selected as outgoing transition, unless the activity
+ is a fork (or a custom activity with fork behaviour). However, in BPMN, the standard behaviour
+ of multiple outgoing sequence flow is to split the incoming token ('execution' in jBPM
+ terminology) into a collection of tokens, one for each outgoing sequence flow. In the following
+ situation, after completing the first task, there will be three tasks activated instead of one.
+ <mediaobject><imageobject><imagedata align="center" fileref="images/bpmn2.sequence.flow.png"/></imageobject></mediaobject>
+ To avoid that a certain sequence flow is taken, one has to add a condition to the sequence flow.
+ At runtime, only when the condition evaluates to true, that sequence flow will
+ be taken.
+ </para>
+
+ <para>
+ To put a condition on a sequence flow, add a <emphasis role="bold">conditionExpression
+ </emphasis> element to the sequence flow. Conditions are to be put between <emphasis role="bold">
+ ${}</emphasis>.
+ <programlisting>
+<sequenceFlow id=....>
+ <conditionExpression xsi:type="tFormalExpression">${amount >= 500} />
+</sequenceFlow>
+ </programlisting>
+ Note that is currently is necessary to add the <emphasis role="bold">
+ xsi:type="tFormalExpression"</emphasis> to the <emphasis role="bold">
+ conditionExpression</emphasis>. This is not 100% BPMN specification compliant, but we'll
+ work this out in a next release.
+ </para>
+
+ <para>
+ Activities (such as the user task) and gateways (such as the exclusive gateway) can have a
+ default sequence flow. This default sequence flow is taken only when all the other outgoing
+ sequence flow from an activity or gateway have a condition that evaluate to false. A
+ default sequence flow is graphically visualized as a sequence flow with a 'slash marker".
+ <mediaobject><imageobject><imagedata align="center" fileref="images/bpmn2.default.sequence.flow.png"/></imageobject></mediaobject>
+ The default sequence flow is specified by filling in the <emphasis role="bold">'default'
+ </emphasis> attribute of the activity or gateway.
+ </para>
+
+ <para>
+ Also note that an expression on a default sequence flow is ignored.
+ </para>
+
+ </section>
+
<section id="gateway">
<title>Gateways</title>
@@ -386,7 +446,7 @@
<para>
An exclusive gateway represents an <emphasis role="bold">exclusive decision</emphasis>
in the process. Exactly one outgoing sequence flow will be taken, depending on the conditions
- defined on the sequence flows.
+ defined on the sequence flow.
</para>
<para>
@@ -400,11 +460,11 @@
<para>
The following diagram shows the usage of an exclusive gateway: depending on the value of the
- amount variable, one of the three outgoing sequence flows out of the exclusive gateway
+ amount variable, one of the three outgoing sequence flow out of the exclusive gateway
is chosen.
<mediaobject><imageobject><imagedata align="center" fileref="images/bpmn2.exclusive.gateway.png"/></imageobject></mediaobject>
The corresponding executable XML of this process looks as follows.
- Note that the conditions are defined on the sequence flows. The exclusive gateway will select
+ Note that the conditions are defined on the sequence flow. The exclusive gateway will select
the single sequence flow for which its condition evaluates to true. If multiple conditions
evaluate to true, the first one encountered will be taken (a log message will indicate
this situation).
@@ -451,12 +511,12 @@
</para>
<para>
- The exclusive gateway requires that all outgoing sequence flows have conditions defined
+ The exclusive gateway requires that all outgoing sequence flow have conditions defined
on them. An exception to this rule is the default sequence flow, as defined above.
The exclusive gateway also has a shortcut attribute to define such a default sequence flow.
Use the <emphasis role="bold">default attribute</emphasis> to reference an existing
<emphasis role="bold">id of a sequence flow</emphasis>. This sequence flow will be taken
- when the conditions on the other outgoing sequence flows all evaluate to false.
+ when the conditions on the other outgoing sequence flow all evaluate to false.
<programlisting>
<exclusiveGateway id="decision" name="decideBasedOnAmountAndBankType" default="myFlow"/>
16 years, 4 months
JBoss JBPM SVN: r5991 - jbpm4/trunk/modules/distro/src/main/files/examples.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-12-18 08:16:19 -0500 (Fri, 18 Dec 2009)
New Revision: 5991
Modified:
jbpm4/trunk/modules/distro/src/main/files/examples/build.xml
Log:
JBPM-2618 fixed Source level problem running Ant script: /examples/build.xml
Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-18 13:03:39 UTC (rev 5990)
+++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-18 13:16:19 UTC (rev 5991)
@@ -83,6 +83,7 @@
<mkdir dir="${jbpm.home}/examples/target/classes" />
<javac srcdir="${jbpm.home}/examples/src"
destdir="${jbpm.home}/examples/target/classes"
+ source="1.5"
classpathref="jbpm.libs.incl.dependencies" />
<copy todir="${jbpm.home}/examples/target/classes">
<fileset dir="${jbpm.home}/examples/src">
16 years, 4 months
JBoss JBPM SVN: r5990 - jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-12-18 08:03:39 -0500 (Fri, 18 Dec 2009)
New Revision: 5990
Modified:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java
Log:
JBPM-2577 verified QuerySyntaxException in HistoryService. added test to HistoryDetailQueryTest
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java 2009-12-18 12:41:26 UTC (rev 5989)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java 2009-12-18 13:03:39 UTC (rev 5990)
@@ -23,13 +23,11 @@
import java.util.List;
-import org.jbpm.api.cmd.Environment;
+import org.jbpm.api.ProcessInstance;
import org.jbpm.api.history.HistoryComment;
import org.jbpm.api.history.HistoryDetail;
import org.jbpm.api.history.HistoryDetailQuery;
-import org.jbpm.api.history.HistoryTask;
import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.test.JbpmTestCase;
import org.jbpm.test.assertion.QueryAssertions;
@@ -39,6 +37,34 @@
*/
public class HistoryDetailQueryTest extends JbpmTestCase {
+ public void testProcessInstance() {
+ deployJpdlXmlString(
+ "<process name='HistoryDetails'>" +
+ " <start>" +
+ " <transition to='review' />" +
+ " </start>" +
+ " <task name='review' " +
+ " assignee='johndoe'>" +
+ " <transition to='wait' />" +
+ " </task>" +
+ " <state name='wait'/>" +
+ "</process>"
+ );
+
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("HistoryDetails");
+ String pid = processInstance.getId();
+
+ List<HistoryDetail> processInstanceHistoryDetails = historyService
+ .createHistoryDetailQuery()
+ .processInstanceId(pid)
+ .list();
+
+ // at this moment, there are not process instance details
+ // but this test already checks if the query works ok
+ assertNotNull(processInstanceHistoryDetails);
+ assertEquals(0, processInstanceHistoryDetails.size());
+ }
+
public void testTaskCommentDetail() {
deployJpdlXmlString(
"<process name='TaskCommentDetail'>" +
@@ -101,9 +127,7 @@
.list();
}
-
public void testOrderBy() {
-
Task task = taskService.newTask();
taskService.saveTask(task);
16 years, 4 months
JBoss JBPM SVN: r5989 - in jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test: jms and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-12-18 07:41:26 -0500 (Fri, 18 Dec 2009)
New Revision: 5989
Modified:
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java
Log:
changed tabs with spaces
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java 2009-12-18 10:16:56 UTC (rev 5988)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java 2009-12-18 12:41:26 UTC (rev 5989)
@@ -6,7 +6,7 @@
import org.jbpm.test.JbpmTestCase;
public class EjbTest extends JbpmTestCase {
-
+
public static Test suite() {
ServletTestSuite servletTestSuite = new ServletTestSuite();
servletTestSuite.addTestSuite(EjbTest.class);
@@ -20,12 +20,11 @@
.deploy());
}
- public void testEjbInvocation() throws Exception {
+ public void testEjbInvocation() throws Exception {
String executionId = executionService
.startProcessInstanceByKey("EJB")
.getProcessInstance()
.getId();
- assertEquals(59, executionService.getVariable(executionId, "answer"));
- }
-
+ assertEquals(59, executionService.getVariable(executionId, "answer"));
+ }
}
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java 2009-12-18 10:16:56 UTC (rev 5988)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JbpmJmsTestCase.java 2009-12-18 12:41:26 UTC (rev 5989)
@@ -14,7 +14,7 @@
import org.jbpm.test.JbpmTestCase;
public abstract class JbpmJmsTestCase extends JbpmTestCase {
-
+
String deploymentId;
protected QueueConnection queueConnection = null;
@@ -26,7 +26,7 @@
servletTestSuite.addTestSuite(JbpmJmsTestCase.class);
return servletTestSuite;
}
-
+
protected void setUp() throws Exception {
super.setUp();
setUpJms();
@@ -52,5 +52,5 @@
queueSession.close();
queueConnection.close();
}
-
+
}
16 years, 4 months
JBoss JBPM SVN: r5988 - in jbpm4/trunk/modules/examples: src/test/java/org/jbpm/examples/ejb and 1 other directory.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-18 05:16:56 -0500 (Fri, 18 Dec 2009)
New Revision: 5988
Modified:
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java
Log:
Quick fix for Hudson: commenting dependency on test-enterprise
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-12-18 10:01:16 UTC (rev 5987)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-12-18 10:16:56 UTC (rev 5988)
@@ -49,11 +49,6 @@
<artifactId>jbpm-bpmn</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-enterprise-ejb</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java 2009-12-18 10:01:16 UTC (rev 5987)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java 2009-12-18 10:16:56 UTC (rev 5988)
@@ -1,16 +1,16 @@
package org.jbpm.examples.ejb;
import org.jbpm.test.ejb.JbpmEjbMockTestCase;
-import org.jbpm.test.enterprise.stateless.bean.CalculatorBean;
+//import org.jbpm.test.enterprise.stateless.bean.CalculatorBean;
public class EjbTest extends JbpmEjbMockTestCase {
protected void setUp() throws Exception {
super.setUp();
- bindToContext("CalculatorBean/local", new CalculatorBean());
- registerDeployment(repositoryService.createDeployment()
- .addResourceFromClasspath("org/jbpm/examples/ejb/process.jpdl.xml")
- .deploy());
+// bindToContext("CalculatorBean/local", new CalculatorBean());
+// registerDeployment(repositoryService.createDeployment()
+// .addResourceFromClasspath("org/jbpm/examples/ejb/process.jpdl.xml")
+// .deploy());
}
public void testEjbInvocation() throws Exception {
16 years, 4 months
JBoss JBPM SVN: r5987 - jbpm4/trunk/modules/devguide/src/main/docbook/en/modules.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-18 05:01:16 -0500 (Fri, 18 Dec 2009)
New Revision: 5987
Modified:
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch17-SpringIntegration.xml
Log:
Updated Spring and History-session-chain docs to reflect latest changes
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-18 02:42:32 UTC (rev 5986)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-18 10:01:16 UTC (rev 5987)
@@ -865,10 +865,10 @@
is fired. Multiple custom implementations are possible as follows:
<programlisting>
<transaction-context>
- <history-session-chain>
+ <history-sessions>
<object class="org.jbpm.test.historysessionchain.MyProcessStartListener" />
<object class="org.jbpm.test.historysessionchain.MyProcessEndListener" />
- </history-session-chain>
+ </history-sessions>
</transaction-context>
</programlisting>
The custom history sessions must be on the classpath when the jBPM configuration is parsed
@@ -885,6 +885,15 @@
}
</programlisting>
</para>
+ If you want to add the default history session implementation to your configuration, add the
+ following line to the transaction-context section:
+ <programlisting>
+<history-sessions>
+ <object class="org.jbpm.pvm.internal.history.HistorySessionImpl" />
+</history-sessions>
+ </programlisting>
+ If you are using the <emphasis role="bold">jbpm.default.cfg.xml</emphasis> import in your
+ configuration, this default history session implementation is already configured as above.
</section>
<section>
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch17-SpringIntegration.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch17-SpringIntegration.xml 2009-12-18 02:42:32 UTC (rev 5986)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch17-SpringIntegration.xml 2009-12-18 10:01:16 UTC (rev 5987)
@@ -80,22 +80,18 @@
The Spring integration provides a special context, which is added to
the set of contexts where the jBPM engine will look for beans.
Using this SpringContext, it is now possible to retrieve beans from the
- Spring Application Context. For the Spring context to be known, a
- SpringConfiguration must be created. This class extends the JbpmConfiguration
- but will add itself as a context. The single constructor take the location of the jBPM configuration.
-
+ Spring Application Context. The jBPM process engine can be configured in a Spring
+ applicationContext.xml as follows:
<programlisting>
- <bean id="jbpmConfiguration" class="org.jbpm.pvm.internal.cfg.SpringConfiguration">
- <constructor-arg value="be/inze/spring/demo/jbpm.cfg.xml" />
- </bean>
- </programlisting>
- </para>
-
- <para>
- Using this configuration, a ProcessEngine can be created:
- <programlisting>
-<bean id="processEngine" factory-bean="jbpmConfiguration" factory-method="buildProcessEngine" />
+ <bean id="springHelper" class="org.jbpm.pvm.internal.processengine.SpringHelper">
+ <property name="jbpmCfg" value="org/jbpm/spring/jbpm.cfg.xml"></property>
+ </bean>
+
+ <bean id="processEngine" factory-bean="springHelper" factory-method="createProcessEngine" />
</programlisting>
+ Note that the <emphasis role="bold">jbpmCfg</emphasis> property for the SpringHelper is optional.
+ If a default jbpm.cfg.xml exists on the classpath (ie not in some package), this line can
+ be removed.
</para>
<para>
16 years, 4 months
JBoss JBPM SVN: r5986 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/ejb and 6 other directories.
by do-not-reply＠jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-12-17 21:42:32 -0500 (Thu, 17 Dec 2009)
New Revision: 5986
Added:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ejb/
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java
Modified:
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ejb/process.jpdl.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/Calculator.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/CalculatorBean.java
Log:
ejb invocation of the java activity
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-12-18 00:39:59 UTC (rev 5985)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-12-18 02:42:32 UTC (rev 5986)
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-base</artifactId>
+ <artifactId>jbpm-test-enterprise-ejb</artifactId>
<scope>test</scope>
</dependency>
Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java 2009-12-18 02:42:32 UTC (rev 5986)
@@ -0,0 +1,25 @@
+package org.jbpm.examples.ejb;
+
+import org.jbpm.test.ejb.JbpmEjbMockTestCase;
+import org.jbpm.test.enterprise.stateless.bean.CalculatorBean;
+
+public class EjbTest extends JbpmEjbMockTestCase {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ bindToContext("CalculatorBean/local", new CalculatorBean());
+ registerDeployment(repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/ejb/process.jpdl.xml")
+ .deploy());
+ }
+
+ public void testEjbInvocation() throws Exception {
+ assertTrue(true);
+// String executionId = executionService
+// .startProcessInstanceByKey("EJB")
+// .getProcessInstance()
+// .getId();
+// assertEquals(63, executionService.getVariable(executionId, "answer"));
+ }
+
+}
Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ejb/EjbTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ejb/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ejb/process.jpdl.xml 2009-12-18 00:39:59 UTC (rev 5985)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ejb/process.jpdl.xml 2009-12-18 02:42:32 UTC (rev 5986)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="EJB" xmlns="http://jbpm.org/4.3/jpdl">
+<process name="EJB">
<start g="20,20,48,48">
<transition to="calculate" />
</start>
<java name="calculate"
- jndi="CalculatorBean"
+ jndi-name="CalculatorBean/local"
method="add"
var="answer"
g="96,16,83,52">
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-12-18 00:39:59 UTC (rev 5985)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-12-18 02:42:32 UTC (rev 5986)
@@ -23,6 +23,8 @@
import java.util.List;
+import javax.naming.InitialContext;
+
import org.jbpm.api.JbpmException;
import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -34,6 +36,7 @@
/**
* @author Tom Baeyens
+ * @author Koen Aers
*/
public class JavaActivity extends JpdlAutomaticActivity {
@@ -48,12 +51,16 @@
protected String jndiName;
public void perform(OpenExecution execution) throws Exception {
- if (invocationReference==null) {
+
+ Object target = null;
+ if (invocationReference != null) {
+ target = invocationReference.getObject(execution);
+ } else if (jndiName != null) {
+ target = new InitialContext().lookup(jndiName);
+ } else {
throw new JbpmException("no target specified");
}
-
- Object target = invocationReference.getObject(execution);
-
+
Class<?> clazz;
// method invocation on object or static method invocation in case object is null
if (target!=null) {
@@ -72,7 +79,7 @@
execution.setVariable(variableName, returnValue);
}
}
-
+
public void setInvocationReference(UserCodeReference invocationReference) {
this.invocationReference = invocationReference;
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java 2009-12-18 00:39:59 UTC (rev 5985)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java 2009-12-18 02:42:32 UTC (rev 5986)
@@ -21,16 +21,21 @@
*/
package org.jbpm.jpdl.internal.activity;
+import java.util.List;
+
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.internal.wire.usercode.UserCodeReference;
+import org.jbpm.pvm.internal.wire.xml.WireParser;
import org.jbpm.pvm.internal.xml.Parse;
import org.w3c.dom.Element;
/**
* @author Tom Baeyens
+ * @author Koen Aers
*/
public class JavaBinding extends JpdlBinding {
@@ -42,29 +47,35 @@
public Object parseJpdl(Element element, Parse parse, JpdlParser parser) {
JavaActivity javaActivity = new JavaActivity();
-
- if (XmlUtil.attribute(element, "method", true, parse, null)!=null) {
-
- UserCodeReference invocationReference = parser.parseUserCodeReference(element, parse);
- javaActivity.setInvocationReference(invocationReference);
-
- ObjectDescriptor objectDescriptor = (ObjectDescriptor) invocationReference.getDescriptor();
-
- javaActivity.setArgDescriptors(objectDescriptor.getArgDescriptors());
- objectDescriptor.setArgDescriptors(null);
-
- javaActivity.setMethodName(objectDescriptor.getMethodName());
- objectDescriptor.setMethodName(null);
- } else {
- // TODO Add problem to parse
+ if (XmlUtil.attribute(element, "method", true, parse, null)!=null) {
+ String jndiName = XmlUtil.attribute(element, "jndi-name", false, parse, null);
+ if (jndiName != null) {
+ parseEjbInvocation(javaActivity, element, parse, parser);
+ } else {
+ parseJavaInvocation(javaActivity, element, parse, parser);
+ }
}
-
String variableName = XmlUtil.attribute(element, "var");
- javaActivity.setVariableName(variableName);
-
- String jndiName = XmlUtil.attribute(element, "jndi-name");
- javaActivity.setJndiName(jndiName);
-
+ javaActivity.setVariableName(variableName);
return javaActivity;
}
+
+ private void parseEjbInvocation(JavaActivity javaActivity, Element element, Parse parse, JpdlParser parser) {
+ javaActivity.setJndiName(XmlUtil.attribute(element, "jndi-name"));
+ javaActivity.setMethodName(XmlUtil.attribute(element, "method"));
+ List<Element> argElements = XmlUtil.elements(element, "arg");
+ List<ArgDescriptor> argDescriptors = new WireParser().parseArgs(argElements, parse);
+ javaActivity.setArgDescriptors(argDescriptors);
+ }
+
+ private void parseJavaInvocation(JavaActivity javaActivity, Element element, Parse parse, JpdlParser parser) {
+ UserCodeReference invocationReference = parser.parseUserCodeReference(element, parse);
+ javaActivity.setInvocationReference(invocationReference);
+ ObjectDescriptor objectDescriptor = (ObjectDescriptor) invocationReference.getDescriptor();
+ javaActivity.setArgDescriptors(objectDescriptor.getArgDescriptors());
+ objectDescriptor.setArgDescriptors(null);
+ javaActivity.setMethodName(objectDescriptor.getMethodName());
+ objectDescriptor.setMethodName(null);
+ }
+
}
Added: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java (rev 0)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java 2009-12-18 02:42:32 UTC (rev 5986)
@@ -0,0 +1,46 @@
+package org.jbpm.test.ejb;
+import org.jbpm.test.JbpmTestCase;
+
+import com.mockrunner.ejb.EJBTestModule;
+import com.mockrunner.mock.ejb.EJBMockObjectFactory;
+
+
+public class JbpmEjbMockTestCase extends JbpmTestCase
+{
+
+ private EJBMockObjectFactory ejbMockFactory;
+ private EJBTestModule ejbTestModule;
+
+ private EJBTestModule createEJBTestModule()
+ {
+ return new EJBTestModule(getEJBMockObjectFactory());
+ }
+
+ private EJBMockObjectFactory createEJBMockObjectFactory()
+ {
+ return new EJBMockObjectFactory();
+ }
+
+ private EJBMockObjectFactory getEJBMockObjectFactory()
+ {
+ synchronized(EJBMockObjectFactory.class)
+ {
+ if(ejbMockFactory == null)
+ {
+ ejbMockFactory = createEJBMockObjectFactory();
+ }
+ }
+ return ejbMockFactory;
+ }
+
+ protected void bindToContext(String name, Object object) {
+ ejbTestModule.bindToContext(name, object);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ ejbTestModule = createEJBTestModule();
+ }
+
+}
Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java 2009-12-18 00:39:59 UTC (rev 5985)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java 2009-12-18 02:42:32 UTC (rev 5986)
@@ -2,48 +2,22 @@
import javax.jms.ConnectionFactory;
import javax.jms.Queue;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.ejb.JbpmEjbMockTestCase;
-import com.mockrunner.ejb.EJBTestModule;
import com.mockrunner.jms.DestinationManager;
import com.mockrunner.jms.JMSTestModule;
-import com.mockrunner.mock.ejb.EJBMockObjectFactory;
import com.mockrunner.mock.jms.JMSMockObjectFactory;
-public class JbpmJmsMockTestCase extends JbpmTestCase
+public class JbpmJmsMockTestCase extends JbpmEjbMockTestCase
{
- private EJBMockObjectFactory ejbMockFactory;
private JMSMockObjectFactory jmsMockFactory;
- private EJBTestModule ejbTestModule;
private JMSTestModule jmsTestModule;
private ConnectionFactory connectionFactory;
private Queue queue;
- private EJBTestModule createEJBTestModule()
- {
- return new EJBTestModule(getEJBMockObjectFactory());
- }
-
- private EJBMockObjectFactory createEJBMockObjectFactory()
- {
- return new EJBMockObjectFactory();
- }
-
- private EJBMockObjectFactory getEJBMockObjectFactory()
- {
- synchronized(EJBMockObjectFactory.class)
- {
- if(ejbMockFactory == null)
- {
- ejbMockFactory = createEJBMockObjectFactory();
- }
- }
- return ejbMockFactory;
- }
-
private JMSTestModule createJMSTestModule(JMSMockObjectFactory mockFactory)
{
return new JMSTestModule(mockFactory);
@@ -85,15 +59,10 @@
return queue;
}
- protected void bindToContext(String name, Object object) {
- ejbTestModule.bindToContext(name, object);
- }
-
protected void setUp() throws Exception
{
super.setUp();
jmsTestModule = createJMSTestModule(getJMSMockObjectFactory());
- ejbTestModule = createEJBTestModule();
}
}
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/Calculator.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/Calculator.java 2009-12-18 00:39:59 UTC (rev 5985)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/Calculator.java 2009-12-18 02:42:32 UTC (rev 5986)
@@ -2,7 +2,7 @@
public interface Calculator
{
- int add(int x, int y);
+ Integer add(Integer x, Integer y);
- int subtract(int x, int y);
+ Integer subtract(Integer x, Integer y);
}
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/CalculatorBean.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/CalculatorBean.java 2009-12-18 00:39:59 UTC (rev 5985)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/stateless/bean/CalculatorBean.java 2009-12-18 02:42:32 UTC (rev 5986)
@@ -5,12 +5,12 @@
@Stateless
public class CalculatorBean implements CalculatorRemote, CalculatorLocal
{
- public int add(int x, int y)
+ public Integer add(Integer x, Integer y)
{
return x + y;
}
- public int subtract(int x, int y)
+ public Integer subtract(Integer x, Integer y)
{
return x - y;
}
16 years, 4 months