[jbpm-commits] JBoss JBPM SVN: r4843 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity and 13 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue May 19 05:58:15 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-05-19 05:58:15 -0400 (Tue, 19 May 2009)
New Revision: 4843
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml
Log:
JBPM-2250 renamed task lists to findPersonalTasks and findGroupTasks
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -46,8 +46,11 @@
* These tasks can still potentially have candidates. */
TaskQuery unassigned();
- /** only query for tasks that are takable by the given user. */
- TaskQuery takableBy(String userId);
+ /** only query for tasks for which the given user is a candidate.
+ * The user could be associated directly as a candidate participant
+ * to the task or the user could be a member of a group that is
+ * associated as a candidate group to the task. */
+ TaskQuery candidate(String userId);
TaskQuery page(int firstResult, int maxResults);
TaskQuery orderAsc(String property);
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -129,11 +129,11 @@
/** list of tasks that are assigned to the given user.
* Returns an empty list in case no such tasks exist. */
- List<Task> findAssignedTasks(String userId);
+ List<Task> findPersonalTasks(String userId);
/** list of tasks that can be taken by the given user.
* Returns an empty list in case no such tasks exist. */
- List<Task> findTakableTasks(String userId);
+ List<Task> findGroupTasks(String userId);
/** get the subtasks for this task. Only goes one level deep at a time. */
List<Task> getSubTasks(long taskDbid);
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -61,7 +61,7 @@
assertNotNull(processInstance.findActiveExecutionIn("review"));
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
// the task in the sub process instance is completed
@@ -78,7 +78,7 @@
assertNotNull(processInstance.findActiveExecutionIn("review"));
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
// the task in the sub process instance is completed
@@ -95,7 +95,7 @@
assertNotNull(processInstance.findActiveExecutionIn("review"));
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
// the task in the sub process instance is completed
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -61,7 +61,7 @@
assertNotNull(processInstance.findActiveExecutionIn("review"));
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
// the result variable is set in the task
@@ -81,7 +81,7 @@
assertNotNull(processInstance.findActiveExecutionIn("review"));
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
// the result variable is set in the task
@@ -101,7 +101,7 @@
assertNotNull(processInstance.findActiveExecutionIn("review"));
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
// the result variable is set in the task
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -66,7 +66,7 @@
assertNotNull(processInstance.findActiveExecutionIn("review"));
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
// first we show that the document has been passed to the sub process instance
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -57,7 +57,7 @@
Execution execution = executionService.startProcessInstanceByKey("TaskAssignee", variables);
String executionId = execution.getId();
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
assertEquals(1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
@@ -67,7 +67,7 @@
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -50,7 +50,7 @@
public void testTaskAssignmentHandler() {
executionService.startProcessInstanceByKey("TaskAssignmentHandler");
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
assertEquals(1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -69,51 +69,51 @@
Execution execution = executionService.startProcessInstanceByKey("TaskCandidates");
String executionId = execution.getId();
- // both johndoe and joesmoe will see the task in their *takable* task list
- List<Task> taskList = taskService.findTakableTasks("johndoe");
+ // both johndoe and joesmoe will see the task in their *group* task list
+ List<Task> taskList = taskService.findGroupTasks("johndoe");
assertEquals("Expected a single task in johndoe's task list", 1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
- taskList = taskService.findTakableTasks("joesmoe");
- assertEquals("Expected a single task in joesmoe's takable task list", 1, taskList.size());
+ taskList = taskService.findGroupTasks("joesmoe");
+ assertEquals("Expected a single task in joesmoe's group task list", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
// johndoe and joesmoe will NOT see the task in their *assigned* task list
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findAssignedTasks("joesmoe");
+ taskList = taskService.findPersonalTasks("joesmoe");
assertEquals(0, taskList.size());
// lets assume that johndoe takes the task
taskService.takeTask(task.getDbid(), "johndoe");
- // johndoe's and joesmoe's takable task list is now empty
- taskList = taskService.findTakableTasks("johndoe");
+ // johndoe's and joesmoe's group task list is now empty
+ taskList = taskService.findGroupTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findTakableTasks("joesmoe");
+ taskList = taskService.findGroupTasks("joesmoe");
assertEquals(0, taskList.size());
// johndoe's assigned task list has the task in it
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
assertEquals("johndoe", task.getAssignee());
// joesmoe will not see the task in the assigned task list
- taskList = taskService.findAssignedTasks("joesmoe");
+ taskList = taskService.findPersonalTasks("joesmoe");
assertEquals(0, taskList.size());
// now johndoe completes the task
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -64,14 +64,14 @@
public void testTaskSwimlane() {
executionService.startProcessInstanceByKey("TaskSwimlane");
- List<Task> taskList = taskService.findTakableTasks("johndoe");
+ List<Task> taskList = taskService.findGroupTasks("johndoe");
assertEquals("Expected a single task in johndoe's task list", 1, taskList.size());
Task task = taskList.get(0);
long taskDbid = task.getDbid();
assertEquals("enter order data", task.getName());
assertNull(task.getAssignee());
- assertEquals(0, taskService.findAssignedTasks("johndoe").size());
+ assertEquals(0, taskService.findPersonalTasks("johndoe").size());
// lets assume that johndoe takes the task
taskService.takeTask(taskDbid, "johndoe");
@@ -82,10 +82,10 @@
// to know the context of this case
// we'll check that the group task lists for johndoe and joesmoe are empty
- assertEquals(0, taskService.findTakableTasks("johndoe").size());
+ assertEquals(0, taskService.findGroupTasks("johndoe").size());
// and that the task is directly assigned to johndoe
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(1, taskList.size());
task = taskList.get(0);
assertEquals("enter order data", task.getName());
@@ -94,7 +94,7 @@
// submit the task
taskService.completeTask(taskDbid);
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(1, taskList.size());
task = taskList.get(0);
assertEquals("calculate quote", task.getName());
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -60,7 +60,7 @@
variables.put("dollars", 100000);
Execution execution = executionService.startProcessInstanceByKey("TaskVariables", variables);
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
assertFalse("Task list for assignee was empty", taskList.isEmpty());
Task task = taskList.get(0);
long taskDbid = task.getDbid();
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -48,7 +48,7 @@
TaskService taskService = this.processEngine.get(TaskService.class);
List<TaskRef> results = new ArrayList<TaskRef>();
- List<Task> assignedTasks = taskService.findAssignedTasks(idRef);
+ List<Task> assignedTasks = taskService.findPersonalTasks(idRef);
adoptTasks(assignedTasks, results);
return results;
@@ -70,8 +70,8 @@
if(null==participationType || participationType.equals(Participation.CANDIDATE))
{
- List<Task> takableTasks = taskService.findTakableTasks(idRef);
- adoptTasks(takableTasks, results);
+ List<Task> groupTasks = taskService.findGroupTasks(idRef);
+ adoptTasks(groupTasks, results);
}
else
{
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -89,17 +89,17 @@
}
- public List<Task> findAssignedTasks(String userId) {
+ public List<Task> findPersonalTasks(String userId) {
return createTaskQuery()
.assignee(userId)
.orderDesc(TaskQuery.PROPERTY_PRIORITY)
.list();
}
- public List<Task> findTakableTasks(String userId)
+ public List<Task> findGroupTasks(String userId)
{
return createTaskQuery()
- .takableBy(userId)
+ .candidate(userId)
.orderDesc(TaskQuery.PROPERTY_PRIORITY)
.list();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -50,7 +50,7 @@
private static final String UNASSIGNED = "unassigned";
protected String assignee = null;
- protected String takableBy = null;
+ protected String candidate = null;
/* groupIds transports the groupIds from the hql to the applyParameters */
protected List<String> groupIds;
@@ -60,18 +60,18 @@
}
public TaskQuery assignee(String assignee) {
- if (takableBy!=null) {
- throw new JbpmException("assignee cannot be combined with takableBy in one query");
+ if (candidate!=null) {
+ throw new JbpmException("assignee(...) cannot be combined with candidate(...) in one query");
}
this.assignee = assignee;
return this;
}
- public TaskQuery takableBy(String userId) {
+ public TaskQuery candidate(String userId) {
if (assignee!=null) {
- throw new JbpmException("assignee cannot be combined with takableBy in one query");
+ throw new JbpmException("assignee(...) cannot be combined with candidate(...) in one query");
}
- this.takableBy = userId;
+ this.candidate = userId;
this.assignee = UNASSIGNED;
return this;
}
@@ -102,9 +102,9 @@
query.setString("assignee", assignee);
}
- if (takableBy!=null) {
- log.debug("setting parameter candidateUserId: "+takableBy);
- query.setString("candidateUserId", takableBy);
+ if (candidate!=null) {
+ log.debug("setting parameter candidateUserId: "+candidate);
+ query.setString("candidateUserId", candidate);
if (groupIds!=null) {
log.debug("setting parameter candidateGroupIds: "+groupIds);
@@ -121,7 +121,7 @@
hql.append(" as task ");
// participations
- if (takableBy!=null) {
+ if (candidate!=null) {
hql.append(", ");
hql.append(ParticipationImpl.class.getName());
hql.append(" as participant ");
@@ -130,7 +130,7 @@
appendWhereClause("participant.type = 'candidate' ", hql);
IdentitySession identitySession = Environment.getFromCurrent(IdentitySession.class);
- List<Group> groups = identitySession.findGroupsByUser(takableBy);
+ List<Group> groups = identitySession.findGroupsByUser(candidate);
if (groups.isEmpty()) {
groupIds = null;
appendWhereClause("participant.userId = :candidateUserId ", hql);
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -57,13 +57,13 @@
task.setAssignee("joesmoe");
long startBusinessTaskDbid = taskService.saveTask(task);
- List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ List<Task> taskList = taskService.findPersonalTasks("johndoe");
assertNotNull(taskList);
assertEquals("do laundry", taskList.get(0).getName());
assertEquals(1, taskList.size());
- taskList = taskService.findAssignedTasks("joesmoe");
+ taskList = taskService.findPersonalTasks("joesmoe");
assertNotNull(taskList);
assertContainsTask(taskList, "get good idea");
@@ -109,7 +109,7 @@
task.setPriority(10);
long profitTaskDbid = taskService.saveTask(task);
- List<Task> taskList = taskService.findAssignedTasks("joesmoe");
+ List<Task> taskList = taskService.findPersonalTasks("joesmoe");
assertNotNull(taskList);
// default sort order is based on the priority
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java 2009-05-19 09:58:15 UTC (rev 4843)
@@ -53,51 +53,51 @@
Execution execution = executionService.startProcessInstanceByKey("TaskCandidates");
String executionId = execution.getId();
- // both johndoe and joesmoe will see the task in their *takable* task list
- List<Task> taskList = taskService.findTakableTasks("johndoe");
+ // both johndoe and joesmoe will see the task in their *group* task list
+ List<Task> taskList = taskService.findGroupTasks("johndoe");
assertEquals("Expected a single task being created", 1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
- taskList = taskService.findTakableTasks("joesmoe");
+ taskList = taskService.findGroupTasks("joesmoe");
assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
// johndoe and joesmoe will NOT see the task in their *assigned* task list
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findAssignedTasks("joesmoe");
+ taskList = taskService.findPersonalTasks("joesmoe");
assertEquals(0, taskList.size());
// lets assume that johndoe takes the task
taskService.takeTask(task.getDbid(), "johndoe");
- // johndoe's and joesmoe's takable task list is now empty
- taskList = taskService.findTakableTasks("johndoe");
+ // johndoe's and joesmoe's group task list is now empty
+ taskList = taskService.findGroupTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findTakableTasks("joesmoe");
+ taskList = taskService.findGroupTasks("joesmoe");
assertEquals(0, taskList.size());
// johndoe's assigned task list has the task in it
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
assertEquals("johndoe", task.getAssignee());
// joesmoe will not see the task in the assigned task list
- taskList = taskService.findAssignedTasks("joesmoe");
+ taskList = taskService.findPersonalTasks("joesmoe");
assertEquals(0, taskList.size());
// now johndoe completes the task
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
@@ -125,51 +125,51 @@
Execution execution = executionService.startProcessInstanceByKey("TaskCandidates", variables);
String executionId = execution.getId();
- // both johndoe and joesmoe will see the task in their *takable* task list
- List<Task> taskList = taskService.findTakableTasks("johndoe");
+ // both johndoe and joesmoe will see the task in their *group* task list
+ List<Task> taskList = taskService.findGroupTasks("johndoe");
assertEquals("Expected a single task being created", 1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
- taskList = taskService.findTakableTasks("joesmoe");
+ taskList = taskService.findGroupTasks("joesmoe");
assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
// johndoe and joesmoe will NOT see the task in their *assigned* task list
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findAssignedTasks("joesmoe");
+ taskList = taskService.findPersonalTasks("joesmoe");
assertEquals(0, taskList.size());
// lets assume that johndoe takes the task
taskService.takeTask(task.getDbid(), "johndoe");
- // johndoe's and joesmoe's takable task list is now empty
- taskList = taskService.findTakableTasks("johndoe");
+ // johndoe's and joesmoe's group task list is now empty
+ taskList = taskService.findGroupTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findTakableTasks("joesmoe");
+ taskList = taskService.findGroupTasks("joesmoe");
assertEquals(0, taskList.size());
// johndoe's assigned task list has the task in it
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
assertEquals("johndoe", task.getAssignee());
// joesmoe will not see the task in the assigned task list
- taskList = taskService.findAssignedTasks("joesmoe");
+ taskList = taskService.findPersonalTasks("joesmoe");
assertEquals(0, taskList.size());
// now johndoe completes the task
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findAssignedTasks("johndoe");
+ taskList = taskService.findPersonalTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
@@ -194,8 +194,8 @@
Execution execution = executionService.startProcessInstanceByKey("DoubleTake");
String executionId = execution.getId();
- // both johndoe and joesmoe will see the task in their *takable* task list
- long taskDbid = taskService.findTakableTasks("johndoe").get(0).getDbid();
+ // both johndoe and joesmoe will see the task in their *group* task list
+ long taskDbid = taskService.findGroupTasks("johndoe").get(0).getDbid();
taskService.takeTask(taskDbid, "johndoe");
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml 2009-05-19 09:58:15 UTC (rev 4843)
@@ -350,7 +350,7 @@
task lists. The code sample will show how to get the task list for
the user with id <literal>johndoe</literal>.
</para>
- <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe");</programlisting>
+ <programlisting>List<Task> taskList = taskService.findPersonalTasks("johndoe");</programlisting>
<para>Typically tasks are associated with a form and displayed in some user
interface. The form needs to be able to read and write data related to the task.
</para>
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-05-19 09:28:01 UTC (rev 4842)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-05-19 09:58:15 UTC (rev 4843)
@@ -785,7 +785,7 @@
Execution execution = executionService
.startProcessInstanceByKey("TaskAssignee", variables);</programlisting>
<para>Then the task list for <literal>johndoe</literal> can be obtained like this.</para>
- <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe");</programlisting>
+ <programlisting>List<Task> taskList = taskService.findPersonalTasks("johndoe");</programlisting>
<para>Note that it is also possible to put plain text like
<literal>assignee="johndoe"</literal>. In that case
the task will be assigned to johndoe.
@@ -857,7 +857,7 @@
</para>
<programlisting>taskService.getAssignedTasks("johndoe");
taskService.getAssignedTasks("joesmoe");</programlisting>
- <para>But the task will show up in the takable task list of all members of the <literal>sales-dept</literal>
+ <para>But the task will show up in the group task list of all members of the <literal>sales-dept</literal>
group.
</para>
<para>The in our example, the <literal>sales-dept</literal> has two members: johndoe and joesmoe</para>
@@ -869,16 +869,16 @@
identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe");
identityService.createMembership("joesmoe", "sales-dept"); </programlisting>
<para>So after the process is created, the task will appear in both the
- takable tasks for users johndoe and joesmoe</para>
- <programlisting>taskService.findTakableTasks("johndoe");
-taskService.findTakableTasks("joesmoe");</programlisting>
+ group tasks for users johndoe and joesmoe</para>
+ <programlisting>taskService.findGroupTasks("johndoe");
+taskService.findGroupTasks("joesmoe");</programlisting>
<para>Candidates must take a task before they can work on it. This will prevent
that two candides start working on the same task. The user interface must only
- offer the action 'Take' for the tasks in the takable task list.
+ offer the action 'Take' for the tasks in the group task list.
</para>
<programlisting>taskService.takeTask(task.getDbid(), "johndoe");</programlisting>
<para>When a user takes a task, the assignee of that task will be set to the given
- user. The task will disappear from all the candidate's takable task list and
+ user. The task will disappear from all the candidate's group task list and
it will appear in the user's assigned tasks.
</para>
<para>Users are only allowed to work on tasks in their personal task list. This
@@ -1109,7 +1109,7 @@
input from the user is translated in setting task variables.
</para>
<para>Getting task variables can be done like this:</para>
- <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ <programlisting>List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
long taskDbid = task.getDbid();
@@ -1302,7 +1302,7 @@
instance starts, it arrives in the <literal>task</literal>. A task will be
created for <literal>johndoe</literal>.
</para>
- <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ <programlisting>List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);</programlisting>
<para>We can see that the document has been passed from the super process
instance to the sub process instance:
@@ -1381,7 +1381,7 @@
<programlisting>ProcessInstance processInstance = executionService
.startProcessInstanceByKey("SubProcessDocument");</programlisting>
<para>Then task is fetched from <literal>johndoe</literal>'s task list</para>
- <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ <programlisting>List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
</programlisting>
<para>Then the <literal>result</literal> variable is set and
@@ -1455,7 +1455,7 @@
<programlisting>ProcessInstance processInstance = executionService
.startProcessInstanceByKey("SubProcessDocument");</programlisting>
<para>Then task is fetched from <literal>johndoe</literal>'s task list</para>
- <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe");
+ <programlisting>List<Task> taskList = taskService.findPersonalTasks("johndoe");
Task task = taskList.get(0);
</programlisting>
<para>Then the task is completed with outcome <literal>ok</literal>.
More information about the jbpm-commits
mailing list