[jbpm-commits] JBoss JBPM SVN: r1914 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 18 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Aug 18 05:34:17 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-08-18 05:34:17 -0400 (Mon, 18 Aug 2008)
New Revision: 1914

Added:
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
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/Assignment.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/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/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.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/client/internal/ExecutionManagerImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.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/process/ProcessIntegrityTest.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:
Move enums to Constants

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -21,7 +21,7 @@
  */
 package org.jboss.bpm.model;
 
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
 
 //$Id$
 
@@ -56,7 +56,7 @@
   /**
    * Add an IORule {@link Expression}
    */
-  ActivityBuilder addIORule(String body, ExpressionLanguage lang);
+  ActivityBuilder addIORule(String body, Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -21,6 +21,8 @@
  */
 package org.jboss.bpm.model;
 
+import org.jboss.bpm.model.Constants.AssignTime;
+
 //$Id$
 
 /**
@@ -32,11 +34,6 @@
  */
 public interface Assignment extends SupportingElement
 {
-  public enum AssignTime
-  {
-    Start, End
-  }
-  
   /**
    * The target for the Assignment MUST be a Property of the Process or the activity
    * itself.

Added: 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	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+//$Id$
+
+
+/**
+ * A Process is any {@link Activity} performed within a company or organization.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Constants 
+{
+
+  public enum AssignTime
+  {
+    Start, End
+  }
+
+  /**
+   * Defines the type of an {@link 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
+  }
+}
\ No newline at end of file


Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.model.Constants.EventDetailType;
 import org.jboss.bpm.model.Signal.SignalType;
 
 /**
@@ -37,7 +37,7 @@
   /**
    * Add an event detail to the last added {@link Event}
    */
-  EventBuilder addEventDetail(EventDetailType detailType);
+  EventBuilder addEventDetail(Constants.EventDetailType detailType);
   
   /**
    * Add a signal ref to the last added {@link 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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -21,6 +21,8 @@
  */
 package org.jboss.bpm.model;
 
+import org.jboss.bpm.model.Constants.EventDetailType;
+
 //$Id$
 
 /**
@@ -32,14 +34,6 @@
 public interface EventDetail extends SupportingElement
 {
   /**
-   * Defines the type of an {@link 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

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -21,6 +21,8 @@
  */
 package org.jboss.bpm.model;
 
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
+
 //$Id$
 
 /**
@@ -32,11 +34,6 @@
  */
 public interface Expression extends SupportingElement
 {
-  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.

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -23,6 +23,8 @@
 
 import java.util.List;
 
+import org.jboss.bpm.model.Constants.GatewayType;
+
 //$Id$
 
 /**
@@ -38,15 +40,6 @@
 public interface Gateway extends FlowObject, MultipleInFlowSupport
 {
   /**
-   * The GatewayType
-   * 
-   */
-  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
    */

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -34,7 +34,7 @@
 {
   GatewayBuilder addDefaultGate(String targetName);
   
-  GatewayBuilder addConditionalGate(String targetName, Expression.ExpressionLanguage exprLang, String exprBody);
+  GatewayBuilder addConditionalGate(String targetName, Constants.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/ProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -22,10 +22,10 @@
 package org.jboss.bpm.model;
 
 import org.jboss.bpm.client.DialectHandler;
-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.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.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.FlowHandler;
 import org.jboss.bpm.runtime.SignalHandler;
@@ -93,19 +93,19 @@
   EventBuilder addEndEvent(String name);
 
   /**
-   * Add a {@link Task} of {@link TaskType} NONE with a given name
+   * Add a {@link Task} of {@link Constants.TaskType} NONE with a given name
    */
   TaskBuilder addTask(String name);
 
   /**
    * Add a {@link Task} with a given name and type
    */
-  TaskBuilder addTask(String name, TaskType type);
+  TaskBuilder addTask(String name, Constants.TaskType type);
 
   /**
    * Add an {@link ExclusiveGateway} with a given name
    */
-  GatewayBuilder addGateway(String name, GatewayType type);
+  GatewayBuilder addGateway(String name, Constants.GatewayType type);
 
   /**
    * Add a {@link Message} with a given name.
@@ -120,7 +120,7 @@
   /**
    * Add an {@link Assignment} to the {@link Process} or the current {@link FlowObject}.
    */
-  ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp);
+  ProcessBuilder addAssignment(Constants.AssignTime time, Constants.ExpressionLanguage lang, String fromExpr, String toProp);
   
   /**
    * Add an {@link ExecutionHandler} with a given Class

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -37,14 +37,6 @@
 public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport
 {
   /**
-   * 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
@@ -53,5 +45,5 @@
    * Script or Manual MUST NOT have an incoming or an outgoing Message Flow.
    * The TaskType list MAY be extended to include new types.
    */
-  TaskType getTaskType();
+  Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -60,6 +60,7 @@
 import org.jboss.bpm.dialect.api10.model.ObjectFactory;
 import org.jboss.bpm.model.Assignment;
 import org.jboss.bpm.model.ComplexGateway;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EndEvent;
 import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.EventDetail;
@@ -87,7 +88,7 @@
 import org.jboss.bpm.model.SignalEventDetail;
 import org.jboss.bpm.model.StartEvent;
 import org.jboss.bpm.model.Task;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.model.Constants.EventDetailType;
 import org.jboss.bpm.model.SequenceFlow.ConditionType;
 import org.jboss.bpm.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.FlowHandler;
@@ -181,20 +182,20 @@
 
       for (EventDetail trigger : start.getTrigger())
       {
-        EventDetailType detailType = trigger.getEventDetailType();
-        if (detailType == EventDetailType.Message)
+        Constants.EventDetailType detailType = trigger.getEventDetailType();
+        if (detailType == Constants.EventDetailType.Message)
         {
           throw new NotImplementedException("JBPM-1657", "StartTrigger Message");
         }
-        else if (detailType == EventDetailType.Timer)
+        else if (detailType == Constants.EventDetailType.Timer)
         {
           throw new NotImplementedException("JBPM-1658", "StartTrigger Timer");
         }
-        else if (detailType == EventDetailType.Conditional)
+        else if (detailType == Constants.EventDetailType.Conditional)
         {
           throw new NotImplementedException("JBPM-1659", "StartTrigger Conditional");
         }
-        else if (detailType == EventDetailType.Signal)
+        else if (detailType == Constants.EventDetailType.Signal)
         {
           SignalEventDetail signalTrigger = (SignalEventDetail)trigger;
           Signal signal = signalTrigger.getSignalRef();
@@ -224,8 +225,8 @@
 
       for (EventDetail result : end.getResult())
       {
-        EventDetailType detailType = result.getEventDetailType();
-        if (detailType == EventDetailType.Message)
+        Constants.EventDetailType detailType = result.getEventDetailType();
+        if (detailType == Constants.EventDetailType.Message)
         {
           MessageEventDetail msgEventDetail = (MessageEventDetail)result;
           Message message = msgEventDetail.getMessageRef();
@@ -234,23 +235,23 @@
           jaxbResult.setMessageRef(jaxbMessageRef);
           jaxbEnd.getResult().add(jaxbResult);
         }
-        else if (detailType == EventDetailType.Error)
+        else if (detailType == Constants.EventDetailType.Error)
         {
           throw new NotImplementedException("JBPM-1677", "EndEvent Error Result");
         }
-        else if (detailType == EventDetailType.Cancel)
+        else if (detailType == Constants.EventDetailType.Cancel)
         {
           throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result");
         }
-        else if (detailType == EventDetailType.Compensation)
+        else if (detailType == Constants.EventDetailType.Compensation)
         {
           throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result");
         }
-        else if (detailType == EventDetailType.Signal)
+        else if (detailType == Constants.EventDetailType.Signal)
         {
           throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result");
         }
-        else if (detailType == EventDetailType.Terminate)
+        else if (detailType == Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -74,6 +74,7 @@
 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.GatewayBuilder;
 import org.jboss.bpm.model.MessageBuilder;
@@ -81,8 +82,8 @@
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.SequenceFlow.ConditionType;
 import org.jboss.bpm.runtime.Handler;
 
@@ -245,7 +246,7 @@
         {
           JAXBSignalEventDetail jaxbSignalTrigger = (JAXBSignalEventDetail)jaxbTrigger;
           JAXBSignal jaxbSignal = jaxbSignalTrigger.getSignal();
-          eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(jaxbSignal.getType(),
+          eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(jaxbSignal.getType(),
               jaxbSignal.getMessage());
         }
         else
@@ -271,7 +272,7 @@
         if (jaxbResult instanceof JAXBMessageEventDetail)
         {
           JAXBMessageEventDetail jaxbMessageResult = (JAXBMessageEventDetail)jaxbResult;
-          eventBuilder.addEventDetail(EventDetailType.Message);
+          eventBuilder.addEventDetail(Constants.EventDetailType.Message);
           JAXBMessageRef jaxbMsg = jaxbMessageResult.getMessageRef();
           eventBuilder.addMessageRef(jaxbMsg.getNameRef());
         }
@@ -351,19 +352,19 @@
     GatewayBuilder gwBuilder;
     if (jaxb instanceof JAXBExclusiveGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Exclusive);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Exclusive);
     }
     else if (jaxb instanceof JAXBInclusiveGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Inclusive);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Inclusive);
     }
     else if (jaxb instanceof JAXBComplexGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Complex);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Complex);
     }
     else if (jaxb instanceof JAXBParallelGateway)
     {
-      gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Parallel);
+      gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -28,11 +28,12 @@
 import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.bpm.model.Activity;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Constants.AssignTime;
 
 /**
  * An Assignment, which is used in the definition of attributes for {@link Process},
@@ -46,7 +47,7 @@
 {
   JAXBProperty to;
   JAXBExpression from;
-  AssignTime assignTime;
+  Constants.AssignTime assignTime;
 
   public JAXBProperty getTo()
   {
@@ -70,13 +71,13 @@
     this.from = from;
   }
 
-  public AssignTime getAssignTime()
+  public Constants.AssignTime getAssignTime()
   {
     return assignTime;
   }
 
   @XmlAttribute(name = "time")
-  public void setAssignTime(AssignTime assignTime)
+  public void setAssignTime(Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -27,7 +27,8 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
 
 /**
  * An Expression, which is used in the definition of attributes for @{link StartEvent},
@@ -40,16 +41,16 @@
 @XmlType(name = "Expression")
 public class JAXBExpression
 {
-  private ExpressionLanguage lang;
+  private Constants.ExpressionLanguage lang;
   private String body;
 
-  public ExpressionLanguage getLang()
+  public Constants.ExpressionLanguage getLang()
   {
     return lang;
   }
 
   @XmlAttribute(required = true)
-  public void setLang(ExpressionLanguage lang)
+  public void setLang(Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -30,9 +30,10 @@
 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.Constants.TaskType;
 import org.jboss.bpm.model.Message.Implementation;
-import org.jboss.bpm.model.Task.TaskType;
 
 //$Id$
 
@@ -49,7 +50,7 @@
     "messageRef", "inputSets", "outputSets" })
 public class JAXBTask extends JAXBActivity
 {
-  private TaskType taskType;
+  private Constants.TaskType taskType;
   private Implementation implementation;
   private List<JAXBInputSet> inputSets = new ArrayList<JAXBInputSet>();
   private List<JAXBOutputSet> outputSets = new ArrayList<JAXBOutputSet>();
@@ -76,13 +77,13 @@
     this.outFlow = outFlow;
   }
 
-  public TaskType getTaskType()
+  public Constants.TaskType getTaskType()
   {
     return taskType;
   }
 
   @XmlAttribute
-  public void setTaskType(TaskType taskType)
+  public void setTaskType(Constants.TaskType taskType)
   {
     this.taskType = taskType;
   }

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -27,6 +27,7 @@
 
 import org.jboss.bpm.client.DialectHandler;
 import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MessageBuilder;
 import org.jboss.bpm.model.Process;
@@ -34,7 +35,7 @@
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.ReceiveTask;
 import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.Task.TaskType;
+import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
 /**
@@ -70,7 +71,7 @@
     procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("A");
     MessageBuilder msgBuilder = procBuilder.addMessage("FooMsg");
     msgBuilder.addProperty("foo", "bar");
-    TaskBuilder taskBuilder = procBuilder.addTask("A", TaskType.Receive);
+    TaskBuilder taskBuilder = procBuilder.addTask("A", Constants.TaskType.Receive);
     taskBuilder.addMessageRef("FooMsg");
     procBuilder.addSequenceFlow("End").addEndEvent("End");
     Process expProc = procBuilder.getProcess();

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -34,11 +34,12 @@
 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.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Gateway.GatewayType;
-import org.jboss.bpm.model.Task.TaskType;
+import org.jboss.bpm.model.Constants.GatewayType;
+import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.bpm.runtime.ExecutionHandler;
 
 /**
@@ -95,7 +96,7 @@
 
   private void adaptState(ProcessBuilder builder, JPDL32State jpdlState)
   {
-    builder.addTask(jpdlState.getName(), TaskType.None);
+    builder.addTask(jpdlState.getName(), Constants.TaskType.None);
     adaptTransitions(builder, jpdlState.getDescriptionOrEventOrExceptionHandler());
     
     for (Object jpdlObj : jpdlState.getDescriptionOrEventOrExceptionHandler())
@@ -124,7 +125,7 @@
 
   private void adaptFork(ProcessBuilder builder, JPDL32Fork jpdlObj)
   {
-    builder.addGateway(jpdlObj.getName(), GatewayType.Parallel);
+    builder.addGateway(jpdlObj.getName(), Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -42,11 +42,12 @@
 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.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Gateway.GatewayType;
-import org.jboss.bpm.model.Task.TaskType;
+import org.jboss.bpm.model.Constants.GatewayType;
+import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.util.xml.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -169,11 +170,11 @@
     {
       String name = stpActivity.getLabel();
       
-      TaskType taskType = TaskType.None;
+      Constants.TaskType taskType = Constants.TaskType.None;
       if (name.startsWith("Send"))
-        taskType = TaskType.Send;
+        taskType = Constants.TaskType.Send;
       if (name.startsWith("Receive"))
-        taskType = TaskType.Receive;
+        taskType = Constants.TaskType.Receive;
       
       builder.addTask(name, taskType);
       adaptOutgoingEdges(builder, stpActivity);
@@ -181,13 +182,13 @@
     else if (activityType == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE)
     {
       String name = stpActivity.getLabel();
-      builder.addGateway(name, GatewayType.Exclusive);
+      builder.addGateway(name, Constants.GatewayType.Exclusive);
       adaptOutgoingEdges(builder, stpActivity);
     }
     else if (activityType == ActivityType.GATEWAY_PARALLEL)
     {
       String name = stpActivity.getLabel();
-      builder.addGateway(name, GatewayType.Parallel);
+      builder.addGateway(name, Constants.GatewayType.Parallel);
       adaptOutgoingEdges(builder, stpActivity);
     }
     else

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -30,11 +30,12 @@
 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.Assignment.AssignTime;
+import org.jboss.bpm.model.Constants.AssignTime;
 import org.jboss.bpm.model.Process.ProcessStatus;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.model.internal.ExpressionEvaluator;
@@ -119,7 +120,7 @@
     ExecutionContext exContext = token.getExecutionContext();
     for (Assignment ass : proc.getAssignments())
     {
-      if (ass.getAssignTime() == AssignTime.Start)
+      if (ass.getAssignTime() == Constants.AssignTime.Start)
       {
         Expression expr = ass.getFrom();
         ExpressionEvaluator exprEvaluator = new ExpressionEvaluator(expr);

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -25,8 +25,9 @@
 
 import org.jboss.bpm.model.Activity;
 import org.jboss.bpm.model.ActivityBuilder;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
 
 /**
  * The ActivityBuilder can be used to build an {@link Activity} dynamically.
@@ -72,7 +73,7 @@
     return this;
   }
 
-  public ActivityBuilder addIORule(String body, ExpressionLanguage lang)
+  public ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang)
   {
     ExpressionImpl expr = new ExpressionImpl(lang, body);
     getActivity().addIORule(expr);
@@ -81,7 +82,7 @@
   
   public ActivityBuilder addProperty(String name, String value)
   {
-    Property prop = new PropertyImpl(name, new ExpressionImpl(ExpressionLanguage.String, value));
+    Property prop = new PropertyImpl(name, new ExpressionImpl(Constants.ExpressionLanguage.String, value));
     getActivity().addProperty(prop);
     return this;
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -24,6 +24,7 @@
 //$Id$
 
 import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.Property;
 
@@ -36,18 +37,18 @@
 @SuppressWarnings("serial")
 public class AssignmentImpl extends SupportingElementImpl implements Assignment
 {
-  private AssignTime assignTime;
+  private Constants.AssignTime assignTime;
   private Expression from;
   private Property to;
 
-  public AssignmentImpl(AssignTime assignTime, Expression from, Property to)
+  public AssignmentImpl(Constants.AssignTime assignTime, Expression from, Property to)
   {
     this.assignTime = assignTime;
     this.from = from;
     this.to = to;
   }
 
-  public AssignTime getAssignTime()
+  public Constants.AssignTime getAssignTime()
   {
     return assignTime;
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -25,6 +25,7 @@
 
 import org.jboss.bpm.NotImplementedException;
 import org.jboss.bpm.model.ComplexGateway;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;
@@ -45,9 +46,9 @@
     super(name);
   }
 
-  public GatewayType getGatewayType()
+  public Constants.GatewayType getGatewayType()
   {
-    return GatewayType.Complex;
+    return Constants.GatewayType.Complex;
   }
 
   public Expression getIncommingCondition()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -30,13 +30,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EndEvent;
 import org.jboss.bpm.model.EventDetail;
 import org.jboss.bpm.model.MessageEventDetail;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.SequenceFlow;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.model.Constants.EventDetailType;
 import org.jboss.bpm.runtime.SignalHandler;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.TokenExecutor;
@@ -94,7 +95,7 @@
     
     for (EventDetail eventDetail : getResult())
     {
-      if (eventDetail.getEventDetailType() == EventDetailType.Message)
+      if (eventDetail.getEventDetailType() == Constants.EventDetailType.Message)
       {
         MessageEventDetail msgEventDetail = (MessageEventDetail)eventDetail;
         MessageSender messageSender = new MessageSender(this, msgEventDetail.getMessageRef());

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -24,6 +24,7 @@
 //$Id$
 
 import org.jboss.bpm.NotImplementedException;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EndEvent;
 import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.EventBuilder;
@@ -31,7 +32,7 @@
 import org.jboss.bpm.model.IntermediateEvent;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.StartEvent;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.model.Constants.EventDetailType;
 import org.jboss.bpm.model.Signal.SignalType;
 
 /**
@@ -49,38 +50,38 @@
     super(proc, flowObject);
   }
 
-  public EventBuilder addEventDetail(EventDetailType detailType)
+  public EventBuilder addEventDetail(Constants.EventDetailType detailType)
   {
-    if (detailType == EventDetailType.Message)
+    if (detailType == Constants.EventDetailType.Message)
     {
       eventDetail = new MessageEventDetailImpl();
       addEventDetail(getEvent(), eventDetail);
     }
-    else if (detailType == EventDetailType.Timer)
+    else if (detailType == Constants.EventDetailType.Timer)
     {
       throw new NotImplementedException("JBPM-1663", "EventDetail Timer");
     }
-    else if (detailType == EventDetailType.Error)
+    else if (detailType == Constants.EventDetailType.Error)
     {
       throw new NotImplementedException("JBPM-1664", "EventDetail Error");
     }
-    else if (detailType == EventDetailType.Cancel)
+    else if (detailType == Constants.EventDetailType.Cancel)
     {
       throw new NotImplementedException("JBPM-1665", "EventDetail Cancel");
     }
-    else if (detailType == EventDetailType.Compensation)
+    else if (detailType == Constants.EventDetailType.Compensation)
     {
       throw new NotImplementedException("JBPM-1666", "EventDetail Compensation");
     }
-    else if (detailType == EventDetailType.Conditional)
+    else if (detailType == Constants.EventDetailType.Conditional)
     {
       throw new NotImplementedException("JBPM-1667", "EventDetail Conditional");
     }
-    else if (detailType == EventDetailType.Link)
+    else if (detailType == Constants.EventDetailType.Link)
     {
       throw new NotImplementedException("JBPM-1668", "EventDetail Link");
     }
-    else if (detailType == EventDetailType.Signal)
+    else if (detailType == Constants.EventDetailType.Signal)
     {
       eventDetail = new SignalEventDetailImpl();
       addEventDetail(getEvent(), eventDetail);
@@ -119,26 +120,26 @@
 
   private void addEventDetail(EventImpl event, EventDetail trigger)
   {
-    EventDetailType detailType = trigger.getEventDetailType();
+    Constants.EventDetailType detailType = trigger.getEventDetailType();
     if (event instanceof StartEvent)
     {
       StartEventImpl start = (StartEventImpl)event;
       if (start.getTrigger().size() > 0)
         throw new NotImplementedException("JBPM-1660", "StartEvent Multiple Trigger");
       
-      if (detailType == EventDetailType.Message)
+      if (detailType == Constants.EventDetailType.Message)
       {
         throw new NotImplementedException("JBPM-1657", "StartEvent Message Trigger");
       }
-      else if (detailType == EventDetailType.Timer)
+      else if (detailType == Constants.EventDetailType.Timer)
       {
         throw new NotImplementedException("JBPM-1658", "StartEvent Timer Trigger");
       }
-      else if (detailType == EventDetailType.Conditional)
+      else if (detailType == Constants.EventDetailType.Conditional)
       {
         throw new NotImplementedException("JBPM-1659", "StartEvent Conditional Trigger");
       }
-      else if (detailType == EventDetailType.Signal)
+      else if (detailType == Constants.EventDetailType.Signal)
       {
         start.addTrigger(eventDetail);
       }
@@ -153,35 +154,35 @@
       if (intermediate.getTrigger().size() > 0)
         throw new NotImplementedException("JBPM-1682", "IntermediateEvent Multiple Trigger");
         
-      if (detailType == EventDetailType.Message)
+      if (detailType == Constants.EventDetailType.Message)
       {
         throw new NotImplementedException("JBPM-1669", "IntermediateEvent Message Trigger");
       }
-      else if (detailType == EventDetailType.Timer)
+      else if (detailType == Constants.EventDetailType.Timer)
       {
         throw new NotImplementedException("JBPM-1670", "IntermediateEvent Timer Trigger");
       }
-      else if (detailType == EventDetailType.Error)
+      else if (detailType == Constants.EventDetailType.Error)
       {
         throw new NotImplementedException("JBPM-1671", "IntermediateEvent Error Trigger");
       }
-      else if (detailType == EventDetailType.Cancel)
+      else if (detailType == Constants.EventDetailType.Cancel)
       {
         throw new NotImplementedException("JBPM-1672", "IntermediateEvent Cancel Trigger");
       }
-      else if (detailType == EventDetailType.Compensation)
+      else if (detailType == Constants.EventDetailType.Compensation)
       {
         throw new NotImplementedException("JBPM-1673", "IntermediateEvent Compensation Trigger");
       }
-      else if (detailType == EventDetailType.Conditional)
+      else if (detailType == Constants.EventDetailType.Conditional)
       {
         throw new NotImplementedException("JBPM-1674", "IntermediateEvent Conditional Trigger");
       }
-      else if (detailType == EventDetailType.Link)
+      else if (detailType == Constants.EventDetailType.Link)
       {
         throw new NotImplementedException("JBPM-1675", "IntermediateEvent Link Trigger");
       }
-      else if (detailType == EventDetailType.Signal)
+      else if (detailType == Constants.EventDetailType.Signal)
       {
         throw new NotImplementedException("JBPM-1650", "IntermediateEvent Signal Trigger");
       }
@@ -196,27 +197,27 @@
       if (end.getResult().size() > 0)
         throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result");
       
-      if (detailType == EventDetailType.Message)
+      if (detailType == Constants.EventDetailType.Message)
       {
         end.addResult(eventDetail);
       }
-      else if (detailType == EventDetailType.Error)
+      else if (detailType == Constants.EventDetailType.Error)
       {
         throw new NotImplementedException("JBPM-1677", "EndEvent Error Result");
       }
-      else if (detailType == EventDetailType.Cancel)
+      else if (detailType == Constants.EventDetailType.Cancel)
       {
         throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result");
       }
-      else if (detailType == EventDetailType.Compensation)
+      else if (detailType == Constants.EventDetailType.Compensation)
       {
         throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result");
       }
-      else if (detailType == EventDetailType.Signal)
+      else if (detailType == Constants.EventDetailType.Signal)
       {
         throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result");
       }
-      else if (detailType == EventDetailType.Terminate)
+      else if (detailType == Constants.EventDetailType.Terminate)
       {
         throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result");
       }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -29,6 +29,7 @@
 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.ExclusiveGateway;
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.FlowObject;
@@ -59,9 +60,9 @@
     super(name);
   }
 
-  public GatewayType getGatewayType()
+  public Constants.GatewayType getGatewayType()
   {
-    return GatewayType.Exclusive;
+    return Constants.GatewayType.Exclusive;
   }
 
   @Override

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,8 +26,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.Token;
 import org.jboss.bpm.runtime.Attachments.Key;
@@ -56,8 +57,8 @@
    */
   public Object evaluateExpression(Token token)
   {
-    ExpressionLanguage exprLang = expr.getExpressionLanguage();
-    if (exprLang == ExpressionLanguage.MVEL)
+    Constants.ExpressionLanguage exprLang = expr.getExpressionLanguage();
+    if (exprLang == Constants.ExpressionLanguage.MVEL)
     {
       String mvel = expr.getExpressionBody();
       ExecutionContext exContext = token.getExecutionContext();

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Expression;
 
 /**
@@ -36,22 +37,22 @@
 public class ExpressionImpl extends SupportingElementImpl implements Expression
 {
   private Object body;
-  private ExpressionLanguage lang;
+  private Constants.ExpressionLanguage lang;
 
   public ExpressionImpl(Object body)
   {
     this.body = body;
-    this.lang = (body instanceof String ? ExpressionLanguage.String : ExpressionLanguage.Object);
+    this.lang = (body instanceof String ? Constants.ExpressionLanguage.String : Constants.ExpressionLanguage.Object);
   }
 
-  public ExpressionImpl(ExpressionLanguage lang, Object body)
+  public ExpressionImpl(Constants.ExpressionLanguage lang, Object body)
   {
     this.body = body;
     this.lang = lang;
   }
 
 
-  public ExpressionLanguage getExpressionLanguage()
+  public Constants.ExpressionLanguage getExpressionLanguage()
   {
     return lang;
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -29,6 +29,7 @@
 import org.jboss.bpm.NameNotUniqueException;
 import org.jboss.bpm.model.Assignment;
 import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Gate;
@@ -38,7 +39,7 @@
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.SingleInFlowSupport;
 import org.jboss.bpm.model.SingleOutFlowSupport;
-import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Constants.AssignTime;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.FlowHandler;
@@ -132,7 +133,7 @@
     // Start Time Assignments
     for (Assignment ass : getAssignments())
     {
-      if (ass.getAssignTime() == AssignTime.Start)
+      if (ass.getAssignTime() == Constants.AssignTime.Start)
         processAssignment(ass, token);
     }
 
@@ -150,7 +151,7 @@
     // End Time Assignments
     for (Assignment ass : getAssignments())
     {
-      if (ass.getAssignTime() == AssignTime.End)
+      if (ass.getAssignTime() == Constants.AssignTime.End)
         processAssignment(ass, token);
     }
   }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -23,10 +23,11 @@
 
 //$Id$
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.Gateway;
 import org.jboss.bpm.model.GatewayBuilder;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
 import org.jboss.bpm.model.SequenceFlow.ConditionType;
 
 /**
@@ -51,7 +52,7 @@
     return this;
   }
 
-  public GatewayBuilder addConditionalGate(String targetName, ExpressionLanguage lang, String body)
+  public GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage lang, String body)
   {
     gate = new GateImpl(targetName, ConditionType.Expression, new ExpressionImpl(lang, body));
     getGateway().addGate(gate);

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -30,12 +30,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.Gate;
 import org.jboss.bpm.model.GraphicalElement;
 import org.jboss.bpm.model.InclusiveGateway;
 import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
 import org.jboss.bpm.model.SequenceFlow.ConditionType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.Token;
@@ -62,9 +63,9 @@
     super(name);
   }
 
-  public GatewayType getGatewayType()
+  public Constants.GatewayType getGatewayType()
   {
-    return GatewayType.Inclusive;
+    return Constants.GatewayType.Inclusive;
   }
 
   @Override
@@ -110,7 +111,7 @@
       if (seqFlow.getConditionType() == ConditionType.Expression)
       {
         Expression expr = seqFlow.getConditionExpression();
-        if (expr.getExpressionLanguage() == ExpressionLanguage.MVEL)
+        if (expr.getExpressionLanguage() == Constants.ExpressionLanguage.MVEL)
         {
           String mvel = expr.getExpressionBody();
           ExecutionContext exContext = token.getExecutionContext();

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Event;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MessageEventDetail;
@@ -38,9 +39,9 @@
 {
   private Message messageRef;
   
-  public EventDetailType getEventDetailType()
+  public Constants.EventDetailType getEventDetailType()
   {
-    return EventDetailType.Message;
+    return Constants.EventDetailType.Message;
   }
   
   public Message.Implementation getImplementation()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -21,7 +21,9 @@
  */
 package org.jboss.bpm.model.internal;
 
+import org.jboss.bpm.model.Constants;
 
+
 //$Id$
 
 /**
@@ -39,8 +41,8 @@
   }
   
   @Override
-  public TaskType getTaskType()
+  public Constants.TaskType getTaskType()
   {
-    return TaskType.None;
+    return Constants.TaskType.None;
   }
 }
\ No newline at end of file

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -29,6 +29,7 @@
 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.Gate;
 import org.jboss.bpm.model.ParallelGateway;
 import org.jboss.bpm.model.SequenceFlow;
@@ -57,9 +58,9 @@
     super(name);
   }
 
-  public GatewayType getGatewayType()
+  public Constants.GatewayType getGatewayType()
   {
-    return GatewayType.Parallel;
+    return Constants.GatewayType.Parallel;
   }
 
   @Override

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -24,6 +24,7 @@
 //$Id$
 
 import org.jboss.bpm.NotImplementedException;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.EventBuilder;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Gateway;
@@ -34,10 +35,10 @@
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.Property;
 import org.jboss.bpm.model.TaskBuilder;
-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.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.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.FlowHandler;
 import org.jboss.bpm.runtime.SignalHandler;
@@ -150,43 +151,43 @@
 
   public TaskBuilder addTask(String name)
   {
-    return addTask(name, TaskType.None);
+    return addTask(name, Constants.TaskType.None);
   }
   
-  public TaskBuilder addTask(String name, TaskType type)
+  public TaskBuilder addTask(String name, Constants.TaskType type)
   {
     flowObject = (FlowObjectImpl)getProcessInternal().getFlowObject(name);
     if (flowObject == null)
     {
-      if (type == TaskType.None || type == null)
+      if (type == Constants.TaskType.None || type == null)
       {
         flowObject = new NoneTaskImpl(name);
       }
-      else if (type == TaskType.Service)
+      else if (type == Constants.TaskType.Service)
       {
         throw new NotImplementedException("JBPM-1652", "Task Type Service");
       }
-      else if (type == TaskType.Receive)
+      else if (type == Constants.TaskType.Receive)
       {
         flowObject = new ReceiveTaskImpl(name);
       }
-      else if (type == TaskType.Send)
+      else if (type == Constants.TaskType.Send)
       {
         flowObject = new SendTaskImpl(name);
       }
-      else if (type == TaskType.User)
+      else if (type == Constants.TaskType.User)
       {
         throw new NotImplementedException("JBPM-1653", "Task Type User");
       }
-      else if (type == TaskType.Script)
+      else if (type == Constants.TaskType.Script)
       {
         throw new NotImplementedException("JBPM-1654", "Task Type Script");
       }
-      else if (type == TaskType.Manual)
+      else if (type == Constants.TaskType.Manual)
       {
         throw new NotImplementedException("JBPM-1655", "Task Type Manual");
       }
-      else if (type == TaskType.Reference)
+      else if (type == Constants.TaskType.Reference)
       {
         throw new NotImplementedException("JBPM-1656", "Task Type Reference");
       }
@@ -199,24 +200,24 @@
     return new TaskBuilderImpl(getProcessInternal(), flowObject);
   }
 
-  public GatewayBuilder addGateway(String name, GatewayType type)
+  public GatewayBuilder addGateway(String name, Constants.GatewayType type)
   {
     flowObject = (FlowObjectImpl)getProcessInternal().getFlowObject(name);
     if (flowObject == null)
     {
-      if (GatewayType.Exclusive == type)
+      if (Constants.GatewayType.Exclusive == type)
       {
         flowObject = new ExclusiveGatewayDataBasedImpl(name);
       }
-      else if (GatewayType.Inclusive == type)
+      else if (Constants.GatewayType.Inclusive == type)
       {
         flowObject = new InclusiveGatewayImpl(name);
       }
-      else if (GatewayType.Parallel == type)
+      else if (Constants.GatewayType.Parallel == type)
       {
         flowObject = new ParallelGatewayImpl(name);
       }
-      else if (GatewayType.Complex == type)
+      else if (Constants.GatewayType.Complex == type)
       {
         flowObject = new ComplexGatewayImpl(name);
       }
@@ -239,7 +240,7 @@
     return this;
   }
   
-  public ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp)
+  public ProcessBuilder addAssignment(Constants.AssignTime time, Constants.ExpressionLanguage lang, String fromExpr, String toProp)
   {
     ExpressionImpl from = new ExpressionImpl(lang, fromExpr);
     PropertyImpl to = new PropertyImpl(toProp, null);

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -29,6 +29,7 @@
 import org.jboss.bpm.InvalidProcessException;
 import org.jboss.bpm.NotImplementedException;
 import org.jboss.bpm.client.MessageListener;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.Property;
@@ -65,9 +66,9 @@
   }
 
   @Override
-  public TaskType getTaskType()
+  public Constants.TaskType getTaskType()
   {
-    return TaskType.Receive;
+    return Constants.TaskType.Receive;
   }
 
   public Message.Implementation getImplementation()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -25,6 +25,7 @@
 
 
 import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.SendTask;
@@ -50,9 +51,9 @@
   }
 
   @Override
-  public TaskType getTaskType()
+  public Constants.TaskType getTaskType()
   {
-    return TaskType.Send;
+    return Constants.TaskType.Send;
   }
 
   public Message.Implementation getImplementation()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.SignalEventDetail;
 
@@ -37,9 +38,9 @@
 {
   private Signal signalRef;
   
-  public EventDetailType getEventDetailType()
+  public Constants.EventDetailType getEventDetailType()
   {
-    return EventDetailType.Signal;
+    return Constants.EventDetailType.Signal;
   }
 
   public Signal getSignalRef()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -22,6 +22,7 @@
 package org.jboss.bpm.model.internal;
 
 import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.model.Task;
 import org.jboss.bpm.runtime.SignalHandler;
@@ -50,7 +51,7 @@
     return ActivityType.Task;
   }
 
-  public abstract TaskType getTaskType();
+  public abstract Constants.TaskType getTaskType();
 
   public SignalHandler getSignalHandler()
   {

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -25,14 +25,15 @@
 
 import javax.management.ObjectName;
 
+import org.jboss.bpm.model.Constants;
 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.TaskBuilder;
-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.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.GatewayType;
+import org.jboss.bpm.model.Constants.TaskType;
 
 /**
  * Test the Airticket sample application
@@ -101,7 +102,7 @@
     procBuilder.addStartEvent("Start").addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the ReceiveReqTask
-    TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, TaskType.Receive);
+    TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Constants.TaskType.Receive);
     taskBuilder.addMessageRef(MESSAGE_REQ_DATA).
     addSequenceFlow(TASK_VALIDATE);
 
@@ -119,8 +120,8 @@
     addSequenceFlow(GATEWAY_IS_VALID);
 
     // Build the ValidateGateway
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, ExpressionLanguage.MVEL, "isReqDataValid == true").
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Constants.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Constants.ExpressionLanguage.MVEL, "isReqDataValid == true").
     addDefaultGate(TASK_SEND_INVALID);
 
     // Build the CheckAvailabilityTask
@@ -137,37 +138,37 @@
     addSequenceFlow(GATEWAY_IS_AVAILABLE);
 
     // Build the SendInvalidTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Constants.TaskType.Send);
     taskBuilder.addMessageRef(MESSAGE_INVALID_DATA).
     addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the AvailabilityGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, ExpressionLanguage.MVEL, "isAvailable == true").
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Constants.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Constants.ExpressionLanguage.MVEL, "isAvailable == true").
     addDefaultGate(TASK_SEND_NOT_AVAILABLE);
     
     // Build the SendOfferTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Constants.TaskType.Send);
     taskBuilder.addMessageRef(MESSAGE_OFFER).
     addSequenceFlow(TASK_RECEIVE_ORDER);
 
     // Build the SendNotAvailableTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Constants.TaskType.Send);
     taskBuilder.addMessageRef(MESSAGE_NOT_AVAILABLE).
     addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the ReceiveReqTask
-    taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, TaskType.Receive);
+    taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Constants.TaskType.Receive);
     taskBuilder.addMessageRef(MESSAGE_ACCEPT_OFFER).
     addSequenceFlow(GATEWAY_IS_ACCEPTED);
     
     // Build the AcceptOfferGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, ExpressionLanguage.MVEL, "isOfferAccepted == true").
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Constants.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Constants.ExpressionLanguage.MVEL, "isOfferAccepted == true").
     addDefaultGate(TASK_RECEIVE_REQUEST);
     
     // Build the AcceptOfferGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, GatewayType.Parallel);
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, Constants.GatewayType.Parallel);
     gatewayBuilder.addGate(TASK_CREDIT_CARD).
     addGate(TASK_BOOKING);
     
@@ -190,11 +191,11 @@
     addSequenceFlow(GATEWAY_SYNC_JOIN);
     
     // Build the SynchronizedJoinGateway
-    gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, GatewayType.Parallel);
+    gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, Constants.GatewayType.Parallel);
     gatewayBuilder.addGate(TASK_SEND_CONFIRM);
     
     // Build the SendConfirmTask
-    taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, TaskType.Send);
+    taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.Collection;
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MessageBuilder;
 import org.jboss.bpm.model.Process;
@@ -33,7 +34,7 @@
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Property;
 import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.model.Constants.EventDetailType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.Token;
@@ -78,7 +79,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(EventDetailType.Message).addMessageRef("EndMessage");
+    procBuilder.addEndEvent("End").addEventDetail(Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -27,13 +27,14 @@
 
 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.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
@@ -134,12 +135,12 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
     procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
     procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", GatewayType.Exclusive).addSequenceFlow("TaskC");
+    procBuilder.addGateway("Merge", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,13 +26,14 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.jboss.bpm.model.Constants;
 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.Signal;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.runtime.BasicAttachments;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -95,9 +96,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -28,13 +28,14 @@
 
 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.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -72,10 +73,10 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
+    procBuilder.addGateway("Merge", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,13 +26,14 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.jboss.bpm.model.Constants;
 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.Signal;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.runtime.BasicAttachments;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -76,9 +77,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("InclusiveGatewaySplitTest").addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Inclusive);
-    gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive);
+    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -27,13 +27,14 @@
 
 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.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
@@ -135,12 +136,12 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
     procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
     procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("TaskC");
+    procBuilder.addGateway("Merge", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,11 +26,12 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -60,7 +61,7 @@
   public Process getProcess() throws IOException
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel).
+    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.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/process/ProcessIntegrityTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java	2008-08-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -24,13 +24,9 @@
 // $Id$
 
 import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.model.EndEvent;
-import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.StartEvent;
-import org.jboss.bpm.model.Task;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
 /**
@@ -48,16 +44,6 @@
     Process proc = builder.addProcess(null).addStartEvent("Start").addSequenceFlow("taskA").addTask("taskA").
     addSequenceFlow("End").addEndEvent("End").getProcess();
     assertEquals("AnonymousProcess#0", proc.getName());
-
-    StartEvent start = (StartEvent)proc.getFlowObject("Start");
-    assertNotNull("Start expected", start);
-
-    FlowObject nfo = proc.getFlowObject("taskA");
-    assertNotNull("FlowObject expected", nfo);
-    assertTrue("Task expected", nfo instanceof Task);
-
-    EndEvent end = (EndEvent)proc.getFlowObject("End");
-    assertNotNull(end);
   }
 
   public void testNoStartState() throws Exception

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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -28,6 +28,7 @@
 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.Message;
 import org.jboss.bpm.model.MessageBuilder;
@@ -36,9 +37,9 @@
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.model.Task.TaskType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
 /**
@@ -53,7 +54,7 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("ReceiveTaskTest").addStartEvent("Start").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA", TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
+    procBuilder.addTask("TaskA", Constants.TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
     try
     {
       procBuilder.getProcess();
@@ -145,9 +146,9 @@
     msgBuilder = procBuilder.addMessage("EndEventMessage");
     msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true);
     procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA", TaskType.Receive).addMessageRef("ReceiveTaskMessage");
+    procBuilder.addTask("TaskA", Constants.TaskType.Receive).addMessageRef("ReceiveTaskMessage");
     EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End");
-    eventBuilder.addEventDetail(EventDetailType.Message).addMessageRef("EndEventMessage");
+    eventBuilder.addEventDetail(Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -24,9 +24,10 @@
 // $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.TaskType;
+import org.jboss.bpm.model.Constants.TaskType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
 /**
@@ -41,7 +42,7 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA", TaskType.Send).addSequenceFlow("End").addEndEvent("End");
+    procBuilder.addTask("TaskA", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -25,12 +25,13 @@
 
 import java.io.IOException;
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.Assignment.AssignTime;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
 import org.jboss.bpm.runtime.Token;
@@ -60,11 +61,11 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("TaskExecutionHandlerTest").addProperty("procProp", "kermit");
-    procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign");
+    procBuilder.addAssignment(Constants.AssignTime.Start, Constants.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(AssignTime.Start, ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign");
+    taskBuilder.addAssignment(Constants.AssignTime.Start, Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,13 +26,14 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.jboss.bpm.model.Constants;
 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.Signal;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.runtime.BasicAttachments;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -95,9 +96,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Exclusive);
-    gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive);
+    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,13 +26,14 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.jboss.bpm.model.Constants;
 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.Signal;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.runtime.BasicAttachments;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -76,9 +77,9 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     procBuilder.addProcess("MultiChoiceTest").addStartEvent("Start").addSequenceFlow("Split");
-    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Inclusive);
-    gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
-    gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20");
+    GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive);
+    gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
+    gatewayBuilder.addConditionalGate("EndB", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -26,11 +26,12 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -60,7 +61,7 @@
   public Process getProcess() throws IOException
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel).
+    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -28,13 +28,14 @@
 
 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.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -72,10 +73,10 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
     eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
-    procBuilder.addSequenceFlow("Merge").addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
+    procBuilder.addSequenceFlow("Merge").addGateway("Merge", Constants.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-18 06:56:19 UTC (rev 1913)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java	2008-08-18 09:34:17 UTC (rev 1914)
@@ -27,13 +27,14 @@
 
 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.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
 import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.EventDetail.EventDetailType;
-import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.Constants.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
@@ -135,12 +136,12 @@
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
     EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
     procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
     eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
     procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("TaskC");
+    procBuilder.addGateway("Merge", Constants.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