[jbpm-commits] JBoss JBPM SVN: r3466 - in jbpm3/trunk: modules/integration and 10 other directories.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-12-19 17:53:18 -0500 (Fri, 19 Dec 2008)
New Revision: 3466

Added:
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml
Removed:
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml
   jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/
   jbpm3/trunk/modules/integration/src/test/resources/deployment/
Modified:
   jbpm3/trunk/modules/integration/pom.xml
   jbpm3/trunk/modules/integration/scripts/assembly-config.xml
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java
   jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java
   jbpm3/trunk/pom.xml
Log:
Upgrade bpm-spec-1.0.0

Modified: jbpm3/trunk/modules/integration/pom.xml
===================================================================
--- jbpm3/trunk/modules/integration/pom.xml	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/pom.xml	2008-12-19 22:53:18 UTC (rev 3466)
@@ -15,7 +15,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <name>JBoss jBPM3 - Spec Integration</name>
+  <name>JBoss jBPM3 - Integration</name>
   <groupId>org.jbpm.jbpm3</groupId>
   <artifactId>jbpm-integration-spec</artifactId>
   <packaging>jar</packaging>
@@ -38,7 +38,7 @@
   <dependencies>
     <dependency>
       <groupId>org.jboss.bpm</groupId>
-      <artifactId>jboss-bpm-api</artifactId>
+      <artifactId>bpm-spec-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
@@ -81,13 +81,8 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.bpm</groupId>
-      <artifactId>jboss-bpm-dialect-api10</artifactId>
+      <artifactId>bpm-spec-cts</artifactId>
       <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.bpm</groupId>
-      <artifactId>jboss-bpm-cts</artifactId>
-      <scope>test</scope>
       <type>zip</type>
     </dependency>
   </dependencies>
@@ -181,7 +176,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.jboss.bpm</groupId>
-                  <artifactId>jboss-bpm-cts</artifactId>
+                  <artifactId>bpm-spec-cts</artifactId>
                   <type>zip</type>
                 </artifactItem>
               </artifactItems>
@@ -194,13 +189,27 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>jbpm-cfg-beans.xml</exclude>
+            <exclude>bpm-spec-jbpm3-beans.xml</exclude>
           </excludes>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <systemProperties>
+            <property>
+              <name>bpm.dialect</name>
+              <value>jbpm3</value>
+            </property>
+            <property>
+              <name>bpm.dialect.uri</name>
+              <value>urn:jbpm.org:jpdl-3.2</value>
+            </property>
+            <property>
+              <name>log4j.output.dir</name>
+              <value>${basedir}/target</value>
+            </property>
+          </systemProperties>
           <excludes>
             <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude>
             <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude>

Modified: jbpm3/trunk/modules/integration/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/integration/scripts/assembly-config.xml	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/scripts/assembly-config.xml	2008-12-19 22:53:18 UTC (rev 3466)
@@ -10,7 +10,7 @@
       <directory>${basedir}/src/main/resources</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>jbpm-cfg-beans.xml</include>
+        <include>bpm-spec-jbpm3-beans.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,8 +31,8 @@
 
 import org.jboss.bpm.api.NotImplementedException;
 import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.AbstractDialectHandler;
 import org.jboss.bpm.api.service.DialectHandler;
-import org.jboss.bpm.api.service.internal.AbstractDialectHandler;
 import org.jbpm.integration.spec.model.ProcessDefinitionImpl;
 
 /**

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,8 +22,8 @@
 package org.jbpm.integration.spec.model;
 
 import org.jboss.bpm.api.model.AbstractElement;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.ContextService;
 import org.jboss.bpm.api.service.ProcessEngine;
 import org.jbpm.JbpmContext;
 import org.jbpm.graph.def.Identifiable;
@@ -85,8 +85,8 @@
       objID = currID;
       tempObj = null;
 
-      ExecutionContextService execService = getProcessEngine().getService(ExecutionContextService.class);
-      ExecutionContext bpmContext = execService.getExecutionContext(true);
+      ContextService execService = getProcessEngine().getService(ContextService.class);
+      Context bpmContext = execService.getContext(true);
       try
       {
         JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,10 +24,10 @@
 import java.util.List;
 
 import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.EndEvent;
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.EndEvent;
+import org.jboss.bpm.incubator.model.SequenceFlow;
 import org.jbpm.graph.def.Node;
 import org.jbpm.graph.node.EndState;
 

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.integration.spec.model;
 
-import org.jboss.bpm.api.model.Event;
 import org.jboss.bpm.api.model.ProcessDefinition;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Event;
 import org.jbpm.graph.def.Node;
 
 /**

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -23,13 +23,13 @@
 
 // $Id$
 
-import org.jboss.bpm.api.model.ExclusiveGateway;
-import org.jboss.bpm.api.model.Expression;
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.ExclusiveGateway;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.SequenceFlow.ConditionType;
 import org.jbpm.graph.def.Node;
 import org.jbpm.graph.exe.ExecutionContext;
 import org.jbpm.graph.node.Decision;

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import org.jboss.bpm.api.model.Expression;
+import org.jboss.bpm.incubator.model.Expression;
 
 /**
  * An Expression, which is used in the definition of attributes for @{link StartEvent},

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,10 +24,10 @@
 import java.util.List;
 
 import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.Gateway;
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Gateway;
+import org.jboss.bpm.incubator.model.SequenceFlow;
 import org.jbpm.graph.def.Node;
 
 /**

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,12 +31,12 @@
 import org.jboss.bpm.api.InvalidProcessException;
 import org.jboss.bpm.api.NotImplementedException;
 import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
+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.SequenceFlow;
-import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.SequenceFlow.ConditionType;
 import org.jbpm.graph.def.Transition;
 import org.jbpm.integration.spec.runtime.InvocationProxy;
 
@@ -77,7 +77,7 @@
     return procDef;
   }
 
-  public ProcessInstance getProcess()
+  public ProcessInstance getProcessInstance()
   {
     throw new NotImplementedException();
   }

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,8 +22,8 @@
 package org.jbpm.integration.spec.model;
 
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Task;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Task;
 import org.jbpm.graph.def.Node;
 
 /**

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -30,13 +30,13 @@
 import org.jboss.bpm.api.Constants;
 import org.jboss.bpm.api.InvalidProcessException;
 import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.Expression;
 import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
+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.SequenceFlow.ConditionType;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.SequenceFlow.ConditionType;
 import org.jbpm.graph.def.Transition;
 import org.jbpm.graph.def.Node.NodeType;
 import org.jbpm.integration.spec.runtime.InvocationProxy;

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -21,6 +21,7 @@
  */
 package org.jbpm.integration.spec.model;
 
+// $Idimport java.util.Date;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -30,15 +31,15 @@
 
 import org.jboss.bpm.api.Constants;
 import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
 import org.jboss.bpm.api.model.ProcessDefinition;
 import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
 import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.api.runtime.ExecutionContext;
+import org.jboss.bpm.api.runtime.Context;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.runtime.Attachments.Key;
 import org.jboss.bpm.api.runtime.Token.TokenStatus;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ContextService;
 import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.api.service.ProcessInstanceService;
 import org.jbpm.JbpmContext;
@@ -180,8 +181,8 @@
 
   public Token startProcess(Attachments contextData)
   {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       // Register the Process implicitly

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.integration.spec.model;
 
-import org.jboss.bpm.api.model.Expression;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
 import org.jbpm.graph.def.Node;
 import org.jbpm.graph.def.Transition;
 

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -25,9 +25,9 @@
 
 import org.jboss.bpm.api.NotImplementedException;
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.StartEvent;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.StartEvent;
 import org.jbpm.graph.def.Node;
 import org.jbpm.graph.node.StartState;
 

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -25,9 +25,9 @@
 
 import org.jboss.bpm.api.NotImplementedException;
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.Task;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.Task;
 import org.jbpm.graph.def.Node;
 
 /**

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,10 +22,10 @@
 package org.jbpm.integration.spec.model;
 
 import org.jboss.bpm.api.NotImplementedException;
+import org.jboss.bpm.api.model.Message;
 import org.jboss.bpm.api.model.ProcessDefinition;
 import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.incubator.client.UserTaskCallback;
-import org.jboss.bpm.incubator.model.Message;
 import org.jboss.bpm.incubator.model.UserTask;
 import org.jbpm.graph.def.Node;
 import org.jbpm.graph.node.TaskNode;

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,8 +22,8 @@
 package org.jbpm.integration.spec.model;
 
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.WaitState;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.WaitState;
 import org.jbpm.graph.def.Node;
 import org.jbpm.graph.node.State;
 

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,8 +24,8 @@
 //$Id$
 
 import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.model.builder.GatewayBuilder;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.builder.GatewayBuilder;
 
 /**
  * The GatewayBuilder can be used to build a Gateway dynamically.

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -29,17 +29,17 @@
 
 import org.jboss.bpm.api.InvalidProcessException;
 import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.EndEvent;
 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.StartEvent;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.model.Gateway.GatewayType;
-import org.jboss.bpm.api.model.Task.TaskType;
-import org.jboss.bpm.api.model.builder.GatewayBuilder;
-import org.jboss.bpm.api.model.builder.ProcessBuilder;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.EndEvent;
+import org.jboss.bpm.incubator.model.StartEvent;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.Gateway.GatewayType;
+import org.jboss.bpm.incubator.model.Task.TaskType;
+import org.jboss.bpm.incubator.model.builder.GatewayBuilder;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilder;
 import org.jbpm.graph.def.Transition;
 import org.jbpm.graph.def.Node.NodeType;
 import org.jbpm.graph.node.Decision;

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -26,11 +26,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.bpm.api.model.Expression;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
 import org.jboss.bpm.api.runtime.Attachments;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.runtime.Attachments.Key;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
 import org.mvel.MVEL;
 
 /**

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -28,8 +28,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.ContextService;
 import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.api.service.ProcessEngineSupport;
 import org.slf4j.Logger;
@@ -100,8 +100,8 @@
     {
       Throwable targetException = null;
 
-      ExecutionContextService ctxService = engine.getService(ExecutionContextService.class);
-      ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+      ContextService ctxService = engine.getService(ContextService.class);
+      Context bpmContext = ctxService.getContext(true);
       try
       {
         return m.invoke(obj, args);

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -29,15 +29,15 @@
 
 import org.jboss.bpm.api.Constants;
 import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
 import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.SequenceFlow;
 import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
 import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.api.runtime.ExecutionContext;
+import org.jboss.bpm.api.runtime.Context;
 import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ContextService;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
 import org.jbpm.JbpmContext;
 import org.jbpm.context.exe.ContextInstance;
 import org.jbpm.graph.def.Transition;
@@ -174,8 +174,8 @@
 
   private void signalInternal(String name)
   {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       NodeImpl<?> currNode = (NodeImpl<?>)getNode();

Copied: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java (from rev 3445, jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java	                        (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,101 @@
+/*
+ * 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.service;
+
+// $Id$
+
+import org.jboss.bpm.api.runtime.BasicAttachments;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.ContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jbpm.JbpmContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The ContextService is the entry point to create or get an Context.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 02-Dec-2008
+ */
+public class ContextServiceImpl extends AbstractService implements ContextService, MutableService
+{
+  // Provide logging
+  final static Logger log = LoggerFactory.getLogger(ContextServiceImpl.class);
+
+  private static ThreadLocal<ContextImpl> contextAssociation = new ThreadLocal<ContextImpl>();
+
+  @Override
+  public void setProcessEngine(ProcessEngine engine)
+  {
+    super.setProcessEngine(engine);
+  }
+
+  public Context createContext()
+  {
+    ProcessEngineImpl engineImpl = (ProcessEngineImpl)getProcessEngine();
+    JbpmContext jbpmContext = engineImpl.getJbpmConfiguration().createJbpmContext();
+    ContextImpl currContext = new ContextImpl(jbpmContext);
+    contextAssociation.set(currContext);
+    return currContext;
+  }
+
+  public Context getContext(boolean create)
+  {
+    ContextImpl currContext = contextAssociation.get();
+
+    if (currContext == null && create == true)
+      currContext = (ContextImpl)createContext();
+
+    if (currContext != null)
+      currContext.clientCount++;
+
+    return currContext;
+  }
+
+  class ContextImpl extends BasicAttachments implements Context
+  {
+    private JbpmContext jbpmContext;
+    private int clientCount;
+
+    ContextImpl(JbpmContext jbpmContext)
+    {
+      this.jbpmContext = jbpmContext;
+      addAttachment(JbpmContext.class, jbpmContext);
+    }
+
+    public void close()
+    {
+      clientCount--;
+
+      if (clientCount < 0)
+        throw new IllegalStateException("PersistenceContext already closed");
+
+      if (clientCount == 0)
+      {
+        contextAssociation.set(null);
+        jbpmContext.close();
+      }
+    }
+  }
+}
\ No newline at end of file

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -30,9 +30,10 @@
 
 import org.jboss.bpm.api.deployment.Deployment;
 import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.DeploymentService;
 import org.jboss.bpm.api.service.ProcessDefinitionService;
 import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractDeploymentService;
 import org.jbpm.integration.spec.deployment.PARDeployment;
 import org.jbpm.integration.spec.deployment.XMLDeployment;
 import org.slf4j.Logger;
@@ -44,7 +45,7 @@
  * @author thomas.diesler at jboss.com
  * @since 28-Nov-2008
  */
-public class DeploymentServiceImpl extends AbstractDeploymentService implements MutableService
+public class DeploymentServiceImpl extends AbstractService implements DeploymentService, MutableService
 {
   // Provide logging
   final Logger log = LoggerFactory.getLogger(DeploymentServiceImpl.class);

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -26,9 +26,9 @@
 import java.net.URI;
 import java.util.Map;
 
+import org.jboss.bpm.api.service.AbstractDialectHandlerService;
 import org.jboss.bpm.api.service.DialectHandler;
 import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractDialectHandlerService;
 
 /**
  * A registry that maps namespaceURI to a {@link DialectHandler}

Deleted: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,100 +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.service;
-
-// $Id$
-
-import org.jboss.bpm.api.runtime.BasicAttachments;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractExecutionContextService;
-import org.jbpm.JbpmContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The ExecutionContextService is the entry point to create or get an ExecutionContext.
- * 
- * @author thomas.diesler at jboss.com
- * @since 02-Dec-2008
- */
-public class ExecutionContextServiceImpl extends AbstractExecutionContextService implements MutableService
-{
-  // Provide logging
-  final static Logger log = LoggerFactory.getLogger(ExecutionContextServiceImpl.class);
-
-  private static ThreadLocal<ExecutionContextImpl> contextAssociation = new ThreadLocal<ExecutionContextImpl>();
-
-  @Override
-  public void setProcessEngine(ProcessEngine engine)
-  {
-    super.setProcessEngine(engine);
-  }
-
-  public ExecutionContext createExecutionContext()
-  {
-    ProcessEngineImpl engineImpl = (ProcessEngineImpl)getProcessEngine();
-    JbpmContext jbpmContext = engineImpl.getJbpmConfiguration().createJbpmContext();
-    ExecutionContextImpl currContext = new ExecutionContextImpl(jbpmContext);
-    contextAssociation.set(currContext);
-    return currContext;
-  }
-
-  public ExecutionContext getExecutionContext(boolean create)
-  {
-    ExecutionContextImpl currContext = contextAssociation.get();
-
-    if (currContext == null && create == true)
-      currContext = (ExecutionContextImpl)createExecutionContext();
-
-    if (currContext != null)
-      currContext.clientCount++;
-
-    return currContext;
-  }
-
-  class ExecutionContextImpl extends BasicAttachments implements ExecutionContext
-  {
-    private JbpmContext jbpmContext;
-    private int clientCount;
-
-    ExecutionContextImpl(JbpmContext jbpmContext)
-    {
-      this.jbpmContext = jbpmContext;
-      addAttachment(JbpmContext.class, jbpmContext);
-    }
-
-    public void close()
-    {
-      clientCount--;
-
-      if (clientCount < 0)
-        throw new IllegalStateException("PersistenceContext already closed");
-
-      if (clientCount == 0)
-      {
-        contextAssociation.set(null);
-        jbpmContext.close();
-      }
-    }
-  }
-}
\ No newline at end of file

Deleted: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,92 +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.service;
-
-// $Id$
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.ProcessInstance;
-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.ProcessInstanceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The ExecutionService manages Tokens
- * 
- * @author thomas.diesler at jboss.com
- * @since 28-Nov-2008
- */
-public class ExecutionServiceImpl extends ExecutionService implements MutableService
-{
-  // Provide logging
-  final Logger log = LoggerFactory.getLogger(ExecutionServiceImpl.class);
-
-  public void setProcessEngine(ProcessEngine engine)
-  {
-    super.setProcessEngine(engine);
-  }
-
-  @Override
-  public Set<Token> getTokens()
-  {
-    Set<Token> tokens = new HashSet<Token>();
-    ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
-    for (ObjectName procID : procService.getInstance())
-    {
-      ProcessInstance proc = procService.getInstance(procID);
-      for (Token aux : proc.getTokens())
-      {
-        tokens.add(aux);
-      }
-    }
-    return tokens;
-  }
-
-  @Override
-  public Token getToken(ObjectName tokenID)
-  {
-    Token token = null;
-
-    // [TODO] is there a better way than iterating over all processes and tokens?
-    ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
-    for (ObjectName procID : procService.getInstance())
-    {
-      ProcessInstance proc = procService.getInstance(procID);
-      for (Token aux : proc.getTokens())
-      {
-        if (aux.getKey().equals(tokenID))
-        {
-          token = aux;
-          break;
-        }
-      }
-    }
-    return token;
-  }
-}

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -28,8 +28,9 @@
 import java.util.Set;
 
 import org.jboss.bpm.api.NotImplementedException;
+import org.jboss.bpm.api.service.AbstractService;
 import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractIdentityService;
+import org.jboss.bpm.incubator.service.IdentityService;
 import org.jbpm.JbpmConfiguration;
 import org.jbpm.JbpmContext;
 import org.jbpm.identity.Group;
@@ -44,7 +45,7 @@
  * @author thomas.diesler at jboss.com
  * @since 28-Nov-2008
  */
-public class IdentityServiceImpl extends AbstractIdentityService implements MutableService
+public class IdentityServiceImpl extends AbstractService implements IdentityService, MutableService
 {
   // Provide logging
   final Logger log = LoggerFactory.getLogger(IdentityServiceImpl.class);

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,8 +31,8 @@
 import org.hibernate.Session;
 import org.jboss.bpm.api.ProcessNotFoundException;
 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.service.ProcessEngine;
 import org.jboss.bpm.incubator.service.PersistenceService;
 import org.slf4j.Logger;

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,9 +24,9 @@
 // $Id$
 
 import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.builder.ProcessBuilder;
-import org.jboss.bpm.api.service.ProcessBuilderService;
 import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilder;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
 import org.jbpm.integration.spec.model.builder.ProcessBuilderImpl;
 
 /**

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -30,12 +30,11 @@
 import javax.management.ObjectName;
 
 import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
-import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractProcessDefinitionService;
+import org.jboss.bpm.api.service.ContextService;
 import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.api.service.ProcessInstanceService;
-import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService;
 import org.jbpm.JbpmContext;
 import org.jbpm.db.GraphSession;
 import org.jbpm.integration.spec.model.ProcessDefinitionImpl;
@@ -49,7 +48,7 @@
  * @author thomas.diesler at jboss.com
  * @since 18-Jun-2008
  */
-public class ProcessDefinitionServiceImpl extends AbstractProcessDefinitionService implements ProcessDefinitionService, MutableService
+public class ProcessDefinitionServiceImpl extends AbstractProcessDefinitionService implements MutableService
 {
   // Provide logging
   final static Logger log = LoggerFactory.getLogger(ProcessDefinitionServiceImpl.class);
@@ -62,8 +61,8 @@
 
   public ProcessDefinition getProcessDefinition(ObjectName procDefID)
   {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       ProcessDefinition procDef = null;
@@ -85,8 +84,8 @@
 
   public Set<ObjectName> getProcessDefinitions()
   {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       Set<ObjectName> procDefs = new HashSet<ObjectName>();
@@ -108,8 +107,8 @@
 
   public ProcessDefinition registerProcessDefinition(ProcessDefinition procDef)
   {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       log.debug("registerProcessDefinition: " + procDef);
@@ -134,8 +133,8 @@
   {
     boolean removed = false;
 
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       ProcessDefinition procDef = getProcessDefinition(procDefID);

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,15 +31,15 @@
 
 import javax.management.ObjectName;
 
+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.ProcessInstance.ProcessStatus;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.ContextService;
 import org.jboss.bpm.api.service.ProcessDefinitionService;
 import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.api.service.ProcessInstanceService;
-import org.jboss.bpm.api.service.internal.AbstractProcessService;
 import org.jbpm.JbpmContext;
 import org.jbpm.db.GraphSession;
 import org.jbpm.integration.spec.model.ProcessDefinitionImpl;
@@ -55,7 +55,7 @@
  * @author thomas.diesler at jboss.com
  * @since 18-Jun-2008
  */
-public class ProcessInstanceServiceImpl extends AbstractProcessService implements ProcessInstanceService, MutableService
+public class ProcessInstanceServiceImpl extends AbstractService implements ProcessInstanceService, MutableService
 {
   // Provide logging
   final static Logger log = LoggerFactory.getLogger(ProcessInstanceServiceImpl.class);
@@ -86,8 +86,8 @@
    */
   public ProcessInstance getInstance(ObjectName procID)
   {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       ProcessInstance proc = null;
@@ -114,8 +114,8 @@
   {
     Set<ObjectName> procs = new HashSet<ObjectName>();
 
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class);
@@ -148,8 +148,8 @@
   {
     Set<ObjectName> procs = new HashSet<ObjectName>();
 
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       Long id = adaptKey(procDefID);
@@ -176,8 +176,8 @@
   {
     log.debug("registerProcess: " + proc);
 
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       if (getInstance(proc.getKey()) != null)
@@ -223,8 +223,8 @@
   {
     boolean removed = false;
 
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
     try
     {
       ProcessInstance proc = getInstance(procID);

Copied: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java (from rev 3445, jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java	                        (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,200 @@
+/*
+ * 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.service;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.ContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessInstanceService;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
+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.TaskInstanceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The TaskService manages Tasks.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 28-Nov-2008
+ */
+public class TaskInstanceServiceImpl extends AbstractService implements TaskInstanceService, MutableService
+{
+  // Provide logging
+  final Logger log = LoggerFactory.getLogger(TaskInstanceServiceImpl.class);
+
+  public void setProcessEngine(ProcessEngine engine)
+  {
+    super.setProcessEngine(engine);
+  }
+
+  public List<TaskInstance> getTasksByProcess(ObjectName procID)
+  {
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
+    try
+    {
+      ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+      ProcessInstance proc = procService.getInstance(procID);
+      if (proc == null)
+        throw new IllegalStateException("Cannot obtain process: " + procID);
+
+      List<TaskInstance> tasks = new ArrayList<TaskInstance>();
+      ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
+      Collection<org.jbpm.taskmgmt.exe.TaskInstance> oldTaskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
+      for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : oldTaskInstances)
+      {
+        TaskInstance task = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
+        tasks.add(task);
+      }
+
+      return tasks;
+    }
+    catch (RuntimeException rte)
+    {
+      throw rte;
+    }
+    finally
+    {
+      bpmContext.close();
+    }
+  }
+
+  public TaskInstance getTask(ObjectName taskID)
+  {
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
+    try
+    {
+      JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
+      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = jbpmContext.getTaskInstance(adaptKey(taskID));
+      return TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
+    }
+    catch (RuntimeException rte)
+    {
+      throw rte;
+    }
+    finally
+    {
+      bpmContext.close();
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  public List<TaskInstance> getTasksByActor(String actor)
+  {
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
+    try
+    {
+      List<TaskInstance> tasks = new ArrayList<TaskInstance>();
+      JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
+      for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : (List<org.jbpm.taskmgmt.exe.TaskInstance>)jbpmContext.getTaskList(actor))
+      {
+        TaskInstance taskInst = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
+        tasks.add(taskInst);
+      }
+      return tasks;
+    }
+    catch (RuntimeException rte)
+    {
+      throw rte;
+    }
+    finally
+    {
+      bpmContext.close();
+    }
+  }
+
+  public void closeTask(ObjectName taskID, String signalName)
+  {
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
+    try
+    {
+      TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
+      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
+
+      if (signalName != null)
+        oldTaskInst.end(signalName);
+      else
+        oldTaskInst.end();
+    }
+    catch (RuntimeException rte)
+    {
+      throw rte;
+    }
+    finally
+    {
+      bpmContext.close();
+    }
+  }
+
+  public void reassignTask(ObjectName taskID, String actor)
+  {
+    ContextService ctxService = getProcessEngine().getService(ContextService.class);
+    Context bpmContext = ctxService.getContext(true);
+    try
+    {
+      TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
+      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
+
+      if (oldTaskInst.getStart() != null)
+      {
+        log.warn("Force stop on task " + oldTaskInst.getId() + ". Will be restarted.");
+        oldTaskInst.setStart(null); // strange, but means isNotStarted()
+      }
+
+      oldTaskInst.start(actor, true);
+    }
+    catch (RuntimeException rte)
+    {
+      throw rte;
+    }
+    finally
+    {
+      bpmContext.close();
+    }
+  }
+
+  private Long adaptKey(ObjectName key)
+  {
+    String id = key.getKeyProperty("id");
+    if (id == null)
+      throw new IllegalStateException("Cannot obtain id property from: " + key);
+
+    return new Long(id);
+  }
+}

Deleted: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,199 +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.service;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.ProcessInstance;
-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.ProcessInstanceService;
-import org.jboss.bpm.api.service.internal.AbstractTaskService;
-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.TaskInstanceImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The TaskService manages Tasks.
- * 
- * @author thomas.diesler at jboss.com
- * @since 28-Nov-2008
- */
-public class TaskServiceImpl extends AbstractTaskService implements MutableService
-{
-  // Provide logging
-  final Logger log = LoggerFactory.getLogger(TaskServiceImpl.class);
-
-  public void setProcessEngine(ProcessEngine engine)
-  {
-    super.setProcessEngine(engine);
-  }
-
-  public List<TaskInstance> getTasksByProcess(ObjectName procID)
-  {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
-    try
-    {
-      ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
-      ProcessInstance proc = procService.getInstance(procID);
-      if (proc == null)
-        throw new IllegalStateException("Cannot obtain process: " + procID);
-
-      List<TaskInstance> tasks = new ArrayList<TaskInstance>();
-      ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
-      Collection<org.jbpm.taskmgmt.exe.TaskInstance> oldTaskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
-      for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : oldTaskInstances)
-      {
-        TaskInstance task = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
-        tasks.add(task);
-      }
-
-      return tasks;
-    }
-    catch (RuntimeException rte)
-    {
-      throw rte;
-    }
-    finally
-    {
-      bpmContext.close();
-    }
-  }
-
-  public TaskInstance getTask(ObjectName taskID)
-  {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
-    try
-    {
-      JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
-      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = jbpmContext.getTaskInstance(adaptKey(taskID));
-      return TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
-    }
-    catch (RuntimeException rte)
-    {
-      throw rte;
-    }
-    finally
-    {
-      bpmContext.close();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public List<TaskInstance> getTasksByActor(String actor)
-  {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
-    try
-    {
-      List<TaskInstance> tasks = new ArrayList<TaskInstance>();
-      JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
-      for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : (List<org.jbpm.taskmgmt.exe.TaskInstance>)jbpmContext.getTaskList(actor))
-      {
-        TaskInstance taskInst = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
-        tasks.add(taskInst);
-      }
-      return tasks;
-    }
-    catch (RuntimeException rte)
-    {
-      throw rte;
-    }
-    finally
-    {
-      bpmContext.close();
-    }
-  }
-
-  public void closeTask(ObjectName taskID, String signalName)
-  {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
-    try
-    {
-      TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
-      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
-
-      if (signalName != null)
-        oldTaskInst.end(signalName);
-      else
-        oldTaskInst.end();
-    }
-    catch (RuntimeException rte)
-    {
-      throw rte;
-    }
-    finally
-    {
-      bpmContext.close();
-    }
-  }
-
-  public void reassignTask(ObjectName taskID, String actor)
-  {
-    ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
-    ExecutionContext bpmContext = ctxService.getExecutionContext(true);
-    try
-    {
-      TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
-      org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
-
-      if (oldTaskInst.getStart() != null)
-      {
-        log.warn("Force stop on task " + oldTaskInst.getId() + ". Will be restarted.");
-        oldTaskInst.setStart(null); // strange, but means isNotStarted()
-      }
-
-      oldTaskInst.start(actor, true);
-    }
-    catch (RuntimeException rte)
-    {
-      throw rte;
-    }
-    finally
-    {
-      bpmContext.close();
-    }
-  }
-
-  private Long adaptKey(ObjectName key)
-  {
-    String id = key.getKeyProperty("id");
-    if (id == null)
-      throw new IllegalStateException("Cannot obtain id property from: " + key);
-
-    return new Long(id);
-  }
-}

Copied: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java (from rev 3445, jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java	                        (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,92 @@
+/*
+ * 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.service;
+
+// $Id$
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessInstanceService;
+import org.jboss.bpm.api.service.TokenService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The ExecutionService manages Tokens
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 28-Nov-2008
+ */
+public class TokenServiceImpl extends TokenService implements MutableService
+{
+  // Provide logging
+  final Logger log = LoggerFactory.getLogger(TokenServiceImpl.class);
+
+  public void setProcessEngine(ProcessEngine engine)
+  {
+    super.setProcessEngine(engine);
+  }
+
+  @Override
+  public Set<Token> getTokens()
+  {
+    Set<Token> tokens = new HashSet<Token>();
+    ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+    for (ObjectName procID : procService.getInstance())
+    {
+      ProcessInstance proc = procService.getInstance(procID);
+      for (Token aux : proc.getTokens())
+      {
+        tokens.add(aux);
+      }
+    }
+    return tokens;
+  }
+
+  @Override
+  public Token getToken(ObjectName tokenID)
+  {
+    Token token = null;
+
+    // [TODO] is there a better way than iterating over all processes and tokens?
+    ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+    for (ObjectName procID : procService.getInstance())
+    {
+      ProcessInstance proc = procService.getInstance(procID);
+      for (Token aux : proc.getTokens())
+      {
+        if (aux.getKey().equals(tokenID))
+        {
+          token = aux;
+          break;
+        }
+      }
+    }
+    return token;
+  }
+}

Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java	2008-12-19 22:53:18 UTC (rev 3466)
@@ -28,10 +28,10 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.model.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.service.TokenService;
 import org.jboss.bpm.incubator.task.TaskInstance;
 import org.jbpm.integration.spec.model.AbstractElementImpl;
 import org.jbpm.integration.spec.runtime.InvocationProxy;
@@ -128,7 +128,7 @@
     if (getDelegate().getToken() != null)
     {
       long tokenID = getDelegate().getToken().getId();
-      ExecutionService exService = getProcessEngine().getService(ExecutionService.class);
+      TokenService exService = getProcessEngine().getService(TokenService.class);
       for (Token auxTok : exService.getTokens())
       {
         TokenImpl tokenImpl = InvocationProxy.getUnderlying(auxTok, TokenImpl.class);

Added: jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml	                        (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml	2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,47 @@
+<!--
+  Note, this uses the bean-deployer-2.0 schema
+  $Id$ 
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="BPMKernelLocator" class="org.jboss.bpm.api.config.internal.KernelLocator">
+  <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!-- The ProcessEngine -->
+ <bean name="BPMProcessEngine" class="org.jbpm.integration.spec.service.ProcessEngineImpl">
+  <property name="services">
+   <set elementClass="org.jboss.bpm.api.service.Service">
+    <inject bean="BPMContextService"/>
+    <inject bean="BPMDeploymentService"/>
+    <inject bean="BPMDialectHandlerService"/>
+    <inject bean="BPMIdentityService"/>
+    <inject bean="BPMProcessDefinitionService"/>
+    <inject bean="BPMProcessInstanceService"/>
+    <inject bean="BPMTaskInstanceService"/>
+    <inject bean="BPMTokenService"/>
+   </set>
+  </property>
+ </bean>
+
+ <!-- The DialectHandlerService -->
+ <bean name="BPMDialectHandlerService" class="org.jbpm.integration.spec.service.DialectHandlerServiceImpl">
+  <property name="dialectHandlers">
+   <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler">
+    <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry>
+   </map>
+  </property>
+ </bean>
+ <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.spec.jpdl32.DialectHandlerImpl" />
+
+ <!-- Other Services -->
+ <bean name="BPMContextService" class="org.jbpm.integration.spec.service.ContextServiceImpl" />
+ <bean name="BPMDeploymentService" class="org.jbpm.integration.spec.service.DeploymentServiceImpl" />
+ <bean name="BPMIdentityService" class="org.jbpm.integration.spec.service.IdentityServiceImpl" />
+ <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.spec.service.ProcessDefinitionServiceImpl" />
+ <bean name="BPMProcessInstanceService" class="org.jbpm.integration.spec.service.ProcessInstanceServiceImpl"/>
+ <bean name="BPMTaskInstanceService" class="org.jbpm.integration.spec.service.TaskInstanceServiceImpl" />
+ <bean name="BPMTokenService" class="org.jbpm.integration.spec.service.TokenServiceImpl" />
+
+</deployment>


Property changes on: jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml	2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,62 +0,0 @@
-<!--
-  Note, this uses the bean-deployer-2.0 schema
-  $Id: $ 
--->
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Locate the single instance of the kernel -->
- <bean name="BPMKernelLocator" class="org.jboss.bpm.api.config.internal.KernelLocator">
-  <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
- </bean>
-
- <!-- The ProcessEngine -->
- <bean name="BPMProcessEngine" class="org.jbpm.integration.spec.service.ProcessEngineImpl">
-  <property name="services">
-   <set elementClass="org.jboss.bpm.api.service.Service">
-    <inject bean="BPMDeploymentService"/>
-    <inject bean="BPMDialectHandlerService"/>
-    <inject bean="BPMExecutionContextService"/>
-    <inject bean="BPMExecutionService"/>
-    <inject bean="BPMIdentityService"/>
-    <inject bean="BPMProcessBuilderService"/>
-    <inject bean="BPMProcessDefinitionService"/>
-    <inject bean="BPMProcessService"/>
-    <inject bean="BPMTaskService"/>
-   </set>
-  </property>
- </bean>
-
- <!-- The PersistenceService -->
- <bean name="BPMPersistenceService" class="org.jbpm.integration.spec.service.NoopPersistenceServiceImpl" />
-
- <!-- The ProcessService -->
- <bean name="BPMProcessService" class="org.jbpm.integration.spec.service.ProcessInstanceServiceImpl">
-  <property name="interceptors">
-   <list elementClass="java.lang.String">
-    <value>org.jbpm.integration.spec.runtime.NodeExecuteInterceptor</value>
-   </list>
-  </property>
- </bean>
-
- <!-- The DialectHandlerService -->
- <bean name="BPMDialectHandlerService" class="org.jbpm.integration.spec.service.DialectHandlerServiceImpl">
-  <property name="dialectHandlers">
-   <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler">
-    <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry>
-    <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry>
-   </map>
-  </property>
- </bean>
- <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl" />
- <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.spec.jpdl32.DialectHandlerImpl" />
-
- <!-- Other Services -->
- <bean name="BPMDeploymentService" class="org.jbpm.integration.spec.service.DeploymentServiceImpl" />
- <bean name="BPMExecutionContextService" class="org.jbpm.integration.spec.service.ExecutionContextServiceImpl" />
- <bean name="BPMExecutionService" class="org.jbpm.integration.spec.service.ExecutionServiceImpl" />
- <bean name="BPMIdentityService" class="org.jbpm.integration.spec.service.IdentityServiceImpl" />
- <bean name="BPMProcessBuilderService" class="org.jbpm.integration.spec.service.ProcessBuilderServiceImpl" />
- <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.spec.service.ProcessDefinitionServiceImpl" />
- <bean name="BPMTaskService" class="org.jbpm.integration.spec.service.TaskServiceImpl" />
-
-</deployment>

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/pom.xml	2008-12-19 22:53:18 UTC (rev 3466)
@@ -46,6 +46,7 @@
     <apache.cactus.version>1.8.0</apache.cactus.version>
     <apache.jackrabbit.version>1.4.5</apache.jackrabbit.version>
     <birt.version>2.2.2</birt.version>
+    <bpm.spec.version>1.0.0-SNAPSHOT</bpm.spec.version>
     <bsh.version>1.3.0</bsh.version>
     <commons.fileupload.version>1.2.1</commons.fileupload.version>
     <commons.io.version>1.4</commons.io.version>
@@ -73,7 +74,6 @@
     <jbpm.designer.version>3.1.5</jbpm.designer.version>
     <jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version>
     <jbpm.jsf-console.version>3.3.1-SNAPSHOT</jbpm.jsf-console.version>
-    <jboss.bpm.version>1.0.0-Alpha3</jboss.bpm.version>
     <jboss.client.version>4.2.2.GA</jboss.client.version>
     <jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
     <jboss.seam.version>2.0.2.GA</jboss.seam.version>
@@ -144,29 +144,29 @@
       <!-- BPM Spec Dependencies-->
       <dependency>
         <groupId>org.jboss.bpm</groupId>
-        <artifactId>jboss-bpm-api</artifactId>
-        <version>${jboss.bpm.version}</version>
+       <artifactId>bpm-spec-api</artifactId>
+        <version>${bpm.spec.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.bpm</groupId>
-        <artifactId>jboss-bpm-dialect-api10</artifactId>
-        <version>${jboss.bpm.version}</version>
+        <artifactId>bpm-spec-dialect-api10</artifactId>
+        <version>${bpm.spec.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.bpm</groupId>
-        <artifactId>jboss-bpm-integration-jboss42</artifactId>
-        <version>${jboss.bpm.version}</version>
+        <artifactId>bpm-spec-integration-jboss42</artifactId>
+        <version>${bpm.spec.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.bpm</groupId>
         <artifactId>jboss-bpm-integration-jboss42</artifactId>
         <classifier>config</classifier>
-        <version>${jboss.bpm.version}</version>
+        <version>${bpm.spec.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.bpm</groupId>
-        <artifactId>jboss-bpm-cts</artifactId>
-        <version>${jboss.bpm.version}</version>
+        <artifactId>bpm-spec-cts</artifactId>
+        <version>${bpm.spec.version}</version>
         <type>zip</type>
       </dependency>