10:23 a.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-04-14 11:23:46 -0400 (Tue, 14 Apr 2009)
New Revision: 4551
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml
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/model/ActivityImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeElementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.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/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
Log:
JBPM-2029 finished timer transition example
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-14
14:21:41 UTC (rev 4550)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -21,7 +21,6 @@
*/
package org.jbpm;
-import java.sql.Connection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -141,13 +140,4 @@
/** delete a process instance */
void deleteProcessInstance(String processInstanceId);
-
-
- /** provide a userId that will be used in the next method invocation
- * on this service by this thread. */
- void setUserId(String userId);
-
- /** provide a JDBC connection that will be used in the next method
- * invocation on this service by this thread. */
- void setConnection(Connection connection);
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java 2009-04-14 14:21:41
UTC (rev 4550)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java 2009-04-14 15:23:46
UTC (rev 4551)
@@ -21,14 +21,15 @@
*/
package org.jbpm;
-import java.sql.Connection;
import java.util.Map;
import org.jbpm.history.HistoryActivityInstanceQuery;
import org.jbpm.history.HistoryProcessInstanceQuery;
-/**
+/** exposes the history information for ongoing and past
+ * process instances.
+ *
* @author Tom Baeyens
*/
public interface HistoryService {
@@ -44,14 +45,4 @@
/** returns for each transitionName, the number of times that transition was taken */
Map<String, Integer> choiceDistribution(String processDefinitionId, String
activityName);
-
-
- /** provide a userId that will be used in the next method invocation
- * on this service by this thread. */
- void setUserId(String userId);
-
- /** provide a JDBC connection that will be used in the next method
- * invocation on this service by this thread. */
- void setConnection(Connection connection);
-
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-04-14
14:21:41 UTC (rev 4550)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -21,7 +21,6 @@
*/
package org.jbpm;
-import java.sql.Connection;
import java.util.List;
import org.jbpm.identity.Group;
@@ -92,12 +91,4 @@
* Role can be null. If no such membership exists, this method will
* not throw an exception and have no effect. */
void deleteMembership(String userId, String groupId, String role);
-
- /** provide a userId that will be used in the next method invocation
- * on this service by this thread. */
- void setUserId(String userId);
-
- /** provide a JDBC connection that will be used in the next method
- * invocation on this service by this thread. */
- void setConnection(Connection connection);
}
\ No newline at end of file
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java 2009-04-14
14:21:41 UTC (rev 4550)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -21,7 +21,6 @@
*/
package org.jbpm;
-import java.sql.Connection;
@@ -42,12 +41,4 @@
/** search for jobs */
JobQuery createJobQuery();
-
- /** provide a userId that will be used in the next method invocation
- * on this service by this thread. */
- void setUserId(String userId);
-
- /** provide a JDBC connection that will be used in the next method
- * invocation on this service by this thread. */
- void setConnection(Connection connection);
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java 2009-04-14 14:21:41
UTC (rev 4550)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java 2009-04-14 15:23:46
UTC (rev 4551)
@@ -21,7 +21,6 @@
*/
package org.jbpm;
-import java.sql.Connection;
import java.util.List;
@@ -57,12 +56,4 @@
/** deletes process definition, the existing executions and the history. */
void deleteProcessDefinitionCascade(String processDefinitionId);
-
- /** provide a userId that will be used in the next method invocation
- * on this service by this thread. */
- void setUserId(String userId);
-
- /** provide a JDBC connection that will be used in the next method
- * invocation on this service by this thread. */
- void setConnection(Connection connection);
}
Modified:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
===================================================================
---
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -1,17 +1,46 @@
package org.jbpm.examples.timer.transition;
+import java.util.ArrayList;
+import java.util.List;
+
import org.jbpm.Execution;
+import org.jbpm.job.Job;
import org.jbpm.test.JbpmTestCase;
public class TimerTransitionTest extends JbpmTestCase {
- public void testTimerTransition() {
+ public void testTimerTransitionTimerFires() {
deployJpdlResource("org/jbpm/examples/timer/transition/process.jpdl.xml");
Execution processInstance =
executionService.startProcessInstanceByKey("TimerTransition");
- managementService.createJobQuery()
- .processInstanceId(processInstance.getId());
+ Job job = managementService.createJobQuery()
+ .processInstanceId(processInstance.getId())
+ .uniqueResult();
+
+ managementService.executeJob(job.getDbid());
+
+ processInstance = executionService.findExecution(processInstance.getId());
+
+ assertEquals("escalation", processInstance.getActivityName());
}
+
+ public void testTimerTransitionTakeTransition() {
+ deployJpdlResource("org/jbpm/examples/timer/transition/process.jpdl.xml");
+
+ Execution processInstance =
executionService.startProcessInstanceByKey("TimerTransition");
+
+
executionService.signalExecutionById(processInstance.getId()+".guardedWait",
"go on");
+
+ processInstance = executionService.findExecution(processInstance.getId());
+
+ assertEquals("next step", processInstance.getActivityName());
+
+ List<Job> jobs = managementService.createJobQuery()
+ .processInstanceId(processInstance.getId())
+ .list();
+
+ assertEquals(new ArrayList<Job>(), new ArrayList<Job>(jobs));
+ }
}
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml 2009-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml 2009-04-14
15:23:46 UTC (rev 4551)
@@ -3,12 +3,12 @@
<process name="TimerTransition"
xmlns="http://jbpm.org/4/jpdl">
<start g="20,20,48,48">
- <transition to="wait" />
+ <transition to="guardedWait" />
</start>
- <state name="wait" g="96,16,127,52">
+ <state name="guardedWait" g="96,16,127,52">
<timer duedate="10 minutes" transition="timout" />
- <transition name="default" to="next step" />
+ <transition name="go on" to="next step" />
<transition name="timout" to="escalation" />
</state>
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-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -109,9 +109,4 @@
activity.setPreviousNeeded(true);
return this;
}
-
- public ActivityBuilder scope() {
- activity.setLocalScope(true);
- return this;
- }
}
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -46,7 +46,6 @@
protected ActivityImpl parentActivity;
protected String type;
- protected boolean isLocalScope;
protected boolean isExecutionAsync;
protected boolean isSignalAsync;
protected boolean isLeaveAsync;
@@ -478,12 +477,6 @@
public void setPreviousNeeded(boolean isPreviousNeeded) {
this.isPreviousNeeded = isPreviousNeeded;
}
- public boolean isLocalScope() {
- return isLocalScope;
- }
- public void setLocalScope(boolean isLocalScope) {
- this.isLocalScope = isLocalScope;
- }
public String getType() {
return type;
}
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeElementImpl.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeElementImpl.java 2009-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeElementImpl.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -38,6 +38,10 @@
protected List<VariableDefinitionImpl> variableDefinitions;
protected boolean hasTimerDefinitions;
protected Set<TimerDefinitionImpl> timerDefinitions;
+
+ public boolean isLocalScope() {
+ return hasVariableDefinitions || hasTimerDefinitions;
+ }
// variable definitions /////////////////////////////////////////////////////
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -457,7 +457,7 @@
}
// getters and setters //////////////////////////////////////////////////////
-
+
public long getDbid() {
return dbid;
}
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-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -109,8 +109,8 @@
.transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .scope()
.transition("c")
+ .variable("makesSureThisBecomesALocalScope")
.endActivity()
.startActivity("c", new AutomaticActivity())
.endActivity()
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-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -65,8 +65,8 @@
.transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .scope()
.transition("c")
+ .variable("makesSureThisBecomesALocalScope")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
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-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -97,23 +97,19 @@
.initialValue(new StringDescriptor("B52"))
.endVariable()
.startActivity("outer", new Composite())
- .scope()
.startVariable("duration")
.initialValue(new StringDescriptor("22 minutes"))
.endVariable()
.startActivity("middle", new Composite())
- .scope()
.startVariable("altitude")
.initialValue(new StringDescriptor("31000 ft"))
.endVariable()
.startActivity("inner", new Composite())
- .scope()
.startVariable("passengers")
.initialValue(new StringDescriptor("52"))
.endVariable()
.startActivity("start", new WaitState())
.initial()
- .scope()
.startVariable("fuel")
.initialValue(new StringDescriptor("kerosine"))
.endVariable()
@@ -154,12 +150,10 @@
.initialValue(new StringDescriptor("B52"))
.endVariable()
.startActivity("c", new Composite())
- .scope()
.startVariable("flight")
.initialValue(new StringDescriptor("U2"))
.endVariable()
.startActivity("i", new WaitState())
- .scope()
.initial()
.startVariable("flight")
.initialValue(new StringDescriptor("C130"))
@@ -202,23 +196,19 @@
.initialValue(new StringDescriptor("B52"))
.endVariable()
.startActivity("outer", new Composite())
- .scope()
.startVariable("duration")
.initialValue(new StringDescriptor("22 minutes"))
.endVariable()
.startActivity("left-middle", new Composite())
- .scope()
.startVariable("altitude")
.initialValue(new StringDescriptor("31000 ft"))
.endVariable()
.startActivity("left-inner", new Composite())
- .scope()
.startVariable("passengers")
.initialValue(new StringDescriptor("52"))
.endVariable()
.startActivity("left-start", new WaitState())
.initial()
- .scope()
.transition("right-inner")
.startVariable("fuel")
.initialValue(new StringDescriptor("kerosine"))
@@ -227,12 +217,10 @@
.endActivity()
.endActivity()
.startActivity("right-middle", new Composite())
- .scope()
.startVariable("customer")
.initialValue(new StringDescriptor("coca-cola"))
.endVariable()
.startActivity("right-inner", new WaitState())
- .scope()
.startVariable("date")
.initialValue(new StringDescriptor("today"))
.endVariable()
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-04-14
14:21:41 UTC (rev 4550)
+++
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-04-14
15:23:46 UTC (rev 4551)
@@ -63,8 +63,8 @@
.transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .scope() // !!!!
.transition("c")
+ .variable("makesSureThisBecomesALocalScope")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -93,8 +93,8 @@
.transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .scope() // !!!!
.transition("c")
+ .variable("makesSureThisBecomesALocalScope")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -124,8 +124,8 @@
.transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .scope() // !!!!
.transition("c")
+ .variable("makesSureThisBecomesALocalScope")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -155,8 +155,8 @@
.transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .scope() // !!!!
.transition("c")
+ .variable("makesSureThisBecomesALocalScope")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -184,8 +184,8 @@
.transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .scope() // !!!!
.transition("c")
+ .variable("makesSureThisBecomesALocalScope")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()