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

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 08:26:37 -0500 (Thu, 27 Nov 2008) New Revision: 3125 Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java Removed: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/Token.java Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/PersistenceToken.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/ExecutionHandler.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/TokenExecutor.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ComplexGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/InclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ParallelGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/WaitStateImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExpressionEvaluator.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeContext.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java Log: Move Token to runtime Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/Token.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/Token.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/Token.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -1,116 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.api.client; - -// $Id$ - -import java.util.Set; - -import javax.management.ObjectName; - -import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; -import org.jboss.bpm.api.model.SequenceFlow; -import org.jboss.bpm.api.runtime.Attachments; - -/** - * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. - * - * By tracking how the Token traverses the Flow Objects, gets diverted through alternative paths, and gets split into - * parallel paths, the normal Sequence Flow should be completely definable. - * - * A Token will have a unique identity that can be used to separate multiple Tokens that may exist because of concurrent - * process instances or the splitting of the Token for parallel processing within a single process instance. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Token -{ - public enum TokenStatus - { - Created, Started, Stoped, Destroyed, Suspended - } - - /** - * Get the associated ProcessEngine - */ - ProcessEngine getProcessEngine(); - - /** - * Get the associated {@link Process} - */ - Process getProcess(); - - /** - * Get the unique token identity - */ - ObjectName getKey(); - - /** - * Get the token status - */ - TokenStatus getTokenStatus(); - - /** - * Get the associated {@link Attachments} - */ - Attachments getAttachments(); - - /** - * Get the last {@link SequenceFlow} - */ - SequenceFlow getLastFlow(); - - /** - * Get the current {@link Node} - */ - Node getCurrentNode(); - - /** - * Get the root token that his Token is associated with - */ - Token getRootToken(); - - /** - * Get the parent token that his Token is associated with - * @return null if this is the root token - */ - Token getParentToken(); - - /** - * Get the set of child tokens - * @return An empty set if there are none - */ - Set<Token> getChildTokens(); - - /** - * Signal the Token, which takes it to the next wait state - */ - void signal(); - - /** - * Signal the Token, which takes it to the next wait state - * @param name A transition or target name - */ - void signal(String name); -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -27,8 +27,8 @@ import java.util.Set; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; /** * A Process is any Activity performed within a company or organization. Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java (from rev 3111, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/Token.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -0,0 +1,116 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.api.runtime; + +// $Id$ + +import java.util.Set; + +import javax.management.ObjectName; + +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.SequenceFlow; + +/** + * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. + * + * By tracking how the Token traverses the Flow Objects, gets diverted through alternative paths, and gets split into + * parallel paths, the normal Sequence Flow should be completely definable. + * + * A Token will have a unique identity that can be used to separate multiple Tokens that may exist because of concurrent + * process instances or the splitting of the Token for parallel processing within a single process instance. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Token +{ + public enum TokenStatus + { + Created, Started, Stoped, Destroyed, Suspended + } + + /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); + + /** + * Get the associated {@link Process} + */ + Process getProcess(); + + /** + * Get the unique token identity + */ + ObjectName getKey(); + + /** + * Get the token status + */ + TokenStatus getTokenStatus(); + + /** + * Get the associated {@link Attachments} + */ + Attachments getAttachments(); + + /** + * Get the last {@link SequenceFlow} + */ + SequenceFlow getLastFlow(); + + /** + * Get the current {@link Node} + */ + Node getCurrentNode(); + + /** + * Get the root token that his Token is associated with + */ + Token getRootToken(); + + /** + * Get the parent token that his Token is associated with + * @return null if this is the root token + */ + Token getParentToken(); + + /** + * Get the set of child tokens + * @return An empty set if there are none + */ + Set<Token> getChildTokens(); + + /** + * Signal the Token, which takes it to the next wait state + */ + void signal(); + + /** + * Signal the Token, which takes it to the next wait state + * @param name A transition or target name + */ + void signal(String name); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/PersistenceToken.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/PersistenceToken.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/PersistenceToken.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -24,7 +24,7 @@ // $Id$ import org.hibernate.Session; -import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.runtime.Token; /** * A Token that gives access to the persistence context Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/ExecutionHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/ExecutionHandler.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/ExecutionHandler.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.runtime.Token; /** * The ProcessEngine invokes the ExecutionHandler on a Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -24,8 +24,8 @@ // $Id$ import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.runtime.Token; /** * The {@link ProcessEngine} invokes the FlowHandler on a {@link Node} Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -24,8 +24,8 @@ // $Id$ import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.Signal; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/TokenExecutor.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/TokenExecutor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/TokenExecutor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.runtime.Token; /** * The {@link FlowHandler} invokes the TokenExecutor to move {@link Token}s along the {@link SequenceFlow}s in the Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -25,8 +25,6 @@ import java.io.IOException; -import org.jboss.bpm.api.client.Token; -import org.jboss.bpm.api.client.Token.TokenStatus; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Expression.ExpressionLanguage; @@ -35,6 +33,8 @@ import org.jboss.bpm.api.model.builder.GatewayBuilder; import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -25,13 +25,13 @@ import java.io.IOException; -import org.jboss.bpm.api.client.Token; -import org.jboss.bpm.api.client.Token.TokenStatus; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Process.ProcessStatus; import org.jboss.bpm.api.model.Task.TaskType; import org.jboss.bpm.api.model.builder.ProcessBuilder; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -25,10 +25,10 @@ import java.io.IOException; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.ProcessDefinition; 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.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.ProcessExt; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -28,11 +28,11 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.Constants.TxType; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Task.TaskType; import org.jboss.bpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.ProcessExt; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ComplexGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ComplexGatewayImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ComplexGatewayImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -62,9 +62,4 @@ { throw new NotImplementedException("JBPM-1637", "ComplexGateway outgoing condition"); } - - public String toString() - { - return "ComplexGateway[" + getName() + "]"; - } } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -29,12 +29,12 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.EndEventExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.runtime.FlowHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -33,12 +33,12 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.EventExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Signal; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -29,13 +29,13 @@ import javax.persistence.Entity; import javax.persistence.Transient; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.ExclusiveGateway; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; 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.incubator.runtime.ExecutionHandler; import org.jboss.bpm.incubator.runtime.FlowHandler; import org.jboss.bpm.incubator.runtime.TokenExecutor; @@ -218,9 +218,4 @@ return selectedGate; } - - public String toString() - { - return "ExclusiveGateway[" + getName() + "]"; - } } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -35,13 +35,13 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Gateway; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; 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.runtime.Token; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.runtime.ExecutionHandler; import org.jboss.bpm.incubator.runtime.SignalHandler; @@ -230,4 +230,9 @@ } }; } + + public String toString() + { + return getGatewayType() + "Gateway[" + getName() + "]"; + } } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/InclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/InclusiveGatewayImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/InclusiveGatewayImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -30,7 +30,6 @@ import javax.persistence.Entity; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; @@ -38,6 +37,7 @@ import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.model.SequenceFlow.ConditionType; 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.InclusiveGateway; import org.jboss.bpm.incubator.runtime.FlowHandler; @@ -189,9 +189,4 @@ return applicableGates; } - - public String toString() - { - return "InclusiveGateway[" + getName() + "]"; - } } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -44,8 +44,6 @@ import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.NameNotUniqueException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; -import org.jboss.bpm.api.client.Token.TokenStatus; import org.jboss.bpm.api.model.EndEvent; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; @@ -53,6 +51,8 @@ import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.StartEvent; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.Group; import org.jboss.bpm.incubator.model.NodeExt; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ParallelGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ParallelGatewayImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ParallelGatewayImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -31,10 +31,10 @@ import javax.persistence.Entity; import javax.persistence.Transient; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.ParallelGateway; import org.jboss.bpm.incubator.runtime.ExecutionHandler; import org.jboss.bpm.incubator.runtime.FlowHandler; @@ -207,9 +207,4 @@ } return mergedToken; } - - public String toString() - { - return "ParallelGateway[" + getName() + "]"; - } } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -43,8 +43,6 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; -import org.jboss.bpm.api.client.Token.TokenStatus; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; @@ -52,6 +50,8 @@ import org.jboss.bpm.api.model.Event.EventDetailType; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.incubator.client.ProcessExt; import org.jboss.bpm.incubator.model.Assignment; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -31,11 +31,11 @@ import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.NotImplementedException; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.client.MessageListener; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.ReceiveTask; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -27,11 +27,11 @@ import javax.persistence.Transient; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.SendTask; import org.jboss.bpm.incubator.runtime.ExecutionHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -30,7 +30,6 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; @@ -38,6 +37,7 @@ import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.client.SignalListener; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.StartEventExt; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -40,13 +40,13 @@ import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.NotImplementedException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.InputSet; import org.jboss.bpm.incubator.model.OutputSet; import org.jboss.bpm.incubator.model.Property; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -33,11 +33,11 @@ import javax.persistence.Transient; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.client.MessageListener; import org.jboss.bpm.incubator.client.UserTaskCallback; import org.jboss.bpm.incubator.model.Message; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/WaitStateImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/WaitStateImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/WaitStateImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -25,10 +25,10 @@ import javax.persistence.Entity; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.WaitState; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.runtime.FlowHandler; import org.jboss.bpm.incubator.runtime.TokenExecutor; import org.jboss.bpm.ri.model.builder.SingleInFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,9 +23,9 @@ //$Id$ -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.NodeExt; import org.jboss.bpm.incubator.model.Assignment.AssignTime; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -29,11 +29,11 @@ import org.hibernate.Session; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.NodeExt; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.NodeExt; import org.jboss.bpm.incubator.runtime.SignalHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExpressionEvaluator.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExpressionEvaluator.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExpressionEvaluator.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -26,10 +26,10 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.bpm.api.client.Token; 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.mvel.MVEL; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.NodeExt; import org.jboss.bpm.incubator.runtime.FlowHandler; import org.jboss.bpm.incubator.runtime.TokenExecutor; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.api.client.Token; -import org.jboss.bpm.api.client.Token.TokenStatus; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.incubator.runtime.TokenExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -26,9 +26,9 @@ import javax.management.ObjectName; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Participant; import org.jboss.bpm.incubator.model.Property; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -24,8 +24,8 @@ //$Id$ import org.hibernate.Session; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.client.PersistenceToken; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.ri.model.NodeImpl; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -25,7 +25,7 @@ import org.hibernate.Session; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token.TokenStatus; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.api.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -21,11 +21,11 @@ */ package org.jboss.bpm.ri.runtime; -import org.jboss.bpm.api.client.Token; -import org.jboss.bpm.api.client.Token.TokenStatus; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.ri.model.ProcessImpl; import org.jboss.bpm.ri.service.ProcessServiceImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeContext.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeContext.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeContext.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.runtime.TokenExecutor; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.incubator.model.NodeExt; import org.jboss.bpm.incubator.runtime.SignalHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -33,10 +33,10 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.Token; -import org.jboss.bpm.api.client.Token.TokenStatus; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.incubator.runtime.FlowHandler; import org.jboss.bpm.incubator.runtime.TokenExecutor; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -33,7 +33,6 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.NotImplementedException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.SequenceFlow; @@ -42,6 +41,7 @@ import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Attachments.Key; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.incubator.runtime.TokenExecutor; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-11-27 13:24:44 UTC (rev 3124) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-11-27 13:26:37 UTC (rev 3125) @@ -31,12 +31,12 @@ import org.jboss.bpm.api.BPMException; import org.jboss.bpm.api.ProcessTimeoutException; import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.client.Token; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.model.Process.ProcessStatus; import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.incubator.client.ProcessExt; import org.jboss.bpm.incubator.model.Assignment;