[jbpm-commits] JBoss JBPM SVN: r3052 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/model and 13 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Nov 24 08:04:30 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-11-24 08:04:29 -0500 (Mon, 24 Nov 2008)
New Revision: 3052

Added:
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java
Removed:
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java
Modified:
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java
   projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java
Log:
Update API signatures

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -26,7 +26,7 @@
 import java.util.Set;
 
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.api.runtime.Attachments;
 
@@ -55,9 +55,9 @@
   ProcessEngine getProcessEngine();
   
   /**
-   * Get the associated {@link ProcessInstance}
+   * Get the associated {@link Process}
    */
-  ProcessInstance getProcess();
+  Process getProcess();
   
   /**
    * Get the unique token identity

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -40,7 +40,7 @@
   /**
    * Get the associated process 
    */
-  ProcessInstance getProcess();
+  Process getProcess();
 
   /** 
    * Get the unique name. 

Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java (from rev 3051, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java	                        (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -0,0 +1,70 @@
+/*
+ * 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.api.model;
+
+//$Id$
+
+import org.jbpm.api.client.ProcessEngine;
+import org.jbpm.api.client.Token;
+import org.jbpm.api.runtime.Attachments;
+
+/**
+ * A Process is any Activity performed within a company or organization.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Process extends ProcessStructure
+{
+  /**
+   * Defines the status a {@link Process} can be in
+   */
+  public enum ProcessStatus
+  {
+    None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
+  }
+
+  /**
+   * Get the associated ProcessEngine
+   */
+  ProcessEngine getProcessEngine();
+  
+  /**
+   * Get the associated ProcessDefinition
+   */
+  ProcessDefinition getProcessDefinition();
+  
+  /**
+   * Get the process state
+   */
+  ProcessStatus getProcessStatus();
+
+  /**
+   * Start the process
+   */
+  Token startProcess();
+
+  /**
+   * Start the process, with a given context data
+   */
+  Token startProcess(Attachments att);
+}
\ No newline at end of file

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -36,7 +36,7 @@
   /**
    * Create a new instance of this process definition
    */
-  ProcessInstance newInstance();
+  Process newInstance();
 
   /**
    * Get the associated ProcessEngine

Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -1,70 +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.api.model;
-
-//$Id$
-
-import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.client.Token;
-import org.jbpm.api.runtime.Attachments;
-
-/**
- * A Process is any Activity performed within a company or organization.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface ProcessInstance extends ProcessStructure
-{
-  /**
-   * Defines the status a {@link ProcessInstance} can be in
-   */
-  public enum ProcessStatus
-  {
-    None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
-  }
-
-  /**
-   * Get the associated ProcessEngine
-   */
-  ProcessEngine getProcessEngine();
-  
-  /**
-   * Get the associated ProcessDefinition
-   */
-  ProcessDefinition getProcessDefinition();
-  
-  /**
-   * Get the process state
-   */
-  ProcessStatus getProcessStatus();
-
-  /**
-   * Start the process
-   */
-  Token startProcess();
-
-  /**
-   * Start the process, with a given context data
-   */
-  Token startProcess(Attachments att);
-}
\ No newline at end of file

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -23,13 +23,13 @@
 
 //$Id$
 
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.Gateway.GatewayType;
 import org.jbpm.api.model.Task.TaskType;
 
 /**
- * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
+ * The ProcessBuilder can be used to build a {@link Process} dynamically.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -37,7 +37,7 @@
 public interface ProcessBuilder
 {
   /**
-   * Add a {@link ProcessInstance} with a given name
+   * Add a {@link Process} with a given name
    */
   ProcessBuilder addProcess(String name);
 

Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java	                        (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -0,0 +1,48 @@
+/*
+ * 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.api.service;
+
+import org.jbpm.api.client.ProcessEngine;
+
+//$Id$
+
+/**
+ * The DialectHandler converts a supported dialect to the ProcessDefinition model.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public abstract class AbstractDialectHandler implements DialectHandler
+{
+  private ProcessEngine engine;
+
+  public ProcessEngine getProcessEngine()
+  {
+    return engine;
+  }
+
+  // Do not expose through the API
+  protected void setProcessEngine(ProcessEngine engine)
+  {
+    this.engine = engine;
+  }
+}


Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -29,7 +29,7 @@
 import org.jbpm.api.client.Configuration;
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 
 /**
@@ -72,17 +72,17 @@
   /**
    * Save the Process to persistent storage
    */
-  public abstract ObjectName saveProcess(ProcessInstance proc);
+  public abstract ObjectName saveProcess(Process proc);
 
   /**
    * Load the Process from persistent storage
    */
-  public abstract ProcessInstance loadProcess(ObjectName procID);
+  public abstract Process loadProcess(ObjectName procID);
 
   /**
    * Delete the Process from persistent storage
    */
-  public abstract void deleteProcess(ProcessInstance proc);
+  public abstract void deleteProcess(Process proc);
 
   /**
    * Save the Node to persistent storage

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -25,11 +25,11 @@
 
 import org.jbpm.api.client.Configuration;
 import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.builder.ProcessBuilder;
 
 /**
- * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
+ * The ProcessBuilder can be used to build a {@link Process} dynamically.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -29,8 +29,8 @@
 
 import org.jbpm.api.client.Configuration;
 import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.ProcessInstance;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process;
+import org.jbpm.api.model.Process.ProcessStatus;
 
 /**
  * The ProcessService is the entry point to create, find and otherwise manage processes.
@@ -57,7 +57,7 @@
   /**
    * Register a Process.
    */
-  public abstract ObjectName registerProcess(ProcessInstance proc);
+  public abstract ObjectName registerProcess(Process proc);
 
   /**
    * Unregister a Process.
@@ -67,7 +67,7 @@
   /**
    * Get a Process for a given id
    */
-  public abstract ProcessInstance getProcess(ObjectName procID);
+  public abstract Process getProcess(ObjectName procID);
 
   /**
    * Get the set of registered Processes

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -25,7 +25,7 @@
 
 import javax.management.ObjectName;
 
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.incubator.model.ProcessStructureExt;
 
@@ -35,7 +35,7 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
-public interface ProcessExt extends ProcessInstance, ProcessStructureExt
+public interface ProcessExt extends Process, ProcessStructureExt
 {
   /**
    * Start the process asynchronously

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -24,7 +24,7 @@
 //$Id$
 
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.Event.EventDetailType;
 import org.jbpm.api.model.Expression.ExpressionLanguage;
 import org.jbpm.api.model.Gateway.GatewayType;
@@ -40,7 +40,7 @@
 import org.jbpm.incubator.runtime.SignalHandler;
 
 /**
- * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
+ * The ProcessBuilder can be used to build a {@link Process} dynamically.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -26,9 +26,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.StartEvent;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.api.service.AbstractService;
 
@@ -61,19 +61,19 @@
    * @param start The StartEvent that triggers the process
    * @param att The Attachments in the ExecutionContext
    */
-  public abstract void startProcess(ProcessInstance proc, StartEvent start, Attachments att);
+  public abstract void startProcess(Process proc, StartEvent start, Attachments att);
 
   /**
    * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
    * Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends without
    * timeout.
    */
-  public abstract ProcessStatus waitForEnd(ProcessInstance proc);
+  public abstract ProcessStatus waitForEnd(Process proc);
 
   /**
    * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
    * Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends with a
    * given timeout.
    */
-  public abstract ProcessStatus waitForEnd(ProcessInstance proc, long timeout);
+  public abstract ProcessStatus waitForEnd(Process proc, long timeout);
 }

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -35,7 +35,7 @@
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.Event;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.Task;
 import org.jbpm.api.service.AbstractService;
 import org.jbpm.api.service.ProcessService;
@@ -137,7 +137,7 @@
   public void sendMessage(ObjectName procID, String targetName, Message msg)
   {
     ProcessService procService = ProcessService.locateProcessService();
-    ProcessInstance proc = procService.getProcess(procID);
+    Process proc = procService.getProcess(procID);
     if (proc == null)
       throw new IllegalStateException("Cannot obtain registered process: " + procID);
 

Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -27,11 +27,11 @@
 
 import org.jbpm.api.client.Token;
 import org.jbpm.api.client.Token.TokenStatus;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.Expression.ExpressionLanguage;
 import org.jbpm.api.model.Gateway.GatewayType;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.api.model.builder.GatewayBuilder;
 import org.jbpm.api.model.builder.ProcessBuilder;
 import org.jbpm.api.runtime.BasicAttachments;
@@ -50,7 +50,7 @@
   public void testGateA() throws Exception
   {
     ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
-    ProcessInstance proc = procDef.newInstance();
+    Process proc = procDef.newInstance();
 
     BasicAttachments att = new BasicAttachments();
     att.addAttachment("foo", "5");
@@ -67,7 +67,7 @@
   public void testGateB() throws Exception
   {
     ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
-    ProcessInstance proc = procDef.newInstance();
+    Process proc = procDef.newInstance();
 
     BasicAttachments att = new BasicAttachments();
     att.addAttachment("foo", "15");
@@ -84,7 +84,7 @@
   public void testInvalidGate() throws Exception
   {
     ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
-    ProcessInstance proc = procDef.newInstance();
+    Process proc = procDef.newInstance();
 
     BasicAttachments att = new BasicAttachments();
     att.addAttachment("foo", "10");

Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -28,7 +28,7 @@
 import javax.management.ObjectName;
 
 import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.service.ProcessDefinitionService;
 import org.jbpm.api.service.ProcessService;
@@ -66,7 +66,7 @@
     ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
     ProcessService procService = engine.getService(ProcessService.class);
 
-    ProcessInstance proc = procDef.newInstance();
+    Process proc = procDef.newInstance();
     assertNotNull("Process not null", proc);
     assertNull("Process not automatically registered", procService.getProcess(proc.getKey()));
     assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey()));

Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -25,7 +25,7 @@
 
 import javax.management.ObjectName;
 
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.builder.ProcessBuilder;
 import org.jbpm.api.service.ProcessBuilderService;
@@ -47,7 +47,7 @@
     ProcessService procService = ProcessService.locateProcessService();
     
     ProcessDefinition procDef = getProcessDefinition();
-    ProcessInstance proc = procDef.newInstance();
+    Process proc = procDef.newInstance();
 
     assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey()));
     assertNull("Process not registered automatically", procService.getProcess(proc.getKey()));

Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -27,9 +27,9 @@
 
 import org.jbpm.api.client.Token;
 import org.jbpm.api.client.Token.TokenStatus;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.api.model.Task.TaskType;
 import org.jbpm.api.model.builder.ProcessBuilder;
 import org.jbpm.api.service.ProcessBuilderService;
@@ -46,7 +46,7 @@
   public void testBasicWaitState() throws Exception
   {
     ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
-    ProcessInstance proc = procDef.newInstance();
+    Process proc = procDef.newInstance();
 
     // Start the Process
     Token tok = proc.startProcess();

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -31,7 +31,7 @@
 import org.hibernate.Session;
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.AbstractElement;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 
 /**
@@ -87,22 +87,22 @@
     // nothing to do
   }
   
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     // nothing to do
   }
   
-  protected void register(ProcessInstance proc)
+  protected void register(Process proc)
   {
     // nothing to do
   }
   
-  protected void unregister(ProcessInstance proc)
+  protected void unregister(Process proc)
   {
     // nothing to do
   }
   
-  protected void destroy(ProcessInstance proc)
+  protected void destroy(Process proc)
   {
     // nothing to do
   }

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -35,7 +35,7 @@
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.client.Token;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.ProcessStructure;
 import org.jbpm.api.model.builder.ObjectNameFactory;
@@ -213,7 +213,7 @@
   }
 
   @Override
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     super.create(proc);
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -48,7 +48,7 @@
 import org.jbpm.api.client.Token.TokenStatus;
 import org.jbpm.api.model.EndEvent;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.ProcessStructure;
 import org.jbpm.api.model.SequenceFlow;
@@ -132,7 +132,7 @@
   private ProcessDefinition procDef;
 
   @ManyToOne(targetEntity = ProcessImpl.class)
-  private ProcessInstance proc;
+  private Process proc;
 
   @ManyToOne(targetEntity = GroupImpl.class)
   private Group groupRef;
@@ -155,7 +155,7 @@
   }
 
   @Override
-  public ProcessInstance getProcess()
+  public Process getProcess()
   {
     return proc;
   }
@@ -399,7 +399,7 @@
   }
 
   @Override
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     super.create(proc);
     this.proc = proc;

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -43,7 +43,7 @@
 import org.jbpm.api.Constants;
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.builder.ObjectNameFactory;
 import org.jbpm.incubator.model.Assignment;
@@ -102,7 +102,7 @@
   }
 
   @Override
-  public ProcessInstance newInstance()
+  public Process newInstance()
   {
     // Create a copy of the process structure from raw data
     ProcessStructureImpl procStructCopy;

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -43,7 +43,7 @@
 import org.jbpm.api.client.Token;
 import org.jbpm.api.client.Token.TokenStatus;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.StartEvent;
 import org.jbpm.api.model.Event.EventDetailType;
@@ -377,28 +377,28 @@
   }
   
   @Override
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     super.create(proc);
     procStruct.create(proc);
   }
 
   @Override
-  public void register(ProcessInstance proc)
+  public void register(Process proc)
   {
     super.register(proc);
     procStruct.register(proc);
   }
 
   @Override
-  public void unregister(ProcessInstance proc)
+  public void unregister(Process proc)
   {
     super.unregister(proc);
     procStruct.unregister(proc);
   }
 
   @Override
-  protected void destroy(ProcessInstance proc)
+  protected void destroy(Process proc)
   {
     super.destroy(proc);
     procStruct.destroy(proc);

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -44,7 +44,7 @@
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.EndEvent;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.StartEvent;
 import org.jbpm.api.model.builder.ObjectNameFactory;
@@ -360,7 +360,7 @@
   }
 
   @Override
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     super.create(proc);
     for (Node node : getNodes())
@@ -371,7 +371,7 @@
   }
 
   @Override
-  protected void register(ProcessInstance proc)
+  protected void register(Process proc)
   {
     super.register(proc);
     for (Node node : getNodes())
@@ -382,7 +382,7 @@
   }
 
   @Override
-  protected void unregister(ProcessInstance proc)
+  protected void unregister(Process proc)
   {
     super.unregister(proc);
     for (Node node : getNodes())
@@ -393,7 +393,7 @@
   }
 
   @Override
-  protected void destroy(ProcessInstance proc)
+  protected void destroy(Process proc)
   {
     super.destroy(proc);
     for (Node node : getNodes())

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -32,7 +32,7 @@
 import org.jbpm.api.InvalidProcessException;
 import org.jbpm.api.NotImplementedException;
 import org.jbpm.api.client.Token;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.ProcessStructure;
 import org.jbpm.api.runtime.Attachments;
@@ -165,7 +165,7 @@
   }
 
   @Override
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     super.create(proc);
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -29,7 +29,7 @@
 import org.jbpm.api.InvalidProcessException;
 import org.jbpm.api.client.Token;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.ProcessStructure;
 import org.jbpm.incubator.model.Message;
@@ -119,7 +119,7 @@
   }
 
   @Override
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     super.create(proc);
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -32,7 +32,7 @@
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.client.Token;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.ProcessStructure;
 import org.jbpm.api.model.SequenceFlow;
@@ -191,7 +191,7 @@
 
             // There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. 
             // That is, a Process Instance SHALL be generated when the Start Event is triggered.
-            ProcessInstance proc = procDef.newInstance();
+            Process proc = procDef.newInstance();
             StartEvent startEvent = proc.getNode(StartEvent.class, startEventName);
             
             ExecutionService execService = engine.getService(ExecutionService.class);

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -34,7 +34,7 @@
 
 import org.jbpm.api.InvalidProcessException;
 import org.jbpm.api.client.Token;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.ProcessStructure;
 import org.jbpm.api.runtime.Attachments;
@@ -202,7 +202,7 @@
   }
 
   @Override
-  protected void create(ProcessInstance proc)
+  protected void create(Process proc)
   {
     super.create(proc);
 
@@ -212,7 +212,7 @@
   }
 
   @Override
-  protected void register(ProcessInstance proc)
+  protected void register(Process proc)
   {
     super.register(proc);
     
@@ -227,7 +227,7 @@
   }
 
   @Override
-  protected void unregister(ProcessInstance proc)
+  protected void unregister(Process proc)
   {
     super.unregister(proc);
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -25,7 +25,7 @@
 
 import org.jbpm.api.NotImplementedException;
 import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.Event.EventDetailType;
 import org.jbpm.api.model.Expression.ExpressionLanguage;
@@ -64,7 +64,7 @@
 import org.jbpm.ri.model.WaitStateImpl;
 
 /**
- * The ProcessBuilder can be used to dynamically build a {@link ProcessInstance}.
+ * The ProcessBuilder can be used to dynamically build a {@link Process}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -29,14 +29,14 @@
 import java.util.Map;
 
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.incubator.model.NodeExt;
 import org.jbpm.incubator.model.ProcessDefinitionExt;
 import org.jbpm.incubator.model.Property;
 
 /**
- * An ExecutionContext that delegates to the current {@link Node} or {@link ProcessInstance} for property rerieval.
+ * An ExecutionContext that delegates to the current {@link Node} or {@link Process} for property rerieval.
  * 
  * @author Thomas.Diesler at jboss.com
  * @since 15-Aug-2008

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -29,7 +29,7 @@
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.client.Token;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.incubator.model.NodeExt;
@@ -91,7 +91,7 @@
   }
 
   @Override
-  public ProcessInstance getProcess()
+  public Process getProcess()
   {
     return delegateToken.getProcess();
   }

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -25,7 +25,7 @@
 
 import org.jbpm.api.client.Token;
 import org.jbpm.api.client.Token.TokenStatus;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.incubator.runtime.TokenExecutor;
 import org.slf4j.Logger;
@@ -43,9 +43,9 @@
   final static Logger log = LoggerFactory.getLogger(InProcessTokenExecutor.class);
 
   @SuppressWarnings("unused")
-  private ProcessInstance proc;
+  private Process proc;
 
-  public InProcessTokenExecutor(ProcessInstance proc)
+  public InProcessTokenExecutor(Process proc)
   {
     this.proc = proc;
   }

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -24,8 +24,8 @@
 import org.jbpm.api.client.Token;
 import org.jbpm.api.client.Token.TokenStatus;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.api.service.ProcessService;
 import org.jbpm.ri.model.ProcessImpl;
 import org.jbpm.ri.service.ProcessServiceImpl;
@@ -67,7 +67,7 @@
 
   public void run()
   {
-    ProcessInstance proc = rtProc.getProcess();
+    Process proc = rtProc.getProcess();
     try
     {
       Node node = token.getCurrentNode();

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -23,13 +23,13 @@
 
 //$Id$
 
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.incubator.runtime.TokenExecutor;
 
 /**
- * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance} 
+ * A RuntimeProcess add runtime behaviour to the {@link Process} 
  * <p/> 
- * To protect the engine from maligious user code it does not extend {@link ProcessInstance} directly.
+ * To protect the engine from maligious user code it does not extend {@link Process} directly.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -37,12 +37,12 @@
 public interface RuntimeProcess
 {
   /**
-   * Get the associated {@link ProcessInstance}
+   * Get the associated {@link Process}
    */
-  ProcessInstance getProcess();
+  Process getProcess();
 
   /**
-   * Get the {@link TokenExecutor} for this {@link ProcessInstance}
+   * Get the {@link TokenExecutor} for this {@link Process}
    */
   ThreadingTokenExecutor getTokenExecutor();
 }
\ No newline at end of file

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -23,26 +23,26 @@
 
 //$Id$
 
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 
 /**
- * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance}
+ * A RuntimeProcess add runtime behaviour to the {@link Process}
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
 public class RuntimeProcessImpl implements RuntimeProcess
 {
-  private ProcessInstance proc;
+  private Process proc;
   private ThreadingTokenExecutor tokenExecutor;
 
-  public RuntimeProcessImpl(ProcessInstance proc)
+  public RuntimeProcessImpl(Process proc)
   {
     this.proc = proc;
     this.tokenExecutor = new ThreadingTokenExecutor(this);
   }
 
-  public ProcessInstance getProcess()
+  public Process getProcess()
   {
     return proc;
   }

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -34,7 +34,7 @@
 import org.jbpm.api.client.Token;
 import org.jbpm.api.client.Token.TokenStatus;
 import org.jbpm.api.model.SequenceFlow;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.incubator.runtime.FlowHandler;
 import org.jbpm.incubator.runtime.TokenExecutor;
 import org.slf4j.Logger;

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -32,10 +32,10 @@
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.client.Token;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.api.model.WaitState;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.api.runtime.BasicAttachments;
 import org.jbpm.api.runtime.Attachments.Key;
@@ -62,7 +62,7 @@
   private SequenceFlow flow;
   private Attachments att;
   private TokenStatus status;
-  private ProcessInstance proc;
+  private Process proc;
   private Session session;
   
   private Token parentToken;
@@ -71,7 +71,7 @@
   /**
    * Construct a Token with given {@link Attachments}
    */
-  public TokenImpl(ProcessInstance proc, Attachments att)
+  public TokenImpl(Process proc, Attachments att)
   {
     this.att = new BasicAttachments(att);
     this.id = new UID().toString();
@@ -104,7 +104,7 @@
   }
 
   @Override
-  public ProcessInstance getProcess()
+  public Process getProcess()
   {
     return proc;
   }

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -33,9 +33,9 @@
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.client.Token;
 import org.jbpm.api.model.Expression;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.StartEvent;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.api.service.ProcessService;
 import org.jbpm.incubator.client.ProcessExt;
@@ -79,12 +79,12 @@
   }
 
   @Override
-  public void startProcess(ProcessInstance proc, StartEvent start, Attachments att)
+  public void startProcess(Process proc, StartEvent start, Attachments att)
   {
     startProcessInternal(proc, start, att);
   }
 
-  private synchronized void startProcessInternal(ProcessInstance proc, StartEvent start, Attachments att)
+  private synchronized void startProcessInternal(Process proc, StartEvent start, Attachments att)
   {
     @SuppressWarnings("serial")
     class InitialFlow extends SequenceFlowImpl
@@ -154,12 +154,12 @@
     }
   }
 
-  public ProcessStatus waitForEnd(ProcessInstance proc)
+  public ProcessStatus waitForEnd(Process proc)
   {
     return waitForEndInternal(proc, 0);
   }
 
-  public ProcessStatus waitForEnd(ProcessInstance proc, long timeout)
+  public ProcessStatus waitForEnd(Process proc, long timeout)
   {
     return waitForEndInternal(proc, timeout);
   }
@@ -169,7 +169,7 @@
    * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was
    * aborted this method throws the causing RuntimeException if avaialable.
    */
-  private ProcessStatus waitForEndInternal(ProcessInstance proc, long timeout)
+  private ProcessStatus waitForEndInternal(Process proc, long timeout)
   {
     ProcessImpl procImpl = (ProcessImpl)proc;
 
@@ -234,13 +234,13 @@
     return status;
   }
 
-  private boolean isProcessTerminated(ProcessInstance proc)
+  private boolean isProcessTerminated(Process proc)
   {
     ProcessStatus status = proc.getProcessStatus();
     return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted;
   }
 
-  private RuntimeProcess getRuntimeProcess(ProcessInstance proc, boolean createNew)
+  private RuntimeProcess getRuntimeProcess(Process proc, boolean createNew)
   {
     RuntimeProcess rtProcess;
     synchronized (runtimeProcesses)
@@ -271,7 +271,7 @@
     {
       ThreadingTokenExecutor tokenExecutor = rtProc.getTokenExecutor();
       ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
-      ProcessInstance proc = rtProc.getProcess();
+      Process proc = rtProc.getProcess();
 
       ProcessEngine engine = getProcessEngine();
       SignalService sigService = engine.getService(SignalService.class);

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -38,7 +38,7 @@
 import org.jbpm.api.ProcessNotFoundException;
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.service.PersistenceService;
 import org.jbpm.api.service.Service;
@@ -151,7 +151,7 @@
   }
 
   @Override
-  public ObjectName saveProcess(ProcessInstance proc)
+  public ObjectName saveProcess(Process proc)
   {
     log.debug("START saveProcess: " + proc.getKey());
     Session session = getSessionFactory().openSession();
@@ -170,15 +170,15 @@
   }
 
   @Override
-  public ProcessInstance loadProcess(ObjectName procID)
+  public Process loadProcess(ObjectName procID)
   {
     log.debug("START loadProcess: " + procID);
-    ProcessInstance proc = null;
+    Process proc = null;
     Session session = getSessionFactory().openSession();
     try
     {
       Integer id = Integer.valueOf(procID.getKeyProperty("id"));
-      proc = (ProcessInstance)session.load(ProcessImpl.class, id);
+      proc = (Process)session.load(ProcessImpl.class, id);
       AbstractElementImpl elImpl = (AbstractElementImpl)proc;
       elImpl.initialize(getProcessEngine(), session);
     }
@@ -195,7 +195,7 @@
   }
 
   @Override
-  public void deleteProcess(ProcessInstance proc)
+  public void deleteProcess(Process proc)
   {
     log.debug("START deleteProcess: " + proc);
     Session session = getSessionFactory().openSession();
@@ -204,7 +204,7 @@
     {
       ObjectName procID = proc.getKey();
       Integer id = Integer.valueOf(procID.getKeyProperty("id"));
-      proc = (ProcessInstance)session.load(ProcessImpl.class, id);
+      proc = (Process)session.load(ProcessImpl.class, id);
       session.delete(proc);
       tx.commit();
     }

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -32,7 +32,7 @@
 import org.jbpm.api.ProcessNotFoundException;
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.service.PersistenceService;
 import org.slf4j.Logger;
@@ -50,7 +50,7 @@
   final Logger log = LoggerFactory.getLogger(InMemoryPersistenceServiceImpl.class);
 
   private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>();
-  private Map<ObjectName, ProcessInstance> procs = new HashMap<ObjectName, ProcessInstance>();
+  private Map<ObjectName, Process> procs = new HashMap<ObjectName, Process>();
   private Map<ObjectName, Node> nodes = new HashMap<ObjectName, Node>();
 
   @Override
@@ -89,7 +89,7 @@
   }
 
   @Override
-  public ObjectName saveProcess(ProcessInstance proc)
+  public ObjectName saveProcess(Process proc)
   {
     procs.put(proc.getKey(), proc);
     
@@ -100,9 +100,9 @@
   }
 
   @Override
-  public ProcessInstance loadProcess(ObjectName procID)
+  public Process loadProcess(ObjectName procID)
   {
-    ProcessInstance proc = procs.get(procID);
+    Process proc = procs.get(procID);
     if (proc == null)
       throw new ProcessNotFoundException("Cannot find process: " + procID);
     
@@ -110,7 +110,7 @@
   }
 
   @Override
-  public void deleteProcess(ProcessInstance proc)
+  public void deleteProcess(Process proc)
   {
     procs.remove(proc.getKey());
     

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -24,13 +24,13 @@
 // $Id$
 
 import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.service.ProcessBuilderService;
 import org.jbpm.incubator.model.builder.ProcessBuilderExt;
 import org.jbpm.ri.model.builder.ProcessBuilderImpl;
 
 /**
- * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
+ * The ProcessBuilder can be used to build a {@link Process} dynamically.
  * 
  * @author thomas.diesler at jboss.com
  * @since 18-Jun-2008

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -34,9 +34,9 @@
 import javax.management.ObjectName;
 
 import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
-import org.jbpm.api.model.ProcessInstance.ProcessStatus;
+import org.jbpm.api.model.Process.ProcessStatus;
 import org.jbpm.api.service.PersistenceService;
 import org.jbpm.api.service.ProcessDefinitionService;
 import org.jbpm.api.service.ProcessService;
@@ -56,7 +56,7 @@
   // Provide logging
   final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class);
   
-  private Map<ObjectName, ProcessInstance> registeredProcs = new HashMap<ObjectName, ProcessInstance>();
+  private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>();
   private List<NodeInterceptor> nodeInterceptors = new ArrayList<NodeInterceptor>();
   
   @Override
@@ -83,9 +83,9 @@
    * Get a Process for a given id
    */
   @Override
-  public ProcessInstance getProcess(ObjectName procID)
+  public Process getProcess(ObjectName procID)
   {
-    ProcessInstance proc = registeredProcs.get(procID);
+    Process proc = registeredProcs.get(procID);
     return proc;
   }
 
@@ -109,7 +109,7 @@
   public Set<ObjectName> getProcesses(String name, ProcessStatus status)
   {
     Set<ObjectName> procSet = new HashSet<ObjectName>();
-    for (ProcessInstance auxProc : registeredProcs.values())
+    for (Process auxProc : registeredProcs.values())
     {
       if (auxProc.getName().equals(name))
       {
@@ -123,7 +123,7 @@
   /**
    * Register a Process.
    */
-  public ObjectName registerProcess(ProcessInstance proc)
+  public ObjectName registerProcess(Process proc)
   {
     log.debug("registerProcess: " + proc);
 
@@ -160,7 +160,7 @@
   public boolean unregisterProcess(ObjectName procID)
   {
     boolean removed = false;
-    ProcessInstance proc = registeredProcs.get(procID);
+    Process proc = registeredProcs.get(procID);
     if (proc != null)
     {
       log.debug("unregisterProcess: " + proc);

Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java	2008-11-24 13:02:51 UTC (rev 3051)
+++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java	2008-11-24 13:04:29 UTC (rev 3052)
@@ -28,7 +28,7 @@
 import org.jbpm.api.ProcessNotFoundException;
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.model.EndEvent;
-import org.jbpm.api.model.ProcessInstance;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.StartEvent;
 import org.jbpm.api.model.Task;
@@ -59,12 +59,12 @@
     procDefService.registerProcessDefinition(procDef);
     
     // Create and save the Process
-    ProcessInstance proc = procDef.newInstance();
+    Process proc = procDef.newInstance();
     service.saveProcess(proc);
 
     // Load the process
     ObjectName procID = proc.getKey();
-    ProcessInstance loadProc = service.loadProcess(procID);
+    Process loadProc = service.loadProcess(procID);
     ProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition());
 
     StartEvent start = loadProc.getNode(StartEvent.class, "Start");




More information about the jbpm-commits mailing list