[jbpm-commits] JBoss JBPM SVN: r3670 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/builder and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Jan 19 04:52:52 EST 2009
Author: tom.baeyens at jboss.com
Date: 2009-01-19 04:52:51 -0500 (Mon, 19 Jan 2009)
New Revision: 3670
Modified:
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
Log:
migrations of process factory to process definition builder
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -65,17 +65,17 @@
super.setUp();
// define process
dueDate = new Date(System.currentTimeMillis() + TIMEOUT);
- ClientProcessDefinition processDefinition = ProcessFactory.build(getName())
- .node("start")
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess(getName())
+ .startActivity("start")
.initial()
.behaviour(new ObjectDescriptor(WaitState.class))
.timer(dueDate, "timeout")
- .transition("timeout")
+ .flow("timeout")
.listener(new ObjectDescriptor(HappyListener.class))
.to("end")
- .node("end")
+ .startActivity("end")
.behaviour(new ObjectDescriptor(WaitState.class))
- .done();
+ .endProcess();
// deploy process
environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(),
processDefinition).deploy();
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -84,17 +84,17 @@
}
// define process
dueDate = new Date(System.currentTimeMillis() + TIMEOUT);
- processDefinition = ProcessFactory.build(getName())
- .node()
+ processDefinition = ProcessFactory.startProcess(getName())
+ .startActivity()
.initial()
.behaviour(new ObjectDescriptor(WaitState.class))
.timer(dueDate, "timeout")
- .transition("timeout")
+ .flow("timeout")
.listener(listenerDescriptor)
.to("end")
- .node("end")
+ .startActivity("end")
.behaviour(new ObjectDescriptor(WaitState.class))
- .done();
+ .endProcess();
}
protected void tearDown() throws Exception {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -96,6 +96,11 @@
return this;
}
+ public ActivityBuilder asyncExecute() {
+ node.setExecutionAsync(true);
+ return this;
+ }
+
protected void addUnresolvedFlow(UnresolvedFlow unresolvedFlow) {
compositeBuilder.addUnresolvedFlow(unresolvedFlow);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -27,10 +27,9 @@
import org.jbpm.pvm.internal.model.EventImpl;
import org.jbpm.pvm.internal.model.NodeImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.internal.model.VariableDefinitionImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
-import org.jbpm.pvm.model.ProcessFactory;
/**
* @author Tom Baeyens
@@ -103,6 +102,14 @@
return activityBuilder;
}
+ public ActivityBuilder startActivity(Class<? extends Activity> activityClass) {
+ return startActivity(null, new ObjectDescriptor(activityClass));
+ }
+
+ public ActivityBuilder startActivity(String nodeName, Class<? extends Activity> activityClass) {
+ return startActivity(nodeName, new ObjectDescriptor(activityClass));
+ }
+
public EventBuilder startEvent(String eventName) {
return new EventBuilder(this, eventName);
}
@@ -112,7 +119,10 @@
}
public CompositeBuilder property(String name, String value) {
- StringDescriptor descriptor = new StringDescriptor(name, value);
+ return property(new StringDescriptor(name, value));
+ }
+
+ public CompositeBuilder property(Descriptor descriptor) {
compositeElement.addProperty(descriptor);
return this;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -56,7 +56,7 @@
* for building a process definition. To use it in this way, start with instantiating a ProcessFactory object.
* Then a number of methods can be invoked concatenated with dots cause all the methods return
* the same process factory object. When done, end that sequence with
- * {@link #done()} to get the constructed ProcessDefinition.
+ * {@link #endProcess()} to get the constructed ProcessDefinition.
* </p>
*
* <p>The idea is that this results into a more compact and more readable
@@ -125,12 +125,12 @@
}
/** starts building a process definition */
- public static ProcessFactory build() {
+ public static ProcessFactory startProcess() {
return new ProcessFactory();
}
/** starts building a process definition */
- public static ProcessFactory build(String processName) {
+ public static ProcessFactory startProcess(String processName) {
return new ProcessFactory(processName);
}
@@ -231,14 +231,14 @@
/** creates a node in the current parent.
* The current parent is either the process definition or a composite node
* in case method {@link #compositeNode(String)} was called previously. */
- public ProcessFactory node() {
- return node(null);
+ public ProcessFactory startActivity() {
+ return startActivity(null);
}
/** creates a named node.
* The current parent is either the process definition or a composite node
* in case method {@link #compositeNode(String)} was called previously. */
- public ProcessFactory node(String nodeName) {
+ public ProcessFactory startActivity(String nodeName) {
if (exceptionHandler!=null) {
exceptionHandler.setNodeName(nodeName);
} else {
@@ -372,7 +372,7 @@
}
compositeElementStack.push(compositeElement);
- node(nodeName);
+ startActivity(nodeName);
compositeElement = node;
return this;
@@ -401,13 +401,13 @@
/** creates a transition on the current node.
* This method requires a current node */
- public ProcessFactory transition() {
- return transition(null);
+ public ProcessFactory flow() {
+ return flow(null);
}
/** creates a named transition on the current node.
* This method requires a current node */
- public ProcessFactory transition(String transitionName) {
+ public ProcessFactory flow(String transitionName) {
if (exceptionHandler!=null) {
exceptionHandler.setTransitionName(transitionName);
} else {
@@ -486,7 +486,7 @@
* called for transitions. If you have exception handlers and listeners
* on an event, make sure that you put the invocations of
* {@link #exceptionHandler(Class)} first. */
- public ProcessFactory event(String eventName) {
+ public ProcessFactory startEvent(String eventName) {
if (exceptionHandler!=null) {
throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd");
}
@@ -503,7 +503,7 @@
/** creates an exception handler for the given exception class on the current process element;
* until the {@link #exceptionHandlerEnd()}. Subsequent invocations of
- * {@link #listener(Activity) listeners} or {@link #transition() transitions} will
+ * {@link #listener(Activity) listeners} or {@link #flow() transitions} will
* have the created exception handler as a target.
*
* DONT'T FORGET TO CLOSE THE EXCEPTION HANDLER WITH exceptionHandlerEnd. */
@@ -546,7 +546,7 @@
}
/** adds an action to the current event. The current event was either
- * created by {@link #event(String)} or by a {@link #transition()}.
+ * created by {@link #startEvent(String)} or by a {@link #flow()}.
* Subsequent invocations of {@link #exceptionHandler(Class)} will
* be associated to this event listener. */
public ProcessFactory listener(Descriptor descriptor) {
@@ -559,7 +559,7 @@
}
/** adds an action to the current event. The current event was either
- * created by {@link #event(String)} or by a {@link #transition()}.
+ * created by {@link #startEvent(String)} or by a {@link #flow()}.
* Subsequent invocations of {@link #exceptionHandler(Class)} will
* be associated to this event listener. */
public ProcessFactory listener(EventListener eventListener) {
@@ -572,7 +572,7 @@
}
/** adds an action to the current event. The current event was either
- * created by {@link #event(String)} or by a {@link #transition()}.
+ * created by {@link #startEvent(String)} or by a {@link #flow()}.
* Subsequent invocations of {@link #exceptionHandler(Class)} will
* be associated to this event listener. */
public ProcessFactory listener(String expression) {
@@ -657,7 +657,7 @@
/** extract the process definition from the factory. This should be
* the last method in the chain of subsequent invoked methods on this
* factory object. */
- public ClientProcessDefinition done() {
+ public ClientProcessDefinition endProcess() {
resolveDestinations();
if (processDefinition.getInitial()==null) {
throw new JbpmException("no initial node");
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.EventImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.model.VariableDefinitionImpl;
@@ -310,7 +311,13 @@
listD.setValueDescriptors(listValues);
listD.setClassName(LinkedList.class.getName());
- OpenProcessDefinition processDefinition = ProcessFactory.build().property(listD).node().initial().done();
+ OpenProcessDefinition processDefinition = ProcessDefinitionBuilder
+ .startProcess()
+ .property(listD)
+ .startActivity()
+ .initial()
+ .endActivity()
+ .endProcess();
dbSession.save(processDefinition);
@@ -354,7 +361,13 @@
setD.setValueDescriptors(listValues);
setD.setClassName(TreeSet.class.getName());
- OpenProcessDefinition processDefinition = ProcessFactory.build().property(setD).node().initial().done();
+ OpenProcessDefinition processDefinition = ProcessDefinitionBuilder
+ .startProcess()
+ .property(setD)
+ .startActivity()
+ .initial()
+ .endActivity()
+ .endProcess();
dbSession.save(processDefinition);
@@ -409,7 +422,13 @@
mapD.setKeyDescriptors(mapKeys);
mapD.setClassName(TreeMap.class.getName());
- OpenProcessDefinition processDefinition = ProcessFactory.build().property(mapD).node().initial().done();
+ OpenProcessDefinition processDefinition = ProcessDefinitionBuilder
+ .startProcess()
+ .property(mapD)
+ .startActivity()
+ .initial()
+ .endActivity()
+ .endProcess();
dbSession.save(processDefinition);
@@ -466,7 +485,15 @@
objStaticMethod.addArgDescriptor(argStaticMethod);
- OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDefault).property(objConstr).property(objStaticMethod).node().initial().done();
+ OpenProcessDefinition processDefinition = ProcessDefinitionBuilder
+ .startProcess()
+ .property(objDefault)
+ .property(objConstr)
+ .property(objStaticMethod)
+ .startActivity()
+ .initial()
+ .endActivity()
+ .endProcess();
dbSession.save(processDefinition);
@@ -506,7 +533,13 @@
objDescr.addOperation(fieldOp);
- OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDescr).node().initial().done();
+ OpenProcessDefinition processDefinition = ProcessDefinitionBuilder
+ .startProcess()
+ .property(objDescr)
+ .startActivity()
+ .initial()
+ .endActivity()
+ .endProcess();
dbSession.save(processDefinition);
@@ -545,7 +578,13 @@
objDescr.addOperation(propertyOp);
- OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDescr).node().initial().done();
+ OpenProcessDefinition processDefinition = ProcessDefinitionBuilder
+ .startProcess()
+ .property(objDescr)
+ .startActivity()
+ .initial()
+ .endActivity()
+ .endProcess();
dbSession.save(processDefinition);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -25,9 +25,9 @@
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.pvm.activities.WaitState;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.script.ScriptManager;
-import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.test.JbpmTestCase;
@@ -56,9 +56,13 @@
ScriptManager scriptManager = environmentFactory.get(ScriptManager.class);
- ClientExecution execution = ProcessFactory.build()
- .node("initial").initial().behaviour(WaitState.class)
- .done().startProcessInstance();
+ ClientExecution execution = ProcessDefinitionBuilder
+ .startProcess()
+ .startActivity("initial", new WaitState())
+ .initial()
+ .endActivity()
+ .endProcess()
+ .startProcessInstance();
execution.setVariable("pv", "hello");
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -25,6 +25,7 @@
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.pvm.activities.WaitState;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.model.ProcessFactory;
@@ -52,9 +53,13 @@
ScriptManager scriptManager = environmentFactory.get(ScriptManager.class);
- ClientExecution execution = ProcessFactory.build()
- .node("initial").initial().behaviour(WaitState.class)
- .done().startProcessInstance();
+ ClientExecution execution = ProcessDefinitionBuilder
+ .startProcess()
+ .startActivity("initial", new WaitState())
+ .initial()
+ .endActivity()
+ .endProcess()
+ .startProcessInstance();
execution.setVariable("pv", "hello");
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -28,7 +28,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.model.OpenProcessDefinition;
-import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
/**
* @author Tom Baeyens
@@ -42,7 +42,7 @@
int nbrOfExecutions = 1;
public void testContinuations() {
-
+
try {
deployProcess();
startExecutions();
@@ -69,22 +69,28 @@
public void deployProcess() {
commandService.execute(new Command<Object>() {
public Object execute(Environment environment) throws Exception {
- OpenProcessDefinition processDefinition = ProcessFactory.build("continuations")
+ OpenProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess("continuations")
.key("continuations")
- .node("start").initial().behaviour(AutomaticActivity.class)
+ .startActivity("start", AutomaticActivity.class)
+ .initial()
.asyncExecute()
- .transition().to("a")
- .node("a").behaviour(AutomaticActivity.class)
+ .flow("a")
+ .endActivity()
+ .startActivity("a", AutomaticActivity.class)
.asyncExecute()
- .transition().to("b")
- .node("b").behaviour(AutomaticActivity.class)
+ .flow("b")
+ .endActivity()
+ .startActivity("b", AutomaticActivity.class)
.asyncExecute()
- .transition().to("c")
- .node("c").behaviour(AutomaticActivity.class)
+ .flow("c")
+ .endActivity()
+ .startActivity("c", AutomaticActivity.class)
.asyncExecute()
- .transition().to("end")
- .node("end").behaviour(WaitState.class)
- .done();
+ .flow("end")
+ .endActivity()
+ .startActivity("end", WaitState.class)
+ .endActivity()
+ .endProcess();
Session session = environment.get(Session.class);
session.save(processDefinition);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -31,6 +31,7 @@
import org.jbpm.activity.ExternalActivity;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cmd.StartExecutionCmd;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
@@ -99,9 +100,12 @@
public void insertExclusiveTestMessages() {
commandService.execute(new Command<Object>() {
public Object execute(Environment environment) throws Exception {
- ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build("excl")
- .node("wait").initial().behaviour(WaitState.class)
- .done();
+ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder
+ .startProcess("excl")
+ .startActivity("wait", WaitState.class)
+ .initial()
+ .endActivity()
+ .endProcess();
processDefinition.setId("excl:1");
Session session = environment.get(Session.class);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -29,18 +29,15 @@
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
-import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivity;
+import org.jbpm.pvm.activities.WaitState;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.type.variable.BlobVariable;
import org.jbpm.pvm.internal.type.variable.ClobVariable;
import org.jbpm.pvm.internal.type.variable.DoubleVariable;
import org.jbpm.pvm.internal.type.variable.LongVariable;
import org.jbpm.pvm.internal.type.variable.StringVariable;
-import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.test.EnvironmentTestCase;
/**
@@ -52,22 +49,18 @@
super("org/jbpm/pvm/internal/type/environment.cfg.xml");
}
- public static class WaitState implements ExternalActivity {
- private static final long serialVersionUID = 1L;
- public void execute(ActivityExecution execution) {
- execution.waitForSignal();
- }
- public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) {
- execution.take(signalName);
- }
+ public static ExecutionImpl startProcessInstance() {
+ return (ExecutionImpl) ProcessDefinitionBuilder
+ .startProcess()
+ .startActivity(WaitState.class).initial()
+ .endActivity()
+ .endProcess()
+ .startProcessInstance();
}
-
public void testStringVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
+
execution.setVariable("v", "hello");
Variable variable = execution.getVariableObject("v");
@@ -80,10 +73,8 @@
}
public void testLongVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
+
execution.setVariable("v", new Long(5));
Variable variable = execution.getVariableObject("v");
@@ -95,10 +86,8 @@
}
public void testDoubleVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
+
execution.setVariable("v", new Double(5.5));
Variable variable = execution.getVariableObject("v");
@@ -110,10 +99,7 @@
}
public void testDateVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
Calendar calendar = new GregorianCalendar();
calendar.set(Calendar.YEAR, 2007);
@@ -135,10 +121,8 @@
}
public void testBooleanVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
+
execution.setVariable("affirmative", Boolean.TRUE);
execution.setVariable("negative", Boolean.FALSE);
@@ -157,10 +141,7 @@
}
public void testCharacterVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
execution.setVariable("v", new Character('c'));
@@ -173,10 +154,7 @@
}
public void testByteVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
execution.setVariable("v", new Byte((byte)78));
@@ -189,10 +167,7 @@
}
public void testShortVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
execution.setVariable("v", new Short((short)78));
@@ -205,10 +180,7 @@
}
public void testIntegerVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
execution.setVariable("v", new Integer(78));
@@ -221,10 +193,7 @@
}
public void testFloatVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
execution.setVariable("v", new Float(78.65));
@@ -237,10 +206,7 @@
}
public void testBytesVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
byte[] bytes = generateBytes();
execution.setVariable("v", bytes);
@@ -257,10 +223,7 @@
}
public void testCharsVariable() {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
char[] chars = generateChars();
execution.setVariable("v", chars);
@@ -292,10 +255,7 @@
}
public void testSerializableVariable() throws Exception {
- ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build()
- .node().initial().behaviour(WaitState.class)
- .done()
- .startProcessInstance();
+ ExecutionImpl execution = startProcessInstance();
TestSerializable testSerializable = new TestSerializable(76);
execution.setVariable("v", testSerializable);
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -66,15 +66,15 @@
}
public static ClientProcessDefinition createCreditProcess() {
- return ProcessFactory.build()
- .node("creditRate?").initial().behaviour(new AutomaticCreditRating())
- .transition("good").to("priority delivery")
- .transition("average").to("bulk delivery")
- .transition("bad").to("payment upfront")
- .node("priority delivery").behaviour(new WaitState())
- .node("bulk delivery").behaviour(new WaitState())
- .node("payment upfront").behaviour(new WaitState())
- .done();
+ return ProcessFactory.startProcess()
+ .startActivity("creditRate?").initial().behaviour(new AutomaticCreditRating())
+ .flow("good").to("priority delivery")
+ .flow("average").to("bulk delivery")
+ .flow("bad").to("payment upfront")
+ .startActivity("priority delivery").behaviour(new WaitState())
+ .startActivity("bulk delivery").behaviour(new WaitState())
+ .startActivity("payment upfront").behaviour(new WaitState())
+ .endProcess();
}
public void testGoodRating() {
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -75,18 +75,18 @@
AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents);
WaitState waitState = new WaitState(recordedEvents);
- ClientProcessDefinition processDefinition = ProcessFactory.build("loan")
- .node("submit loan request").initial().behaviour(automaticActivity)
- .transition().to("evaluate")
- .node("evaluate").behaviour(waitState)
- .transition("approve").to("wire money")
- .transition("reject").to("end")
- .node("wire money").behaviour(automaticActivity)
- .transition().to("archive")
- .node("archive").behaviour(waitState)
- .transition().to("end")
- .node("end").behaviour(waitState)
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("loan")
+ .startActivity("submit loan request").initial().behaviour(automaticActivity)
+ .flow().to("evaluate")
+ .startActivity("evaluate").behaviour(waitState)
+ .flow("approve").to("wire money")
+ .flow("reject").to("end")
+ .startActivity("wire money").behaviour(automaticActivity)
+ .flow().to("archive")
+ .startActivity("archive").behaviour(waitState)
+ .flow().to("end")
+ .startActivity("end").behaviour(waitState)
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -121,18 +121,18 @@
AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents);
WaitState waitState = new WaitState(recordedEvents);
- ClientProcessDefinition processDefinition = ProcessFactory.build("loan")
- .node("submit loan request").initial().behaviour(automaticActivity)
- .transition().to("evaluate")
- .node("evaluate").behaviour(waitState)
- .transition("approve").to("wire money")
- .transition("reject").to("end")
- .node("wire money").behaviour(automaticActivity)
- .transition().to("archive")
- .node("archive").behaviour(waitState)
- .transition().to("end")
- .node("end").behaviour(waitState)
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("loan")
+ .startActivity("submit loan request").initial().behaviour(automaticActivity)
+ .flow().to("evaluate")
+ .startActivity("evaluate").behaviour(waitState)
+ .flow("approve").to("wire money")
+ .flow("reject").to("end")
+ .startActivity("wire money").behaviour(automaticActivity)
+ .flow().to("archive")
+ .startActivity("archive").behaviour(waitState)
+ .flow().to("end")
+ .startActivity("end").behaviour(waitState)
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -82,13 +82,13 @@
public void testListenToNodeLeaveOnProcessForProcessNodes(){
Recorder recorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent(Event.NODE_END)
.listener(recorder)
- .node("initial").initial().behaviour(new WaitState())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
execution.signal();
@@ -100,13 +100,13 @@
public void testListenToNodeEnterOnProcessForProcessNodes(){
Recorder recorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event(Event.NODE_BEGIN)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent(Event.NODE_BEGIN)
.listener(recorder)
- .node("initial").initial().behaviour(new WaitState())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
execution.signal();
@@ -118,13 +118,13 @@
public void testListenToTransitionOnProcessForTransitionBetweenProcessNodes(){
Recorder recorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event(Event.TRANSITION_TAKE)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent(Event.TRANSITION_TAKE)
.listener(recorder)
- .node("initial").initial().behaviour(new WaitState())
- .transition("go").to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .flow("go").to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
execution.signal();
@@ -161,17 +161,17 @@
public void testListenToNodeLeaveOnProcessForSequenceChildNodes(){
Recorder recorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent(Event.NODE_END)
.listener(recorder)
.compositeNode("sequence").initial().behaviour(new Sequence())
.needsPrevious()
- .node("one").behaviour(new WaitState())
- .node("two").behaviour(new WaitState())
- .node("three").behaviour(new WaitState())
+ .startActivity("one").behaviour(new WaitState())
+ .startActivity("two").behaviour(new WaitState())
+ .startActivity("three").behaviour(new WaitState())
.compositeEnd()
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
assertEquals(0, recorder.events.size());
@@ -189,16 +189,16 @@
public void testListenToNodeLeaveOnProcessForTransitionBetweenSequenceChildNodes(){
Recorder recorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent(Event.NODE_END)
.listener(recorder)
.compositeNode("sequence").initial().behaviour(new Sequence())
- .node("one").behaviour(new WaitState())
- .transition().to("two")
- .node("two").behaviour(new WaitState())
+ .startActivity("one").behaviour(new WaitState())
+ .flow().to("two")
+ .startActivity("two").behaviour(new WaitState())
.compositeEnd()
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -215,17 +215,17 @@
public void testListenToNodeEnterOnProcessForSequenceChildNodes(){
Recorder recorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event(Event.NODE_BEGIN)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent(Event.NODE_BEGIN)
.listener(recorder)
.compositeNode("sequence").initial().behaviour(new Sequence())
.needsPrevious()
- .node("one").behaviour(new WaitState())
- .node("two").behaviour(new WaitState())
- .node("three").behaviour(new WaitState())
+ .startActivity("one").behaviour(new WaitState())
+ .startActivity("two").behaviour(new WaitState())
+ .startActivity("three").behaviour(new WaitState())
.compositeEnd()
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
assertEquals("event(node-begin) on one", recorder.events.get(0));
@@ -241,16 +241,16 @@
public void testListenToTransitionTakeOnProcessForTransitionBetweenSequenceChildNodes(){
Recorder recorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event(Event.TRANSITION_TAKE)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent(Event.TRANSITION_TAKE)
.listener(recorder)
.compositeNode("sequence").initial().behaviour(new Sequence())
- .node("one").behaviour(new WaitState())
- .transition("increment").to("two")
- .node("two").behaviour(new WaitState())
+ .startActivity("one").behaviour(new WaitState())
+ .flow("increment").to("two")
+ .startActivity("two").behaviour(new WaitState())
.compositeEnd()
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -267,25 +267,25 @@
Recorder innerRecorder = new Recorder();
Recorder nestedStateRecorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event("hello")
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent("hello")
.listener(processRecorder)
.compositeNode("outer").initial().behaviour(new Sequence())
- .event("hello")
+ .startEvent("hello")
.listener(outerRecorder)
.compositeNode("middel").behaviour(new Sequence())
- .event("hello")
+ .startEvent("hello")
.listener(middelRecorder)
.compositeNode("inner").behaviour(new Sequence())
- .event("hello")
+ .startEvent("hello")
.listener(innerRecorder)
- .node("nested state").behaviour(new FireableState())
- .event("hello")
+ .startActivity("nested state").behaviour(new FireableState())
+ .startEvent("hello")
.listener(nestedStateRecorder)
.compositeEnd()
.compositeEnd()
.compositeEnd()
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -315,26 +315,26 @@
Recorder innerRecorder = new Recorder();
Recorder nestedStateRecorder = new Recorder();
- ClientProcessDefinition processDefinition = ProcessFactory.build("propagate")
- .event("hello")
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+ .startEvent("hello")
.listener(processRecorder)
.compositeNode("outer").initial().behaviour(new Sequence())
- .event("hello")
+ .startEvent("hello")
.listener(outerRecorder)
.compositeNode("middle").behaviour(new Sequence())
- .event("hello")
+ .startEvent("hello")
.listener(middleRecorder)
.propagationDisabled()
.compositeNode("inner").behaviour(new Sequence())
- .event("hello")
+ .startEvent("hello")
.listener(innerRecorder)
- .node("nested state").behaviour(new FireableState())
- .event("hello")
+ .startActivity("nested state").behaviour(new FireableState())
+ .startEvent("hello")
.listener(nestedStateRecorder)
.compositeEnd()
.compositeEnd()
.compositeEnd()
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -86,13 +86,13 @@
public void testEventListenerOnNodeEnd() {
NodeLeaveAction nodeLeaveAction = new NodeLeaveAction();
- ClientProcessDefinition processDefinition = ProcessFactory.build("leave node action test")
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave node action test")
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(nodeLeaveAction)
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -118,12 +118,12 @@
public void testEventListenerOnTransition() {
TransitionAction transitionAction = new TransitionAction();
- ClientProcessDefinition processDefinition = ProcessFactory.build("transition action test")
- .node("initial").initial().behaviour(new WaitState())
- .transition("t").to("end")
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("transition action test")
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .flow("t").to("end")
.listener(transitionAction)
- .node("end").behaviour(new WaitState())
- .done();
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -149,13 +149,13 @@
public void testEventListenerOnNodeBegin() {
NodeBeginAction nodeBeginAction = new NodeBeginAction();
- ClientProcessDefinition processDefinition = ProcessFactory.build("enter node action test")
- .node("initial").initial().behaviour(new WaitState())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .event(Event.NODE_BEGIN)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter node action test")
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .startEvent(Event.NODE_BEGIN)
.listener(nodeBeginAction)
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -198,13 +198,13 @@
public void testCustomEventInNode() {
CheckRivetsAction checkRivetsAction = new CheckRivetsAction();
- ClientProcessDefinition processDefinition = ProcessFactory.build("custom node action test")
- .node("initial").initial().behaviour(new WaitStateWithCustomEvent())
- .event("end of riveter shift") // http://en.wikipedia.org/wiki/Kilroy_was_here
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("custom node action test")
+ .startActivity("initial").initial().behaviour(new WaitStateWithCustomEvent())
+ .startEvent("end of riveter shift") // http://en.wikipedia.org/wiki/Kilroy_was_here
.listener(checkRivetsAction)
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -245,10 +245,10 @@
public void testBasicEventSequence() {
ClientProcessDefinition processDefinition = ProcessFactory.build("basic", new RecordingProcessDefinition())
- .node("initial").initial().behaviour(new AutomaticActivity())
- .transition().to("end")
- .node("end").behaviour(new EndState())
- .done();
+ .startActivity("initial").initial().behaviour(new AutomaticActivity())
+ .flow().to("end")
+ .startActivity("end").behaviour(new EndState())
+ .endProcess();
RecordingExecution execution = (RecordingExecution) processDefinition.startProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -65,16 +65,16 @@
public void testExceptionHandlerOnProcessDefinition() {
Catcher catcher = new Catcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
.exceptionHandler(RuntimeException.class)
.listener(catcher)
.exceptionHandlerEnd()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(new Batter())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -87,16 +87,16 @@
public void testExceptionHandlerOnEvent() {
Catcher catcher = new Catcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.exceptionHandler(RuntimeException.class)
.listener(catcher)
.exceptionHandlerEnd()
.listener(new Batter())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -109,16 +109,16 @@
public void testExceptionHandlerOnAction() {
Catcher catcher = new Catcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(new Batter())
.exceptionHandler(RuntimeException.class)
.listener(catcher)
.exceptionHandlerEnd()
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -131,16 +131,16 @@
public void testExceptionHandlerOnOtherNode() {
Catcher catcher = new Catcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(new Batter())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
.exceptionHandler(RuntimeException.class)
.listener(catcher)
.exceptionHandlerEnd()
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -156,17 +156,17 @@
public void testExceptionHandlerOnOtherEvent() {
Catcher catcher = new Catcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event("other")
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent("other")
.exceptionHandler(RuntimeException.class)
.listener(catcher)
.exceptionHandlerEnd()
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(new Batter())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -188,17 +188,17 @@
public void testExceptionHandlerOnOtherAction() {
Catcher catcher = new Catcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(new BehavedAction())
.exceptionHandler(RuntimeException.class)
.listener(catcher)
.exceptionHandlerEnd()
.listener(new Batter())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -213,16 +213,16 @@
public void testUnmatchedExceptionHandlerOnAction() {
Catcher catcher = new Catcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(new Batter())
.exceptionHandler(NullPointerException.class)
.listener(catcher)
.exceptionHandlerEnd()
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -246,16 +246,16 @@
public void testRethrowingExceptionHandler() {
RethrowingCatcher rethrowingCatcher = new RethrowingCatcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(new Batter())
.exceptionHandler(RuntimeException.class)
.listener(rethrowingCatcher)
.exceptionHandlerEnd()
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -274,9 +274,9 @@
// (=the surrounding process element)
RethrowingCatcher rethrowingCatcher = new RethrowingCatcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.exceptionHandler(RuntimeException.class)
.listener(new Catcher())
.exceptionHandlerEnd()
@@ -284,9 +284,9 @@
.exceptionHandler(RuntimeException.class)
.listener(rethrowingCatcher)
.exceptionHandlerEnd()
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -300,9 +300,9 @@
// an exception handler rethrows
RethrowingCatcher rethrowingCatcher = new RethrowingCatcher();
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("initial").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("initial").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(new Batter())
.exceptionHandler(RuntimeException.class)
.listener(rethrowingCatcher)
@@ -310,9 +310,9 @@
.exceptionHandler(RuntimeException.class)
.listener(new Catcher())
.exceptionHandlerEnd()
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
try {
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -77,13 +77,13 @@
}
public void testBasicState() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new AutomaticActivity())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
- .transition().to("c")
- .node("c").behaviour(new AutomaticActivity())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new AutomaticActivity())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
+ .flow().to("c")
+ .startActivity("c").behaviour(new AutomaticActivity())
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
@@ -99,14 +99,14 @@
}
public void testSignalOnInactiveExecution() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new AutomaticActivity())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new AutomaticActivity())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
.scope()
- .transition().to("c")
- .node("c").behaviour(new AutomaticActivity())
- .done();
+ .flow().to("c")
+ .startActivity("c").behaviour(new AutomaticActivity())
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
processInstance.start();
@@ -123,13 +123,13 @@
}
public void testCustomEndState() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new AutomaticActivity())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
- .transition().to("c")
- .node("c").behaviour(new AutomaticActivity())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new AutomaticActivity())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
+ .flow().to("c")
+ .startActivity("c").behaviour(new AutomaticActivity())
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
processInstance.start();
@@ -147,13 +147,13 @@
}
public void testInvalidCustomStates() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new AutomaticActivity())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
- .transition().to("c")
- .node("c").behaviour(new AutomaticActivity())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new AutomaticActivity())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
+ .flow().to("c")
+ .startActivity("c").behaviour(new AutomaticActivity())
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
processInstance.start();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -58,15 +58,15 @@
}
public static ClientProcessDefinition createCreditProcess() {
- return ProcessFactory.build()
- .node("creditRate?").initial().behaviour(new ExternalDecision())
- .transition("good").to("priority delivery")
- .transition("average").to("bulk delivery")
- .transition("bad").to("payment upfront")
- .node("priority delivery").behaviour(new WaitState())
- .node("bulk delivery").behaviour(new WaitState())
- .node("payment upfront").behaviour(new WaitState())
- .done();
+ return ProcessFactory.startProcess()
+ .startActivity("creditRate?").initial().behaviour(new ExternalDecision())
+ .flow("good").to("priority delivery")
+ .flow("average").to("bulk delivery")
+ .flow("bad").to("payment upfront")
+ .startActivity("priority delivery").behaviour(new WaitState())
+ .startActivity("bulk delivery").behaviour(new WaitState())
+ .startActivity("payment upfront").behaviour(new WaitState())
+ .endProcess();
}
public void testGoodRating() {
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -73,13 +73,13 @@
List<String> recordedEvents = new ArrayList<String>();
FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents);
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(functionalActivity)
- .transition().to("b")
- .node("b").behaviour(functionalActivity)
- .transition().to("c")
- .node("c").behaviour(functionalActivity)
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(functionalActivity)
+ .flow().to("b")
+ .startActivity("b").behaviour(functionalActivity)
+ .flow().to("c")
+ .startActivity("c").behaviour(functionalActivity)
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
@@ -109,12 +109,12 @@
List<String> recordedEvents = new ArrayList<String>();
FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents);
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new AutomaticActivity())
- .transition().to("b")
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new AutomaticActivity())
+ .flow().to("b")
.listener(functionalActivity)
- .node("b").behaviour(new AutomaticActivity())
- .done();
+ .startActivity("b").behaviour(new AutomaticActivity())
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
processInstance.start();
@@ -139,11 +139,11 @@
List<String> recordedEvents = new ArrayList<String>();
FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents);
- ClientProcessDefinition processDefinition = ProcessFactory.build()
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
.compositeNode("a").initial().behaviour(new Composite())
- .node().behaviour(functionalActivity)
+ .startActivity().behaviour(functionalActivity)
.compositeEnd()
- .done();
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
processInstance.start();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -84,14 +84,14 @@
public void testWhile() {
int loops = 20;
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("for").initial().behaviour(new For(loops))
- .transition("loop").to("recorder")
- .transition("done").to("end")
- .node("recorder").behaviour(new Recorder())
- .transition().to("for")
- .node("end").behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("for").initial().behaviour(new For(loops))
+ .flow("loop").to("recorder")
+ .flow("done").to("end")
+ .startActivity("recorder").behaviour(new Recorder())
+ .flow().to("for")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -58,14 +58,14 @@
}
public void testInactivationWhenCreatingNestedExecution() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new AutomaticActivity())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new AutomaticActivity())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
.scope()
- .transition().to("c")
- .node("c").behaviour(new WaitState())
- .done();
+ .flow().to("c")
+ .startActivity("c").behaviour(new WaitState())
+ .endProcess();
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -60,10 +60,10 @@
}
public void testProcessInstanceVariableDeclaration() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
.variable("flight")
- .node("a").initial().behaviour(new WaitState())
- .done();
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -72,10 +72,10 @@
}
public void testProcessInstanceVariableDeclarationWithInitialValue() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
.variable("flight", "B52")
- .node("a").initial().behaviour(new WaitState())
- .done();
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -84,7 +84,7 @@
}
public void testNestedScopeDeclarations() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
.variable("flight", "B52")
.compositeNode("outer").behaviour(new Composite())
.variable("duration", "22 minutes")
@@ -98,7 +98,7 @@
.compositeEnd()
.compositeEnd()
.compositeEnd()
- .done();
+ .endProcess();
Map<String, Object> expectedVariables = new HashMap<String, Object>();
@@ -125,14 +125,14 @@
}
public void testHiddenVariable() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
.variable("flight", "B52")
.compositeNode("c").behaviour(new Composite())
.variable("flight", "U2")
- .node("i").initial().behaviour(new WaitState())
+ .startActivity("i").initial().behaviour(new WaitState())
.variable("flight", "C130")
.compositeEnd()
- .done();
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
OpenExecution executionC = processInstance.getExecution("c");
@@ -163,7 +163,7 @@
| | +---------------------------+ | +----------------------------+ |
+--------------------------------------------------------------------+
*/
- ClientProcessDefinition processDefinition = ProcessFactory.build()
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
.variable("flight", "B52")
.compositeNode("outer").behaviour(new Composite())
.variable("duration", "22 minutes")
@@ -173,7 +173,7 @@
.variable("passengers", "52")
.compositeNode("left-start").initial().behaviour(new WaitState())
.variable("fuel", "kerosine")
- .transition().to("right-inner")
+ .flow().to("right-inner")
.compositeEnd()
.compositeEnd()
.compositeEnd()
@@ -184,7 +184,7 @@
.compositeEnd()
.compositeEnd()
.compositeEnd()
- .done();
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
OpenExecution outerExecution = processInstance.getExecution("outer");
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -56,14 +56,14 @@
}
public void testOuterscopeLookup() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
.scope() // !!!!
- .transition().to("c")
- .node("c").behaviour(new WaitState())
- .done();
+ .flow().to("c")
+ .startActivity("c").behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
processInstance.setVariable("destination", "anywhere");
@@ -81,14 +81,14 @@
}
public void testLocalVariableLookup() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
.scope() // !!!!
- .transition().to("c")
- .node("c").behaviour(new WaitState())
- .done();
+ .flow().to("c")
+ .startActivity("c").behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -107,14 +107,14 @@
}
public void testLocalVariableUpdate() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
.scope() // !!!!
- .transition().to("c")
- .node("c").behaviour(new WaitState())
- .done();
+ .flow().to("c")
+ .startActivity("c").behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -133,14 +133,14 @@
}
public void testDefaultCreationOnGlobalScope() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
.scope() // !!!!
- .transition().to("c")
- .node("c").behaviour(new WaitState())
- .done();
+ .flow().to("c")
+ .startActivity("c").behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -157,14 +157,14 @@
}
public void testVariableUpdatesOnEndedScope() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .flow().to("b")
+ .startActivity("b").behaviour(new WaitState())
.scope() // !!!!
- .transition().to("c")
- .node("c").behaviour(new WaitState())
- .done();
+ .flow().to("c")
+ .startActivity("c").behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -75,21 +75,21 @@
}
public void testSubProcess() {
- ClientProcessDefinition subProcess = ProcessFactory.build("sub")
- .node("sub1").initial().behaviour(new AutomaticActivity())
- .transition().to("sub2")
- .node("sub2").behaviour(new WaitState())
- .transition().to("sub3")
- .node("sub3").behaviour(new EndState())
- .done();
+ ClientProcessDefinition subProcess = ProcessFactory.startProcess("sub")
+ .startActivity("sub1").initial().behaviour(new AutomaticActivity())
+ .flow().to("sub2")
+ .startActivity("sub2").behaviour(new WaitState())
+ .flow().to("sub3")
+ .startActivity("sub3").behaviour(new EndState())
+ .endProcess();
- ClientProcessDefinition superProcess = ProcessFactory.build("super")
- .node("super1").initial().behaviour(new AutomaticActivity())
- .transition().to("super2")
- .node("super2").behaviour(new SubProcess(subProcess))
- .transition().to("super3")
- .node("super3").behaviour(new WaitState())
- .done();
+ ClientProcessDefinition superProcess = ProcessFactory.startProcess("super")
+ .startActivity("super1").initial().behaviour(new AutomaticActivity())
+ .flow().to("super2")
+ .startActivity("super2").behaviour(new SubProcess(subProcess))
+ .flow().to("super3")
+ .startActivity("super3").behaviour(new WaitState())
+ .endProcess();
ClientExecution superProcesInstance = superProcess.startProcessInstance();
assertEquals("super2", superProcesInstance.getNode().getName());
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -64,12 +64,12 @@
}
public void testSmallAmount() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("make loss").initial().behaviour(new AutomaticActivity())
- .transition("use jbpm").to("make profit")
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("make loss").initial().behaviour(new AutomaticActivity())
+ .flow("use jbpm").to("make profit")
.waitCondition(new AlwaysTrue())
- .node("make profit").behaviour(new WaitState())
- .done();
+ .startActivity("make profit").behaviour(new WaitState())
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -123,18 +123,18 @@
public void testTransitionBasedConcurrency() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("fork").initial().behaviour(new Fork())
- .transition("billing").to("bill")
- .transition("shipping").to("ship")
- .node("bill").behaviour(new WaitState())
- .transition().to("join")
- .node("ship").behaviour(new WaitState())
- .transition().to("join")
- .node("join").behaviour(new Join())
- .transition().to("end")
- .node("end").behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("fork").initial().behaviour(new Fork())
+ .flow("billing").to("bill")
+ .flow("shipping").to("ship")
+ .startActivity("bill").behaviour(new WaitState())
+ .flow().to("join")
+ .startActivity("ship").behaviour(new WaitState())
+ .flow().to("join")
+ .startActivity("join").behaviour(new Join())
+ .flow().to("end")
+ .startActivity("end").behaviour(new WaitState())
+ .endProcess();
ClientExecution main = processDefinition.startProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -74,37 +74,37 @@
+--------------+
*/
- ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state")
+ .startEvent(Event.NODE_END)
.listener(processListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(processListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(processListener)
.compositeNode("composite")
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(compositeListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(compositeListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(compositeListener)
- .node("inside").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("inside").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(insideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(insideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(insideListener)
- .transition().to("outside")
+ .flow().to("outside")
.compositeEnd()
- .node("outside").behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("outside").behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(outsideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(outsideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(outsideListener)
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -149,37 +149,37 @@
+--------------+
*/
- ClientProcessDefinition processDefinition = ProcessFactory.build("enter a super state")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter a super state")
+ .startEvent(Event.NODE_END)
.listener(processListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(processListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(processListener)
- .node("outside").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("outside").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(outsideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(outsideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(outsideListener)
- .transition().to("inside")
+ .flow().to("inside")
.compositeNode("composite")
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(compositeListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(compositeListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(compositeListener)
- .node("inside").behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("inside").behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(insideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(insideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(insideListener)
.compositeEnd()
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -223,30 +223,30 @@
+-----------------+
*/
- ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state")
+ .startEvent(Event.NODE_END)
.listener(processListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(processListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(processListener)
.compositeNode("composite")
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(compositeListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(compositeListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(compositeListener)
- .node("inside").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("inside").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(insideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(insideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(insideListener)
- .transition().to("inside")
+ .flow().to("inside")
.compositeEnd()
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -289,37 +289,37 @@
+--------------+
*/
- ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state")
+ .startEvent(Event.NODE_END)
.listener(processListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(processListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(processListener)
.compositeNode("composite")
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(compositeListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(compositeListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(compositeListener)
- .transition().to("outside")
- .node("inside").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ .flow().to("outside")
+ .startActivity("inside").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(insideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(insideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(insideListener)
.compositeEnd()
- .node("outside").behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("outside").behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(outsideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(outsideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(outsideListener)
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
@@ -369,53 +369,53 @@
+--------------------------+
*/
- ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state")
- .event(Event.NODE_END)
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state")
+ .startEvent(Event.NODE_END)
.listener(processListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(processListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(processListener)
.compositeNode("source outside")
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(sourceOutsideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(sourceOutsideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(sourceOutsideListener)
.compositeNode("source middle")
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(sourceMiddleListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(sourceMiddleListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(sourceMiddleListener)
- .transition().to("destination inside")
- .node("source inside").initial().behaviour(new WaitState())
- .event(Event.NODE_END)
+ .flow().to("destination inside")
+ .startActivity("source inside").initial().behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(sourceInsideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(sourceInsideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(sourceInsideListener)
.compositeEnd()
.compositeEnd()
.compositeNode("destination outside")
- .event(Event.NODE_END)
+ .startEvent(Event.NODE_END)
.listener(destinationOutsideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(destinationOutsideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(destinationOutsideListener)
- .node("destination inside").behaviour(new WaitState())
- .event(Event.NODE_END)
+ .startActivity("destination inside").behaviour(new WaitState())
+ .startEvent(Event.NODE_END)
.listener(destinationInsideListener)
- .event(Event.NODE_BEGIN)
+ .startEvent(Event.NODE_BEGIN)
.listener(destinationInsideListener)
- .event(Event.TRANSITION_TAKE)
+ .startEvent(Event.TRANSITION_TAKE)
.listener(destinationInsideListener)
.compositeEnd()
- .done();
+ .endProcess();
ClientExecution execution = processDefinition.startProcessInstance();
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 09:29:38 UTC (rev 3669)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 09:52:51 UTC (rev 3670)
@@ -49,9 +49,9 @@
}
public void testSetAndGetVariable() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -66,9 +66,9 @@
}
public void testHasVariable() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -79,9 +79,9 @@
}
public void testSetVariables() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -98,9 +98,9 @@
}
public void testGetVariables() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -116,9 +116,9 @@
}
public void testRemoveVariable() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -150,9 +150,9 @@
}
public void testRemoveVariables() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -167,9 +167,9 @@
}
public void testGetVariableKeys() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -185,9 +185,9 @@
}
public void testGetUnexistingVariable() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
@@ -206,9 +206,9 @@
}
public void testInitialiseVariablesBeforeProcessInstanceBegin() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new VariableActivity())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new VariableActivity())
+ .endProcess();
// here, the process instance is created first, and only later it is begun
ClientProcessInstance processInstance = processDefinition.createProcessInstance();
@@ -218,9 +218,9 @@
}
public void testNullValue() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .done();
+ ClientProcessDefinition processDefinition = ProcessFactory.startProcess()
+ .startActivity("a").initial().behaviour(new WaitState())
+ .endProcess();
ClientExecution processInstance = processDefinition.startProcessInstance();
More information about the jbpm-commits
mailing list