[jbpm-commits] JBoss JBPM SVN: r3253 - in jbpm3/trunk/modules/integration/spec/src: main/java/org/jbpm/integration/spec/task and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sun Dec 7 08:19:20 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-12-07 08:19:20 -0500 (Sun, 07 Dec 2008)
New Revision: 3253

Added:
   jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java
Removed:
   jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java
Modified:
   jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
   jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
   jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java
Log:
Move task management to incubator

Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java	2008-12-07 13:16:58 UTC (rev 3252)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java	2008-12-07 13:19:20 UTC (rev 3253)
@@ -35,12 +35,11 @@
 import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.api.service.ProcessInstanceService;
 import org.jboss.bpm.api.service.internal.AbstractTaskService;
-import org.jboss.bpm.api.task.Task;
+import org.jboss.bpm.incubator.task.TaskInstance;
 import org.jbpm.JbpmContext;
 import org.jbpm.integration.spec.model.ProcessInstanceImpl;
 import org.jbpm.integration.spec.runtime.InvocationProxy;
-import org.jbpm.integration.spec.task.TaskImpl;
-import org.jbpm.taskmgmt.exe.TaskInstance;
+import org.jbpm.integration.spec.task.TaskInstanceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,7 +60,7 @@
     super.setProcessEngine(engine);
   }
 
-  public List<Task> getTasksByProcess(ObjectName procID)
+  public List<TaskInstance> getTasksByProcess(ObjectName procID)
   {
     ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
     ExecutionContext bpmContext = ctxService.getExecutionContext(true);
@@ -72,12 +71,12 @@
       if (proc == null)
         throw new IllegalStateException("Cannot obtain process: " + procID);
 
-      List<Task> tasks = new ArrayList<Task>();
+      List<TaskInstance> tasks = new ArrayList<TaskInstance>();
       ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
-      Collection<TaskInstance> taskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
-      for (TaskInstance taskInst : taskInstances)
+      Collection<org.jbpm.taskmgmt.exe.TaskInstance> oldTaskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
+      for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : oldTaskInstances)
       {
-        Task task = TaskImpl.newInstance(getProcessEngine(), taskInst);
+        TaskInstance task = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
         tasks.add(task);
       }
 
@@ -93,15 +92,15 @@
     }
   }
 
-  public Task getTask(ObjectName taskID)
+  public TaskInstance getTask(ObjectName taskID)
   {
     ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
     ExecutionContext bpmContext = ctxService.getExecutionContext(true);
     try
     {
       JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
-      TaskInstance taskInst = jbpmContext.getTaskInstance(adaptKey(taskID));
-      return TaskImpl.newInstance(getProcessEngine(), taskInst);
+      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = jbpmContext.getTaskInstance(adaptKey(taskID));
+      return TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
     }
     catch (RuntimeException rte)
     {
@@ -114,18 +113,18 @@
   }
 
   @SuppressWarnings("unchecked")
-  public List<Task> getTasksByActor(String actor)
+  public List<TaskInstance> getTasksByActor(String actor)
   {
     ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
     ExecutionContext bpmContext = ctxService.getExecutionContext(true);
     try
     {
-      List<Task> tasks = new ArrayList<Task>();
+      List<TaskInstance> tasks = new ArrayList<TaskInstance>();
       JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
-      for (TaskInstance taskInst : (List<TaskInstance>)jbpmContext.getTaskList(actor))
+      for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : (List<org.jbpm.taskmgmt.exe.TaskInstance>)jbpmContext.getTaskList(actor))
       {
-        Task task = TaskImpl.newInstance(getProcessEngine(), taskInst);
-        tasks.add(task);
+        TaskInstance taskInst = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
+        tasks.add(taskInst);
       }
       return tasks;
     }
@@ -145,13 +144,13 @@
     ExecutionContext bpmContext = ctxService.getExecutionContext(true);
     try
     {
-      TaskImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskImpl.class);
-      TaskInstance taskInst = taskImpl.getDelegate();
+      TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
+      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
 
       if (signalName != null)
-        taskInst.end(signalName);
+        oldTaskInst.end(signalName);
       else
-        taskInst.end();
+        oldTaskInst.end();
     }
     catch (RuntimeException rte)
     {
@@ -169,16 +168,16 @@
     ExecutionContext bpmContext = ctxService.getExecutionContext(true);
     try
     {
-      TaskImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskImpl.class);
-      TaskInstance taskInst = taskImpl.getDelegate();
+      TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
+      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
 
-      if (taskInst.getStart() != null)
+      if (oldTaskInst.getStart() != null)
       {
-        log.warn("Force stop on task " + taskInst.getId() + ". Will be restarted.");
-        taskInst.setStart(null); // strange, but means isNotStarted()
+        log.warn("Force stop on task " + oldTaskInst.getId() + ". Will be restarted.");
+        oldTaskInst.setStart(null); // strange, but means isNotStarted()
       }
 
-      taskInst.start(actor, true);
+      oldTaskInst.start(actor, true);
     }
     catch (RuntimeException rte)
     {

Deleted: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java	2008-12-07 13:16:58 UTC (rev 3252)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java	2008-12-07 13:19:20 UTC (rev 3253)
@@ -1,159 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.integration.spec.task;
-
-// $Id$
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
-import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.ExecutionService;
-import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.task.Task;
-import org.jbpm.integration.spec.model.AbstractElementImpl;
-import org.jbpm.integration.spec.runtime.InvocationProxy;
-import org.jbpm.integration.spec.runtime.TokenImpl;
-import org.jbpm.taskmgmt.exe.PooledActor;
-import org.jbpm.taskmgmt.exe.TaskInstance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The TaskService manages Tasks.
- * 
- * @author thomas.diesler at jboss.com
- * @since 28-Nov-2008
- */
-public class TaskImpl extends AbstractElementImpl<TaskInstance> implements Task 
-{
-  private static final long serialVersionUID = 1L;
-
-  // Provide logging
-  final Logger log = LoggerFactory.getLogger(TaskImpl.class);
-
-  private ObjectName keyCache;
-  
-  public static Task newInstance(ProcessEngine engine, TaskInstance tmpTask)
-  {
-    return InvocationProxy.newInstance(new TaskImpl(engine, tmpTask), Task.class);
-  }
-  
-  private TaskImpl(ProcessEngine engine, TaskInstance tmpTask)
-  {
-    super(engine, tmpTask, TaskInstance.class);
-    
-    if (tmpTask.getId() > 0)
-      keyCache = getKey(tmpTask);
-  }
-
-  public ObjectName getKey()
-  {
-    ObjectName objKey = keyCache;
-    if (objKey == null)
-    {
-      TaskInstance delegate = getDelegate();
-      objKey = getKey(delegate);
-      if (delegate.getId() > 0)
-        keyCache = objKey;
-    }
-    return objKey;
-  }
-
-  public static ObjectName getKey(TaskInstance tmpTask)
-  {
-    return ObjectNameFactory.create("Task:id=" + tmpTask.getId());
-  }
-
-  public String getName()
-  {
-    return getDelegate().getName();
-  }
-
-  public void end(String targetName)
-  {
-    getDelegate().end(targetName);
-  }
-  
-  public boolean hasEnded()
-  {
-    return getDelegate().hasEnded();
-  }
-  
-  public boolean isCancelled()
-  {
-    return getDelegate().isCancelled();
-  }
-  
-  public boolean isBlocking()
-  {
-    return getDelegate().isBlocking();
-  }
-
-  public boolean isSignalling()
-  {
-    return getDelegate().isSignalling();
-  }
-
-  public String getActor()
-  {
-    return getDelegate().getActorId();
-  }
-
-  public ObjectName getCorrelationKey()
-  {
-    Token token = null;
-    
-    if (getDelegate().getToken() != null)
-    {
-      long tokenID = getDelegate().getToken().getId();
-      ExecutionService exService = getProcessEngine().getService(ExecutionService.class);
-      for (Token auxTok : exService.getTokens())
-      {
-        TokenImpl tokenImpl = InvocationProxy.getUnderlying(auxTok, TokenImpl.class);
-        if (tokenImpl.getDelegate().getId() == tokenID)
-        {
-          token = auxTok;
-          break;
-        }
-      }
-    }
-    
-    if (token == null)
-      throw new IllegalStateException("Cannot obtain associated token");
-    
-    return token.getKey();
-  }
-
-  public Set<String> getPooledActors()
-  {
-    Set<String> actors = new HashSet<String>();
-    for (PooledActor pa : getDelegate().getPooledActors())
-    {
-      actors.add(pa.getActorId());
-    }
-    return actors;
-  }
-}

Copied: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java (from rev 3245, jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java	                        (rev 0)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java	2008-12-07 13:19:20 UTC (rev 3253)
@@ -0,0 +1,158 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.integration.spec.task;
+
+// $Id$
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ExecutionService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.task.TaskInstance;
+import org.jbpm.integration.spec.model.AbstractElementImpl;
+import org.jbpm.integration.spec.runtime.InvocationProxy;
+import org.jbpm.integration.spec.runtime.TokenImpl;
+import org.jbpm.taskmgmt.exe.PooledActor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The TaskService manages Tasks.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 28-Nov-2008
+ */
+public class TaskInstanceImpl extends AbstractElementImpl<org.jbpm.taskmgmt.exe.TaskInstance> implements TaskInstance 
+{
+  private static final long serialVersionUID = 1L;
+
+  // Provide logging
+  final Logger log = LoggerFactory.getLogger(TaskInstanceImpl.class);
+
+  private ObjectName keyCache;
+  
+  public static TaskInstance newInstance(ProcessEngine engine, org.jbpm.taskmgmt.exe.TaskInstance tmpTask)
+  {
+    return InvocationProxy.newInstance(new TaskInstanceImpl(engine, tmpTask), TaskInstance.class);
+  }
+  
+  private TaskInstanceImpl(ProcessEngine engine, org.jbpm.taskmgmt.exe.TaskInstance tmpTask)
+  {
+    super(engine, tmpTask, org.jbpm.taskmgmt.exe.TaskInstance.class);
+    
+    if (tmpTask.getId() > 0)
+      keyCache = getKey(tmpTask);
+  }
+
+  public ObjectName getKey()
+  {
+    ObjectName objKey = keyCache;
+    if (objKey == null)
+    {
+      org.jbpm.taskmgmt.exe.TaskInstance delegate = getDelegate();
+      objKey = getKey(delegate);
+      if (delegate.getId() > 0)
+        keyCache = objKey;
+    }
+    return objKey;
+  }
+
+  public static ObjectName getKey(org.jbpm.taskmgmt.exe.TaskInstance tmpTask)
+  {
+    return ObjectNameFactory.create("Task:id=" + tmpTask.getId());
+  }
+
+  public String getName()
+  {
+    return getDelegate().getName();
+  }
+
+  public void end(String targetName)
+  {
+    getDelegate().end(targetName);
+  }
+  
+  public boolean hasEnded()
+  {
+    return getDelegate().hasEnded();
+  }
+  
+  public boolean isCancelled()
+  {
+    return getDelegate().isCancelled();
+  }
+  
+  public boolean isBlocking()
+  {
+    return getDelegate().isBlocking();
+  }
+
+  public boolean isSignalling()
+  {
+    return getDelegate().isSignalling();
+  }
+
+  public String getActor()
+  {
+    return getDelegate().getActorId();
+  }
+
+  public ObjectName getCorrelationKey()
+  {
+    Token token = null;
+    
+    if (getDelegate().getToken() != null)
+    {
+      long tokenID = getDelegate().getToken().getId();
+      ExecutionService exService = getProcessEngine().getService(ExecutionService.class);
+      for (Token auxTok : exService.getTokens())
+      {
+        TokenImpl tokenImpl = InvocationProxy.getUnderlying(auxTok, TokenImpl.class);
+        if (tokenImpl.getDelegate().getId() == tokenID)
+        {
+          token = auxTok;
+          break;
+        }
+      }
+    }
+    
+    if (token == null)
+      throw new IllegalStateException("Cannot obtain associated token");
+    
+    return token.getKey();
+  }
+
+  public Set<String> getPooledActors()
+  {
+    Set<String> actors = new HashSet<String>();
+    for (PooledActor pa : getDelegate().getPooledActors())
+    {
+      actors.add(pa.getActorId());
+    }
+    return actors;
+  }
+}

Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java	2008-12-07 13:16:58 UTC (rev 3252)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java	2008-12-07 13:19:20 UTC (rev 3253)
@@ -33,8 +33,8 @@
 import org.jboss.bpm.api.model.ProcessDefinition;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.service.TaskService;
 import org.jboss.bpm.api.test.APITestCase;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
 
 /**
  * Test simple PAR deployment
@@ -68,7 +68,7 @@
     Token childTwo = getChildToken(token, "Prepare shipping");
     assertNotNull("Review Order", childTwo);
     
-    TaskService taskService = getProcessEngine().getService(TaskService.class);
+    TaskInstanceService taskService = getProcessEngine().getService(TaskInstanceService.class);
     assertEquals(2, taskService.getTasksByProcess(proc.getKey()).size());
     
     // Undeploy the process

Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java	2008-12-07 13:16:58 UTC (rev 3252)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java	2008-12-07 13:19:20 UTC (rev 3253)
@@ -29,9 +29,9 @@
 import org.jboss.bpm.api.model.ProcessDefinition;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.service.TaskService;
-import org.jboss.bpm.api.task.Task;
 import org.jboss.bpm.api.test.APITestCase;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
+import org.jboss.bpm.incubator.task.TaskInstance;
 
 /**
  * This uses the API to do the same as the EndTasksDbTest
@@ -110,8 +110,8 @@
 
       assertEquals("approval", token.getNode().getName());
       
-      TaskService taskService = getProcessEngine().getService(TaskService.class);
-      Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
+      TaskInstanceService taskService = getProcessEngine().getService(TaskInstanceService.class);
+      TaskInstance task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
       assertNotNull("One task", task);
       assertEquals("Task name", "approve", task.getName());
 
@@ -154,8 +154,8 @@
 
       assertEquals("approval", token.getNode().getName());
       
-      TaskService taskService = getProcessEngine().getService(TaskService.class);
-      Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
+      TaskInstanceService taskService = getProcessEngine().getService(TaskInstanceService.class);
+      TaskInstance task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
       task.end("reject");
       
       assertEquals("cancelled", token.getNode().getName());
@@ -195,8 +195,8 @@
       Token token = proc.startProcess();
       token.signal("cancel");
 
-      TaskService taskService = getProcessEngine().getService(TaskService.class);
-      Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
+      TaskInstanceService taskService = getProcessEngine().getService(TaskInstanceService.class);
+      TaskInstance task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
       assertTrue(task.getName() + " ended", task.hasEnded());
       assertFalse(task.getName() + " not cancelled", task.isCancelled());
       assertFalse(task.getName() + " not blocking", task.isBlocking());




More information about the jbpm-commits mailing list