[jbpm-commits] JBoss JBPM SVN: r3672 - in jbpm4/trunk/modules: test-pojo/src/main/java/org/jbpm/test/activities and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Jan 19 06:05:47 EST 2009


Author: tom.baeyens at jboss.com
Date: 2009-01-19 06:05:47 -0500 (Mon, 19 Jan 2009)
New Revision: 3672

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/ProcessDefinitionBuilder.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
Log:
migrations of process factory to process definition builder

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 11:01:14 UTC (rev 3671)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java	2009-01-19 11:05:47 UTC (rev 3672)
@@ -104,4 +104,9 @@
   protected void addUnresolvedFlow(UnresolvedFlow unresolvedFlow) {
     compositeBuilder.addUnresolvedFlow(unresolvedFlow);
   }
+
+  public ActivityBuilder needsPrevious() {
+    node.setPreviousNeeded(true);
+    return this;
+  }
 }

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java	2009-01-19 11:01:14 UTC (rev 3671)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java	2009-01-19 11:05:47 UTC (rev 3672)
@@ -49,7 +49,10 @@
   }
 
   public static ProcessDefinitionBuilder startProcess(String processDefinitionName) {
-    ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl();
+    return startProcess(processDefinitionName, new ProcessDefinitionImpl());
+  }
+
+  public static ProcessDefinitionBuilder startProcess(String processDefinitionName, ProcessDefinitionImpl processDefinition) {
     processDefinition.setName(processDefinitionName);
     return new ProcessDefinitionBuilder(processDefinition);
   }

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 11:01:14 UTC (rev 3671)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java	2009-01-19 11:05:47 UTC (rev 3672)
@@ -28,6 +28,7 @@
 import org.jbpm.activity.ExternalActivity;
 import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 
@@ -66,14 +67,19 @@
   }
 
   public static ClientProcessDefinition createCreditProcess() {
-    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())
+    return ProcessDefinitionBuilder.startProcess()
+      .startActivity("creditRate?", new AutomaticCreditRating())
+        .initial()
+        .flow("priority delivery", "good")
+        .flow("bulk delivery", "average")
+        .flow("payment upfront", "bad")
+      .endActivity()
+      .startActivity("priority delivery", new WaitState())
+      .endActivity()
+      .startActivity("bulk delivery", new WaitState())
+      .endActivity()
+      .startActivity("payment upfront", new WaitState())
+      .endActivity()
     .endProcess();
   }
 

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 11:01:14 UTC (rev 3671)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java	2009-01-19 11:05:47 UTC (rev 3672)
@@ -31,6 +31,7 @@
 import org.jbpm.client.ClientExecution;
 import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 
@@ -75,17 +76,24 @@
     AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents);
     WaitState waitState = new WaitState(recordedEvents);
 
-    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)
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("loan")
+      .startActivity("submit loan request", automaticActivity)
+        .initial()
+        .flow("evaluate")
+      .endActivity()
+      .startActivity("evaluate", waitState)
+        .flow("wire money", "approve")
+        .flow("end", "reject")
+      .endActivity()
+      .startActivity("wire money", automaticActivity)
+        .flow("archive")
+      .endActivity()
+      .startActivity("archive", waitState)
+        .flow("end")
+      .endActivity()
+      .startActivity("end", waitState)
+      .endActivity()
     .endProcess();
 
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -121,17 +129,24 @@
     AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents);
     WaitState waitState = new WaitState(recordedEvents);
 
-    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)
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("loan")
+      .startActivity("submit loan request", automaticActivity)
+        .initial()
+        .flow("evaluate")
+      .endActivity()
+      .startActivity("evaluate", waitState)
+        .flow("wire money", "approve")
+        .flow("end", "reject")
+      .endActivity()
+      .startActivity("wire money", automaticActivity)
+        .flow("archive")
+      .endActivity()
+      .startActivity("archive", waitState)
+        .flow("end")
+      .endActivity()
+      .startActivity("end", waitState)
+      .endActivity()
     .endProcess();
   
     

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 11:01:14 UTC (rev 3671)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java	2009-01-19 11:05:47 UTC (rev 3672)
@@ -35,14 +35,13 @@
 import org.jbpm.model.Event;
 import org.jbpm.model.Node;
 import org.jbpm.model.ObservableElement;
-import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.test.JbpmTestCase;
 
 /**
  * @author Tom Baeyens
  */
-public class EventPropagationTest extends JbpmTestCase
-{
+public class EventPropagationTest extends JbpmTestCase {
   
   public class Recorder implements EventListener {
     private static final long serialVersionUID = 1L;
@@ -82,12 +81,17 @@
   public void testListenToNodeLeaveOnProcessForProcessNodes(){
     Recorder recorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
-        .startEvent(Event.NODE_END) 
-          .listener(recorder)
-        .startActivity("initial").initial().behaviour(new WaitState())
-          .flow().to("end")
-        .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent(Event.NODE_END) 
+        .listener(recorder)
+      .endEvent()
+      .startActivity("initial", new WaitState())
+        .initial()
+        .flow("end")
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -100,12 +104,17 @@
   public void testListenToNodeEnterOnProcessForProcessNodes(){
     Recorder recorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
-        .startEvent(Event.NODE_BEGIN) 
-          .listener(recorder)
-        .startActivity("initial").initial().behaviour(new WaitState())
-          .flow().to("end")
-        .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent(Event.NODE_BEGIN) 
+        .listener(recorder)
+      .endEvent()
+      .startActivity("initial", new WaitState())
+        .initial()
+        .flow("end")
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -118,12 +127,17 @@
   public void testListenToTransitionOnProcessForTransitionBetweenProcessNodes(){
     Recorder recorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
-        .startEvent(Event.TRANSITION_TAKE) 
-          .listener(recorder)
-        .startActivity("initial").initial().behaviour(new WaitState())
-          .flow("go").to("end")
-        .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent(Event.TRANSITION_TAKE) 
+        .listener(recorder)
+      .endEvent()
+      .startActivity("initial", new WaitState())
+        .initial()
+        .flow("end", "go")
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -161,16 +175,23 @@
   public void testListenToNodeLeaveOnProcessForSequenceChildNodes(){
     Recorder recorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
-        .startEvent(Event.NODE_END) 
-          .listener(recorder)
-        .compositeNode("sequence").initial().behaviour(new Sequence())
-          .needsPrevious()
-            .startActivity("one").behaviour(new WaitState())
-            .startActivity("two").behaviour(new WaitState())
-            .startActivity("three").behaviour(new WaitState())
-        .compositeEnd()
-        .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent(Event.NODE_END) 
+        .listener(recorder)
+      .endEvent()
+      .startActivity("sequence", new Sequence())
+        .initial()
+        .needsPrevious()
+        .startActivity("one", new WaitState())
+        .endActivity()
+        .startActivity("two", new WaitState())
+        .endActivity()
+        .startActivity("three", new WaitState())
+        .endActivity()
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -189,15 +210,21 @@
   public void testListenToNodeLeaveOnProcessForTransitionBetweenSequenceChildNodes(){
     Recorder recorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
-        .startEvent(Event.NODE_END) 
-          .listener(recorder)
-        .compositeNode("sequence").initial().behaviour(new Sequence())
-            .startActivity("one").behaviour(new WaitState())
-              .flow().to("two")
-            .startActivity("two").behaviour(new WaitState())
-        .compositeEnd()
-        .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent(Event.NODE_END) 
+        .listener(recorder)
+      .endEvent()
+      .startActivity("sequence", new Sequence())
+        .initial()
+        .startActivity("one", new WaitState())
+          .flow("two")
+        .endActivity()
+        .startActivity("two", new WaitState())
+        .endActivity()
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -215,16 +242,23 @@
   public void testListenToNodeEnterOnProcessForSequenceChildNodes(){
     Recorder recorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
-        .startEvent(Event.NODE_BEGIN) 
-          .listener(recorder)
-        .compositeNode("sequence").initial().behaviour(new Sequence())
-          .needsPrevious()
-            .startActivity("one").behaviour(new WaitState())
-            .startActivity("two").behaviour(new WaitState())
-            .startActivity("three").behaviour(new WaitState())
-        .compositeEnd()
-        .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent(Event.NODE_BEGIN) 
+        .listener(recorder)
+      .endEvent()
+      .startActivity("sequence", new Sequence())
+        .initial()
+        .needsPrevious()
+        .startActivity("one", new WaitState())
+        .endActivity()
+        .startActivity("two", new WaitState())
+        .endActivity()
+        .startActivity("three", new WaitState())
+        .endActivity()
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -241,15 +275,21 @@
   public void testListenToTransitionTakeOnProcessForTransitionBetweenSequenceChildNodes(){
     Recorder recorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
-        .startEvent(Event.TRANSITION_TAKE) 
-          .listener(recorder)
-        .compositeNode("sequence").initial().behaviour(new Sequence())
-            .startActivity("one").behaviour(new WaitState())
-              .flow("increment").to("two")
-            .startActivity("two").behaviour(new WaitState())
-          .compositeEnd()
-        .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent(Event.TRANSITION_TAKE) 
+        .listener(recorder)
+      .endEvent()
+      .startActivity("sequence", new Sequence())
+        .initial()
+        .startActivity("one", new WaitState())
+          .flow("two", "increment")
+        .endActivity()
+        .startActivity("two", new WaitState())
+        .endActivity()
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -267,24 +307,32 @@
     Recorder innerRecorder = new Recorder();
     Recorder nestedStateRecorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent("hello") 
+        .listener(processRecorder)
+      .endEvent()
+      .startActivity("outer", new Sequence())
+        .initial()
         .startEvent("hello") 
-          .listener(processRecorder)
-        .compositeNode("outer").initial().behaviour(new Sequence())
+          .listener(outerRecorder)
+        .endEvent()
+        .startActivity("middel", new Sequence())
           .startEvent("hello") 
-            .listener(outerRecorder)
-            .compositeNode("middel").behaviour(new Sequence())
+            .listener(middelRecorder)
+          .endEvent()
+          .startActivity("inner", new Sequence())
+            .startEvent("hello") 
+              .listener(innerRecorder)
+            .endEvent()
+            .startActivity("nested state", new FireableState())
               .startEvent("hello") 
-                .listener(middelRecorder)
-                .compositeNode("inner").behaviour(new Sequence())
-                  .startEvent("hello") 
-                    .listener(innerRecorder)
-                    .startActivity("nested state").behaviour(new FireableState())
-                      .startEvent("hello") 
-                        .listener(nestedStateRecorder)
-                .compositeEnd()
-            .compositeEnd()
-        .compositeEnd()
+                .listener(nestedStateRecorder)
+              .endEvent()
+            .endActivity()
+          .endActivity()
+        .endActivity()
+      .endActivity()
     .endProcess();
     
     ClientExecution execution = processDefinition.startProcessInstance();
@@ -315,25 +363,32 @@
     Recorder innerRecorder = new Recorder();
     Recorder nestedStateRecorder = new Recorder();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate")
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("propagate")
+      .startEvent("hello") 
+        .listener(processRecorder)
+      .endEvent()
+      .startActivity("outer", new Sequence())
+        .initial()
         .startEvent("hello") 
-          .listener(processRecorder)
-        .compositeNode("outer").initial().behaviour(new Sequence())
+          .listener(outerRecorder)
+        .endEvent()
+        .startActivity("middle", new Sequence())
           .startEvent("hello") 
-            .listener(outerRecorder)
-          .compositeNode("middle").behaviour(new Sequence())
+            .listener(middleRecorder, false)
+          .endEvent()
+          .startActivity("inner", new Sequence())
             .startEvent("hello") 
-              .listener(middleRecorder)
-            .propagationDisabled()
-            .compositeNode("inner").behaviour(new Sequence())
+              .listener(innerRecorder)
+            .endEvent()
+            .startActivity("nested state", new FireableState())
               .startEvent("hello") 
-                .listener(innerRecorder)
-                .startActivity("nested state").behaviour(new FireableState())
-                  .startEvent("hello") 
-                    .listener(nestedStateRecorder)
-            .compositeEnd()
-          .compositeEnd()
-        .compositeEnd()
+                .listener(nestedStateRecorder)
+              .endEvent()
+            .endActivity()
+          .endActivity()
+        .endActivity()
+      .endActivity()
     .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 11:01:14 UTC (rev 3671)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java	2009-01-19 11:05:47 UTC (rev 3672)
@@ -35,6 +35,7 @@
 import org.jbpm.model.Event;
 import org.jbpm.model.Node;
 import org.jbpm.model.ObservableElement;
+import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
 import org.jbpm.pvm.model.ProcessFactory;
@@ -86,13 +87,18 @@
   public void testEventListenerOnNodeEnd() {
     NodeLeaveAction nodeLeaveAction = new NodeLeaveAction();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave node action test")
-      .startActivity("initial").initial().behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("leave node action test")
+      .startActivity("initial", new WaitState())
+        .initial()
+        .flow("end")
         .startEvent(Event.NODE_END)
           .listener(nodeLeaveAction)
-        .flow().to("end")
-      .startActivity("end").behaviour(new WaitState())
-      .endProcess();
+        .endEvent()
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
+    .endProcess();
 
     ClientExecution execution = processDefinition.startProcessInstance();
 
@@ -118,12 +124,18 @@
   public void testEventListenerOnTransition() {
     TransitionAction transitionAction = new TransitionAction();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("transition action test")
-      .startActivity("initial").initial().behaviour(new WaitState())
-        .flow("t").to("end")
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("transition action test")
+      .startActivity("initial", new WaitState())
+        .initial()
+        .startFlow("end")
+          .name("t")
           .listener(transitionAction)
-      .startActivity("end").behaviour(new WaitState())
-      .endProcess();
+        .endFlow()
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
+    .endProcess();
 
     ClientExecution execution = processDefinition.startProcessInstance();
 
@@ -149,13 +161,18 @@
   public void testEventListenerOnNodeBegin() {
     NodeBeginAction nodeBeginAction = new NodeBeginAction();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter node action test")
-      .startActivity("initial").initial().behaviour(new WaitState())
-        .flow().to("end")
-      .startActivity("end").behaviour(new WaitState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("enter node action test")
+      .startActivity("initial", new WaitState())
+        .initial()
+        .flow("end")
+      .endActivity()
+      .startActivity("end", new WaitState())
         .startEvent(Event.NODE_BEGIN)
           .listener(nodeBeginAction)
-      .endProcess();
+        .endEvent()
+      .endActivity()
+    .endProcess();
 
     ClientExecution execution = processDefinition.startProcessInstance();
 
@@ -198,13 +215,18 @@
   public void testCustomEventInNode() {
     CheckRivetsAction checkRivetsAction = new CheckRivetsAction();
     
-    ClientProcessDefinition processDefinition = ProcessFactory.startProcess("custom node action test")
-      .startActivity("initial").initial().behaviour(new WaitStateWithCustomEvent())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("custom node action test")
+      .startActivity("initial", new WaitStateWithCustomEvent())
+        .initial()
+        .flow("end")
         .startEvent("end of riveter shift") // http://en.wikipedia.org/wiki/Kilroy_was_here
           .listener(checkRivetsAction)
-        .flow().to("end")
-      .startActivity("end").behaviour(new WaitState())
-      .endProcess();
+        .endEvent()
+      .endActivity()
+      .startActivity("end", new WaitState())
+      .endActivity()
+    .endProcess();
 
     ClientExecution execution = processDefinition.startProcessInstance();
 
@@ -244,10 +266,14 @@
   }
   
   public void testBasicEventSequence() {
-    ClientProcessDefinition processDefinition = ProcessFactory.build("basic", new RecordingProcessDefinition())
-        .startActivity("initial").initial().behaviour(new AutomaticActivity())
-          .flow().to("end")
-        .startActivity("end").behaviour(new EndState())
+    ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
+    .startProcess("basic", new RecordingProcessDefinition())
+      .startActivity("initial", new AutomaticActivity())
+        .initial()
+        .flow("end")
+      .endActivity()
+      .startActivity("end", new EndState())
+      .endActivity()
     .endProcess();
 
     RecordingExecution execution = (RecordingExecution) processDefinition.startProcessInstance();




More information about the jbpm-commits mailing list