[jbpm-commits] JBoss JBPM SVN: r3248 - in jbpm3/trunk/modules/integration: spec and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Dec 6 11:33:38 EST 2008


Author: thomas.diesler at 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 at 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
     {




More information about the jbpm-commits mailing list