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

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Aug 19 07:04:44 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-08-19 07:04:43 -0400 (Tue, 19 Aug 2008)
New Revision: 1930

Added:
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java
Removed:
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/
Modified:
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.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/Process.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java
   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/ProcessUnmarshaller.java
   jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
   jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java
   jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java
   jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
   jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java
   jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java
Log:
Restructure API packages

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -41,7 +41,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.EngineShutdownException;
 import org.jboss.bpm.client.internal.DialectRegistry;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.runtime.Attachments;
 import org.w3c.dom.Document;
@@ -115,7 +114,7 @@
    * @param status The optional process status
    * @return An empty set if the process cannot be found
    */
-  public Set<Process> getProcesses(String name, Constants.ProcessStatus status)
+  public Set<Process> getProcesses(String name, Process.ProcessStatus status)
   {
     Set<Process> procSet = new HashSet<Process>();
     for (Process aux : procs.values())

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -54,7 +54,7 @@
   /**
    * Add an IORule Expression
    */
-  ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang);
+  ActivityBuilder addIORule(String body, Expression.ExpressionLanguage lang);
   
   /**
    * Add an activity property

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
  */
 package org.jboss.bpm.model;
 
-import org.jboss.bpm.model.Constants.AssignTime;
 
 //$Id$
 
@@ -34,6 +33,11 @@
  */
 public interface Assignment
 {
+  public enum AssignTime
+  {
+    Start, End
+  }
+
   /**
    * The target for the Assignment MUST be a Property of the Process or the activity
    * itself.
@@ -58,5 +62,5 @@
    * This can be used to assign the (local) Properties of the activity to the higher-level
    * (global) Properties of the Process as an output to the activity.
    */
-  AssignTime getAssignTime();
+  Assignment.AssignTime getAssignTime();
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,7 +25,7 @@
 
 
 /**
- * DEfines the constants used by the JBossBPM spec
+ * Defines the constants used by the JBossBPM spec
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -33,60 +33,4 @@
 public interface Constants 
 {
   static final String ID_DOMAIN = "jboss.bpm";
-
-  public enum AssignTime
-  {
-    Start, End
-  }
-
-  /**
-   * Defines the type of an Event
-   */
-  public enum EventDetailType
-  {
-    Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate 
-  }
-
-  public enum ExpressionLanguage
-  {
-    MVEL, String, Object
-  }
-
-  /**
-   * The GatewayType
-   * 
-   */
-  public enum GatewayType
-  {
-    Exclusive, Inclusive, Complex, Parallel
-  }
-
-  /**
-   * The TaskType
-   */
-  public enum TaskType
-  {
-    Service, Receive, Send, User, Script, Manual, Reference, None
-  }
-
-  /**
-   * Defines the type of a {@link Process}
-   */
-  public enum ProcessType
-  {
-    None, Private, Abstract, Collaboration
-  }
-
-  /**
-   * Defines the status a {@link Process} can be in
-   */
-  public enum ProcessStatus
-  {
-    None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
-  }
-
-  public enum ParticipantType
-  {
-    Role, Entity
-  }
 }
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -36,7 +36,7 @@
   /**
    * Add an event detail to the last added Event
    */
-  EventBuilder addEventDetail(Constants.EventDetailType detailType);
+  EventBuilder addEventDetail(EventDetail.EventDetailType detailType);
   
   /**
    * Add a signal ref to the last added EventDetail

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
  */
 package org.jboss.bpm.model;
 
-import org.jboss.bpm.model.Constants.EventDetailType;
 
 //$Id$
 
@@ -34,11 +33,19 @@
 public interface EventDetail 
 {
   /**
+   * Defines the type of an Event
+   */
+  public enum EventDetailType
+  {
+    Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate 
+  }
+
+  /**
    * The EventDetailType attribute defines the type of trigger expected for an Event. The
    * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate,
    * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each
    * have a subset of the EventDetailTypes that can be used.
    * The EventDetailType list MAY be extended to include new types.
    */
-  EventDetailType getEventDetailType();
+  EventDetail.EventDetailType getEventDetailType();
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
  */
 package org.jboss.bpm.model;
 
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
 
 //$Id$
 
@@ -34,6 +33,11 @@
  */
 public interface Expression 
 {
+  public enum ExpressionLanguage
+  {
+    MVEL, String, Object
+  }
+
   /**
    * An ExpressionBody MUST be entered to provide the text of the expression, which
    * will be written in the language defined by the ExpressionLanguage attribute.
@@ -50,6 +54,6 @@
    * The value of the ExpressionLanguage should follow the naming conventions for the
    * version of the specified language.
    */
-  ExpressionLanguage getExpressionLanguage();
+  Expression.ExpressionLanguage getExpressionLanguage();
 
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -23,7 +23,6 @@
 
 import java.util.List;
 
-import org.jboss.bpm.model.Constants.GatewayType;
 
 //$Id$
 
@@ -40,10 +39,19 @@
 public interface Gateway extends FlowObject
 {
   /**
+   * The GatewayType
+   * 
+   */
+  public enum GatewayType
+  {
+    Exclusive, Inclusive, Complex, Parallel
+  }
+
+  /**
    * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway,
    * both for incoming and outgoing Sequence Flow
    */
-  GatewayType getGatewayType();
+  Gateway.GatewayType getGatewayType();
 
   /**
    * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -33,7 +33,7 @@
 {
   GatewayBuilder addDefaultGate(String targetName);
   
-  GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage exprLang, String exprBody);
+  GatewayBuilder addConditionalGate(String targetName, Expression.ExpressionLanguage exprLang, String exprBody);
 
   GatewayBuilder addGate(String targetName);
 }
\ No newline at end of file

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-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
  */
 package org.jboss.bpm.model;
 
-import org.jboss.bpm.model.Constants.ParticipantType;
 
 
 //$Id$
@@ -36,10 +35,15 @@
  */
 public interface Participant 
 {
+  public enum ParticipantType
+  {
+    Role, Entity
+  }
+
   /**
    * Get the type of this participant
    */
-  ParticipantType getParticipantType();
+  Participant.ParticipantType getParticipantType();
 
   /**
    * If the ParticipantType = Role, then a Role MUST be identified.

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,6 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.bpm.model.Constants.ProcessStatus;
-import org.jboss.bpm.model.Constants.ProcessType;
 import org.jboss.bpm.runtime.Attachments;
 
 /**
@@ -40,6 +38,22 @@
 public interface Process extends GraphicalElement, PropertySupport
 {
   /**
+   * Defines the type of a {@link Process}
+   */
+  public enum ProcessType
+  {
+    None, Private, Abstract, Collaboration
+  }
+
+  /**
+   * Defines the status a {@link Process} can be in
+   */
+  public enum ProcessStatus
+  {
+    None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
+  }
+
+  /**
    * Get the unique name.
    */
   String getName();
@@ -47,12 +61,12 @@
   /**
    * Get the process state
    */
-  ProcessStatus getProcessStatus();
+  Process.ProcessStatus getProcessStatus();
   
   /**
    * Get the process type
    */
-  ProcessType getProcessType();
+  Process.ProcessType getProcessType();
 
   /**
    * Get the list of flow objects

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -22,10 +22,8 @@
 package org.jboss.bpm.model;
 
 import org.jboss.bpm.client.DialectHandler;
-import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.Constants.TaskType;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
 import org.jboss.bpm.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.FlowHandler;
 import org.jboss.bpm.runtime.SignalHandler;
@@ -94,19 +92,19 @@
   EventBuilder addEndEvent(String name);
 
   /**
-   * Add a Task of {@link TaskType} NONE with a given name
+   * Add a Task of {@link Task.TaskType} NONE with a given name
    */
   TaskBuilder addTask(String name);
 
   /**
    * Add a Task with a given name and type
    */
-  TaskBuilder addTask(String name, TaskType type);
+  TaskBuilder addTask(String name, Task.TaskType type);
 
   /**
    * Add a Gateway with a given name
    */
-  GatewayBuilder addGateway(String name, GatewayType type);
+  GatewayBuilder addGateway(String name, Gateway.GatewayType type);
 
   /**
    * Add a {@link Message} with a given name.

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -38,6 +38,14 @@
 public interface Task extends Activity
 {
   /**
+   * The TaskType
+   */
+  public enum TaskType
+  {
+    Service, Receive, Send, User, Script, Manual, Reference, None
+  }
+
+  /**
    * TaskType is an attribute that has a default of None, but MAY be set to Send,
    * Receive, User, Script, Manual, Reference, or Service. The TaskType will be
    * impacted by the Message Flow to and/or from the Task, if Message Flow are
@@ -46,5 +54,5 @@
    * Script or Manual MUST NOT have an incoming or an outgoing Message Flow.
    * The TaskType list MAY be extended to include new types.
    */
-  Constants.TaskType getTaskType();
+  Task.TaskType getTaskType();
 }
\ No newline at end of file

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-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -61,7 +61,6 @@
 import org.jboss.bpm.model.Assignment;
 import org.jboss.bpm.model.ComplexGateway;
 import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EndEvent;
 import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.EventDetail;
@@ -181,20 +180,20 @@
 
       for (EventDetail trigger : start.getTrigger())
       {
-        Constants.EventDetailType detailType = trigger.getEventDetailType();
-        if (detailType == Constants.EventDetailType.Message)
+        EventDetail.EventDetailType detailType = trigger.getEventDetailType();
+        if (detailType == EventDetail.EventDetailType.Message)
         {
           throw new NotImplementedException("JBPM-1657", "StartTrigger Message");
         }
-        else if (detailType == Constants.EventDetailType.Timer)
+        else if (detailType == EventDetail.EventDetailType.Timer)
         {
           throw new NotImplementedException("JBPM-1658", "StartTrigger Timer");
         }
-        else if (detailType == Constants.EventDetailType.Conditional)
+        else if (detailType == EventDetail.EventDetailType.Conditional)
         {
           throw new NotImplementedException("JBPM-1659", "StartTrigger Conditional");
         }
-        else if (detailType == Constants.EventDetailType.Signal)
+        else if (detailType == EventDetail.EventDetailType.Signal)
         {
           SignalEventDetail signalTrigger = (SignalEventDetail)trigger;
           Signal signal = signalTrigger.getSignalRef();
@@ -224,8 +223,8 @@
 
       for (EventDetail result : end.getResult())
       {
-        Constants.EventDetailType detailType = result.getEventDetailType();
-        if (detailType == Constants.EventDetailType.Message)
+        EventDetail.EventDetailType detailType = result.getEventDetailType();
+        if (detailType == EventDetail.EventDetailType.Message)
         {
           MessageEventDetail msgEventDetail = (MessageEventDetail)result;
           Message message = msgEventDetail.getMessageRef();
@@ -234,23 +233,23 @@
           jaxbResult.setMessageRef(jaxbMessageRef);
           jaxbEnd.getResult().add(jaxbResult);
         }
-        else if (detailType == Constants.EventDetailType.Error)
+        else if (detailType == EventDetail.EventDetailType.Error)
         {
           throw new NotImplementedException("JBPM-1677", "EndEvent Error Result");
         }
-        else if (detailType == Constants.EventDetailType.Cancel)
+        else if (detailType == EventDetail.EventDetailType.Cancel)
         {
           throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result");
         }
-        else if (detailType == Constants.EventDetailType.Compensation)
+        else if (detailType == EventDetail.EventDetailType.Compensation)
         {
           throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result");
         }
-        else if (detailType == Constants.EventDetailType.Signal)
+        else if (detailType == EventDetail.EventDetailType.Signal)
         {
           throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result");
         }
-        else if (detailType == Constants.EventDetailType.Terminate)
+        else if (detailType == EventDetail.EventDetailType.Terminate)
         {
           throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result");
         }

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -73,8 +73,9 @@
 import org.jboss.bpm.dialect.api10.model.JAXBTerminateEventDetail;
 import org.jboss.bpm.dialect.api10.model.JAXBTimerEventDetail;
 import org.jboss.bpm.dialect.api10.model.ObjectFactory;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
 import org.jboss.bpm.model.MessageBuilder;
 import org.jboss.bpm.model.ObjectNameFactory;
@@ -244,7 +245,7 @@
         {
           JAXBSignalEventDetail jaxbSignalTrigger = (JAXBSignalEventDetail)jaxbTrigger;
           JAXBSignal jaxbSignal = jaxbSignalTrigger.getSignal();
-          eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(jaxbSignal.getType(),
+          eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(jaxbSignal.getType(),
               jaxbSignal.getMessage());
         }
         else
@@ -270,7 +271,7 @@
         if (jaxbResult instanceof JAXBMessageEventDetail)
         {
           JAXBMessageEventDetail jaxbMessageResult = (JAXBMessageEventDetail)jaxbResult;
-          eventBuilder.addEventDetail(Constants.EventDetailType.Message);
+          eventBuilder.addEventDetail(EventDetail.EventDetailType.Message);
           JAXBMessageRef jaxbMsg = jaxbMessageResult.getMessageRef();
           eventBuilder.addMessageRef(jaxbMsg.getNameRef());
         }
@@ -350,19 +351,19 @@
     GatewayBuilder gwBuilder;
     if (jaxb instanceof JAXBExclusiveGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Exclusive);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Exclusive);
     }
     else if (jaxb instanceof JAXBInclusiveGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Inclusive);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Inclusive);
     }
     else if (jaxb instanceof JAXBComplexGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Complex);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Complex);
     }
     else if (jaxb instanceof JAXBParallelGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Parallel);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Parallel);
     }
     else
     {

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,8 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.Assignment.AssignTime;
 
 /**
  * An Assignment, which is used in the definition of attributes for Process,
@@ -65,13 +66,13 @@
     this.from = from;
   }
 
-  public AssignTime getAssignTime()
+  public Assignment.AssignTime getAssignTime()
   {
     return assignTime;
   }
 
   @XmlAttribute(name = "time")
-  public void setAssignTime(AssignTime assignTime)
+  public void setAssignTime(Assignment.AssignTime assignTime)
   {
     this.assignTime = assignTime;
   }

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,7 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
 
 /**
  * An Expression, which is used in the definition of attributes for @{link StartEvent},
@@ -40,16 +40,16 @@
 @XmlType(name = "Expression")
 public class JAXBExpression
 {
-  private Constants.ExpressionLanguage lang;
+  private Expression.ExpressionLanguage lang;
   private String body;
 
-  public Constants.ExpressionLanguage getLang()
+  public Expression.ExpressionLanguage getLang()
   {
     return lang;
   }
 
   @XmlAttribute(required = true)
-  public void setLang(Constants.ExpressionLanguage lang)
+  public void setLang(Expression.ExpressionLanguage lang)
   {
     this.lang = lang;
   }

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -30,8 +30,8 @@
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Task;
 import org.jboss.bpm.model.Message.Implementation;
 
 //$Id$
@@ -49,7 +49,7 @@
     "messageRef", "inputSets", "outputSets" })
 public class JAXBTask extends JAXBActivity
 {
-  private Constants.TaskType taskType;
+  private Task.TaskType taskType;
   private Implementation implementation;
   private List<JAXBInputSet> inputSets = new ArrayList<JAXBInputSet>();
   private List<JAXBOutputSet> outputSets = new ArrayList<JAXBOutputSet>();
@@ -76,13 +76,13 @@
     this.outFlow = outFlow;
   }
 
-  public Constants.TaskType getTaskType()
+  public Task.TaskType getTaskType()
   {
     return taskType;
   }
 
   @XmlAttribute
-  public void setTaskType(Constants.TaskType taskType)
+  public void setTaskType(Task.TaskType taskType)
   {
     this.taskType = taskType;
   }

Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,10 +34,11 @@
 import org.jboss.bpm.dialect.jpdl32.model.JPDL32StartState;
 import org.jboss.bpm.dialect.jpdl32.model.JPDL32State;
 import org.jboss.bpm.dialect.jpdl32.model.JPDL32Transition;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
 import org.jboss.bpm.runtime.ExecutionHandler;
 
 /**
@@ -94,7 +95,7 @@
 
   private void adaptState(ProcessBuilder builder, JPDL32State jpdlState)
   {
-    builder.addTask(jpdlState.getName(), Constants.TaskType.None);
+    builder.addTask(jpdlState.getName(), Task.TaskType.None);
     adaptTransitions(builder, jpdlState.getDescriptionOrEventOrExceptionHandler());
     
     for (Object jpdlObj : jpdlState.getDescriptionOrEventOrExceptionHandler())
@@ -123,7 +124,7 @@
 
   private void adaptFork(ProcessBuilder builder, JPDL32Fork jpdlObj)
   {
-    builder.addGateway(jpdlObj.getName(), Constants.GatewayType.Parallel);
+    builder.addGateway(jpdlObj.getName(), Gateway.GatewayType.Parallel);
     adaptTransitions(builder, jpdlObj.getScriptOrDescriptionOrEvent());
   }
 

Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -42,10 +42,11 @@
 import org.jboss.bpm.dialect.stp.model.ObjectFactory;
 import org.jboss.bpm.dialect.stp.model.Pool;
 import org.jboss.bpm.dialect.stp.model.SequenceEdge;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
 import org.jboss.util.xml.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -168,11 +169,11 @@
     {
       String name = stpActivity.getLabel();
       
-      Constants.TaskType taskType = Constants.TaskType.None;
+      Task.TaskType taskType = Task.TaskType.None;
       if (name.startsWith("Send"))
-        taskType = Constants.TaskType.Send;
+        taskType = Task.TaskType.Send;
       if (name.startsWith("Receive"))
-        taskType = Constants.TaskType.Receive;
+        taskType = Task.TaskType.Receive;
       
       builder.addTask(name, taskType);
       adaptOutgoingEdges(builder, stpActivity);
@@ -180,13 +181,13 @@
     else if (activityType == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE)
     {
       String name = stpActivity.getLabel();
-      builder.addGateway(name, Constants.GatewayType.Exclusive);
+      builder.addGateway(name, Gateway.GatewayType.Exclusive);
       adaptOutgoingEdges(builder, stpActivity);
     }
     else if (activityType == ActivityType.GATEWAY_PARALLEL)
     {
       String name = stpActivity.getLabel();
-      builder.addGateway(name, Constants.GatewayType.Parallel);
+      builder.addGateway(name, Gateway.GatewayType.Parallel);
       adaptOutgoingEdges(builder, stpActivity);
     }
     else

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -35,12 +35,11 @@
 import org.jboss.bpm.client.ProcessManager;
 import org.jboss.bpm.client.SignalManager;
 import org.jboss.bpm.model.Assignment;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.StartEvent;
-import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.model.Assignment.AssignTime;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.ri.model.impl.ExpressionEvaluator;
 import org.jboss.bpm.ri.model.impl.ProcessImpl;
@@ -49,8 +48,8 @@
 import org.jboss.bpm.ri.model.impl.TokenExecutorImpl;
 import org.jboss.bpm.ri.runtime.DelegatingToken;
 import org.jboss.bpm.ri.runtime.MutableToken;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
 import org.jboss.bpm.ri.runtime.TokenImpl;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
 import org.jboss.bpm.runtime.Attachments;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.Token;
@@ -74,7 +73,7 @@
   public void startProcess(final Process proc, final Attachments att)
   {
     final ProcessImpl procImpl = (ProcessImpl)proc;
-    procImpl.setProcessStatus(Constants.ProcessStatus.Active);
+    procImpl.setProcessStatus(Process.ProcessStatus.Active);
 
     SignalManager signalManager = SignalManager.locateSignalManager();
     signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_PROCESS_ENTER));
@@ -188,13 +187,13 @@
       ProcessImpl proc = (ProcessImpl)rtProc.getProcess();
       
       String procName = proc.getName();
-      Constants.ProcessStatus procStatus = proc.getProcessStatus();
+      Process.ProcessStatus procStatus = proc.getProcessStatus();
       boolean hasActiveTokens = tokenExecutor.hasRunnableTokens();
       try
       {
         synchronized (proc)
         {
-          while (procStatus == Constants.ProcessStatus.Active && hasActiveTokens)
+          while (procStatus == Process.ProcessStatus.Active && hasActiveTokens)
           {
             try
             {
@@ -215,10 +214,10 @@
         SignalManager signalManager = SignalManager.locateSignalManager();
         signalManager.throwSignal(procName, new Signal(procName, Signal.SignalType.SYSTEM_PROCESS_EXIT));
 
-        if (procStatus == Constants.ProcessStatus.Active)
+        if (procStatus == Process.ProcessStatus.Active)
         {
           ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
-          procImpl.setProcessStatus(Constants.ProcessStatus.Completed);
+          procImpl.setProcessStatus(Process.ProcessStatus.Completed);
         }
 
         ProcessManager procManager = ProcessManager.locateProcessManager();

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,13 +26,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Process;
 import org.jboss.bpm.ri.model.impl.FlowObjectImpl;
 import org.jboss.bpm.ri.model.impl.ProcessImpl;
 import org.jboss.bpm.ri.runtime.DelegatingToken;
 import org.jboss.bpm.ri.runtime.MutableToken;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
 import org.jboss.bpm.runtime.HandlerSupport;
 import org.jboss.bpm.runtime.SignalHandler;
 import org.jboss.bpm.runtime.Token;
@@ -75,8 +75,8 @@
         throw new IllegalStateException("Cannot obtain initial flow");
 
       TokenStatus tokStatus = token.getTokenStatus();
-      Constants.ProcessStatus procStatus = procImpl.getProcessStatus();
-      while (procStatus == Constants.ProcessStatus.Active && tokStatus == TokenStatus.Started)
+      Process.ProcessStatus procStatus = procImpl.getProcessStatus();
+      while (procStatus == Process.ProcessStatus.Active && tokStatus == TokenStatus.Started)
       {
         flow = token.getFlow();
 
@@ -120,7 +120,7 @@
     catch (RuntimeException rte)
     {
       log.error("Process aborted: " + procImpl, rte);
-      procImpl.setProcessStatus(Constants.ProcessStatus.Aborted);
+      procImpl.setProcessStatus(Process.ProcessStatus.Aborted);
       procImpl.setRuntimeException(rte);
     }
     finally

Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java (from rev 1928, jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java)
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -0,0 +1,95 @@
+/*
+ * 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.ri.model.impl;
+
+//$Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.AbstractElement;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.ObjectNameFactory;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Task;
+import org.jboss.util.id.UID;
+
+/**
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at SuppressWarnings("serial")
+public class AbstractElementImpl implements AbstractElement
+{
+  private ObjectName id;
+
+  public ObjectName getID()
+  {
+    return id;
+  }
+
+  /**
+   * Initialize the flow object
+   */
+  protected void initialize(ProcessImpl proc)
+  {
+    assignElementID();
+  }
+
+  protected void assignElementID()
+  {
+    StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+    if (this instanceof Event)
+    {
+      Event event = (Event)this;
+      str.append("type=Event,name=" + event.getName());
+    }
+    else if (this instanceof Process)
+    {
+      Process proc = (Process)this;
+      str.append("type=Process,name=" + proc.getName());
+    }
+    else if (this instanceof Task)
+    {
+      Task task = (Task)this;
+      str.append("type=Task,name=" + task.getName());
+    }
+    else if (this instanceof Gateway)
+    {
+      Gateway gateway = (Gateway)this;
+      str.append("type=Gateway,name=" + gateway.getName());
+    }
+    else if (this instanceof ConnectingObject)
+    {
+      str.append("type=Flow");
+    }
+    else
+    {
+      str.append("type=Other");
+    }
+    str.append(",id=" + new UID());
+    this.id = ObjectNameFactory.create(str.toString());
+  }
+}
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
 import org.jboss.bpm.model.Activity;
 import org.jboss.bpm.model.ActivityBuilder;
 import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
 
 /**
  * The ActivityBuilder can be used to build an {@link Activity} dynamically.

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -45,7 +45,7 @@
 /**
  * An activity is a generic term for work that a company or organization performs via business processes. An activity
  * can be atomic or non-atomic (compound). The types of activities that are a part of a Process Model are: Process,
- * Sub-Process, and Task.
+ * Sub-Process, and 
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,6 @@
 import org.jboss.bpm.model.Assignment;
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.Constants.AssignTime;
 
 /**
  * An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates.

Deleted: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -1,95 +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.ri.model.impl;
-
-//$Id$
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.model.AbstractElement;
-import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
-import org.jboss.bpm.model.Event;
-import org.jboss.bpm.model.Gateway;
-import org.jboss.bpm.model.ObjectNameFactory;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.Task;
-import org.jboss.util.id.UID;
-
-/**
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at SuppressWarnings("serial")
-public class BPMNElementImpl implements AbstractElement
-{
-  private ObjectName id;
-
-  public ObjectName getID()
-  {
-    return id;
-  }
-
-  /**
-   * Initialize the flow object
-   */
-  protected void initialize(ProcessImpl proc)
-  {
-    assignElementID();
-  }
-
-  protected void assignElementID()
-  {
-    StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
-    if (this instanceof Event)
-    {
-      Event event = (Event)this;
-      str.append("type=Event,name=" + event.getName());
-    }
-    else if (this instanceof Process)
-    {
-      Process proc = (Process)this;
-      str.append("type=Process,name=" + proc.getName());
-    }
-    else if (this instanceof Task)
-    {
-      Task task = (Task)this;
-      str.append("type=Task,name=" + task.getName());
-    }
-    else if (this instanceof Gateway)
-    {
-      Gateway gateway = (Gateway)this;
-      str.append("type=Gateway,name=" + gateway.getName());
-    }
-    else if (this instanceof ConnectingObject)
-    {
-      str.append("type=Flow");
-    }
-    else
-    {
-      str.append("type=Other");
-    }
-    str.append(",id=" + new UID());
-    this.id = ObjectNameFactory.create(str.toString());
-  }
-}
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,14 +26,13 @@
 import org.jboss.bpm.NotImplementedException;
 import org.jboss.bpm.model.ComplexGateway;
 import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;
 
 /**
  * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex
  * Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers
- * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway.
+ * can provide complex expressions that determine the merging and/or splitting behavior of the 
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -35,7 +35,7 @@
 import org.jboss.bpm.model.MessageEventDetail;
 import org.jboss.bpm.model.SequenceFlow;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
 import org.jboss.bpm.runtime.SignalHandler;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,8 +21,8 @@
  */
 package org.jboss.bpm.ri.model.impl;
 
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Entity;
+import org.jboss.bpm.model.Participant;
 
 //$Id$
 
@@ -43,9 +43,9 @@
     this.entityRef = this;
   }
 
-  public Constants.ParticipantType getParticipantType()
+  public Participant.ParticipantType getParticipantType()
   {
-    return Constants.ParticipantType.Entity;
+    return Participant.ParticipantType.Entity;
   }
   
   public String getName()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -31,7 +31,7 @@
 import org.jboss.bpm.model.IntermediateEvent;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.StartEvent;
-import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
 import org.jboss.bpm.model.Signal.SignalType;
 
 /**

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,7 +34,6 @@
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.SequenceFlow.ConditionType;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,7 @@
 import java.util.Map;
 
 import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.Attachments.Key;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,7 +24,6 @@
 //$Id$
 
 import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
 
 /**
  * An Expression, which is used in the definition of attributes for @{link StartEvent},

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -36,7 +36,7 @@
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.SingleInFlowSupport;
 import org.jboss.bpm.model.SingleOutFlowSupport;
-import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.model.Assignment.AssignTime;
 import org.jboss.bpm.ri.model.spec.MultipleInFlowSupport;
 import org.jboss.bpm.ri.model.spec.MultipleOutFlowSupport;
 import org.jboss.bpm.runtime.ExecutionContext;
@@ -49,7 +49,7 @@
 //$Id$
 
 /**
- * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
+ * A Flow Object is one of the set of following graphical objects: Event, Activity, and 
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
 import org.jboss.bpm.model.SequenceFlow.ConditionType;
 
 /**

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -31,6 +31,6 @@
  * @since 08-Jul-2008
  */
 @SuppressWarnings("serial")
-public abstract class GraphicalElementImpl extends BPMNElementImpl implements GraphicalElement
+public abstract class GraphicalElementImpl extends AbstractElementImpl implements GraphicalElement
 {
 }
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -35,8 +35,7 @@
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.InclusiveGateway;
 import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.Constants.GatewayType;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
 import org.jboss.bpm.model.SequenceFlow.ConditionType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.Token;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,6 @@
 import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MessageEventDetail;
-import org.jboss.bpm.model.Constants.EventDetailType;
 
 /**
  * The message event detail

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
  */
 package org.jboss.bpm.ri.model.impl;
 
-import org.jboss.bpm.model.Constants.TaskType;
 
 
 //$Id$

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -32,7 +32,6 @@
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.ParallelGateway;
 import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.ri.runtime.TokenImpl;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,10 +34,10 @@
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.Property;
 import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.Constants.TaskType;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Task.TaskType;
 import org.jboss.bpm.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.FlowHandler;
 import org.jboss.bpm.runtime.SignalHandler;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -41,7 +41,6 @@
 import org.jboss.bpm.ProcessTimeoutException;
 import org.jboss.bpm.client.ProcessManager;
 import org.jboss.bpm.model.Assignment;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EndEvent;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.InputSet;
@@ -77,7 +76,7 @@
   // The process assignments
   private List<Assignment> assignments = new ArrayList<Assignment>();
   // the status of the process
-  private Constants.ProcessStatus status = Constants.ProcessStatus.None;
+  private Process.ProcessStatus status = Process.ProcessStatus.None;
   // The possible exception that caused the process to abort
   private RuntimeException runtimeException;
   // The thread of the executor
@@ -118,7 +117,7 @@
     throw new NotImplementedException("JBPM-1646", "Process Performers");
   }
 
-  public Constants.ProcessType getProcessType()
+  public Process.ProcessType getProcessType()
   {
     throw new NotImplementedException("JBPM-1647", "Process Type");
   }
@@ -177,7 +176,7 @@
   public List<FlowObject> getFlowObjects()
   {
 
-    if (status == Constants.ProcessStatus.None)
+    if (status == Process.ProcessStatus.None)
       return flowObjects;
 
     return Collections.unmodifiableList(flowObjects);
@@ -214,10 +213,10 @@
   {
     ProcessManager pm = ProcessManager.locateProcessManager();
 
-    if (status == Constants.ProcessStatus.Aborted || status == Constants.ProcessStatus.Completed)
+    if (status == Process.ProcessStatus.Aborted || status == Process.ProcessStatus.Completed)
       resetProcess();
 
-    if (status != Constants.ProcessStatus.Ready)
+    if (status != Process.ProcessStatus.Ready)
       throw new IllegalStateException("Cannot start process in state: " + status);
 
     // Register the process if needed
@@ -239,7 +238,7 @@
       FlowObjectImpl foImpl = (FlowObjectImpl)fo;
       foImpl.reset();
     }
-    status = Constants.ProcessStatus.Ready;
+    status = Process.ProcessStatus.Ready;
     runtimeException = null;
   }
 
@@ -260,7 +259,7 @@
    */
   private void waitForEndInternal(long timeout)
   {
-    if (status == Constants.ProcessStatus.None || status == Constants.ProcessStatus.Ready)
+    if (status == Process.ProcessStatus.None || status == Process.ProcessStatus.Ready)
       throw new IllegalStateException("Cannot wait for process in state: " + status);
 
     if (executorThread == null)
@@ -314,7 +313,7 @@
 
   private boolean isProcessTerminated()
   {
-    return status == Constants.ProcessStatus.Cancelled || status == Constants.ProcessStatus.Completed || status == Constants.ProcessStatus.Aborted;
+    return status == Process.ProcessStatus.Cancelled || status == Process.ProcessStatus.Completed || status == Process.ProcessStatus.Aborted;
   }
 
   public FlowObject getFlowObject(String name)
@@ -346,12 +345,12 @@
     return retFlowObjects;
   }
 
-  public Constants.ProcessStatus getProcessStatus()
+  public Process.ProcessStatus getProcessStatus()
   {
     return status;
   }
 
-  public void setProcessStatus(Constants.ProcessStatus status)
+  public void setProcessStatus(Process.ProcessStatus status)
   {
     this.status = status;
   }
@@ -391,7 +390,7 @@
 
   public void initialize()
   {
-    if (status != Constants.ProcessStatus.None)
+    if (status != Process.ProcessStatus.None)
       throw new IllegalStateException("Cannot initialize process in state: " + status);
 
     // Initialize the Element
@@ -417,7 +416,7 @@
       foImpl.initialize(this);
     }
 
-    status = Constants.ProcessStatus.Ready;
+    status = Process.ProcessStatus.Ready;
   }
 
   protected void initializeMessageRef(Message msgRef)

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -32,7 +32,6 @@
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.Property;
 import org.jboss.bpm.model.ReceiveTask;
-import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.bpm.model.Message.Implementation;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.Token;

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,7 @@
  */
 package org.jboss.bpm.ri.model.impl;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Participant;
 import org.jboss.bpm.model.Role;
 
 //$Id$
@@ -43,9 +43,9 @@
     this.roleRef = this;
   }
 
-  public Constants.ParticipantType getParticipantType()
+  public Participant.ParticipantType getParticipantType()
   {
-    return Constants.ParticipantType.Role;
+    return Participant.ParticipantType.Role;
   }
   
   public String getName()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,7 +24,7 @@
 //$Id$
 
 import org.jboss.bpm.model.Process;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
 import org.jboss.bpm.runtime.TokenExecutor;
 
 /**

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,6 @@
 import org.jboss.bpm.InvalidProcessException;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.SendTask;
-import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.bpm.model.Message.Implementation;
 import org.jboss.bpm.runtime.Token;
 

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,7 +25,6 @@
 
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.SignalEventDetail;
-import org.jboss.bpm.model.Constants.EventDetailType;
 
 /**
  * The Signal event detail

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -32,15 +32,15 @@
 import org.jboss.bpm.client.ExecutionManager;
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.SequenceFlow;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.SignalEventDetail;
 import org.jboss.bpm.model.StartEvent;
 import org.jboss.bpm.ri.client.ExecutionManagerImpl;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
 import org.jboss.bpm.ri.runtime.TokenImpl;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
 import org.jboss.bpm.runtime.SignalHandler;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;
@@ -140,7 +140,7 @@
             if (startSignal.getSignalType() == signal.getSignalType() && startSignal.getMessage().equals(signal.getMessage()))
             {
               log.debug("catchSignal: " + signal);
-              if (proc.getProcessStatus() == Constants.ProcessStatus.Active)
+              if (proc.getProcessStatus() == Process.ProcessStatus.Active)
               {
                 log.debug("Start process from signal: " + signal);
                 ExecutionManagerImpl exManager = (ExecutionManagerImpl)ExecutionManager.locateExecutionManager();

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -31,6 +31,6 @@
  * @since 08-Jul-2008
  */
 @SuppressWarnings("serial")
-public abstract class SupportingElementImpl extends BPMNElementImpl implements SupportingElement
+public abstract class SupportingElementImpl extends AbstractElementImpl implements SupportingElement
 {
 }
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,7 +24,6 @@
 import org.jboss.bpm.client.SignalManager;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.Task;
-import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.bpm.runtime.SignalHandler;
 
 //$Id$

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,12 +34,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.SequenceFlow;
 import org.jboss.bpm.ri.client.RunnableToken;
 import org.jboss.bpm.ri.runtime.MutableToken;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
 import org.jboss.bpm.runtime.FlowHandler;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;
@@ -98,7 +97,7 @@
   public void start(Token token)
   {
     Process proc = rtProc.getProcess();
-    if (proc.getProcessStatus() != Constants.ProcessStatus.Active)
+    if (proc.getProcessStatus() != Process.ProcessStatus.Active)
       throw new IllegalStateException("Cannot start token to process in state: " + proc.getProcessStatus());
     
     log.debug("Start Token: " + token);

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -30,7 +30,7 @@
 /**
  * The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based
  * Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing
- * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken
+ * Sequence Flow of the  These expressions use the values of process data to determine which path should be taken
  * (hence the name Data-Based).
  * 
  * The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will
@@ -39,7 +39,7 @@
  * and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be
  * chosen—along with its associated Sequence Flow.
  * 
- * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure
+ * The default Gate is not mandatory for a  This means that if it is not used, then it is up to the modeler to insure
  * that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However,
  * BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed
  * through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,7 +28,7 @@
 //$Id$
 
 /**
- * A Service Task.
+ * A Service 
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
@@ -42,7 +42,7 @@
    * Message Flows MAY be shown on the diagram. However, the display of the
    * Message Flow is not required. The Message is applied to all incoming
    * Message Flow, but can arrive for only one of the incoming Message Flow
-   * for a single instance of the Task.
+   * for a single instance of the 
    */
   Message getInMessageRef();
   
@@ -53,7 +53,7 @@
    * Flow MAY be shown on the diagram. However, the display of the Message
    * Flow is not required. The Message is applied to all outgoing Message Flow
    * and the Message will be sent down all outgoing Message Flow at the
-   * completion of a single instance of the Task.
+   * completion of a single instance of the 
    */
   Message getOutMessageRef();
   

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -43,7 +43,7 @@
    * Message Flows MAY be shown on the diagram. However, the display of the
    * Message Flow is not required. The Message is applied to all incoming
    * Message Flow, but can arrive for only one of the incoming Message Flow
-   * for a single instance of the Task.
+   * for a single instance of the 
    */
   Message getInMessageRef();
   
@@ -54,7 +54,7 @@
    * Flow MAY be shown on the diagram. However, the display of the Message
    * Flow is not required. The Message is applied to all outgoing Message Flow
    * and the Message will be sent down all outgoing Message Flow at the
-   * completion of a single instance of the Task.
+   * completion of a single instance of the 
    */
   Message getOutMessageRef();
 

Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java (from rev 1929, jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/RuntimeProcess.java)
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -0,0 +1,47 @@
+/*
+ * 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.ri.runtime;
+
+//$Id$
+
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.runtime.TokenExecutor;
+
+/**
+ * A RuntimeProcess add runtime behaviour to the {@link Process} <p/> To protect the engine from maligious user code it
+ * does not extend {@link Process} directly.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface RuntimeProcess
+{
+  /**
+   * Get the associated {@link Process}
+   */
+  Process getProcess();
+
+  /**
+   * Get the {@link TokenExecutor} for this {@link Process}
+   */
+  TokenExecutor getTokenExecutor();
+}
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,11 +25,13 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
 import org.jboss.bpm.model.TaskBuilder;
 
 /**
@@ -99,7 +101,7 @@
     procBuilder.addStartEvent("Start").addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the ReceiveReqTask
-    TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Constants.TaskType.Receive);
+    TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Task.TaskType.Receive);
     taskBuilder.addMessageRef(MESSAGE_REQ_DATA).
     addSequenceFlow(TASK_VALIDATE);
 
@@ -117,8 +119,8 @@
     addSequenceFlow(GATEWAY_IS_VALID);
 
     // Build the ValidateGateway
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Constants.GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Constants.ExpressionLanguage.MVEL, "isReqDataValid == true").
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Gateway.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Expression.ExpressionLanguage.MVEL, "isReqDataValid == true").
     addDefaultGate(TASK_SEND_INVALID);
 
     // Build the CheckAvailabilityTask
@@ -135,37 +137,37 @@
     addSequenceFlow(GATEWAY_IS_AVAILABLE);
 
     // Build the SendInvalidTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Constants.TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Task.TaskType.Send);
     taskBuilder.addMessageRef(MESSAGE_INVALID_DATA).
     addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the AvailabilityGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Constants.GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Constants.ExpressionLanguage.MVEL, "isAvailable == true").
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Gateway.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Expression.ExpressionLanguage.MVEL, "isAvailable == true").
     addDefaultGate(TASK_SEND_NOT_AVAILABLE);
     
     // Build the SendOfferTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Constants.TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Task.TaskType.Send);
     taskBuilder.addMessageRef(MESSAGE_OFFER).
     addSequenceFlow(TASK_RECEIVE_ORDER);
 
     // Build the SendNotAvailableTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Constants.TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Task.TaskType.Send);
     taskBuilder.addMessageRef(MESSAGE_NOT_AVAILABLE).
     addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the ReceiveReqTask
-    taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Constants.TaskType.Receive);
+    taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Task.TaskType.Receive);
     taskBuilder.addMessageRef(MESSAGE_ACCEPT_OFFER).
     addSequenceFlow(GATEWAY_IS_ACCEPTED);
     
     // Build the AcceptOfferGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Constants.GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Constants.ExpressionLanguage.MVEL, "isOfferAccepted == true").
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Gateway.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Expression.ExpressionLanguage.MVEL, "isOfferAccepted == true").
     addDefaultGate(TASK_RECEIVE_REQUEST);
     
     // Build the AcceptOfferGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, Constants.GatewayType.Parallel);
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, Gateway.GatewayType.Parallel);
     gatewayBuilder.addGate(TASK_CREDIT_CARD).
     addGate(TASK_BOOKING);
     
@@ -188,11 +190,11 @@
     addSequenceFlow(GATEWAY_SYNC_JOIN);
     
     // Build the SynchronizedJoinGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, Constants.GatewayType.Parallel);
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, Gateway.GatewayType.Parallel);
     gatewayBuilder.addGate(TASK_SEND_CONFIRM);
     
     // Build the SendConfirmTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Constants.TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Task.TaskType.Send);
     taskBuilder.addMessageRef(MESSAGE_CONFIRM).
     addSequenceFlow(EVENT_END);
     

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.util.Collection;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.EventDetail;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MessageBuilder;
 import org.jboss.bpm.model.Process;
@@ -78,7 +78,7 @@
     msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true).addProperty("attKeys", null, true);
     TaskBuilder taskBuilder = procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class);
     taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
-    procBuilder.addEndEvent("End").addEventDetail(Constants.EventDetailType.Message).addMessageRef("EndMessage");
+    procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
     Process proc = procBuilder.getProcess();
     return proc;
   }

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,9 @@
 
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -133,12 +134,12 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
     procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
     procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", Constants.GatewayType.Exclusive).addSequenceFlow("TaskC");
+    procBuilder.addGateway("Merge", Gateway.GatewayType.Exclusive).addSequenceFlow("TaskC");
     procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
     procBuilder.addEndEvent("End");
     Process proc = procBuilder.getProcess();

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
@@ -94,9 +95,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo > 10");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo > 10");
     procBuilder.addEndEvent("EndA").addEndEvent("EndB");
     Process proc = procBuilder.getProcess();
     return proc;

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,8 +28,9 @@
 
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -71,10 +72,10 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", Constants.GatewayType.Inclusive).addSequenceFlow("End");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
+    procBuilder.addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End");
     procBuilder.addEndEvent("End");
     Process proc = procBuilder.getProcess();
     return proc;

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
@@ -75,9 +76,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("InclusiveGatewaySplitTest").addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive);
-    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo < 20");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive);
+    gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo < 20");
     procBuilder.addEndEvent("EndA").addEndEvent("EndB");
     Process proc = procBuilder.getProcess();
     return proc;

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,9 @@
 
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -134,12 +135,12 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
     procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
     procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", Constants.GatewayType.Parallel).addSequenceFlow("TaskC");
+    procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("TaskC");
     procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
     procBuilder.addEndEvent("End");
     Process proc = procBuilder.getProcess();

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -60,7 +60,7 @@
   public Process getProcess() throws IOException
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.GatewayType.Parallel).
+    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel).
     addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess();
     return proc;
   }

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,8 +28,8 @@
 import org.jboss.bpm.client.ProcessManager;
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MessageBuilder;
 import org.jboss.bpm.model.MessageBuilderFactory;
@@ -37,6 +37,7 @@
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.Task;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -52,7 +53,7 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("ReceiveTaskTest").addStartEvent("Start").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA", Constants.TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
+    procBuilder.addTask("TaskA", Task.TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
     try
     {
       procBuilder.getProcess();
@@ -144,9 +145,9 @@
     msgBuilder = procBuilder.addMessage("EndEventMessage");
     msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true);
     procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA", Constants.TaskType.Receive).addMessageRef("ReceiveTaskMessage");
+    procBuilder.addTask("TaskA", Task.TaskType.Receive).addMessageRef("ReceiveTaskMessage");
     EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Message).addMessageRef("EndEventMessage");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndEventMessage");
     return procBuilder.getProcess();
   }
 }

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,9 +24,9 @@
 // $Id$
 
 import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
 /**
@@ -41,7 +41,7 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA", Constants.TaskType.Send).addSequenceFlow("End").addEndEvent("End");
+    procBuilder.addTask("TaskA", Task.TaskType.Send).addSequenceFlow("End").addEndEvent("End");
     try
     {
       procBuilder.getProcess();

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,7 +25,8 @@
 
 import java.io.IOException;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -59,11 +60,11 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("TaskExecutionHandlerTest").addProperty("procProp", "kermit");
-    procBuilder.addAssignment(Constants.AssignTime.Start, Constants.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign");
+    procBuilder.addAssignment(Assignment.AssignTime.Start, Expression.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign");
     procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
     TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
     taskBuilder.addProperty("taskProp", "piggy").addExecutionHandler(TaskA.class).addSequenceFlow("End");
-    taskBuilder.addAssignment(Constants.AssignTime.Start, Constants.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign");
+    taskBuilder.addAssignment(Assignment.AssignTime.Start, Expression.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign");
     procBuilder.addEndEvent("End");
     return procBuilder.getProcess();
   }

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
@@ -94,9 +95,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo > 10");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo > 10");
     procBuilder.addEndEvent("EndA").addEndEvent("EndB");
     Process proc = procBuilder.getProcess();
     return proc;

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
@@ -75,9 +76,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("MultiChoiceTest").addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive);
-    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo < 20");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive);
+    gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo < 20");
     procBuilder.addEndEvent("EndA").addEndEvent("EndB");
     Process proc = procBuilder.getProcess();
     return proc;

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -60,7 +60,7 @@
   public Process getProcess() throws IOException
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.GatewayType.Parallel).
+    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel).
     addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess();
     return proc;
   }

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,8 +28,9 @@
 
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -71,10 +72,10 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
     eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
-    procBuilder.addSequenceFlow("Merge").addGateway("Merge", Constants.GatewayType.Inclusive).addSequenceFlow("End");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
+    procBuilder.addSequenceFlow("Merge").addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End");
     procBuilder.addEndEvent("End");
     Process proc = procBuilder.getProcess();
     return proc;

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java	2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java	2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,9 @@
 
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -134,12 +135,12 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
     procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
     procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", Constants.GatewayType.Parallel).addSequenceFlow("TaskC");
+    procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("TaskC");
     procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
     procBuilder.addEndEvent("End");
     Process proc = procBuilder.getProcess();




More information about the jbpm-commits mailing list