[jbpm-commits] JBoss JBPM SVN: r2656 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/model/builder and 15 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Oct 29 09:01:28 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-10-29 09:01:28 -0400 (Wed, 29 Oct 2008)
New Revision: 2656

Removed:
   projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketAPIDescriptorTest.java
   projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketMarshallerTest.java
   projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketSTPDescriptorTest.java
Modified:
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/SignalListener.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java
   projects/spec/trunk/modules/dialects/api10/.classpath
   projects/spec/trunk/modules/dialects/jpdl32/.classpath
   projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java
   projects/spec/trunk/modules/dialects/stp/.classpath
   projects/spec/trunk/modules/dialects/xpdl21/.classpath
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleInFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleOutFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleInFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleOutFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleInFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleOutFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleInFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleOutFlowSupport.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java
   projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenExecutorImpl.java
   projects/spec/trunk/modules/samples/airticket/client/.classpath
   projects/spec/trunk/modules/samples/airticket/client/pom.xml
   projects/spec/trunk/modules/samples/airticket/server/.classpath
   projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
   projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
   projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
Log:
Fix compile issues 

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/SignalListener.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/SignalListener.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/SignalListener.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -24,6 +24,7 @@
 //$Id$
 
 import org.jbpm.api.model.Signal;
+import org.jbpm.api.service.SignalService;
 
 /**
  * A signal listener that can be registered with the {@link SignalService}

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -21,6 +21,7 @@
  */
 package org.jbpm.api.model.builder;
 
+import org.jbpm.api.model.Gate;
 import org.jbpm.api.model.Expression.ExpressionLanguage;
 
 

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -27,11 +27,12 @@
 import java.io.Writer;
 import java.net.URI;
 import java.net.URL;
+
 import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
 
 /**
- * The DialectHandler converts a supported dialect to the Process model.
+ * The DialectHandler converts a supported dialect to the ProcessDefinition model.
  * 
  * @author thomas.diesler at jboss.com
  * @since 18-Jun-2008
@@ -46,14 +47,12 @@
   URI getNamespaceURI();
   
   /**
-   * Create a {@link Process} from a descriptor.
-   * @param isInclude TODO
+   * Create a ProcessDefinition from a descriptor.
    */
   ProcessDefinition createProcessDefinition(String pXML);
 
   /**
-   * Create a {@link Process} from a descriptor URL.
-   * @param isInclude TODO
+   * Create a ProcessDefinition from a descriptor URL.
    */
   ProcessDefinition createProcessDefinition(URL pURL) throws IOException;
 

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -52,7 +52,7 @@
 public class CTSTestCase extends APITestCase
 {
   // Provide logging
-  final Logger log = LoggerFactory.getLogger(CTSTestCase.class);
+  private static final Logger log = LoggerFactory.getLogger(CTSTestCase.class);
 
   // The embedded SignalListener
   private SignalListener signalListener;

Modified: projects/spec/trunk/modules/dialects/api10/.classpath
===================================================================
--- projects/spec/trunk/modules/dialects/api10/.classpath	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/dialects/api10/.classpath	2008-10-29 13:01:28 UTC (rev 2656)
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/trunk/modules/dialects/jpdl32/.classpath
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/.classpath	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/dialects/jpdl32/.classpath	2008-10-29 13:01:28 UTC (rev 2656)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -34,8 +34,8 @@
 
 import org.jbpm.api.InvalidProcessException;
 import org.jbpm.api.NotImplementedException;
+import org.jbpm.api.model.Process;
 import org.jbpm.api.model.ProcessDefinition;
-import org.jbpm.api.model.Process;
 import org.jbpm.api.service.DialectHandler;
 import org.jbpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
 

Modified: projects/spec/trunk/modules/dialects/stp/.classpath
===================================================================
--- projects/spec/trunk/modules/dialects/stp/.classpath	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/dialects/stp/.classpath	2008-10-29 13:01:28 UTC (rev 2656)
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/trunk/modules/dialects/xpdl21/.classpath
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/.classpath	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/dialects/xpdl21/.classpath	2008-10-29 13:01:28 UTC (rev 2656)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleInFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleInFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleInFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 
 /**

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleOutFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleOutFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MultipleOutFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 
 /**

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleInFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleInFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleInFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 
 /**

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleOutFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleOutFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SingleOutFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 
 /**

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleInFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleInFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleInFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.ri.model.SequenceFlowImpl;
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleOutFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleOutFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MultipleOutFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.ri.model.SequenceFlowImpl;
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleInFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleInFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleInFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.ri.model.SequenceFlowImpl;
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleOutFlowSupport.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleOutFlowSupport.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SingleOutFlowSupport.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jbpm.api.model.Node;
 import org.jbpm.api.model.SequenceFlow;
 import org.jbpm.ri.model.SequenceFlowImpl;
 

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -31,7 +31,7 @@
 import org.jbpm.api.runtime.Token;
 
 /**
- * A {@link Token} that includes properties from the current {@link Activity}
+ * A {@link Token} that includes properties from the current {@link Node}
  * 
  * @author Thomas.Diesler at jboss.com
  * @since 15-Aug-2008
@@ -44,7 +44,7 @@
   public DelegatingToken(MutableToken token)
   {
     this.delegateToken = token;
-    
+
     Node targetRef = token.getFlow().getTargetRef();
     ExecutionContext exContext = token.getExecutionContext();
     this.delegateContext = new DelegatingExecutionContext(targetRef, exContext);
@@ -109,7 +109,7 @@
   {
     delegateToken.setOutputSet(outputSet);
   }
-  
+
   public String toString()
   {
     Node node = getFlow().getTargetRef();

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenExecutorImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenExecutorImpl.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenExecutorImpl.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -41,7 +41,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link FlowHandler} invokes the TokenExecutor to schedule {@link ConnectingObject} objects together with their
+ * The {@link FlowHandler} invokes the TokenExecutor to schedule {@link SequenceFlow} objects together with their
  * associated {@link Token}.
  * 
  * @author thomas.diesler at jboss.com
@@ -122,7 +122,7 @@
 
       if (token.getTokenStatus() != TokenStatus.Started)
         throw new IllegalStateException("Cannot move token in state: " + token.getTokenStatus());
-      
+
       MutableToken mutableToken = (MutableToken)token;
       mutableToken.setFlow(flow);
     }
@@ -156,14 +156,14 @@
       RunnableToken rtToken = runnableTokens.get(token.getTokenID());
       if (rtToken == null)
         throw new IllegalStateException("Not a runnable token: " + token);
-      
+
       log.debug("Suspend Token: " + token);
       MutableToken mutableToken = (MutableToken)token;
       mutableToken.setTokenStatus(TokenStatus.Suspended);
-      
+
       // Release the thread for a suspended token
       rtToken.releaseThread();
-      
+
       return token.getTokenID();
     }
   }
@@ -187,7 +187,7 @@
       rtToken = new RunnableToken(this, rtProc, mutableToken);
       runnableTokens.put(token.getTokenID(), rtToken);
       executor.submit(rtToken);
-      
+
       return token;
     }
   }

Modified: projects/spec/trunk/modules/samples/airticket/client/.classpath
===================================================================
--- projects/spec/trunk/modules/samples/airticket/client/.classpath	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/client/.classpath	2008-10-29 13:01:28 UTC (rev 2656)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/trunk/modules/samples/airticket/client/pom.xml
===================================================================
--- projects/spec/trunk/modules/samples/airticket/client/pom.xml	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/client/pom.xml	2008-10-29 13:01:28 UTC (rev 2656)
@@ -38,8 +38,8 @@
   <!-- Profiles -->
   <profiles>
     <!--
-      Name: skiptests
-      Desc: Skips the tests 
+      Name: gwt
+      Desc: Build and run the GWT client 
     -->
     <profile>
       <id>gwt</id>

Modified: projects/spec/trunk/modules/samples/airticket/server/.classpath
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/.classpath	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/server/.classpath	2008-10-29 13:01:28 UTC (rev 2656)
@@ -4,7 +4,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -25,16 +25,16 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Gateway;
-import org.jboss.bpm.model.GatewayBuilder;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.ProcessBuilder;
-import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Task;
-import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.Assignment.AssignTime;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jbpm.api.model.Expression;
+import org.jbpm.api.model.Gateway;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.Task;
+import org.jbpm.api.model.Assignment.AssignTime;
+import org.jbpm.api.model.Expression.ExpressionLanguage;
+import org.jbpm.api.model.builder.GatewayBuilder;
+import org.jbpm.api.model.builder.ProcessBuilder;
+import org.jbpm.api.model.builder.TaskBuilder;
+import org.jbpm.api.service.ProcessBuilderService;
 
 /**
  * Test the Airticket sample application
@@ -92,11 +92,10 @@
     this.msgListenerID = msgListenerID;
   }
 
-  public Process buildProcess()
+  public ProcessDefinition buildProcessDefinition()
   {
     // Create a Process through the ProcessBuilder
-    ProcessBuilderFactory procFactory = ProcessBuilderFactory.newInstance();
-    ProcessBuilder procBuilder = procFactory.newProcessBuilder();
+    ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder();
     procBuilder.addProcess(PROCESS_NAME);
     
     // Add Start Event
@@ -104,8 +103,8 @@
 
     // Build the ReceiveReqTask
     TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Task.TaskType.Receive);
-    taskBuilder.addMessageRef(MESSAGE_REQ_DATA).
-    addAssignment(AssignTime.End, ExpressionLanguage.MVEL, getValidationExpression(), PROPERTY_IS_VALID_REQUEST).
+    taskBuilder.addInMessageRef(MESSAGE_REQ_DATA).
+    addNodeAssignment(AssignTime.End, ExpressionLanguage.MVEL, getValidationExpression(), PROPERTY_IS_VALID_REQUEST).
     addSequenceFlow(GATEWAY_IS_VALID);
 
     // Build the ValidateGateway
@@ -115,13 +114,13 @@
 
     // Build the CheckAvailabilityTask
     taskBuilder = procBuilder.addTask(TASK_CHECK_AVAILABLE);
-    taskBuilder.addAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " < 10", PROPERTY_IS_AVAILABLE).
-    addAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " * 111", PROPERTY_PRICE).
+    taskBuilder.addNodeAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " < 10", PROPERTY_IS_AVAILABLE).
+    addNodeAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " * 111", PROPERTY_PRICE).
     addSequenceFlow(GATEWAY_IS_AVAILABLE);
 
     // Build the SendInvalidTask
     taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Task.TaskType.Send);
-    taskBuilder.addMessageRef(MESSAGE_INVALID_DATA).
+    taskBuilder.addOutMessageRef(MESSAGE_INVALID_DATA).
     addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the AvailabilityGateway
@@ -131,17 +130,17 @@
     
     // Build the SendOfferTask
     taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Task.TaskType.Send);
-    taskBuilder.addMessageRef(MESSAGE_OFFER).
+    taskBuilder.addOutMessageRef(MESSAGE_OFFER).
     addSequenceFlow(TASK_RECEIVE_ORDER);
 
     // Build the SendNotAvailableTask
     taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Task.TaskType.Send);
-    taskBuilder.addMessageRef(MESSAGE_NOT_AVAILABLE).
+    taskBuilder.addOutMessageRef(MESSAGE_NOT_AVAILABLE).
     addSequenceFlow(TASK_RECEIVE_REQUEST);
 
     // Build the ReceiveReqTask
     taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Task.TaskType.Receive);
-    taskBuilder.addMessageRef(MESSAGE_ACCEPT_OFFER).
+    taskBuilder.addInMessageRef(MESSAGE_ACCEPT_OFFER).
     addSequenceFlow(GATEWAY_IS_ACCEPTED);
     
     // Build the AcceptOfferGateway
@@ -178,14 +177,14 @@
     
     // Build the SendConfirmTask
     taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Task.TaskType.Send);
-    taskBuilder.addMessageRef(MESSAGE_CONFIRM).
+    taskBuilder.addOutMessageRef(MESSAGE_CONFIRM).
     addSequenceFlow(EVENT_END);
     
     // Add the EndEvent
     procBuilder.addEndEvent(EVENT_END);
 
     // Add ReqDataMsg 
-    procBuilder.addMessage(MESSAGE_REQ_DATA).
+    procBuilder.addProcessMessage(MESSAGE_REQ_DATA).
     addProperty(PROPERTY_NAME, null, true).
     addProperty(PROPERTY_FROM, null, true).
     addProperty(PROPERTY_TO, null, true).
@@ -193,7 +192,7 @@
     addProperty(PROPERTY_SEATS, null, true);
     
     // Add InvalidDataMsg 
-    procBuilder.addMessage(MESSAGE_INVALID_DATA).
+    procBuilder.addProcessMessage(MESSAGE_INVALID_DATA).
     addToRef(msgListenerID).
     addProperty(PROPERTY_NAME, null, true).
     addProperty(PROPERTY_FROM, null, true).
@@ -202,7 +201,7 @@
     addProperty(PROPERTY_SEATS, null, true);
     
     // Add NotAvailableMsg 
-    procBuilder.addMessage(MESSAGE_NOT_AVAILABLE).
+    procBuilder.addProcessMessage(MESSAGE_NOT_AVAILABLE).
     addToRef(msgListenerID).
     addProperty(PROPERTY_NAME, null, true).
     addProperty(PROPERTY_FROM, null, true).
@@ -211,7 +210,7 @@
     addProperty(PROPERTY_SEATS, null, true);
     
     // Add OfferMsg 
-    procBuilder.addMessage(MESSAGE_OFFER).
+    procBuilder.addProcessMessage(MESSAGE_OFFER).
     addToRef(msgListenerID).
     addProperty(PROPERTY_NAME, null, true).
     addProperty(PROPERTY_FROM, null, true).
@@ -221,13 +220,13 @@
     addProperty(PROPERTY_PRICE, null, true);
     
     // Add AcceptOfferMsg 
-    procBuilder.addMessage(MESSAGE_ACCEPT_OFFER).
+    procBuilder.addProcessMessage(MESSAGE_ACCEPT_OFFER).
     addProperty(TASK_CREDIT_CARD, null, true).
     addProperty(PROPERTY_EXPIRE, null, true).
     addProperty(PROPERTY_IS_OFFER_ACCEPTED, null, true);
     
     // Add ConfirmMsg 
-    procBuilder.addMessage(MESSAGE_CONFIRM).
+    procBuilder.addProcessMessage(MESSAGE_CONFIRM).
     addToRef(msgListenerID).
     addProperty(PROPERTY_NAME, null, true).
     addProperty(PROPERTY_FROM, null, true).
@@ -237,7 +236,7 @@
     addProperty(PROPERTY_PRICE, null, true);
     
     // Get the process
-    Process proc = procBuilder.getProcess();
+    ProcessDefinition proc = procBuilder.getProcessDefinition();
     return proc;
   }
   

Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -6,17 +6,6 @@
 import javax.management.ObjectName;
 import javax.servlet.http.HttpSession;
 
-import org.jboss.bpm.client.MessageListener;
-import org.jboss.bpm.client.MessageManager;
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.client.SignalListener;
-import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.MessageBuilder;
-import org.jboss.bpm.model.MessageBuilderFactory;
-import org.jboss.bpm.model.ObjectNameFactory;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.Signal;
 import org.jboss.bpm.samples.airticket.AirticketProcessBuilder;
 import org.jboss.bpm.samples.airticket.client.AirticketService;
 import org.jboss.bpm.samples.airticket.client.ConfirmMessage;
@@ -26,19 +15,31 @@
 import org.jboss.bpm.samples.airticket.client.OfferMessage;
 import org.jboss.bpm.samples.airticket.client.OrderMessage;
 import org.jboss.bpm.samples.airticket.client.RequestMessage;
+import org.jbpm.api.client.MessageListener;
+import org.jbpm.api.client.SignalListener;
+import org.jbpm.api.model.Message;
+import org.jbpm.api.model.Process;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.Signal;
+import org.jbpm.api.model.builder.MessageBuilder;
+import org.jbpm.api.model.builder.ObjectNameFactory;
+import org.jbpm.api.service.MessageBuilderService;
+import org.jbpm.api.service.MessageService;
+import org.jbpm.api.service.ProcessService;
+import org.jbpm.api.service.SignalService;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
 @SuppressWarnings("serial")
 public class AirticketServiceImpl extends RemoteServiceServlet implements AirticketService
 {
-  private ObjectName sampleID = ObjectNameFactory.create("org.jboss.bpm:sample=AirticketService");
+  private ObjectName sampleID = ObjectNameFactory.create("org.jbpm:sample=AirticketService");
 
   public void sendMessage(GwtMessage gwtMsg)
   {
-    ProcessManager pm = ProcessManager.locateProcessManager();
-    MessageManager mm = MessageManager.locateMessageManager();
-    SignalManager sm = SignalManager.locateSignalManager();
+    ProcessService procService = ProcessService.locateProcessService();
+    MessageService mm = MessageService.locateMessageService();
+    SignalService sm = SignalService.locateSignalService();
 
     System.out.println(gwtMsg);
 
@@ -59,11 +60,13 @@
     
     // Create/Start a new process
     ObjectName procID = (ObjectName)httpSession.getAttribute("procID");
-    if (procID == null || pm.getProcessByID(procID) == null)
+    if (procID == null || procService.getProcess(procID) == null)
     {
       System.out.println("Create new Process");
       AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID);
-      Process proc = procBuilder.buildProcess();
+      ProcessDefinition procDef = procBuilder.buildProcessDefinition();
+      Process proc = procDef.newInstance();
+      procService.registerProcess(proc);
       procID = proc.startProcess();
       httpSession.setAttribute("procID", procID);
     }
@@ -98,43 +101,43 @@
       if (msgName.equals(AirticketProcessBuilder.MESSAGE_OFFER))
       {
         OfferMessage gwtMsg = new OfferMessage();
-        gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
-        gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
-        gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
-        gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
-        gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
-        gwtMsg.price = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
+        gwtMsg.name = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_NAME).getValue();
+        gwtMsg.from = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_FROM).getValue();
+        gwtMsg.to = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_TO).getValue();
+        gwtMsg.date = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_DATE).getValue();
+        gwtMsg.seats = new Integer(bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_SEATS).getValue());
+        gwtMsg.price = new Integer(bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_PRICE).getValue());
         returnMsg = gwtMsg;
       }
       else if (msgName.equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA))
       {
         InvalidDataMessage gwtMsg = new InvalidDataMessage();
-        gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
-        gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
-        gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
-        gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
-        gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
+        gwtMsg.name = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_NAME).getValue();
+        gwtMsg.from = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_FROM).getValue();
+        gwtMsg.to = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_TO).getValue();
+        gwtMsg.date = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_DATE).getValue();
+        gwtMsg.seats = new Integer(bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_SEATS).getValue());
         returnMsg = gwtMsg;
       }
       else if (msgName.equals(AirticketProcessBuilder.MESSAGE_NOT_AVAILABLE))
       {
         NotAvailableMessage gwtMsg = new NotAvailableMessage();
-        gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
-        gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
-        gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
-        gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
-        gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
+        gwtMsg.name = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_NAME).getValue();
+        gwtMsg.from = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_FROM).getValue();
+        gwtMsg.to = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_TO).getValue();
+        gwtMsg.date = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_DATE).getValue();
+        gwtMsg.seats = new Integer(bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_SEATS).getValue());
         returnMsg = gwtMsg;
       }
       else if (msgName.equals(AirticketProcessBuilder.MESSAGE_CONFIRM))
       {
         ConfirmMessage gwtMsg = new ConfirmMessage();
-        gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
-        gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
-        gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
-        gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
-        gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
-        gwtMsg.price = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
+        gwtMsg.name = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_NAME).getValue();
+        gwtMsg.from = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_FROM).getValue();
+        gwtMsg.to = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_TO).getValue();
+        gwtMsg.date = bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_DATE).getValue();
+        gwtMsg.seats = new Integer(bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_SEATS).getValue());
+        gwtMsg.price = new Integer(bpmMsg.getProperty(AirticketProcessBuilder.PROPERTY_PRICE).getValue());
         returnMsg = gwtMsg;
       }
       else
@@ -147,8 +150,7 @@
 
   private Message getRequestMessage(RequestMessage gwtMsg)
   {
-    MessageBuilderFactory msgFactory = MessageBuilderFactory.newInstance();
-    MessageBuilder msgBuilder = msgFactory.newMessageBuilder();
+    MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
     Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_REQ_DATA).
     addProperty(AirticketProcessBuilder.PROPERTY_NAME, gwtMsg.name).
     addProperty(AirticketProcessBuilder.PROPERTY_FROM, gwtMsg.from).
@@ -161,8 +163,7 @@
 
   private Message getOrderMessage(OrderMessage gwtMsg)
   {
-    MessageBuilderFactory msgFactory = MessageBuilderFactory.newInstance();
-    MessageBuilder msgBuilder = msgFactory.newMessageBuilder();
+    MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
     Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_ACCEPT_OFFER).
     addProperty(AirticketProcessBuilder.PROPERTY_CREDIT_CARD, gwtMsg.creditCard).
     addProperty(AirticketProcessBuilder.PROPERTY_EXPIRE, gwtMsg.expire).
@@ -180,6 +181,13 @@
       this.messageQueue = messageQueue;
     }
 
+    @Override
+    public ObjectName getKey()
+    {
+      return sampleID;
+    }
+
+    @Override
     public void catchMessage(Message message)
     {
       messageQueue.add(message);
@@ -194,11 +202,13 @@
 
   class AirticketSignalListener implements SignalListener
   {
+    @Override
     public boolean acceptSignal(Signal signal)
     {
       return true;
     }
 
+    @Override
     public void catchSignal(Signal signal)
     {
       System.out.println(signal);

Deleted: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketAPIDescriptorTest.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketAPIDescriptorTest.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketAPIDescriptorTest.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.samples.airticket;
-
-// $Id$
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- * Test the Airticket sample application
- * 
- * @author thomas.diesler at jboss.com
- * @since 03-Jul-2008
- */
-public class AirticketAPIDescriptorTest extends AirticketTest
-{
-  @Override
-  protected Process getProcess() throws IOException
-  {
-    URL expURL = getResourceURL("samples/airticket/airticket-api10.xml");
-    ProcessManager pm = ProcessManager.locateProcessManager();
-    return pm.createProcess(expURL);
-  }
-}
\ No newline at end of file

Deleted: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketMarshallerTest.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketMarshallerTest.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketMarshallerTest.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.samples.airticket;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- * Test the Airticket process marshaller
- * 
- * @author thomas.diesler at jboss.com
- * @since 03-Jul-2008
- */
-public class AirticketMarshallerTest extends AirticketTest
-{
-  @Override
-  protected Process getProcess() throws IOException
-  {
-    // Marshall the process to a string
-    Process proc = super.getProcess();
-    String procXML = marshallProcess(proc);
-    
-    // Recreate the process from the marshalled process
-    ProcessManager procManager = ProcessManager.locateProcessManager();
-    return procManager.createProcess(procXML);
-  }
-}
\ No newline at end of file

Deleted: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketSTPDescriptorTest.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketSTPDescriptorTest.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketSTPDescriptorTest.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.samples.airticket;
-
-// $Id$
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- * Test the Airticket sample application
- * 
- * @author thomas.diesler at jboss.com
- * @since 03-Jul-2008
- */
-public class AirticketSTPDescriptorTest extends AirticketTest
-{
-  @Override
-  protected Process getProcess() throws IOException
-  {
-    URL expURL = getResourceURL("samples/airticket/airticket-stp-api10.xml");
-    ProcessManager pm = ProcessManager.locateProcessManager();
-    return pm.createProcess(expURL);
-  }
-}
\ No newline at end of file

Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java	2008-10-29 11:42:20 UTC (rev 2655)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java	2008-10-29 13:01:28 UTC (rev 2656)
@@ -27,14 +27,17 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.bpm.client.MessageListener;
-import org.jboss.bpm.client.MessageManager;
-import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.MessageBuilder;
-import org.jboss.bpm.model.MessageBuilderFactory;
-import org.jboss.bpm.model.ObjectNameFactory;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.test.DefaultEngineTestCase;
+import org.jbpm.api.client.MessageListener;
+import org.jbpm.api.model.Message;
+import org.jbpm.api.model.Process;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.builder.MessageBuilder;
+import org.jbpm.api.model.builder.ObjectNameFactory;
+import org.jbpm.api.service.MessageBuilderService;
+import org.jbpm.api.service.MessageService;
+import org.jbpm.api.test.CTSTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test the Airticket sample application
@@ -42,37 +45,42 @@
  * @author thomas.diesler at jboss.com
  * @since 03-Jul-2008
  */
-public class AirticketTest extends DefaultEngineTestCase
+public class AirticketTest extends CTSTestCase
 {
-  private MessageManager messageManager = MessageManager.locateMessageManager();
+  // Provide logging
+  private static final Logger log = LoggerFactory.getLogger(AirticketTest.class);
+  
+  private MessageService messageManager = MessageService.locateMessageService();
   private AirticketMessageListener msgListener;
   
   public void testValidData() throws Exception
   {
-    Process proc = getProcess();
+    ProcessDefinition procDef = getProcessDefinition();
+    Process proc = procDef.newInstance();
     proc.startProcess();
     
-    messageManager.sendMessage(proc.getID(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());
+    messageManager.sendMessage(proc.getKey(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());
     proc.waitForEnd();
 
     Message confirmMessage = msgListener.getConfirmMessage();
     assertNotNull("Expected confirm message", confirmMessage);
-    Integer price = confirmMessage.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
-    assertEquals(new Integer(222), price);
+    String price = confirmMessage.getProperty(AirticketProcessBuilder.PROPERTY_PRICE).getValue();
+    assertEquals(new Integer(222), new Integer(price));
   }
 
   public void testInvalidData() throws Exception
   {
-    Process proc = getProcess();
+    ProcessDefinition procDef = getProcessDefinition();
+    Process proc = procDef.newInstance();
     proc.startProcess();
     
-    messageManager.sendMessage(proc.getID(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getInvalidRequestMessage());
+    messageManager.sendMessage(proc.getKey(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getInvalidRequestMessage());
     proc.waitForEnd();
 
     Message confirmMessage = msgListener.getConfirmMessage();
     assertNotNull("Expected confirm message", confirmMessage);
-    Integer price = confirmMessage.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
-    assertEquals(new Integer(222), price);
+    String price = confirmMessage.getProperty(AirticketProcessBuilder.PROPERTY_PRICE).getValue();
+    assertEquals(new Integer(222), new Integer(price));
   }
   
   @Override
@@ -97,8 +105,7 @@
 
   private Message getValidRequestMessage()
   {
-    MessageBuilderFactory msgFactory = MessageBuilderFactory.newInstance();
-    MessageBuilder msgBuilder = msgFactory.newMessageBuilder();
+    MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
     Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_REQ_DATA).
     addProperty(AirticketProcessBuilder.PROPERTY_NAME, "Kermit").
     addProperty(AirticketProcessBuilder.PROPERTY_FROM, "MUC").
@@ -110,8 +117,7 @@
 
   private Message getInvalidRequestMessage()
   {
-    MessageBuilderFactory msgFactory = MessageBuilderFactory.newInstance();
-    MessageBuilder msgBuilder = msgFactory.newMessageBuilder();
+    MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
     Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_REQ_DATA).
     addProperty(AirticketProcessBuilder.PROPERTY_NAME, "Kermit").
     addProperty(AirticketProcessBuilder.PROPERTY_FROM, "MUC").
@@ -124,8 +130,7 @@
 
   private Message getAcceptOfferMessage()
   {
-    MessageBuilderFactory msgFactory = MessageBuilderFactory.newInstance();
-    MessageBuilder msgBuilder = msgFactory.newMessageBuilder();
+    MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
     Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_ACCEPT_OFFER).
     addProperty(AirticketProcessBuilder.PROPERTY_CREDIT_CARD, "1234-1234-1234-1234").
     addProperty(AirticketProcessBuilder.PROPERTY_EXPIRE, "25-Jul-2012").
@@ -135,10 +140,10 @@
   }
 
   
-  protected Process getProcess() throws IOException
+  protected ProcessDefinition getProcessDefinition() throws IOException
   {
     AirticketProcessBuilder builder = new AirticketProcessBuilder(getTestID());
-    return builder.buildProcess();
+    return builder.buildProcessDefinition();
   }
   
   class AirticketMessageListener implements MessageListener
@@ -151,6 +156,12 @@
       this.listenerID = listenerID;
     }
 
+    @Override
+    public ObjectName getKey()
+    {
+      return ObjectNameFactory.create("org.jbpm.listener:sample=AirticketService");
+    }
+
     public Message getConfirmMessage()
     {
       return confirmMessage;
@@ -159,8 +170,8 @@
     public void catchMessage(Message msg)
     {
       log.debug("catchMessage: " + msg);
-      ObjectName procID = msg.getFromRef().getEntityRef().getName();
-      MessageManager mm = MessageManager.locateMessageManager();
+      ObjectName procID = msg.getFromRef().getName();
+      MessageService mm = MessageService.locateMessageService();
       if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA))
         mm.sendMessage(procID, AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());
       else if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_OFFER))




More information about the jbpm-commits mailing list