5:15 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 18:15:33 -0500 (Fri, 19 Dec 2008)
New Revision: 3467
Added:
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
jbpm3/trunk/modules/integration/src/test/resources/deployment/
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg
jbpm3/trunk/modules/integration/src/test/resources/jndi.properties
Removed:
jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
jbpm3/trunk/pom.xml
Log:
Fix dependencies and restore DeploymentPARTest
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -103,19 +103,15 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <artifactId>bpm-spec-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-integration-jboss42</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-integration-jboss42</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
<classifier>config</classifier>
</dependency>
@@ -127,12 +123,6 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
- <classifier>soa</classifier>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<type>war</type>
</dependency>
@@ -297,6 +287,14 @@
<profiles>
<profile>
<id>soa</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <classifier>soa</classifier>
+ <type>war</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-19
22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-19
23:15:33 UTC (rev 3467)
@@ -54,7 +54,7 @@
<outputDirectory>resources/jbpm-integration-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jboss-bpm-integration-jboss42:jar:config</include>
+ <include>*:bpm-spec-integration-jboss42:jar:config</include>
<include>*:jbpm-integration-spec:jar:config</include>
</includes>
<unpack>true</unpack>
Modified:
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
---
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-19
22:53:18 UTC (rev 3466)
+++
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-19
23:15:33 UTC (rev 3467)
@@ -160,8 +160,8 @@
<include name="dom4j.jar" />
<include name="hibernate.jar" />
<include name="hsqldb.jar" />
- <include name="jboss-bpm-api.jar" />
- <include name="jboss-bpm-integration-jboss42.jar" />
+ <include name="bpm-spec-api.jar" />
+ <include name="bpm-spec-integration-jboss42.jar" />
<include name="jbpm-enterprise-bundle.ear" />
<include name="jbpm-integration-spec.jar"/>
<include name="jbpm-jpdl.jar" />
@@ -198,7 +198,6 @@
<!-- jbpm/jbpm-integration.beans -->
<fileset dir="(a){deploy.artifacts.dir}/lib"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans"
override="true">
- <include name="jboss-bpm-dialect-api10.jar" />
<include name="jbpm-integration-spec.jar" />
</fileset>
<fileset
dir="(a){deploy.artifacts.dir}/resources/jbpm-integration-config"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans/META-INF"
override="true">
@@ -214,8 +213,8 @@
<include name="bpm-process-deployer.xml" />
</fileset>
<fileset dir="(a){deploy.artifacts.dir}/lib"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
- <include name="jboss-bpm-api.jar" />
- <include name="jboss-bpm-integration-jboss42.jar" />
+ <include name="bpm-spec-api.jar" />
+ <include name="bpm-spec-integration-jboss42.jar" />
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
<include name="slf4j-api.jar" />
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -92,7 +92,7 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <artifactId>bpm-spec-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Deleted: jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml 2008-12-19 22:53:18 UTC (rev
3466)
+++ jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml 2008-12-19 23:15:33 UTC (rev
3467)
@@ -1,19 +0,0 @@
-<jbpm-configuration>
-
- <jbpm-context>
- <service name="persistence"
factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
- <service name="message"
factory="org.jbpm.msg.jms.JmsMessageServiceFactory" />
- <service name="scheduler"
factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" />
- <service name="tx" factory="org.jbpm.tx.TxServiceFactory"
/>
- <service name="logging"
factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
- <service name="authentication"
factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory"
/>
- </jbpm-context>
-
- <!--
- Note, that the default job executor needs to be overwritten with a null value.
- In the enterprise configuration there should be no job executor.
- Async messaging is there bound to jms and timers to ejb timers.
- -->
- <null name="jbpm.job.executor" />
-
-</jbpm-configuration>
Modified:
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
===================================================================
---
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-19
22:53:18 UTC (rev 3466)
+++
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-19
23:15:33 UTC (rev 3467)
@@ -21,6 +21,8 @@
*/
package org.jbpm.enterprise.config;
+// $Id$
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -31,7 +33,7 @@
import junit.framework.TestCase;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.model.ObjectNameFactory;
import org.jboss.bpm.api.test.IntegrationTestHelper;
/**
Copied:
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment
(from rev 3353,
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment)
Deleted:
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
===================================================================
---
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-12
08:26:18 UTC (rev 3353)
+++
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-19
23:15:33 UTC (rev 3467)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.test.integration.spec.deployment;
-
-// $Id$
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.jboss.bpm.api.deployment.Deployment;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.test.APITestCase;
-import org.jboss.bpm.incubator.service.TaskInstanceService;
-
-/**
- * Test simple PAR deployment
- *
- * @author thomas.diesler(a)jboss.com
- * @since 24-Nov-2008
- */
-public class DeploymentPARTest extends APITestCase
-{
-
- public void testSimplePARDeploy() throws Exception
- {
- URL parURL = getTestArchiveURL("fork-join-example.par");
-
- DeploymentService depService =
getProcessEngine().getService(DeploymentService.class);
- Deployment dep = depService.createDeployment(parURL);
-
- ProcessDefinition procDef = depService.deploy(dep);
- assertNotNull("ProcDef not null", procDef);
-
- ProcessInstance proc = procDef.newInstance();
-
- Token token = proc.startProcess();
-
- assertEquals("fork1", token.getNode().getName());
- assertEquals(2, token.getChildTokens().size());
-
- // Get the child tokens
- Token childOne = getChildToken(token, "Review Order");
- assertNotNull("Review Order", childOne);
-
- Token childTwo = getChildToken(token, "Prepare shipping");
- assertNotNull("Review Order", childTwo);
-
- TaskInstanceService taskService =
getProcessEngine().getService(TaskInstanceService.class);
- assertEquals(2, taskService.getTasksByProcess(proc.getKey()).size());
-
- // Undeploy the process
- assertTrue("Undeploy successful", depService.undeploy(dep));
- }
-
- private Token getChildToken(Token token, String nodeName)
- {
- Map<String, Token> childToks = new HashMap<String, Token>();
- Iterator<Token> itTok = token.getChildTokens().iterator();
- while (itTok.hasNext())
- {
- Token child = itTok.next();
- childToks.put(child.getNode().getName(), child);
- }
- return childToks.get(nodeName);
- }
-}
Copied:
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
(from rev 3353,
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java)
===================================================================
---
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
(rev 0)
+++
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-19
23:15:33 UTC (rev 3467)
@@ -0,0 +1,90 @@
+/*
+ * 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.integration.spec.deployment;
+
+// $Id$
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jboss.bpm.api.deployment.Deployment;
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.DeploymentService;
+import org.jboss.bpm.api.test.APITestCase;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
+
+/**
+ * Test simple PAR deployment
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Nov-2008
+ */
+public class DeploymentPARTest extends APITestCase
+{
+
+ public void testSimplePARDeploy() throws Exception
+ {
+ URL parURL = getTestArchiveURL("fork-join-example.par");
+
+ DeploymentService depService =
getProcessEngine().getService(DeploymentService.class);
+ Deployment dep = depService.createDeployment(parURL);
+
+ ProcessDefinition procDef = depService.deploy(dep);
+ assertNotNull("ProcDef not null", procDef);
+
+ ProcessInstance proc = procDef.newInstance();
+
+ Token token = proc.startProcess();
+
+ assertEquals("fork1", token.getNode().getName());
+ assertEquals(2, token.getChildTokens().size());
+
+ // Get the child tokens
+ Token childOne = getChildToken(token, "Review Order");
+ assertNotNull("Review Order", childOne);
+
+ Token childTwo = getChildToken(token, "Prepare shipping");
+ assertNotNull("Review Order", childTwo);
+
+ TaskInstanceService taskService =
getProcessEngine().getService(TaskInstanceService.class);
+ assertEquals(2, taskService.getTasksByProcess(proc.getKey()).size());
+
+ // Undeploy the process
+ assertTrue("Undeploy successful", depService.undeploy(dep));
+ }
+
+ private Token getChildToken(Token token, String nodeName)
+ {
+ Map<String, Token> childToks = new HashMap<String, Token>();
+ Iterator<Token> itTok = token.getChildTokens().iterator();
+ while (itTok.hasNext())
+ {
+ Token child = itTok.next();
+ childToks.put(child.getNode().getName(), child);
+ }
+ return childToks.get(nodeName);
+ }
+}
Copied: jbpm3/trunk/modules/integration/src/test/resources/deployment (from rev 3353,
jbpm3/trunk/modules/integration/src/test/resources/deployment)
Copied: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example
(from rev 3353,
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example)
Deleted:
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
===================================================================
---
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml 2008-12-12
08:26:18 UTC (rev 3353)
+++
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml 2008-12-19
23:15:33 UTC (rev 3467)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="ForkJoinExample3" width="658"
height="421">
- <node name="start" x="150" y="25" width="140"
height="40">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="fork1" x="96" y="95" width="252"
height="24">
- <edge>
- <label x="5" y="-10" />
- </edge>
- <edge>
- <label x="-92" y="-11" />
- </edge>
- </node>
- <node name="Review Order" x="69" y="172"
width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="Prepare shipping" x="293" y="171"
width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="join1" x="118" y="256"
width="252" height="24">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="Review results" x="183" y="299"
width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="Wrap up" x="367" y="320"
width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="end" x="176" y="359" width="140"
height="40" />
-</root-container>
Copied:
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
(from rev 3353,
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml)
===================================================================
---
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
(rev 0)
+++
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml 2008-12-19
23:15:33 UTC (rev 3467)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="ForkJoinExample3" width="658"
height="421">
+ <node name="start" x="150" y="25" width="140"
height="40">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="fork1" x="96" y="95" width="252"
height="24">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ <edge>
+ <label x="-92" y="-11" />
+ </edge>
+ </node>
+ <node name="Review Order" x="69" y="172"
width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="Prepare shipping" x="293" y="171"
width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="join1" x="118" y="256"
width="252" height="24">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="Review results" x="183" y="299"
width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="Wrap up" x="367" y="320"
width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="end" x="176" y="359" width="140"
height="40" />
+</root-container>
Deleted:
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
===================================================================
---
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml 2008-12-12
08:26:18 UTC (rev 3353)
+++
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml 2008-12-19
23:15:33 UTC (rev 3467)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition xmlns="urn:jbpm.org:jpdl-3.2"
name="ForkJoinExample3">
- <start-state name="start">
- <transition to="fork1"></transition>
- </start-state>
- <fork name="fork1">
- <transition to="Prepare shipping" name="to Prepare
shipping"></transition>
- <transition to="Review Order" name="to Review
Order"></transition>
- </fork>
-
- <task-node name="Review Order">
- <task name="Do review order">
- <assignment pooled-actors="sales"></assignment>
- </task>
- <transition to="join1" name="done with review
order"></transition>
- </task-node>
-
- <task-node name="Prepare shipping">
- <task name="Do prepare shipping">
- <assignment pooled-actors="sales,hr"></assignment>
- </task>
- <transition to="join1" name="done with prepare
shipping"></transition>
- </task-node>
-
- <join name="join1">
- <transition to="Review results"></transition>
- </join>
-
- <task-node name="Review results">
- <task name="Review previous steps">
- <assignment pooled-actors="user"></assignment>
- </task>
- <transition to="Wrap up" name="review
ok"></transition>
- </task-node>
-
- <task-node name="Wrap up">
- <task name="Wrap up">
- <assignment actor-id="fred"></assignment>
- </task>
- <transition to="end" name="finish this
one"></transition>
- </task-node>
-
- <end-state name="end"></end-state>
-</process-definition>
\ No newline at end of file
Copied:
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
(from rev 3353,
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml)
===================================================================
---
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
(rev 0)
+++
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml 2008-12-19
23:15:33 UTC (rev 3467)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.2"
name="ForkJoinExample3">
+ <start-state name="start">
+ <transition to="fork1"></transition>
+ </start-state>
+ <fork name="fork1">
+ <transition to="Prepare shipping" name="to Prepare
shipping"></transition>
+ <transition to="Review Order" name="to Review
Order"></transition>
+ </fork>
+
+ <task-node name="Review Order">
+ <task name="Do review order">
+ <assignment pooled-actors="sales"></assignment>
+ </task>
+ <transition to="join1" name="done with review
order"></transition>
+ </task-node>
+
+ <task-node name="Prepare shipping">
+ <task name="Do prepare shipping">
+ <assignment pooled-actors="sales,hr"></assignment>
+ </task>
+ <transition to="join1" name="done with prepare
shipping"></transition>
+ </task-node>
+
+ <join name="join1">
+ <transition to="Review results"></transition>
+ </join>
+
+ <task-node name="Review results">
+ <task name="Review previous steps">
+ <assignment pooled-actors="user"></assignment>
+ </task>
+ <transition to="Wrap up" name="review
ok"></transition>
+ </task-node>
+
+ <task-node name="Wrap up">
+ <task name="Wrap up">
+ <assignment actor-id="fred"></assignment>
+ </task>
+ <transition to="end" name="finish this
one"></transition>
+ </task-node>
+
+ <end-state name="end"></end-state>
+</process-definition>
\ No newline at end of file
Deleted:
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg
===================================================================
(Binary files differ)
Copied:
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg
(from rev 3353,
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg)
===================================================================
(Binary files differ)
Copied: jbpm3/trunk/modules/integration/src/test/resources/jndi.properties (from rev 3352,
jbpm3/trunk/modules/integration/src/test/resources/jndi.properties)
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/jndi.properties
(rev 0)
+++ jbpm3/trunk/modules/integration/src/test/resources/jndi.properties 2008-12-19 23:15:33
UTC (rev 3467)
@@ -0,0 +1,3 @@
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming.client
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/pom.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -159,7 +159,7 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-integration-jboss42</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
<classifier>config</classifier>
<version>${bpm.spec.version}</version>
</dependency>