JBoss JBPM SVN: r3254 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-07 08:19:26 -0500 (Sun, 07 Dec 2008)
New Revision: 3254
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java
Log:
Move task management to incubator
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-07 13:19:20 UTC (rev 3253)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-07 13:19:26 UTC (rev 3254)
@@ -36,10 +36,10 @@
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.service.TaskService;
-import org.jboss.bpm.api.task.Task;
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.server.integration.TaskManagement;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
+import org.jboss.bpm.incubator.task.TaskInstance;
/**
* An implementation that delegates to a BPM Spec.
@@ -58,8 +58,8 @@
log.info("getTaskById: " + taskId);
ObjectName taskKey = getTaskKey(taskId);
- TaskService taskService = getTaskService();
- Task task = taskService.getTask(taskKey);
+ TaskInstanceService taskService = getTaskService();
+ TaskInstance task = taskService.getTask(taskKey);
return adaptTask(task);
}
@@ -69,8 +69,8 @@
log.info("getTasksByActor: " + actor);
List<TaskRef> taskRefs = new ArrayList<TaskRef>();
- TaskService taskService = getTaskService();
- for (Task task : taskService.getTasksByActor(actor))
+ TaskInstanceService taskService = getTaskService();
+ for (TaskInstance task : taskService.getTasksByActor(actor))
{
log.info(task);
taskRefs.add(adaptTask(task));
@@ -83,7 +83,7 @@
log.info("closeTask: " + taskId + "," + signalName);
ObjectName taskKey = getTaskKey(taskId);
- TaskService taskService = getTaskService();
+ TaskInstanceService taskService = getTaskService();
taskService.closeTask(taskKey, signalName);
}
@@ -92,11 +92,11 @@
log.info("reassignTask: " + taskId + "," + actor);
ObjectName taskKey = getTaskKey(taskId);
- TaskService taskService = getTaskService();
+ TaskInstanceService taskService = getTaskService();
taskService.reassignTask(taskKey, actor);
}
- private TaskRef adaptTask(Task task)
+ private TaskRef adaptTask(TaskInstance task)
{
Long taskId = adaptKey(task.getKey());
@@ -145,10 +145,10 @@
return ObjectNameFactory.create("Task:id= " + taskId);
}
- private TaskService getTaskService()
+ private TaskInstanceService getTaskService()
{
ProcessEngine engine = ProcessEngineFactory.getProcessEngine();
- TaskService taskService = engine.getService(TaskService.class);
+ TaskInstanceService taskService = engine.getService(TaskInstanceService.class);
return taskService;
}
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java 2008-12-07 13:19:20 UTC (rev 3253)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java 2008-12-07 13:19:26 UTC (rev 3254)
@@ -25,9 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.api.service.IdentityService;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.console.server.integration.UserManagement;
+import org.jboss.bpm.incubator.service.IdentityService;
/**
* An implementation that delegates to a BPM Spec.
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3253 - in jbpm3/trunk/modules/integration/spec/src: main/java/org/jbpm/integration/spec/task and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)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(a)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(a)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());
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3252 - in projects/spec/trunk/modules: api/src/main/java/org/jboss/bpm/api/service and 6 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-07 08:16:58 -0500 (Sun, 07 Dec 2008)
New Revision: 3252
Added:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessEngineException.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/IdentityService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/TaskInstanceService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/task/
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/task/TaskInstance.java
Removed:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/BPMException.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/IdentityService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/TaskService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/task/
Modified:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/EngineShutdownException.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/InvalidProcessException.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/NodeNotFoundException.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessNotFoundException.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessTimeoutException.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractIdentityService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractTaskService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java
Log:
Move task management to incubator
Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/BPMException.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/BPMException.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/BPMException.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -1,55 +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.jboss.bpm.api;
-
-// $Id$
-
-/**
- * A RuntimeException that can be thrown for unrecoverable API errors
- *
- * @author thomas.diesler(a)jboss.com
- * @since 18-Jun-2008
- */
-@SuppressWarnings("serial")
-public class BPMException extends RuntimeException
-{
- public BPMException()
- {
- super();
- }
-
- public BPMException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public BPMException(String message)
- {
- super(message);
- }
-
- public BPMException(Throwable cause)
- {
- super(cause);
- }
-
-}
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/EngineShutdownException.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/EngineShutdownException.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/EngineShutdownException.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -30,7 +30,7 @@
* @since 18-Jun-2008
*/
@SuppressWarnings("serial")
-public class EngineShutdownException extends BPMException
+public class EngineShutdownException extends ProcessEngineException
{
public EngineShutdownException()
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/InvalidProcessException.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/InvalidProcessException.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/InvalidProcessException.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -31,7 +31,7 @@
* @since 18-Jun-2008
*/
@SuppressWarnings("serial")
-public class InvalidProcessException extends BPMException
+public class InvalidProcessException extends ProcessEngineException
{
public InvalidProcessException()
{
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/NodeNotFoundException.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/NodeNotFoundException.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/NodeNotFoundException.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -31,7 +31,7 @@
* @since 18-Sep-2008
*/
@SuppressWarnings("serial")
-public class NodeNotFoundException extends BPMException
+public class NodeNotFoundException extends ProcessEngineException
{
public NodeNotFoundException(String message)
{
Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessEngineException.java (from rev 3251, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/BPMException.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessEngineException.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessEngineException.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -0,0 +1,55 @@
+/*
+ * 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.jboss.bpm.api;
+
+// $Id$
+
+/**
+ * A RuntimeException that can be thrown for unrecoverable API errors
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+@SuppressWarnings("serial")
+public class ProcessEngineException extends RuntimeException
+{
+ public ProcessEngineException()
+ {
+ super();
+ }
+
+ public ProcessEngineException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public ProcessEngineException(String message)
+ {
+ super(message);
+ }
+
+ public ProcessEngineException(Throwable cause)
+ {
+ super(cause);
+ }
+
+}
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessNotFoundException.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessNotFoundException.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessNotFoundException.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -31,7 +31,7 @@
* @since 18-Sep-2008
*/
@SuppressWarnings("serial")
-public class ProcessNotFoundException extends BPMException
+public class ProcessNotFoundException extends ProcessEngineException
{
public ProcessNotFoundException(String message)
{
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessTimeoutException.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessTimeoutException.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/ProcessTimeoutException.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -30,7 +30,7 @@
* @since 24-Jul-2008
*/
@SuppressWarnings("serial")
-public class ProcessTimeoutException extends BPMException
+public class ProcessTimeoutException extends ProcessEngineException
{
public ProcessTimeoutException()
{
Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/IdentityService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/IdentityService.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/IdentityService.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -1,57 +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.jboss.bpm.api.service;
-
-// $Id$
-
-import java.util.List;
-
-/**
- * The IdentityService manages identities
- *
- * @author thomas.diesler(a)jboss.com
- * @since 28-Nov-2008
- */
-public interface IdentityService
-{
-
- /**
- * Get a list of groups.
- */
- List<String> getGroups();
-
- /**
- * Get a list of groups a given actor belongs to.
- */
- List<String> getGroupsByActor(String actor);
-
- /**
- * Get a list of groups.
- */
- List<String> getActors();
-
- /**
- * Get a list of actors that belong to a given group.
- */
- List<String> getActorsByGroup(String group);
-
-}
\ No newline at end of file
Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/TaskService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/TaskService.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/TaskService.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -1,50 +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.jboss.bpm.api.service;
-
-//$Id$
-
-import java.util.List;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.task.Task;
-
-/**
- * The TaskService manages Tasks.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 28-Nov-2008
- */
-public interface TaskService
-{
- List<Task> getTasksByProcess(ObjectName procID);
-
- Task getTask(ObjectName taskID);
-
- List<Task> getTasksByActor(String actor);
-
- void reassignTask(ObjectName taskID, String actor);
-
- void closeTask(ObjectName taskID, String signalName);
-
-}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractIdentityService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractIdentityService.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractIdentityService.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.bpm.api.service.IdentityService;
+import org.jboss.bpm.incubator.service.IdentityService;
/**
* The IdentityService manages identities
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractTaskService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractTaskService.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractTaskService.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.api.service.internal;
-import org.jboss.bpm.api.service.TaskService;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
// $Id$
@@ -31,7 +31,7 @@
* @author thomas.diesler(a)jboss.com
* @since 28-Nov-2008
*/
-public abstract class AbstractTaskService extends AbstractService implements TaskService
+public abstract class AbstractTaskService extends AbstractService implements TaskInstanceService
{
// Hide public constructor
protected AbstractTaskService()
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -34,7 +34,7 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.BPMException;
+import org.jboss.bpm.api.ProcessEngineException;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.DialectHandler;
import org.jboss.bpm.api.service.DialectHandlerService;
@@ -296,7 +296,7 @@
}
catch (IOException ex)
{
- throw new BPMException("Cannot marshall process", ex);
+ throw new ProcessEngineException("Cannot marshall process", ex);
}
}
Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/IdentityService.java (from rev 3250, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/IdentityService.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/IdentityService.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/IdentityService.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -0,0 +1,57 @@
+/*
+ * 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.jboss.bpm.incubator.service;
+
+// $Id$
+
+import java.util.List;
+
+/**
+ * The IdentityService manages identities
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 28-Nov-2008
+ */
+public interface IdentityService
+{
+
+ /**
+ * Get a list of groups.
+ */
+ List<String> getGroups();
+
+ /**
+ * Get a list of groups a given actor belongs to.
+ */
+ List<String> getGroupsByActor(String actor);
+
+ /**
+ * Get a list of groups.
+ */
+ List<String> getActors();
+
+ /**
+ * Get a list of actors that belong to a given group.
+ */
+ List<String> getActorsByGroup(String group);
+
+}
\ No newline at end of file
Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/TaskInstanceService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/TaskInstanceService.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/TaskInstanceService.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -0,0 +1,50 @@
+/*
+ * 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.jboss.bpm.incubator.service;
+
+//$Id$
+
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.incubator.task.TaskInstance;
+
+/**
+ * The TaskService manages Tasks.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 28-Nov-2008
+ */
+public interface TaskInstanceService
+{
+ List<TaskInstance> getTasksByProcess(ObjectName procID);
+
+ TaskInstance getTask(ObjectName taskID);
+
+ List<TaskInstance> getTasksByActor(String actor);
+
+ void reassignTask(ObjectName taskID, String actor);
+
+ void closeTask(ObjectName taskID, String signalName);
+
+}
\ No newline at end of file
Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/TaskInstanceService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/task/TaskInstance.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/task/TaskInstance.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/task/TaskInstance.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.incubator.task;
+
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+public interface TaskInstance
+{
+ ObjectName getKey();
+
+ ObjectName getCorrelationKey();
+
+ String getName();
+
+ String getActor();
+
+ Set<String> getPooledActors();
+
+ void end(String targetName);
+
+ boolean isBlocking();
+
+ boolean isSignalling();
+
+ boolean isCancelled();
+
+ boolean hasEnded();
+}
+
Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/task/TaskInstance.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-07 08:08:52 UTC (rev 3251)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-07 13:16:58 UTC (rev 3252)
@@ -28,7 +28,7 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.BPMException;
+import org.jboss.bpm.api.ProcessEngineException;
import org.jboss.bpm.api.ProcessTimeoutException;
import org.jboss.bpm.api.model.Expression;
import org.jboss.bpm.api.model.ProcessInstance;
@@ -189,7 +189,7 @@
{
if (procImpl.getRuntimeException() != null)
{
- throw new BPMException("Process aborted", procImpl.getRuntimeException());
+ throw new ProcessEngineException("Process aborted", procImpl.getRuntimeException());
}
else
{
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3251 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-07 03:08:52 -0500 (Sun, 07 Dec 2008)
New Revision: 3251
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java
Log:
Use single util instance
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java 2008-12-06 16:39:08 UTC (rev 3250)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java 2008-12-07 08:08:52 UTC (rev 3251)
@@ -93,10 +93,9 @@
VariableUpdateLog variableLog = saveAndReloadUpdateLog(processInstance);
- // assertEquals(now, ((Date) variableLog.getOldValue()));
- // assertEquals(future, (Date) variableLog.getNewValue());
- assertEquals(DateDbTestUtil.getInstance().convertDateToSeconds(now), DateDbTestUtil.getInstance().convertDateToSeconds((Date)variableLog.getOldValue()));
- assertEquals(DateDbTestUtil.getInstance().convertDateToSeconds(future), DateDbTestUtil.getInstance().convertDateToSeconds((Date)variableLog.getNewValue()));
+ DateDbTestUtil dbUtilInst = DateDbTestUtil.getInstance();
+ assertEquals(dbUtilInst.convertDateToSeconds(now), dbUtilInst.convertDateToSeconds((Date)variableLog.getOldValue()));
+ assertEquals(dbUtilInst.convertDateToSeconds(future), dbUtilInst.convertDateToSeconds((Date)variableLog.getNewValue()));
}
public void testDoubleUpdateLog()
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3250 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-06 11:39:08 -0500 (Sat, 06 Dec 2008)
New Revision: 3250
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
Log:
useSpecIntegration = false
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-06 16:34:04 UTC (rev 3249)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-06 16:39:08 UTC (rev 3250)
@@ -37,7 +37,7 @@
*/
public class ManagementFactoryImpl extends ManagementFactory
{
- private boolean useSpecIntegration = true;
+ private boolean useSpecIntegration = false;
public ProcessManagement createProcessManagement()
{
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3249 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-06 11:34:04 -0500 (Sat, 06 Dec 2008)
New Revision: 3249
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
Log:
Refactor ConfigurationProvider, ProcessInstanceService
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-06 16:34:04 UTC (rev 3249)
@@ -40,7 +40,7 @@
import org.jboss.bpm.api.runtime.Token.TokenStatus;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef.STATE;
@@ -124,12 +124,12 @@
log.info("getProcessInstances: " + procDef);
- ProcessService procService = getProcessService();
- Iterator<ObjectName> itProc = procService.getProcesses(procDef.getKey(), ProcessStatus.Active).iterator();
+ ProcessInstanceService procService = getProcessService();
+ Iterator<ObjectName> itProc = procService.getInstance(procDef.getKey(), ProcessStatus.Active).iterator();
while (itProc.hasNext())
{
ObjectName procID = itProc.next();
- ProcessInstance proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getInstance(procID);
log.info(proc);
@@ -173,12 +173,12 @@
public void signalToken(long tokenId, String name)
{
Token token = null;
- ProcessService procService = getProcessService();
- Iterator<ObjectName> itProc = procService.getProcesses().iterator();
+ ProcessInstanceService procService = getProcessService();
+ Iterator<ObjectName> itProc = procService.getInstance().iterator();
while (token == null && itProc.hasNext())
{
ObjectName procID = itProc.next();
- ProcessInstance proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getInstance(procID);
for (Token aux : proc.getTokens())
{
Long auxId = adaptKey(aux.getKey());
@@ -232,24 +232,24 @@
return new ProcessDefinitionRef(procDefID, procDef.getName(), procDef.getVersion());
}
- private ProcessService getProcessService()
+ private ProcessInstanceService getProcessService()
{
ProcessEngine engine = ProcessEngineFactory.getProcessEngine();
- ProcessService pService = engine.getService(ProcessService.class);
+ ProcessInstanceService pService = engine.getService(ProcessInstanceService.class);
return pService;
}
private ProcessInstance getProcessById(long procID)
{
ProcessInstance proc = null;
- ProcessService procService = getProcessService();
- Iterator<ObjectName> it = procService.getProcesses().iterator();
+ ProcessInstanceService procService = getProcessService();
+ Iterator<ObjectName> it = procService.getInstance().iterator();
while (it.hasNext())
{
ObjectName auxKey = it.next();
if (procID == adaptKey(auxKey))
{
- proc = procService.getProcess(auxKey);
+ proc = procService.getInstance(auxKey);
break;
}
}
@@ -277,7 +277,7 @@
Long tokenId = adaptKey(token.getKey());
token.getKey();
- Node currNode = token.getCurrentNode();
+ Node currNode = token.getNode();
TokenReference tokenRef = new TokenReference(tokenId, null, currNode.getName());
TokenStatus tokenStatus = token.getTokenStatus();
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-06 16:34:04 UTC (rev 3249)
@@ -117,7 +117,7 @@
taskRef.addPooledActor(pa);
}
- Node currentNode = token.getCurrentNode();
+ Node currentNode = token.getNode();
if (currentNode instanceof SingleOutFlowSupport)
{
SingleOutFlowSupport sofs = (SingleOutFlowSupport)currentNode;
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3248 - in jbpm3/trunk/modules/integration: spec and 5 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-06 11:33:38 -0500 (Sat, 06 Dec 2008)
New Revision: 3248
Modified:
jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml
jbpm3/trunk/modules/integration/spec/deploy.sh
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java
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/deployment/DeploymentXMLTest.java
jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java
Log:
Refactor ConfigurationProvider, ProcessInstanceService
Modified: jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml 2008-12-06 16:33:38 UTC (rev 3248)
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- The JBoss service configuration file for the PAR deployer service.
- $Id$
+<!--
+ The JBoss service configuration file for the PAR deployer service.
+
+ $Id$
-->
<server>
- <mbean code="org.jbpm.integration.jboss42.PARSubDeployer"
- name="jboss.deployer:service=PARDeployer">
- </mbean>
+ <mbean code="org.jbpm.integration.jboss42.PARSubDeployer" name="jboss.deployer:service=PARDeployer">
+ <depends>jboss.ejb:service=EJBDeployer</depends>
+ </mbean>
</server>
\ No newline at end of file
Modified: jbpm3/trunk/modules/integration/spec/deploy.sh
===================================================================
--- jbpm3/trunk/modules/integration/spec/deploy.sh 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/deploy.sh 2008-12-06 16:33:38 UTC (rev 3248)
@@ -1,4 +1,6 @@
#! /bin/bash
+mvn -o install
+
rm $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans/bpm-spec-integration-jbpm3*.jar
cp target/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -30,8 +30,8 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.ExecutionContext;
@@ -40,7 +40,7 @@
import org.jboss.bpm.api.runtime.Token.TokenStatus;
import org.jboss.bpm.api.service.ExecutionContextService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jbpm.JbpmContext;
import org.jbpm.integration.spec.runtime.InvocationProxy;
import org.jbpm.integration.spec.runtime.TokenImpl;
@@ -58,9 +58,6 @@
private ObjectName keyCache;
- // [TODO] delegate this property
- private ProcessStatus status = ProcessStatus.None;
-
public static ProcessInstance newInstance(ProcessEngine engine, org.jbpm.graph.exe.ProcessInstance tmpProc, boolean proxy)
{
ProcessInstance proc = new ProcessInstanceImpl(engine, tmpProc);
@@ -96,7 +93,7 @@
public static ObjectName getKey(org.jbpm.graph.exe.ProcessInstance procInst)
{
org.jbpm.graph.def.ProcessDefinition oldProcDef = procInst.getProcessDefinition();
- return ObjectNameFactory.create(Constants.ID_DOMAIN + ":proc=" + oldProcDef.getName() + ",id=" + procInst.getId());
+ return ObjectNameFactory.create(Constants.ID_DOMAIN + ":procInst=" + oldProcDef.getName() + ",id=" + procInst.getId());
}
// @Override
@@ -111,22 +108,26 @@
{
Token rootToken = getRootToken();
TokenStatus tokenStatus = rootToken != null ? rootToken.getTokenStatus() : null;
+
+ org.jbpm.graph.exe.ProcessInstance oldProcInst = getDelegate();
- org.jbpm.graph.exe.ProcessInstance delegate = getDelegate();
- if (delegate.isSuspended())
+ ProcessStatus status = ProcessStatus.None;
+
+ if (oldProcInst.getStart() != null)
+ status = ProcessStatus.Active;
+
+ if (oldProcInst.isSuspended())
status = ProcessStatus.Suspended;
- if (status == ProcessStatus.Active)
- {
- if (delegate.hasEnded() || tokenStatus == TokenStatus.Destroyed)
- status = ProcessStatus.Completed;
- }
+ if (oldProcInst.hasEnded() || tokenStatus == TokenStatus.Destroyed)
+ status = ProcessStatus.Completed;
+
return status;
}
public void setProcessStatus(ProcessStatus status)
{
- this.status = status;
+ //this.status = status;
}
public Token getRootToken()
@@ -193,9 +194,9 @@
try
{
// Register the Process
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- if (procService.getProcess(getKey()) == null)
- procService.registerProcess(this);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ if (procService.getInstance(getKey()) == null)
+ procService.registerInstance(this);
org.jbpm.graph.exe.ProcessInstance procInst = getDelegate();
@@ -251,32 +252,31 @@
public void suspend()
{
+ ProcessStatus status = getProcessStatus();
if (status != ProcessStatus.Active)
throw new IllegalStateException("Cannot suspend a process in state: " + status);
getDelegate().suspend();
- status = ProcessStatus.Suspended;
}
public void resume()
{
+ ProcessStatus status = getProcessStatus();
if (status != ProcessStatus.Suspended)
throw new IllegalStateException("Cannot resume a process in state: " + status);
getDelegate().resume();
- status = ProcessStatus.Active;
}
public void cancel()
{
+ ProcessStatus status = getProcessStatus();
if (status != ProcessStatus.Active && status != ProcessStatus.Suspended)
throw new IllegalStateException("Cannot cancel a process in state: " + status);
org.jbpm.graph.exe.ProcessInstance delegate = getDelegate();
delegate.setEnd(new Date());
delegate.end();
-
- status = ProcessStatus.Cancelled;
}
private Set<Token> getAllTokens(Token token)
@@ -293,6 +293,6 @@
public String toString()
{
- return "Process[" + getKey() + "]";
+ return "ProcessInstance[" + getKey() + ",status=" + getProcessStatus() + "]";
}
}
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -63,14 +63,14 @@
{
return InvocationProxy.newInstance(new TokenImpl(engine, tmpToken), Token.class);
}
-
+
private TokenImpl(ProcessEngine engine, org.jbpm.graph.exe.Token tmpToken)
{
super(engine, tmpToken, org.jbpm.graph.exe.Token.class);
ContextInstance context = tmpToken.getProcessInstance().getContextInstance();
this.att = new TokenAttachmentDelegate(this, context);
-
+
if (tmpToken.getId() > 0)
keyCache = getKey(tmpToken);
}
@@ -135,7 +135,7 @@
}
// @Override
- public Node getCurrentNode()
+ public Node getNode()
{
String nodeName = getDelegate().getNode().getNameExt();
return getProcess().getNode(nodeName);
@@ -187,7 +187,7 @@
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
- NodeImpl<?> currNode = (NodeImpl<?>)getCurrentNode();
+ NodeImpl<?> currNode = (NodeImpl<?>)getNode();
if (currNode == null)
throw new IllegalStateException("Cannot signal token with no current node: " + this);
@@ -217,7 +217,7 @@
lastFlow = currNode.getOutFlowByTransition(trans);
getDelegate().signal();
}
-
+
// Save the token
JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
jbpmContext.save(getDelegate());
@@ -236,23 +236,10 @@
public String toString()
{
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
- try
- {
- Node currNode = getCurrentNode();
- int children = getChildTokens().size();
- boolean root = getParentToken() == null;
- TokenStatus status = getTokenStatus();
- return "[key=" + getKey() + ",root=" + root + ",status=" + status + ",node=" + currNode + ",flow=" + lastFlow + ",child=" + children + "]";
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- finally
- {
- bpmContext.close();
- }
+ Node currNode = getNode();
+ int children = getChildTokens().size();
+ boolean root = getParentToken() == null;
+ TokenStatus status = getTokenStatus();
+ return "[key=" + getKey() + ",root=" + root + ",status=" + status + ",node=" + currNode + ",flow=" + lastFlow + ",child=" + children + "]";
}
}
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -32,7 +32,7 @@
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.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,10 +57,10 @@
public Set<Token> getTokens()
{
Set<Token> tokens = new HashSet<Token>();
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- for (ObjectName procID : procService.getProcesses())
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ for (ObjectName procID : procService.getInstance())
{
- ProcessInstance proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getInstance(procID);
for (Token aux : proc.getTokens())
{
tokens.add(aux);
@@ -75,10 +75,10 @@
Token token = null;
// [TODO] is there a better way than iterating over all processes and tokens?
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- for (ObjectName procID : procService.getProcesses())
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ for (ObjectName procID : procService.getInstance())
{
- ProcessInstance proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getInstance(procID);
for (Token aux : proc.getTokens())
{
if (aux.getKey().equals(tokenID))
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -34,7 +34,7 @@
import org.jboss.bpm.api.service.ExecutionContextService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService;
import org.jbpm.JbpmContext;
import org.jbpm.db.GraphSession;
@@ -144,9 +144,9 @@
log.debug("unregisterProcessDefinition: " + procDef);
// Unregister the associated process instances
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- for (ObjectName procID : procService.getProcesses(procDefID, null))
- procService.unregisterProcess(procID);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ for (ObjectName procID : procService.getInstance(procDefID, null))
+ procService.unregisterInstance(procID);
JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
jbpmContext.getGraphSession().deleteProcessDefinition(adaptKey(procDefID));
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -38,7 +38,7 @@
import org.jboss.bpm.api.service.ExecutionContextService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractProcessService;
import org.jbpm.JbpmContext;
import org.jbpm.db.GraphSession;
@@ -55,7 +55,7 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public class ProcessServiceImpl extends AbstractProcessService implements ProcessService, MutableService
+public class ProcessServiceImpl extends AbstractProcessService implements ProcessInstanceService, MutableService
{
// Provide logging
final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class);
@@ -86,7 +86,7 @@
* Get a Process for a given id
*/
// @Override
- public ProcessInstance getProcess(ObjectName procID)
+ public ProcessInstance getInstance(ObjectName procID)
{
ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
@@ -113,7 +113,7 @@
* Get the set of registered Processes
*/
// @Override
- public Set<ObjectName> getProcesses()
+ public Set<ObjectName> getInstance()
{
Set<ObjectName> procs = new HashSet<ObjectName>();
@@ -148,7 +148,7 @@
* @return An empty set if the process cannot be found
*/
// @Override
- public Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status)
+ public Set<ObjectName> getInstance(ObjectName procDefID, ProcessStatus status)
{
Set<ObjectName> procs = new HashSet<ObjectName>();
@@ -176,7 +176,7 @@
/**
* Register a Process.
*/
- public ProcessInstance registerProcess(ProcessInstance proc)
+ public ProcessInstance registerInstance(ProcessInstance proc)
{
log.debug("registerProcess: " + proc);
@@ -184,7 +184,7 @@
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
- if (getProcess(proc.getKey()) != null)
+ if (getInstance(proc.getKey()) != null)
throw new IllegalStateException("Process already registered: " + proc);
ProcessStatus procStatus = proc.getProcessStatus();
@@ -223,7 +223,7 @@
/**
* Unregister a Process.
*/
- public boolean unregisterProcess(ObjectName procID)
+ public boolean unregisterInstance(ObjectName procID)
{
boolean removed = false;
@@ -231,7 +231,7 @@
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
- ProcessInstance proc = getProcess(procID);
+ ProcessInstance proc = getInstance(procID);
if (proc != null)
{
log.debug("unregisterProcess: " + proc);
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-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.runtime.ExecutionContext;
import org.jboss.bpm.api.service.ExecutionContextService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractTaskService;
import org.jboss.bpm.api.task.Task;
import org.jbpm.JbpmContext;
@@ -67,8 +67,8 @@
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- ProcessInstance proc = procService.getProcess(procID);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ ProcessInstance proc = procService.getInstance(procID);
if (proc == null)
throw new IllegalStateException("Cannot obtain process: " + procID);
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-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -58,7 +58,7 @@
Token token = proc.startProcess();
- assertEquals("fork1", token.getCurrentNode().getName());
+ assertEquals("fork1", token.getNode().getName());
assertEquals(2, token.getChildTokens().size());
// Get the child tokens
@@ -82,7 +82,7 @@
while (itTok.hasNext())
{
Token child = itTok.next();
- childToks.put(child.getCurrentNode().getName(), child);
+ childToks.put(child.getNode().getName(), child);
}
return childToks.get(nodeName);
}
Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java 2008-12-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -55,16 +55,16 @@
ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
- assertEquals("Node name", "a", token.getCurrentNode().getName());
+ assertEquals("Node name", "a", token.getNode().getName());
token.signal();
- assertEquals("Node name", "b", token.getCurrentNode().getName());
+ assertEquals("Node name", "b", token.getNode().getName());
token.signal();
- assertEquals("Node name", "c", token.getCurrentNode().getName());
+ assertEquals("Node name", "c", token.getNode().getName());
token.signal();
- assertEquals("Node name", "end", token.getCurrentNode().getName());
+ assertEquals("Node name", "end", token.getNode().getName());
assertEquals(ProcessStatus.Completed, proc.getProcessStatus());
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-06 16:33:05 UTC (rev 3247)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java 2008-12-06 16:33:38 UTC (rev 3248)
@@ -68,11 +68,11 @@
Token token = proc.startProcess();
- assertEquals("approval", proc.getRootToken().getCurrentNode().getName());
+ assertEquals("approval", proc.getRootToken().getNode().getName());
token.signal("cancel");
- assertEquals("cancelled", proc.getRootToken().getCurrentNode().getName());
+ assertEquals("cancelled", proc.getRootToken().getNode().getName());
}
finally
{
@@ -108,7 +108,7 @@
Token token = proc.startProcess();
- assertEquals("approval", token.getCurrentNode().getName());
+ assertEquals("approval", token.getNode().getName());
TaskService taskService = getProcessEngine().getService(TaskService.class);
Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
@@ -116,7 +116,7 @@
assertEquals("Task name", "approve", task.getName());
task.end("approve");
- assertEquals("process", token.getCurrentNode().getName());
+ assertEquals("process", token.getNode().getName());
}
finally
{
@@ -152,13 +152,13 @@
Token token = proc.startProcess();
- assertEquals("approval", token.getCurrentNode().getName());
+ assertEquals("approval", token.getNode().getName());
TaskService taskService = getProcessEngine().getService(TaskService.class);
Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
task.end("reject");
- assertEquals("cancelled", token.getCurrentNode().getName());
+ assertEquals("cancelled", token.getNode().getName());
}
finally
{
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3247 - in projects/spec/trunk/modules: api/src/main/java/org/jboss/bpm/api/config/internal and 14 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-06 11:33:05 -0500 (Sat, 06 Dec 2008)
New Revision: 3247
Added:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessInstanceService.java
Removed:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java
Modified:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/internal/MicrocontainerConfigurationProvider.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java
projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
Log:
Refactor ConfigurationProvider
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -45,13 +45,17 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public abstract class Configuration
+public final class Configuration
{
private static ConfigurationProvider provider;
+ // Hide the ctor
+ private Configuration()
+ {
+ }
+
/**
* Create a new instance of ProcessEngine for this configuration
- *
* @return The configured instance of a process engine
*/
public static ProcessEngine getProcessEngine()
@@ -64,23 +68,16 @@
*
* @return The configured instance of a process engine
*/
- public static ProcessEngine getProcessEngine(URL cfgURL)
+ public static ProcessEngine getProcessEngine(String engineName)
{
- return getConfigurationProvider().getProcessEngine(cfgURL);
+ return getConfigurationProvider().getProcessEngine(engineName);
}
/**
- * Get a ProcessEngine with a given name from this configuration
- *
- * @return The configured instance of a process engine
+ * Get the ConfigurationProvider
*/
- public static ProcessEngine getProcessEngine(String cfgXML)
+ public static ConfigurationProvider getConfigurationProvider()
{
- return getConfigurationProvider().getProcessEngine(cfgXML);
- }
-
- private static ConfigurationProvider getConfigurationProvider()
- {
if (provider == null)
{
// Get the provider name from the System property
@@ -104,6 +101,10 @@
}
}
+ // Verify that we have a provider name
+ if (providerName == null)
+ throw new IllegalStateException("Cannot obtain configuration provider");
+
// Load the config provider
try
{
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -23,6 +23,7 @@
//$Id$
+import java.io.InputStream;
import java.net.URL;
import org.jboss.bpm.api.service.ProcessEngine;
@@ -42,14 +43,23 @@
ProcessEngine getProcessEngine();
/**
- * Get a ProcessEngine that is configured with a given config file
+ * Get a ProcessEngine with a given name from this ConfigurationProvider
* @return The configured instance of a process engine
*/
- ProcessEngine getProcessEngine(URL cfgURL);
+ ProcessEngine getProcessEngine(String name);
/**
- * Get a ProcessEngine that is configured with a given config string
- * @return The configured instance of a process engine
+ * Configure this provider from the given URL
*/
- ProcessEngine getProcessEngine(String cfgXML);
+ void configure(URL urlConfig);
+
+ /**
+ * Configure this provider from the resource
+ */
+ void configure(String resourceConfig);
+
+ /**
+ * Configure this provider from the resource
+ */
+ void configure(InputStream streamConfig);
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/internal/MicrocontainerConfigurationProvider.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/internal/MicrocontainerConfigurationProvider.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/internal/MicrocontainerConfigurationProvider.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -23,6 +23,7 @@
//$Id$
+import java.io.InputStream;
import java.net.URL;
import org.jboss.bpm.api.NotImplementedException;
@@ -39,55 +40,70 @@
*/
public class MicrocontainerConfigurationProvider implements ConfigurationProvider
{
- /** The process engine bean name - jBPMEngine */
- public static final String BEAN_NAME = "BPMProcessEngine";
+ /** The process engine bean name - BPMProcessEngine */
+ public static final String DEFAULT_BEAN_NAME = "BPMProcessEngine";
/** The default bean config: jbpm-cfg-beans.xml */
- public static final String JBPM_ENGINE_CONFIG = "jbpm-cfg-beans.xml";
+ public static final String DEFAULT_BEANS_CONFIG = "jbpm-cfg-beans.xml";
+ private Kernel kernel;
private ProcessEngine engine;
@Override
public ProcessEngine getProcessEngine()
{
+ return getProcessEngine(DEFAULT_BEAN_NAME);
+ }
+
+ @Override
+ @SuppressWarnings("deprecation")
+ public ProcessEngine getProcessEngine(String engineName)
+ {
if (engine == null)
{
- Kernel kernel = KernelLocator.getKernel();
+ kernel = KernelLocator.getKernel();
if (kernel == null)
{
- EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer();
- deployer.deploy(getDefaultConfigURL());
+ configureWithDefault();
}
- engine = getProcessEngineBean();
+ KernelRegistryEntry entry = kernel.getRegistry().getEntry(engineName);
+ engine = (ProcessEngine)entry.getTarget();
}
return engine;
}
- @Override
- public ProcessEngine getProcessEngine(URL cfgURL)
+ private void configureWithDefault()
{
- throw new NotImplementedException();
+ URL urlConfig = Thread.currentThread().getContextClassLoader().getResource(DEFAULT_BEANS_CONFIG);
+ if (urlConfig == null)
+ throw new IllegalStateException("Cannot find resource: " + DEFAULT_BEANS_CONFIG);
+
+ configure(urlConfig);
}
-
+
@Override
- public ProcessEngine getProcessEngine(String cfgXML)
+ public void configure(InputStream streamConfig)
{
- throw new NotImplementedException();
+ throw new NotImplementedException("Cannot bootstrap JBossMC from InputStream");
}
- @SuppressWarnings("deprecation")
- private ProcessEngine getProcessEngineBean()
+ @Override
+ public void configure(String resourceConfig)
{
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
- ProcessEngine engine = (ProcessEngine)entry.getTarget();
- return engine;
+ URL urlConfig = Thread.currentThread().getContextClassLoader().getResource(resourceConfig);
+ if (urlConfig == null)
+ throw new IllegalStateException("Cannot find resource: " + resourceConfig);
+
+ configure(urlConfig);
}
- private URL getDefaultConfigURL()
+ @Override
+ public void configure(URL urlConfig)
{
- URL cfgURL = Thread.currentThread().getContextClassLoader().getResource(JBPM_ENGINE_CONFIG);
- if (cfgURL == null)
- throw new IllegalStateException("Cannot find resource: " + JBPM_ENGINE_CONFIG);
- return cfgURL;
+ EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer();
+ deployer.deploy(urlConfig);
+
+ kernel = KernelLocator.getKernel();
+ if (kernel == null)
+ throw new IllegalStateException("Cannot obtain kernel from KernelLocator.");
}
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -84,7 +84,7 @@
/**
* Get the current {@link Node}
*/
- Node getCurrentNode();
+ Node getNode();
/**
* Get the root token that his Token is associated with
Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessInstanceService.java (from rev 3246, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessInstanceService.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessInstanceService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -0,0 +1,72 @@
+/*
+ * 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.jboss.bpm.api.service;
+
+//$Id$
+
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
+
+/**
+ * The ProcessInstanceService is the entry point to create, find and otherwise manage processe instances.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 25-Sep-2008
+ */
+public interface ProcessInstanceService
+{
+
+ /**
+ * Register a ProcessInstance.
+ * @return An implementation may return a proxied version of the given Process
+ */
+ ProcessInstance registerInstance(ProcessInstance proc);
+
+ /**
+ * Unregister a ProcessInstance.
+ */
+ boolean unregisterInstance(ObjectName procID);
+
+ /**
+ * Get a ProcessInstance for a given id
+ */
+ ProcessInstance getInstance(ObjectName procID);
+
+ /**
+ * Get the set of registered ProcessInstances
+ */
+ Set<ObjectName> getInstance();
+
+ /**
+ * Get the set of ProcessInstance for a given ProcessDefinition
+ *
+ * @param procDefID The process definition id
+ * @param status The optional process status
+ * @return An empty set if the process cannot be found
+ */
+ Set<ObjectName> getInstance(ObjectName procDefID, ProcessStatus status);
+
+}
\ No newline at end of file
Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -1,72 +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.jboss.bpm.api.service;
-
-//$Id$
-
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
-
-/**
- * The ProcessService is the entry point to create, find and otherwise manage processes.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 25-Sep-2008
- */
-public interface ProcessService
-{
-
- /**
- * Register a Process.
- * @return An implementation may return a proxied version of the given Process
- */
- ProcessInstance registerProcess(ProcessInstance proc);
-
- /**
- * Unregister a Process.
- */
- boolean unregisterProcess(ObjectName procID);
-
- /**
- * Get a Process for a given id
- */
- ProcessInstance getProcess(ObjectName procID);
-
- /**
- * Get the set of registered Processes
- */
- Set<ObjectName> getProcesses();
-
- /**
- * Get the set of Processes for a given ProcessDefinition
- *
- * @param procDefID The process definition id
- * @param status The optional process status
- * @return An empty set if the process cannot be found
- */
- Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status);
-
-}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
/**
* The ProcessService is the entry point to create, find and otherwise manage processes.
@@ -31,7 +31,7 @@
* @author thomas.diesler(a)jboss.com
* @since 25-Sep-2008
*/
-public abstract class AbstractProcessService extends AbstractService implements ProcessService
+public abstract class AbstractProcessService extends AbstractService implements ProcessInstanceService
{
// Hide public constructor
protected AbstractProcessService()
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -37,7 +37,7 @@
import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.Task;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractService;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.model.Message;
@@ -136,8 +136,8 @@
*/
public void sendMessage(ObjectName procID, String targetName, Message msg)
{
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- ProcessInstance proc = procService.getProcess(procID);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ ProcessInstance proc = procService.getInstance(procID);
if (proc == null)
throw new IllegalStateException("Cannot obtain registered process: " + procID);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -57,7 +57,7 @@
Token tok = proc.startProcess(att);
- String nodeName = tok.getCurrentNode().getName();
+ String nodeName = tok.getNode().getName();
assertEquals("EndA", nodeName);
assertEquals(TokenStatus.Destroyed, tok.getTokenStatus());
@@ -74,7 +74,7 @@
Token tok = proc.startProcess(att);
- String nodeName = tok.getCurrentNode().getName();
+ String nodeName = tok.getNode().getName();
assertEquals("EndB", nodeName);
assertEquals(TokenStatus.Destroyed, tok.getTokenStatus());
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -31,7 +31,7 @@
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.api.test.ProcessCatalog;
@@ -64,11 +64,11 @@
ProcessEngine engine = procDef.getProcessEngine();
ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
- ProcessService procService = engine.getService(ProcessService.class);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
ProcessInstance proc = procDef.newInstance();
assertNotNull("Process not null", proc);
- assertNull("Process not automatically registered", procService.getProcess(proc.getKey()));
+ assertNull("Process not automatically registered", procService.getInstance(proc.getKey()));
assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey()));
}
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -31,7 +31,7 @@
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
/**
@@ -45,23 +45,23 @@
public void testRegisterProcess() throws Exception
{
ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
ProcessDefinition procDef = getProcessDefinition();
ProcessInstance proc = procDef.newInstance();
assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey()));
- assertNull("Process not registered automatically", procService.getProcess(proc.getKey()));
+ assertNull("Process not registered automatically", procService.getInstance(proc.getKey()));
// Register the process
- proc = procService.registerProcess(proc);
+ proc = procService.registerInstance(proc);
assertNotNull("Proc not null", proc);
assertNotNull("ProcessDefinition registered", procDefService.getProcessDefinition(procDef.getKey()));
- assertNotNull("Process registered", procService.getProcess(proc.getKey()));
+ assertNotNull("Process registered", procService.getInstance(proc.getKey()));
// Unregister the process
- procService.unregisterProcess(proc.getKey());
- assertNull("Process unregistered", procService.getProcess(proc.getKey()));
+ procService.unregisterInstance(proc.getKey());
+ assertNull("Process unregistered", procService.getInstance(proc.getKey()));
assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey()));
procDefService.unregisterProcessDefinition(procDef.getKey());
@@ -71,7 +71,7 @@
public void testStartProcess() throws Exception
{
ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
ProcessDefinition procDef = getProcessDefinition();
ProcessInstance proc = procDef.newInstance();
@@ -80,11 +80,11 @@
assertNotNull("Token not null", token);
ObjectName procID = proc.getKey();
- assertNotNull("Process registered", procService.getProcess(procID));
+ assertNotNull("Process registered", procService.getInstance(procID));
// Unregister the process
- procService.unregisterProcess(procID);
- assertNull("Process unregistered", procService.getProcess(procID));
+ procService.unregisterInstance(procID);
+ assertNull("Process unregistered", procService.getInstance(procID));
assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey()));
procDefService.unregisterProcessDefinition(procDef.getKey());
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -50,25 +50,25 @@
// Start the Process
Token tok = proc.startProcess();
- String nodeName = tok.getCurrentNode().getName();
+ String nodeName = tok.getNode().getName();
assertEquals(TokenStatus.Suspended, tok.getTokenStatus());
assertEquals("TaskA", nodeName);
tok.signal();
- nodeName = tok.getCurrentNode().getName();
+ nodeName = tok.getNode().getName();
assertEquals(TokenStatus.Suspended, tok.getTokenStatus());
assertEquals("TaskB", nodeName);
tok.signal();
- nodeName = tok.getCurrentNode().getName();
+ nodeName = tok.getNode().getName();
assertEquals(TokenStatus.Suspended, tok.getTokenStatus());
assertEquals("TaskC", nodeName);
tok.signal();
- nodeName = tok.getCurrentNode().getName();
+ nodeName = tok.getNode().getName();
assertEquals("End", nodeName);
assertEquals(TokenStatus.Destroyed, tok.getTokenStatus());
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
@@ -80,9 +80,9 @@
sigService.throwSignal(newSignal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Get the just started process
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- Set<ObjectName> procIDs = procService.getProcesses(procDefID, null);
- proc = (ProcessInstanceExt) procService.getProcess(procIDs.iterator().next());
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ Set<ObjectName> procIDs = procService.getInstance(procDefID, null);
+ proc = (ProcessInstanceExt) procService.getInstance(procIDs.iterator().next());
// Wait for the process to end
if (proc != null)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -32,7 +32,7 @@
import org.jboss.bpm.api.model.Task.TaskType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
@@ -91,12 +91,12 @@
public void testSuspendedMessage() throws Exception
{
ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
ProcessInstance proc = procDef.newInstance();
- proc = procService.registerProcess(proc);
+ proc = procService.registerInstance(proc);
try
{
// Send the message before the process is started
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -35,7 +35,7 @@
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
@@ -61,8 +61,8 @@
ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Register the process - this assigns the procID
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- procService.registerProcess(proc);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ procService.registerInstance(proc);
// Add the user message listener
MessageService msgService = MessageService.locateMessageService();
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -52,7 +52,7 @@
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Group;
@@ -389,8 +389,8 @@
catch (RuntimeException rte)
{
// A process that cannot be started id unregistered automatically
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- procService.unregisterProcess(getKey());
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ procService.unregisterInstance(getKey());
throw rte;
}
}
@@ -422,9 +422,9 @@
// Register the process if needed
ProcessEngine engine = getProcessEngine();
- ProcessService procService = engine.getService(ProcessService.class);
- if (procService.getProcess(getKey()) == null)
- procService.registerProcess(this);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ if (procService.getInstance(getKey()) == null)
+ procService.registerInstance(this);
return start;
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -42,7 +42,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
// Do start time assignments
for (Assignment ass : node.getAssignments())
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -51,7 +51,7 @@
{
this.delegateToken = token;
- NodeExt targetNode = (NodeExt)token.getCurrentNode();
+ NodeExt targetNode = (NodeExt)token.getNode();
Attachments exContext = token.getAttachments();
this.delegateContext = new DelegatingAttachments(targetNode, exContext);
}
@@ -99,9 +99,9 @@
}
@Override
- public Node getCurrentNode()
+ public Node getNode()
{
- return delegateToken.getCurrentNode();
+ return delegateToken.getNode();
}
@Override
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -39,7 +39,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
SignalHandler sigHandler = node.getSignalHandler();
sigHandler.throwExitSignal(token);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -41,7 +41,7 @@
{
TokenExecutor tokenExecutor = rtContext.getTokenExecutor();
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
// Call the next Interceptor
rtContext.next();
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -38,7 +38,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeImpl nodeImpl = (NodeImpl)token.getCurrentNode();
+ NodeImpl nodeImpl = (NodeImpl)token.getNode();
nodeImpl.execute(rtContext);
}
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -26,7 +26,7 @@
import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.service.ProcessServiceImpl;
import org.slf4j.Logger;
@@ -70,21 +70,21 @@
ProcessInstance proc = rtProc.getProcess();
try
{
- Node node = token.getCurrentNode();
+ Node node = token.getNode();
if (node == null)
throw new IllegalStateException("Cannot obtain initial node");
RuntimeContext rtContext = new RuntimeContext(tokenExecutor);
// Add the interceptors that are defined on the ProcessService
- ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessService.class);
+ ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessInstanceService.class);
for (NodeInterceptor itor : procService.getNodeInterceptors())
rtContext.addInterceptor(itor);
while (continueTokenExecution())
{
// Get the target node
- node = token.getCurrentNode();
+ node = token.getNode();
// Synchronize on the target Node
synchronized (node)
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -39,7 +39,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
try
{
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -43,7 +43,7 @@
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Attachments.Key;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.runtime.TokenExecutor;
import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.service.ProcessServiceImpl;
@@ -162,7 +162,7 @@
}
@Override
- public Node getCurrentNode()
+ public Node getNode()
{
String targetRef = flow.getTargetRef();
return getProcess().getNode(targetRef);
@@ -189,7 +189,7 @@
@Override
public void signal()
{
- Node node = getCurrentNode();
+ Node node = getNode();
if (node == null)
throw new IllegalStateException("Cannot obtain current node");
@@ -197,7 +197,7 @@
RuntimeContext rtContext = new RuntimeContext(tokenExecutor);
// Add the interceptors that are defined on the ProcessService
- ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessService.class);
+ ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessInstanceService.class);
for (NodeInterceptor itor : procService.getNodeInterceptors())
rtContext.addInterceptor(itor);
@@ -216,7 +216,7 @@
while (continueTokenExecution())
{
// Get the target node
- node = getCurrentNode();
+ node = getNode();
// Create a Token that includes node properties
DelegatingToken tokCopy = new DelegatingToken(this);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -52,7 +52,7 @@
public void execute(RuntimeContext rtContext)
{
MutableToken token = (MutableToken)rtContext.getToken();
- Node node = token.getCurrentNode();
+ Node node = token.getNode();
// Get persistence session
Session session = token.getSession();
@@ -94,7 +94,7 @@
service.saveNode(session, node);
// Get TxType of the next node
- Node nextNode = token.getCurrentNode();
+ Node nextNode = token.getNode();
if (nextNode != null)
{
txTypeNext = getTxType((NodeExt)nextNode);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.jboss.bpm.ri.model.ProcessDefinitionImpl;
@@ -107,9 +107,9 @@
ProcessEngine engine = getProcessEngine();
// Unregister the associated process instances
- ProcessService procService = engine.getService(ProcessService.class);
- for (ObjectName procID : procService.getProcesses(procDefID, null))
- procService.unregisterProcess(procID);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ for (ObjectName procID : procService.getInstance(procDefID, null))
+ procService.unregisterInstance(procID);
// Delete the ProcessDefinition through the PersistenceService
PersistenceService persService = engine.getService(PersistenceService.class);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -38,7 +38,7 @@
import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractProcessService;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.jboss.bpm.ri.model.ProcessInstanceImpl;
@@ -52,7 +52,7 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public class ProcessServiceImpl extends AbstractProcessService implements ProcessService, MutableService
+public class ProcessServiceImpl extends AbstractProcessService implements ProcessInstanceService, MutableService
{
// Provide logging
final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class);
@@ -84,7 +84,7 @@
* Get a Process for a given id
*/
@Override
- public ProcessInstance getProcess(ObjectName procID)
+ public ProcessInstance getInstance(ObjectName procID)
{
ProcessInstance proc = registeredProcs.get(procID);
return proc;
@@ -94,7 +94,7 @@
* Get the set of registered Processes
*/
@Override
- public Set<ObjectName> getProcesses()
+ public Set<ObjectName> getInstance()
{
return Collections.unmodifiableSet(registeredProcs.keySet());
}
@@ -107,7 +107,7 @@
* @return An empty set if the process cannot be found
*/
@Override
- public Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status)
+ public Set<ObjectName> getInstance(ObjectName procDefID, ProcessStatus status)
{
Set<ObjectName> procSet = new HashSet<ObjectName>();
for (ProcessInstance auxProc : registeredProcs.values())
@@ -125,11 +125,11 @@
/**
* Register a Process.
*/
- public ProcessInstance registerProcess(ProcessInstance proc)
+ public ProcessInstance registerInstance(ProcessInstance proc)
{
log.debug("registerProcess: " + proc);
- if (getProcess(proc.getKey()) != null)
+ if (getInstance(proc.getKey()) != null)
throw new IllegalStateException("Process already registered: " + proc);
ProcessStatus procStatus = proc.getProcessStatus();
@@ -159,7 +159,7 @@
/**
* Unregister a Process.
*/
- public boolean unregisterProcess(ObjectName procID)
+ public boolean unregisterInstance(ObjectName procID)
{
boolean removed = false;
ProcessInstance proc = registeredProcs.get(procID);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -37,7 +37,7 @@
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
@@ -223,9 +223,9 @@
// this could happen when the Process never received a start signal
// and then we get here because of a ProcessTimeoutException
ProcessEngine engine = getProcessEngine();
- ProcessService procService = engine.getService(ProcessService.class);
- if (procService.getProcess(proc.getKey()) != null)
- procService.unregisterProcess(proc.getKey());
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ if (procService.getInstance(proc.getKey()) != null)
+ procService.unregisterInstance(proc.getKey());
}
status = proc.getProcessStatus();
@@ -314,8 +314,8 @@
synchronized (proc)
{
- ProcessService procService = engine.getService(ProcessService.class);
- procService.unregisterProcess(procID);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ procService.unregisterInstance(procID);
runtimeProcesses.remove(procID);
// Notify that the process has now ended
Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -10,7 +10,7 @@
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
@@ -40,7 +40,7 @@
public void sendMessage(GwtMessage gwtMsg)
{
ProcessEngine engine = Configuration.getProcessEngine();
- ProcessService procService = engine.getService(ProcessService.class);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
MessageService mm = MessageService.locateMessageService();
SignalService sm = SignalService.locateSignalService();
@@ -63,13 +63,13 @@
// Create/Start a new process
ObjectName procID = (ObjectName)httpSession.getAttribute("procID");
- if (procID == null || procService.getProcess(procID) == null)
+ if (procID == null || procService.getInstance(procID) == null)
{
System.out.println("Create new Process");
AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID);
ProcessDefinition procDef = procBuilder.buildProcessDefinition();
ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
- procService.registerProcess(proc);
+ procService.registerInstance(proc);
procID = proc.startProcessAsync();
httpSession.setAttribute("procID", procID);
}
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3246 - in projects/gwt-console/trunk: war and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-06 10:05:11 -0500 (Sat, 06 Dec 2008)
New Revision: 3246
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
projects/gwt-console/trunk/war/pom.xml
Log:
Disable gwt tests. Failing tests prevent a successful build, which seems to be required to run the test. How is this suposed to work?
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-05 23:14:34 UTC (rev 3245)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
@@ -37,7 +37,7 @@
*/
public class ManagementFactoryImpl extends ManagementFactory
{
- private boolean useSpecIntegration = false;
+ private boolean useSpecIntegration = true;
public ProcessManagement createProcessManagement()
{
Modified: projects/gwt-console/trunk/war/pom.xml
===================================================================
--- projects/gwt-console/trunk/war/pom.xml 2008-12-05 23:14:34 UTC (rev 3245)
+++ projects/gwt-console/trunk/war/pom.xml 2008-12-06 15:05:11 UTC (rev 3246)
@@ -107,7 +107,7 @@
<goal>mergewebxml</goal>
<goal>compile</goal>
<goal>gwt</goal>
- <goal>test</goal>
+ <!--goal>test</goal-->
</goals>
</execution>
</executions>
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3245 - in jbpm4/trunk/modules: task and 8 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-05 18:14:34 -0500 (Fri, 05 Dec 2008)
New Revision: 3245
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
jbpm4/trunk/modules/task/
jbpm4/trunk/modules/task/pom.xml
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml
jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java
jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java
Log:
JBPM-1858: completed task management operations
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -34,17 +34,17 @@
/** Creates a task with the given identifier.
* The returned task will be transient.
- * Use {@link #updateTask(Task)} to persist the task. */
+ * Use {@link #saveTask(Task)} to persist the task. */
Task newTask(String taskId);
+ /** Saves the given task to persistent storage. */
+ void saveTask(Task task);
+
/** Retrieves the task with the given identifier from persistent storage.
* If no task with the given identifier exists,
* the call returns <code>null</code>. */
Task getTask(String taskId);
- /** Saves the given task to persistent storage. */
- void updateTask(Task task);
-
/** Marks the task with the given identifier as completed.
* This operation may result in a process instance being resumed. */
void submitTask(String taskId);
Property changes on: jbpm4/trunk/modules/task
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Modified: jbpm4/trunk/modules/task/pom.xml
===================================================================
--- jbpm4/trunk/modules/task/pom.xml 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/pom.xml 2008-12-05 23:14:34 UTC (rev 3245)
@@ -85,7 +85,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <exclude>org/jbpm/task/TaskServiceTest.java</exclude>
</excludes>
</configuration>
</plugin>
Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -23,26 +23,26 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.session.DbSession;
-import org.jbpm.task.internal.model.TaskImpl;
+import org.jbpm.task.Task;
+import org.jbpm.task.session.TaskDbSession;
/**
- * @author Tom Baeyens
+ * @author Alejandro Guizar
*/
public class DeleteTask implements Command<Void> {
private static final long serialVersionUID = 1L;
- protected long taskDbid;
-
- public DeleteTask(long taskDbid) {
- this.taskDbid = taskDbid;
+ protected String taskId;
+
+ public DeleteTask(String taskId) {
+ this.taskId = taskId;
}
public Void execute(Environment environment) throws Exception {
- DbSession dbSession = environment.get(DbSession.class);
- TaskImpl task = dbSession.get(TaskImpl.class, taskDbid);
- dbSession.delete(task);
+ TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
+ Task task = taskDbSession.getTask(taskId);
+ taskDbSession.delete(task);
return null;
}
Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -23,25 +23,23 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.session.DbSession;
import org.jbpm.task.Task;
-import org.jbpm.task.internal.model.TaskImpl;
+import org.jbpm.task.session.TaskDbSession;
/**
- * @author Tom Baeyens
+ * @author Alejandro Guizar
*/
public class GetTask implements Command<Task> {
private static final long serialVersionUID = 1L;
- protected long taskDbid;
+ protected String taskId;
- public GetTask(long taskDbid) {
- this.taskDbid = taskDbid;
+ public GetTask(String taskId) {
+ this.taskId = taskId;
}
public Task execute(Environment environment) throws Exception {
- DbSession dbSession = environment.get(DbSession.class);
- return dbSession.get(TaskImpl.class, taskDbid);
+ return environment.get(TaskDbSession.class).getTask(taskId);
}
}
Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -23,12 +23,11 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.session.DbSession;
import org.jbpm.task.Task;
+import org.jbpm.task.session.TaskDbSession;
-
/**
- * @author Tom Baeyens
+ * @author Alejandro Guizar
*/
public class UpdateTask implements Command<Void> {
@@ -41,8 +40,7 @@
}
public Void execute(Environment environment) throws Exception {
- DbSession dbSession = environment.get(DbSession.class);
- dbSession.save(task);
+ environment.get(TaskDbSession.class).save(task);
return null;
}
Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -21,14 +21,22 @@
*/
package org.jbpm.task.internal.hibernate;
+import org.hibernate.criterion.Restrictions;
import org.jbpm.pvm.internal.hibernate.HibernateDbSession;
+import org.jbpm.task.Task;
+import org.jbpm.task.internal.model.TaskImpl;
import org.jbpm.task.session.TaskDbSession;
/**
* @author Alejandro Guizar
- *
*/
public class HibernateTaskDbSession extends HibernateDbSession implements
TaskDbSession {
+ public Task getTask(String taskId) {
+ return (Task) session.createCriteria(TaskImpl.class)
+ .add(Restrictions.eq("id", taskId))
+ .uniqueResult();
+ }
+
}
Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -28,68 +28,71 @@
import org.jbpm.task.Role;
import org.jbpm.task.Task;
import org.jbpm.task.internal.cmd.CreateTask;
+import org.jbpm.task.internal.cmd.DeleteTask;
+import org.jbpm.task.internal.cmd.GetTask;
import org.jbpm.task.internal.cmd.UpdateTask;
/**
- * @author Tom Baeyens
+ * @author Alejandro Guizar
*/
public class TaskServiceImpl implements TaskService {
-
- protected CommandService commandService;
-
- public TaskServiceImpl() {
- }
- public TaskServiceImpl(CommandService commandService) {
- this.commandService = commandService;
- }
+ protected CommandService commandService;
- public void updateTask(Task task) {
- commandService.execute(new UpdateTask(task));
- }
+ public TaskServiceImpl() {
+ }
- public CommandService getCommandService() {
- return commandService;
- }
- public void setCommandService(CommandService commandService) {
- this.commandService = commandService;
- }
+ public TaskServiceImpl(CommandService commandService) {
+ this.commandService = commandService;
+ }
- public void deleteTask(String taskId) {
- // TODO Auto-generated method stub
-
- }
+ public CommandService getCommandService() {
+ return commandService;
+ }
- public List<Task> getPersonalTaskList(String userId, int firstResult, int maxResults) {
- // TODO Auto-generated method stub
- return null;
- }
+ public void setCommandService(CommandService commandService) {
+ this.commandService = commandService;
+ }
- public Task getTask(String taskId) {
- // TODO Auto-generated method stub
- return null;
- }
+ public Task newTask(String taskId) {
+ return commandService.execute(new CreateTask(taskId));
+ }
- public Task newTask(String taskId) {
- return commandService.execute(new CreateTask(taskId));
- }
+ public Task getTask(String taskId) {
+ return commandService.execute(new GetTask(taskId));
+ }
- public void submitTask(String taskId) {
- // TODO Auto-generated method stub
- }
+ public void saveTask(Task task) {
+ commandService.execute(new UpdateTask(task));
+ }
- public List<Task> getGroupTaskList(String userId, int firstResult, int maxResults) {
- // TODO Auto-generated method stub
- return null;
- }
+ public void submitTask(String taskId) {
+ // TODO Auto-generated method stub
+ }
- public List<String> getCandidates(String taskId) {
- // TODO Auto-generated method stub
- return null;
- }
+ public void deleteTask(String taskId) {
+ commandService.execute(new DeleteTask(taskId));
+ }
- public List<Role> getRoles(String taskId) {
- // TODO Auto-generated method stub
- return null;
- }
+ public List<String> getCandidates(String taskId) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Role> getRoles(String taskId) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Task> getPersonalTaskList(String userId, int firstResult,
+ int maxResults) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Task> getGroupTaskList(String userId, int firstResult,
+ int maxResults) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -22,6 +22,7 @@
package org.jbpm.task.session;
import org.jbpm.session.DbSession;
+import org.jbpm.task.Task;
/**
* Persistence interface for tasks.
@@ -29,5 +30,5 @@
*/
public interface TaskDbSession extends DbSession {
- // TODO
+ Task getTask(String taskId);
}
Modified: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml 2008-12-05 23:14:34 UTC (rev 3245)
@@ -52,6 +52,7 @@
<discriminator type="char" column="CLASS_"/>
<version name="dbversion" column="DBVERSION_" />
+ <property name="id" column="ID_" unique="true" />
<property name="name" column="NAME_"/>
<property name="description" column="DESCR_"/>
<property name="assignee" column="ASSIGNEE_"/>
Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -30,8 +30,44 @@
public void testNewTask() {
String taskId = getName();
- Task task = createTask(taskId);
+ Task task = taskService.newTask(taskId);
assertEquals(taskId, task.getId());
+ // new task is transient
+ task = taskService.getTask(taskId);
+ assertNull("expected null, but was " + task, task);
}
+ public void testSaveTask() {
+ String taskId = getName();
+ Task task = taskService.newTask(taskId);
+ saveTask(task);
+ // task was made persistent
+ assertNotNull("expected task '" + taskId + "', but was null",
+ taskService.getTask(taskId));
+ }
+
+ public void testGetTask() {
+ String taskId = getName();
+ // ensure task does not exist
+ Task task = taskService.getTask(taskId);
+ assertNull("expected null, but was " + task, task);
+ // create task and verify it exists
+ task = taskService.newTask(taskId);
+ saveTask(task);
+ assertNotNull("expected task '" + taskId + "', but was null",
+ taskService.getTask(taskId));
+ }
+
+ public void testDeleteTask() {
+ String taskId = getName();
+ Task task = taskService.newTask(taskId);
+ taskService.saveTask(task);
+ // task was made persistent
+ assertNotNull("expected task '" + taskId + "', but was null",
+ taskService.getTask(taskId));
+ // delete task and verify it does not exist
+ taskService.deleteTask(taskId);
+ task = taskService.getTask(taskId);
+ assertNull("expected null, but was " + task, task);
+ }
}
Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-12-05 23:14:34 UTC (rev 3245)
@@ -42,7 +42,9 @@
<job-executor auto-start="false" />
<job-test-helper />
+ <!-- TODO reintroduce id-generator after lifecycle issue is fixed
<id-generator />
+ -->
<variable-types resource="jbpm.pvm.types.xml" />
<business-calendar>
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-05 21:14:05 UTC (rev 3244)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-05 23:14:34 UTC (rev 3245)
@@ -80,7 +80,13 @@
processService.deleteProcessDefinitionAndInstances(processDefinition.getId());
}
}
-
+
+ if (tasks != null) {
+ for (Task task : tasks) {
+ taskService.deleteTask(task.getId());
+ }
+ }
+
Db.verifyClean(processEngine);
super.tearDown();
@@ -106,14 +112,12 @@
return null;
}
- public Task createTask(String taskId) {
- Task task = taskService.newTask(taskId);
-
+ public void saveTask(Task task) {
if (tasks == null) {
tasks = new ArrayList<Task>();
}
tasks.add(task);
- return task;
+ taskService.saveTask(task);
}
}
17 years, 4 months
- 1
- 0