[jbpm-commits] JBoss JBPM SVN: r1786 - in jbossbpm/spec/trunk: modules/api and 23 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Jul 31 03:40:59 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-07-31 03:40:59 -0400 (Thu, 31 Jul 2008)
New Revision: 1786
Added:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessRegistryTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/engine/
Removed:
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/engine/
Modified:
jbossbpm/spec/trunk/modules/api/pom.xml
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
jbossbpm/spec/trunk/modules/dialects/
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
jbossbpm/spec/trunk/modules/samples/airticket/
jbossbpm/spec/trunk/modules/samples/airticket/README.txt
jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessStartTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/engine/basic-engine-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/parallelsplit/parallel-split-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml
jbossbpm/spec/trunk/pom.xml
Log:
Add CTS tests
Modified: jbossbpm/spec/trunk/modules/api/pom.xml
===================================================================
--- jbossbpm/spec/trunk/modules/api/pom.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/api/pom.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -66,7 +66,7 @@
<destdir>target/schema</destdir>
<schemas>
<schema>
- <namespace>urn:api.bpm.jboss:jpdl-0.1</namespace>
+ <namespace>urn:bpm.jboss:pdl-0.1</namespace>
<file>jbpm-api-0.1.xsd</file>
</schema>
</schemas>
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -160,7 +160,8 @@
}
/**
- * Register a Process
+ * Register a Process.
+ * This is not part of the API.
*/
protected void registerProcess(Process proc)
{
@@ -169,8 +170,9 @@
/**
* Remove a Process
+ * This is not part of the API.
*/
- public void removeProcess(Process proc)
+ protected void removeProcess(Process proc)
{
procs.remove(proc);
}
@@ -187,9 +189,9 @@
* If the process was aborted this method throws the causing RuntimeException if avaialable.
*
*/
- public Status waitForEnd(ObjectName id, long timeout)
+ public Status waitForEnd(ObjectName procID, long timeout)
{
- Process proc = getProcessByID(id);
+ Process proc = getProcessByID(procID);
Status status = proc.getStatus();
if (status == Status.None || status == Status.Ready)
@@ -224,9 +226,14 @@
{
log.warn(ex);
}
+ finally
+ {
+ // Remove the process
+ removeProcess(proc);
+ }
// Throw timeout exception if it took too long
- throw new ProcessTimeoutException("Process timeout for: " + id);
+ throw new ProcessTimeoutException("Process timeout for: " + procID);
}
private String getNamespaceURI(InputStream inStream)
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -78,8 +78,13 @@
ProcessBuilder addEndEvent(String name);
/**
- * Add a {@link Task} with a given name
+ * Add a {@link Task} of {@link TaskType} NONE with a given name
*/
+ TaskBuilder addTask(String name);
+
+ /**
+ * Add a {@link Task} with a given name and type
+ */
TaskBuilder addTask(String name, TaskType type);
/**
Property changes on: jbossbpm/spec/trunk/modules/dialects
___________________________________________________________________
Name: svn:ignore
- .settings
+ .settings
target
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
- at XmlSchema(namespace="urn:api.bpm.jboss:jpdl-0.1")
+ at XmlSchema(namespace="urn:bpm.jboss:pdl-0.1")
package org.jboss.bpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlSchema;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -54,6 +54,20 @@
this.dialectRegistry = dialectRegistry;
}
+ // Provide public access
+ @Override
+ public void registerProcess(Process proc)
+ {
+ super.registerProcess(proc);
+ }
+
+ // Provide public access
+ @Override
+ public void removeProcess(Process proc)
+ {
+ super.removeProcess(proc);
+ }
+
public ObjectName startProcess(String name, Attachments att)
{
Set<Process> procSet = findProcessByName(name, Status.Ready);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -142,6 +142,11 @@
return this;
}
+ public TaskBuilder addTask(String name)
+ {
+ return addTask(name, TaskType.None);
+ }
+
public TaskBuilder addTask(String name, TaskType type)
{
if (type == TaskType.None)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -35,9 +35,8 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.client.ProcessEngineLocator;
import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.client.internal.ProcessManagerImpl;
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.InputSet;
@@ -187,22 +186,29 @@
public ObjectName startProcess(Attachments att)
{
- ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
- ProcessManager pm = engine.getProcessManager();
+ ProcessManagerImpl pm = (ProcessManagerImpl)ProcessManager.locateProcessManager();
+
+ if (getStatus() != Status.Ready)
+ throw new IllegalStateException("Cannot start process in state: " + getStatus());
+
+ // Register the process if needed
+ if (pm.findProcessByName(getName(), null).size() == 0)
+ {
+ pm.registerProcess(this);
+ }
+
return pm.startProcess(getName(), att);
}
public void waitForEnd()
{
- ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
- ProcessManager pm = engine.getProcessManager();
+ ProcessManager pm = ProcessManager.locateProcessManager();
pm.waitForEnd(getID(), -1);
}
public void waitForEnd(long timeout)
{
- ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
- ProcessManager pm = engine.getProcessManager();
+ ProcessManager pm = ProcessManager.locateProcessManager();
pm.waitForEnd(getID(), timeout);
}
@@ -251,8 +257,7 @@
// Set the anonymous default name
if (getName() == null)
{
- ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
- ProcessManager pm = engine.getProcessManager();
+ ProcessManager pm = ProcessManager.locateProcessManager();
this.name = "AnonymousProcess#" + pm.getProcesses().size();
}
Property changes on: jbossbpm/spec/trunk/modules/samples/airticket
___________________________________________________________________
Name: svn:ignore
- .gwt-cache
.settings
+ .gwt-cache
.settings
target
Modified: jbossbpm/spec/trunk/modules/samples/airticket/README.txt
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/README.txt 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/samples/airticket/README.txt 2008-07-31 07:40:59 UTC (rev 1786)
@@ -1,117 +1,22 @@
-WELCOME to the maven-googlewebtoolkit2-sample Project
-=====================================================
+WELCOME to the Airticket Sample Project
+=======================================
-Also see GWT-Maven documentation:
-http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/index.html
-
About:
======
This sample project has some specific goals:
- + GWT-Maven 'Best Practice' & Usage
- + Java5+ integration on the GWT server side & Java1.4 on the GWT client side using a multi-module maven project.
- + GWT RPC structure via multi-module maven project - and inheriting a GWT module
- + The features offered by GWT-Maven (like building a WAR, running the GWTShell, mergewebxml, and GWT testing)
+ + BPM GWT 'Best Practice' & Usage
+ + GWT server side & GWT client side
Overview:
=========
-This sample package contains 4 different examples to show how GWT-Maven
-should be used with your project. If you intend to use multiple modules, you will want to build
-more than one of the examples. If you wish to set up a simpler single module (with just one pom.xml),
-then choose the example that is closest to the function of your project (likely the war project).
+This sample shows how a BPM GWT client interacts with the BPM engine based on Messages and Signals.
-This sample uses GWT-Maven with the "automatic" GWT setup mode enabled. This means
-that you do *not* have to download and install GWT yourself, the plugin will
-setup and extract GWT for you (when using this method).
-(You can optionally use manual method with a local GWT install, see documentation.)
-Which project to build:
-=======================
- + parent (this is the root parent module of the project)
- + rpc (this is the GWT RPC *INTERFACE* definition) Java 1.4
- + server (this is the GWT RPC *IMPLEMENTATION*, it builds a GWT module that war inherits) Java 1.5+
- + war (this is the GWT client code) Java 1.4
-
-Prerequisites:
-==============
- + Maven2 - http://maven.apache.org
- + Maven bin directory added to Path
-
-
-Running the parent example:
+Running the Client example:
===========================
-The parent example demonstrates a multi-module Maven build with a GWT project.
-When run it will build the rpc, server, and war sub projects.
-1. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample directory.
-2. Execute "mvn clean install".
-3. Sub projects will have artifacts (see details for each below)
+Enable the 'gwt' profile to build and run the GWT client.
+ mvn -Pgwt gwt:gwt
-Running the WAR example:
-========================
-The WAR project builds a Web-Application-Archive file for a GWT project.
-This war can then be deployed to a servlet container, and or you can run this
-project in the GWTShell using GWT-Maven.
-This project demonstrates not only the usefulness of GWT-Maven in terms of
-building WAR files, and running the shell, but also the "merge web xml" aspect.
-Notice that this project has a local web.xml source file, that is used to create
-a deployment time file that includes a standard servlet entry, as well as a GWT-RPC entry.
-(GWT-Maven allows you to use the embedded Tomcat server with source web.xml and other
-files [context.xml, if you use Tomcat outside of the shell], and it configures the
-embedded Tomcat for you.)
-
-This project also includes a testing sample using the GWT-Maven testGwt goal, and
-includes EMMA based code coverage and reports for GWTTestCase based tests.
-Code coverage with GWT is a bit tricky, but using the coverage patch JAR (as this project does)
-and generating ONLY a report (not instrumentation data itself, which GWT does for you when patched)
-along with AntRun to move things around, creates an automated build with testing and reports.
-(If you want to see the testing stuff, uncomment the "testGwt" goal in the POM, it is commented
-out by default to keep things faster and simpler.)
-(Note* - when running tests the Surefire plugin is NOT used for GwtTestCase based tests, rather
-a special testGwt goal is included with GWT-Maven for GwtTestCase based tests, thus TWO test phases
-will happen during "mvn test", one for Surefire standard tests, and one for testGwt GWT tests.)
-
-1. Build the server sub-project, using the instructions in "Running the parent example" above.
-2. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample/war directory.
-3. Execute "mvn package".
-4. Your sample war will be created in the war/target directory.
-
- OR you can run the GWTShell locally by executing "mvn gwt:gwt".
-
- Optionally: Execute "mvn test site" (with testGwt goal enabled) to run test and get coverage.
-(See "target/site" directory for output.)
-
-
-Running the RPC example
-========================
-The RPC example is meant to show defining GWT-RPC interfaces.
-This project creates a JAR archive that includes source, so that it can be used by other
-GWT projects (the WAR example here uses it). This project does not need GWT-Maven
-(no shell to run, no GWT compiler, etc) - but does require GWT dependencies.
-
-1. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample/rpc directory.
-2. Execute "mvn install".
-3. Your JAR library, with source included, will be in the rpc/target directory.
-
-
-Running the SERVER sample
-=========================
-The Server example demonstrates implementing GWT-RPC interfaces (the one from the RPC example),
-creating a GWT library module (that other projects can inherit), and including a standard
-HttpServlet example in the same project. This project creates
-a JAR archive that is built for the server side of a GWT project. This JAR can then
-be inherited using GWT inheritance to expose a GWT-RPC endpoint.
-(This demonstrates that it can make sense to break up your GWT projects into client and server portions,
-sometimes that helps with re-use [more than one client can import and use the RPC] and with team divisions.)
-
-1. Use a command prompt to navigate into the maven-googlewebtoolkit2-sample/server directory.
-2. Execute "mvn install".
-3. Your JAR library, with source included, will be in the server/target directory.
-
-
-More help:
-==========
-Docs: http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/index.html
-Also refer to the the gwt-maven message board: http://groups.google.com/group/gwt-maven
-
Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -35,48 +35,57 @@
</dependency>
</dependencies>
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <groupId>com.totsp.gwt</groupId>
- <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
- <version>2.0-beta18</version>
- <configuration>
- <logLevel>INFO</logLevel>
- <compileTargets>
- <value>org.jboss.bpm.samples.airticket.Application</value>
- </compileTargets>
- <runTarget>org.jboss.bpm.samples.airticket.Application/Application.html
- </runTarget>
- <generatorRootClasses>
- <value>org.jboss.bpm.samples.airticket.Application</value>
- </generatorRootClasses>
- <overwriteGeneratedClasses>true</overwriteGeneratedClasses>
- <style>DETAILED</style>
- <generateGettersAndSetters> true</generateGettersAndSetters>
- <noServer>false</noServer>
- <extraJvmArgs>-Dgwt.coverage.enable=true</extraJvmArgs>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>setup</goal>
- <goal>extractGwt</goal>
- <goal>mergewebxml</goal>
- <goal>compile</goal>
- <goal>gwt</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>target/web.xml</webXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- Profiles -->
+ <profiles>
+ <!--
+ Name: skiptests
+ Desc: Skips the tests
+ -->
+ <profile>
+ <id>gwt</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.totsp.gwt</groupId>
+ <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+ <version>2.0-beta18</version>
+ <configuration>
+ <logLevel>INFO</logLevel>
+ <compileTargets>
+ <value>org.jboss.bpm.samples.airticket.Application</value>
+ </compileTargets>
+ <runTarget>org.jboss.bpm.samples.airticket.Application/Application.html
+ </runTarget>
+ <generatorRootClasses>
+ <value>org.jboss.bpm.samples.airticket.Application</value>
+ </generatorRootClasses>
+ <overwriteGeneratedClasses>true</overwriteGeneratedClasses>
+ <style>DETAILED</style>
+ <generateGettersAndSetters> true</generateGettersAndSetters>
+ <noServer>false</noServer>
+ <extraJvmArgs>-Dgwt.coverage.enable=true</extraJvmArgs>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>setup</goal>
+ <goal>extractGwt</goal>
+ <goal>mergewebxml</goal>
+ <goal>compile</goal>
+ <goal>gwt</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>target/web.xml</webXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -67,7 +67,7 @@
addSequenceFlow("ValidateTask");
// Build the ValidateTask
- taskBuilder = procBuilder.addTask("ValidateTask", TaskType.None);
+ taskBuilder = procBuilder.addTask("ValidateTask");
taskBuilder.addExecutionHandler(ValidationHandler.class).
addInputSet().
addPropertyInput("Name", null).
@@ -85,7 +85,7 @@
addDefaultGate("SendInvalidTask");
// Build the CheckAvailabilityTask
- taskBuilder = procBuilder.addTask("CheckAvailabilityTask", TaskType.None);
+ taskBuilder = procBuilder.addTask("CheckAvailabilityTask");
taskBuilder.addExecutionHandler(AvailabilityHandler.class).
addInputSet().
addPropertyInput("From", null).
@@ -152,7 +152,7 @@
addGate("BookingTask");
// Build the CreditCardTask
- taskBuilder = procBuilder.addTask("CreditCardTask", TaskType.None);
+ taskBuilder = procBuilder.addTask("CreditCardTask");
taskBuilder.addInputSet().
addPropertyInput("CreditCard", null).
addPropertyInput("Expire", null).
@@ -160,7 +160,7 @@
addSequenceFlow("SynchronizedJoinGateway");
// Build the BookingTask
- taskBuilder = procBuilder.addTask("BookingTask", TaskType.None);
+ taskBuilder = procBuilder.addTask("BookingTask");
taskBuilder.addInputSet().
addPropertyInput("Name", null).
addPropertyInput("From", null).
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -46,7 +46,7 @@
<bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>urn:api.bpm.jboss:jpdl-0.1</key><value>api10</value></entry>
+ <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
<entry><key>urn:jbpm.org:jpdl-3.2</key><value>jpdl32</value></entry>
<entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
<entry><key>http://www.wfmc.org/2008/XPDL2.1</key><value>xpdl21</value></entry>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -47,7 +47,7 @@
protected void setUp() throws Exception
{
super.setUp();
- jpdlURL = getResourceURL("samples/engine/basic-engine-" + getDialect() + ".xml");
+ jpdlURL = getResourceURL("cts/engine/basic-engine-" + getDialect() + ".xml");
engine = ProcessEngineLocator.locateProcessEngine();
engine.cancelShutdown();
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -33,7 +33,6 @@
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.model.Task;
-import org.jboss.bpm.model.Task.TaskType;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -48,7 +47,7 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA", TaskType.None).
+ Process proc = builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA").
addSequenceFlow("end").addEndEvent("end").getProcess();
assertEquals("AnonymousProcess#0", proc.getName());
@@ -69,7 +68,7 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- builder.addProcess(null).addTask("taskA", TaskType.None).addSequenceFlow("end").addEndEvent("end").getProcess();
+ builder.addProcess(null).addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
fail("InvalidProcessException expected");
}
catch (InvalidProcessException ex)
@@ -84,8 +83,8 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA", TaskType.None).addSequenceFlow("end").addTask(
- "end", TaskType.None).getProcess();
+ builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").
+ addTask("end").getProcess();
fail("InvalidProcessException expected");
}
catch (InvalidProcessException ex)
@@ -100,8 +99,8 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA", TaskType.None).addSequenceFlow("end").addTask(
- "taskA", TaskType.None).addSequenceFlow("end").addEndEvent("end").getProcess();
+ builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").
+ addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
fail("InvalidProcessException expected");
}
catch (InvalidProcessException ex)
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessStartTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessStartTest.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessStartTest.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -28,7 +28,6 @@
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Task.TaskType;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -59,15 +58,15 @@
}
catch (RuntimeException rte)
{
- System.out.println(rte);
+ // expected;
}
}
private Process getProcess()
{
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = builder.addProcess(getName()).addStartEvent().addSequenceFlow("taskA").addTask("taskA",
- TaskType.None).addSequenceFlow("end").addEndEvent("end").getProcess();
+ Process proc = builder.addProcess(getName()).addStartEvent().addSequenceFlow("taskA").
+ addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
return proc;
}
}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessRegistryTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessRegistryTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessRegistryTest.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -0,0 +1,82 @@
+/*
+ * 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.jboss.bpm.cts.processmanager;
+
+// $Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Test the ProcessRegistry
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessRegistryTest extends DefaultEngineTestCase
+{
+ public void testStartProcess() throws Exception
+ {
+ Process proc = getProcess();
+ ObjectName procID = proc.getID();
+
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ try
+ {
+ pm.getProcessByID(procID);
+ fail("A process created through the builder is not registered automatically");
+ }
+ catch (RuntimeException ex)
+ {
+ // expected
+ }
+
+ // Start the process, which automatically adds it to the registery
+ assertEquals(procID, proc.startProcess());
+ assertNotNull(pm.getProcessByID(procID));
+
+ proc.waitForEnd();
+
+ try
+ {
+ pm.getProcessByID(procID);
+ fail("A terminated process is removed from the registry");
+ }
+ catch (RuntimeException ex)
+ {
+ // expected
+ }
+ }
+
+ private Process getProcess()
+ {
+ ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ Process proc = builder.addProcess(getName()).addStartEvent().addSequenceFlow("taskA").
+ addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessRegistryTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -33,7 +33,6 @@
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Task.TaskType;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -73,7 +72,7 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = procBuilder.addProcess(getName()).addStartEvent().addSequenceFlow("stateA").addTask("stateA", TaskType.None).
+ Process proc = procBuilder.addProcess(getName()).addStartEvent().addSequenceFlow("stateA").addTask("stateA").
addSequenceFlow("end").addEndEvent("end").getProcess();
runProcess(proc);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-31 07:40:59 UTC (rev 1786)
@@ -33,7 +33,6 @@
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Task.TaskType;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -73,7 +72,7 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = procBuilder.addProcess(getName()).addStartEvent().addSequenceFlow("stateA").addTask("stateA", TaskType.None).
+ Process proc = procBuilder.addProcess(getName()).addStartEvent().addSequenceFlow("stateA").addTask("stateA").
addExecutionHandler(TaskA.class).addSequenceFlow("end").addEndEvent("end").getProcess();
runProcess(proc);
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/engine (from rev 1785, jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/engine)
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/engine/basic-engine-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/engine/basic-engine-api10.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -1,4 +1,4 @@
-<ns2:process name="basic-engine" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+<ns2:process name="basic-engine" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start>
<sequence to="stateA" />
</start>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -42,7 +42,7 @@
<bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>urn:api.bpm.jboss:jpdl-0.1</key><value>api10</value></entry>
+ <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
<entry><key>urn:jbpm.org:jpdl-3.2</key><value>jpdl32</value></entry>
<entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
<entry><key>http://www.wfmc.org/2008/XPDL2.1</key><value>xpdl21</value></entry>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/parallelsplit/parallel-split-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/parallelsplit/parallel-split-api10.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/parallelsplit/parallel-split-api10.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -1,4 +1,4 @@
-<ns2:process name="testParallelSplit" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+<ns2:process name="testParallelSplit" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start>
<sequence to="gateway" />
</start>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -1,4 +1,4 @@
-<ns2:process name="testBasicSequence" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+<ns2:process name="testBasicSequence" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start>
<sequence to="stateA" />
</start>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -1,4 +1,4 @@
-<ns2:process name="testBasicTask" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+<ns2:process name="testBasicTask" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start>
<sequence to="stateA" />
</start>
Modified: jbossbpm/spec/trunk/pom.xml
===================================================================
--- jbossbpm/spec/trunk/pom.xml 2008-07-30 19:52:06 UTC (rev 1785)
+++ jbossbpm/spec/trunk/pom.xml 2008-07-31 07:40:59 UTC (rev 1786)
@@ -32,8 +32,8 @@
<module>modules/api</module>
<module>modules/ri</module>
<module>modules/dialects</module>
+ <module>modules/testsuite</module>
<module>modules/samples/airticket</module>
- <module>modules/testsuite</module>
</modules>
<!-- Properties -->
More information about the jbpm-commits
mailing list