[jbpm-commits] JBoss JBPM SVN: r1813 - in jbossbpm/spec/trunk: modules/api/src/main/java/org/jboss/bpm/client and 8 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Aug 4 04:15:03 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-08-04 04:15:02 -0400 (Mon, 04 Aug 2008)
New Revision: 1813

Added:
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java
Removed:
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Flow.java
Modified:
   jbossbpm/spec/trunk/.project
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Executable.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowScheduler.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java
   jbossbpm/spec/trunk/modules/dialects/.classpath
   jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowSchedulerImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java
   jbossbpm/spec/trunk/modules/samples/airticket/.classpath
Log:
Flow -> ConnectingObject

Modified: jbossbpm/spec/trunk/.project
===================================================================
--- jbossbpm/spec/trunk/.project	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/.project	2008-08-04 08:15:02 UTC (rev 1813)
@@ -11,12 +11,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -30,6 +30,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.Process;

Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java (from rev 1811, jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Flow.java)
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -0,0 +1,59 @@
+/*
+ * 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.model;
+
+//$Id$
+
+/**
+ * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence
+ * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model,
+ * although they both affect the performance of activities within a Process.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ConnectingObject extends GraphicalElement
+{
+  /**
+   * Name is an optional attribute that is text description of the Connecting Object.
+   */
+  String getName();
+
+  /**
+   * SourceRef is an attribute that identifies which Graphical Element the Connecting
+   * Object is connected from. Note: there are restrictions as to what objects Sequence
+   * Flow and Message Flow can connect. 
+   */
+  GraphicalElement getSourceRef();
+
+  /**
+   * TargetRef is an attribute that identifies which Graphical Element the Connecting
+   * Object is connected to. Note: there are restrictions as to what objects Sequence
+   * Flow and Message Flow can connect.
+   */
+  GraphicalElement getTargetRef();
+
+  /**
+   * Get the required target name
+   */
+  String getTargetName();
+}
\ No newline at end of file

Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Flow.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Flow.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Flow.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -1,59 +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.model;
-
-//$Id$
-
-/**
- * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence
- * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model,
- * although they both affect the performance of activities within a Process.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Flow extends GraphicalElement
-{
-  /**
-   * Name is an optional attribute that is text description of the Connecting Object.
-   */
-  String getName();
-
-  /**
-   * SourceRef is an attribute that identifies which Graphical Element the Connecting
-   * Object is connected from. Note: there are restrictions as to what objects Sequence
-   * Flow and Message Flow can connect. 
-   */
-  GraphicalElement getSourceRef();
-
-  /**
-   * TargetRef is an attribute that identifies which Graphical Element the Connecting
-   * Object is connected to. Note: there are restrictions as to what objects Sequence
-   * Flow and Message Flow can connect.
-   */
-  GraphicalElement getTargetRef();
-
-  /**
-   * Get the required target name
-   */
-  String getTargetName();
-}
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -26,7 +26,7 @@
 /**
  * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started. 
  * <p/>
- * It will affect the {@link Flow} of the {@link Process}, but will not start or (directly) terminate
+ * It will affect the {@link ConnectingObject} of the {@link Process}, but will not start or (directly) terminate
  * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process}, 
  * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction.
  * 

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -33,7 +33,7 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
-public interface MessageFlow extends Flow
+public interface MessageFlow extends ConnectingObject
 {
   /**
    * MessageRef is an optional attribute that identifies the Message that is being sent.

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -26,7 +26,7 @@
 //$Id$
 
 /**
- * Implementing {@link FlowObject}s support multiple incomming {@link Flow}s.
+ * Implementing {@link FlowObject}s support multiple incomming {@link ConnectingObject}s.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -36,5 +36,5 @@
   /**
    * Get the list of in flows
    */
-  List<Flow> getInFlows();
+  List<ConnectingObject> getInFlows();
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -26,7 +26,7 @@
 //$Id$
 
 /**
- * Implementing {@link FlowObject} support multiple outgoing {@link Flow}.
+ * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -36,5 +36,5 @@
   /**
    * Get the list of out flows
    */
-  List<Flow> getOutFlows();
+  List<ConnectingObject> getOutFlows();
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -24,9 +24,10 @@
 //$Id$
 
 /**
- * A Participant, which is used in the definition of attributes for a {@link Pool}, {@link Message}, and {@link
- * WebService}
+ * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService
  * 
+ * TODO: Add javadoc links for Pool, WebService
+ * 
  * @author thomas.diesler at jboss.com
  * @since 21-Jul-2008
  */

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -33,7 +33,7 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
-public interface SequenceFlow extends Flow
+public interface SequenceFlow extends ConnectingObject
 {
   /**
    * The ConditionType

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -24,7 +24,7 @@
 //$Id$
 
 /**
- * Implementing {@link FlowObject} support a single incomming {@link Flow}.
+ * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -34,5 +34,5 @@
   /**
    * Get the out flow
    */
-  Flow getInFlow();
+  ConnectingObject getInFlow();
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -25,7 +25,7 @@
 //$Id$
 
 /**
- * Implementing {@link FlowObject}s support a single outgoing {@link Flow}s.
+ * Implementing {@link FlowObject}s support a single outgoing {@link ConnectingObject}s.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -35,5 +35,5 @@
   /**
    * Get the out flow
    */
-  Flow getOutFlow();
+  ConnectingObject getOutFlow();
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Executable.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Executable.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Executable.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -21,6 +21,8 @@
  */
 package org.jboss.bpm.runtime;
 
+import org.jboss.bpm.model.FlowObject;
+
 //$Id$
 
 /**

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -24,6 +24,7 @@
 //$Id$
 
 import org.jboss.bpm.client.ProcessEngine;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 
 /**
@@ -38,8 +39,8 @@
   /**
    * Execute the the FlowHandler.
    * <p/>
-   * The FlowHandler will add the active outgoing {@link Flow}s to
-   * some {@link Flow} queue for the {@link ProcessEngine} to execute.    
+   * The FlowHandler will add the active outgoing {@link ConnectingObject}s to
+   * some {@link ConnectingObject} queue for the {@link ProcessEngine} to execute.    
    */
   void execute(FlowScheduler scheduler, Token token);
 

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowScheduler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowScheduler.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowScheduler.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -23,11 +23,11 @@
 
 //$Id$
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 
 /**
  * The {@link FlowHandler} invokes the FlowScheduler to schedule 
- * {@link Flow} objects together with their associated {@link Token}.
+ * {@link ConnectingObject} objects together with their associated {@link Token}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -35,8 +35,8 @@
 public interface FlowScheduler
 {
   /**
-   * Schedule the given {@link Flow} and {@link Token}
+   * Schedule the given {@link ConnectingObject} and {@link Token}
    * @param flow TODO
    */
-  void scheduleTuple(Flow flow, Token token);
+  void scheduleTuple(ConnectingObject flow, Token token);
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -23,8 +23,9 @@
 
 //$Id$
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.SequenceFlow;
 
 /**
  * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime.
@@ -58,7 +59,7 @@
   /**
    * Get the current {@link SequenceFlow} 
    */
-  Flow getFlow();
+  ConnectingObject getFlow();
   
   /**
    * Create a schallow copy of this Token.

Modified: jbossbpm/spec/trunk/modules/dialects/.classpath
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/.classpath	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/dialects/.classpath	2008-08-04 08:15:02 UTC (rev 1813)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -59,7 +59,7 @@
 import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.ExclusiveGateway;
 import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.Gateway;
@@ -308,7 +308,7 @@
     return parName;
   }
 
-  private JAXBFlow getJAXBFlow(Flow flow)
+  private JAXBFlow getJAXBFlow(ConnectingObject flow)
   {
     JAXBFlow jaxb;
     if (flow instanceof SequenceFlow)

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.client.ExecutionManager;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.Signal;
@@ -86,7 +86,7 @@
       {
         // Peek the head flow
         Token token = flowScheduler.peekHeadTuple();
-        Flow flow = token.getFlow();
+        ConnectingObject flow = token.getFlow();
 
         // Get the target and its handlers
         FlowObject target = (FlowObject)flow.getTargetRef();

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -31,7 +31,7 @@
 import org.jboss.bpm.NotImplementedException;
 import org.jboss.bpm.model.Activity;
 import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.InputSet;
 import org.jboss.bpm.model.OutputSet;
 import org.jboss.bpm.model.Process;
@@ -59,8 +59,8 @@
   private List<OutputSet> outputSets = new ArrayList<OutputSet>();
   private List<Expression> ioRules = new ArrayList<Expression>();
   private List<Property> props = new ArrayList<Property>();
-  private Flow inFlow;
-  private Flow outFlow;
+  private ConnectingObject inFlow;
+  private ConnectingObject outFlow;
 
   public ActivityImpl(String name)
   {
@@ -163,22 +163,22 @@
     props.add(prop);
   }
 
-  public Flow getInFlow()
+  public ConnectingObject getInFlow()
   {
     return inFlow;
   }
 
-  public void setInFlow(Flow inFlow)
+  public void setInFlow(ConnectingObject inFlow)
   {
     this.inFlow = inFlow;
   }
 
-  public Flow getOutFlow()
+  public ConnectingObject getOutFlow()
   {
     return outFlow;
   }
 
-  public void setOutFlow(Flow flow)
+  public void setOutFlow(ConnectingObject flow)
   {
     this.outFlow = flow;
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -28,7 +28,7 @@
 import org.jboss.bpm.client.ObjectNameFactory;
 import org.jboss.bpm.model.BPMNElement;
 import org.jboss.bpm.model.Event;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.NameSupport;
 import org.jboss.bpm.model.Process;
@@ -77,7 +77,7 @@
     {
       str.append("type=Gateway");
     }
-    else if (this instanceof Flow)
+    else if (this instanceof ConnectingObject)
     {
       str.append("type=Flow");
     }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.model.EndEvent;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.Result;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.runtime.FlowHandler;
@@ -51,7 +51,7 @@
 
   private String name;
   private Result result;
-  private Flow inFlow;
+  private ConnectingObject inFlow;
 
   public EndEventImpl(String name)
   {
@@ -63,7 +63,7 @@
     return name;
   }
 
-  public Flow getInFlow()
+  public ConnectingObject getInFlow()
   {
     return inFlow;
   }
@@ -71,7 +71,7 @@
   /**
    * Set the in flow
    */
-  public void setInFlow(Flow inFlow)
+  public void setInFlow(ConnectingObject inFlow)
   {
     this.inFlow = inFlow;
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -29,7 +29,7 @@
 import org.jboss.bpm.NotImplementedException;
 import org.jboss.bpm.model.ExclusiveGateway;
 import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.SequenceFlow;
@@ -63,7 +63,7 @@
   }
 
   @Override
-  public void addInFlow(Flow inFlow)
+  public void addInFlow(ConnectingObject inFlow)
   {
     if (getInFlows().size() > 0)
       throw new NotImplementedException("ExclusiveGateway with multiple inFlows");

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.GraphicalElement;
 
 /**
@@ -34,7 +34,7 @@
  * @since 08-Jul-2008
  */
 @SuppressWarnings("serial")
-public abstract class FlowImpl extends SupportingElementImpl implements Flow
+public abstract class FlowImpl extends SupportingElementImpl implements ConnectingObject
 {
   private String name;
   private String targetName;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -23,7 +23,7 @@
 
 import org.jboss.bpm.InvalidProcessException;
 import org.jboss.bpm.NameNotUniqueException;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.Gateway;
@@ -121,7 +121,7 @@
     }
 
     // Initialize in/out flows
-    Flow outFlow = null;
+    ConnectingObject outFlow = null;
     if (this instanceof SingleOutFlowSupport)
     {
       SingleOutFlowSupport sof = (SingleOutFlowSupport)this;
@@ -131,7 +131,7 @@
     else if (this instanceof MultipleOutFlowSupport)
     {
       MultipleOutFlowSupport mof = (MultipleOutFlowSupport)this;
-      for (Flow flow : mof.getOutFlows())
+      for (ConnectingObject flow : mof.getOutFlows())
       {
         outFlow = flow;
         initFlow(proc, (FlowImpl)outFlow);
@@ -147,7 +147,7 @@
       }
     }
 
-    Flow inFlow = null;
+    ConnectingObject inFlow = null;
     if (this instanceof SingleInFlowSupport)
     {
       SingleInFlowSupport sif = (SingleInFlowSupport)this;
@@ -156,7 +156,7 @@
     else if (this instanceof MultipleInFlowSupport)
     {
       MultipleInFlowSupport mif = (MultipleInFlowSupport)this;
-      for (Flow flow : mif.getInFlows())
+      for (ConnectingObject flow : mif.getInFlows())
       {
         inFlow = flow;
       }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowSchedulerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowSchedulerImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowSchedulerImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -26,7 +26,7 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.runtime.FlowHandler;
 import org.jboss.bpm.runtime.MutableFlowScheduler;
 import org.jboss.bpm.runtime.Token;
@@ -34,7 +34,7 @@
 
 /**
  * The {@link FlowHandler} invokes the FlowScheduler to schedule 
- * {@link Flow} objects together with their associated {@link Token}.
+ * {@link ConnectingObject} objects together with their associated {@link Token}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -43,7 +43,7 @@
 {
   private Queue<Token> flowQueue = new ConcurrentLinkedQueue<Token>();
 
-  public void scheduleTuple(Flow flow, Token token)
+  public void scheduleTuple(ConnectingObject flow, Token token)
   {
     TokenImpl tokenImpl = (TokenImpl)token;
     tokenImpl.setFlow(flow);

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -33,7 +33,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GraphicalElement;
@@ -64,11 +64,11 @@
   private static final Log log = LogFactory.getLog(GatewayImpl.class);
 
   private String name;
-  protected List<Flow> inFlows = new ArrayList<Flow>();
+  protected List<ConnectingObject> inFlows = new ArrayList<ConnectingObject>();
   private Map<String, Gate> gates = new LinkedHashMap<String, Gate>();
 
   // Sync management
-  private Set<Flow> outstandingFlows;
+  private Set<ConnectingObject> outstandingFlows;
   private Set<Token> mergeTokens;
 
   public GatewayImpl(String name)
@@ -92,12 +92,12 @@
     gates.put(targetName, gate);
   }
 
-  public List<Flow> getInFlows()
+  public List<ConnectingObject> getInFlows()
   {
     return Collections.unmodifiableList(inFlows);
   }
 
-  public void addInFlow(Flow inFlow)
+  public void addInFlow(ConnectingObject inFlow)
   {
     this.inFlows.add(inFlow);
   }
@@ -131,11 +131,11 @@
     {
       if (outstandingFlows == null)
       {
-        outstandingFlows = new HashSet<Flow>(inFlows);
+        outstandingFlows = new HashSet<ConnectingObject>(inFlows);
         mergeTokens = new HashSet<Token>();
       }
 
-      Flow flow = token.getFlow();
+      ConnectingObject flow = token.getFlow();
       outstandingFlows.remove(flow);
 
       if (outstandingFlows.size() > 0)
@@ -190,7 +190,7 @@
             {
               // Log the list of outstanding flows
               Set<String> sourceNames = new HashSet<String>();
-              for (Flow flow : outstandingFlows)
+              for (ConnectingObject flow : outstandingFlows)
               {
                 GraphicalElement sourceRef = flow.getSourceRef();
                 if (sourceRef instanceof NameSupport)

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -25,7 +25,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.InputSet;
 import org.jboss.bpm.model.IntermediateEvent;
 import org.jboss.bpm.model.OutputSet;
@@ -51,8 +51,8 @@
   private static final Log log = LogFactory.getLog(IntermediateEventImpl.class);
 
   private String name;
-  private Flow inFlow;
-  private Flow outFlow;
+  private ConnectingObject inFlow;
+  private ConnectingObject outFlow;
 
   public IntermediateEventImpl(String name)
   {
@@ -64,22 +64,22 @@
     return name;
   }
 
-  public Flow getInFlow()
+  public ConnectingObject getInFlow()
   {
     return inFlow;
   }
 
-  public void setInFlow(Flow inFlow)
+  public void setInFlow(ConnectingObject inFlow)
   {
     this.inFlow = inFlow;
   }
 
-  public Flow getOutFlow()
+  public ConnectingObject getOutFlow()
   {
     return outFlow;
   }
 
-  public void setOutFlow(Flow flow)
+  public void setOutFlow(ConnectingObject flow)
   {
     this.outFlow = flow;
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -21,7 +21,7 @@
  */
 package org.jboss.bpm.model.internal;
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.MultipleInFlowSupport;
 
@@ -29,7 +29,7 @@
 //$Id$
 
 /**
- * Implementing {@link FlowObject} support multiple incomming {@link Flow}.
+ * Implementing {@link FlowObject} support multiple incomming {@link ConnectingObject}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -39,5 +39,5 @@
   /**
    * Add an incomming Flow
    */
-  void addInFlow(Flow flow);
+  void addInFlow(ConnectingObject flow);
 }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -21,14 +21,14 @@
  */
 package org.jboss.bpm.model.internal;
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.MultipleOutFlowSupport;
 
 //$Id$
 
 /**
- * Implementing {@link FlowObject} support multiple outgoing {@link Flow}.
+ * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -38,6 +38,6 @@
   /**
    * Add an outgoing Flow
    */
-  void addOutFlow(Flow flow);
+  void addOutFlow(ConnectingObject flow);
 
 }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -21,7 +21,7 @@
  */
 package org.jboss.bpm.model.internal;
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.SingleInFlowSupport;
 
@@ -29,7 +29,7 @@
 //$Id$
 
 /**
- * Implementing {@link FlowObject} support a single incomming {@link Flow}.
+ * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -39,5 +39,5 @@
   /**
    * Set the incomming Flow
    */
-  void setInFlow(Flow flow);
+  void setInFlow(ConnectingObject flow);
 }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -21,7 +21,7 @@
  */
 package org.jboss.bpm.model.internal;
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.SingleOutFlowSupport;
 
@@ -29,7 +29,7 @@
 //$Id$
 
 /**
- * Implementing {@link FlowObject}s support a single outgoing {@link Flow}s.
+ * Implementing {@link FlowObject}s support a single outgoing {@link ConnectingObject}s.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -39,5 +39,5 @@
   /**
    * Set the outgoing Flow
    */
-  void setOutFlow(Flow flow);
+  void setOutFlow(ConnectingObject flow);
 }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.NotImplementedException;
 import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.InputSet;
 import org.jboss.bpm.model.OutputSet;
 import org.jboss.bpm.model.Signal;
@@ -54,19 +54,19 @@
   // provide logging
   private static final Log log = LogFactory.getLog(StartEventImpl.class);
 
-  private Flow outFlow;
+  private ConnectingObject outFlow;
 
   public List<EventDetail> getTrigger()
   {
     throw new NotImplementedException();
   }
 
-  public Flow getOutFlow()
+  public ConnectingObject getOutFlow()
   {
     return outFlow;
   }
 
-  public void setOutFlow(Flow flow)
+  public void setOutFlow(ConnectingObject flow)
   {
     this.outFlow = flow;
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java	2008-08-04 08:15:02 UTC (rev 1813)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.ConnectingObject;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.runtime.Attachments;
 import org.jboss.bpm.runtime.BasicAttachments;
@@ -48,7 +48,7 @@
 {
   private String id;
   private Process proc;
-  private Flow flow;
+  private ConnectingObject flow;
   private ExecutionContext context;
 
   /**
@@ -76,12 +76,12 @@
     return context;
   }
   
-  public Flow getFlow()
+  public ConnectingObject getFlow()
   {
     return flow;
   }
 
-  public void setFlow(Flow flow)
+  public void setFlow(ConnectingObject flow)
   {
     this.flow = flow;
   }

Modified: jbossbpm/spec/trunk/modules/samples/airticket/.classpath
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/.classpath	2008-08-04 07:53:38 UTC (rev 1812)
+++ jbossbpm/spec/trunk/modules/samples/airticket/.classpath	2008-08-04 08:15:02 UTC (rev 1813)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>




More information about the jbpm-commits mailing list