[jbpm-commits] JBoss JBPM SVN: r1886 - in jbossbpm/spec/trunk/modules: testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Aug 13 13:36:40 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-08-13 13:36:40 -0400 (Wed, 13 Aug 2008)
New Revision: 1886

Added:
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeProcBuilderTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitProcBuilderTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeProcBuilderTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitProcBuilderTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeProcBuilderTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitProcBuilderTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.png
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split.png
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge.png
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split.png
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.png
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split.png
Modified:
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram
Log:
WIP - gateway descriptor tests

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -23,6 +23,9 @@
 
 // $Id$
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,14 +38,17 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.BPMException;
+import org.jboss.bpm.client.DialectHandler;
 import org.jboss.bpm.client.MessageListener;
 import org.jboss.bpm.client.MessageManager;
 import org.jboss.bpm.client.ObjectNameFactory;
+import org.jboss.bpm.client.ProcessManager;
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
 import org.jboss.bpm.client.internal.EmbeddedBeansDeployer;
 import org.jboss.bpm.model.BPMNElement;
 import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.Signal;
 
 public abstract class AbstractAPITestCase extends TestCase
@@ -193,4 +199,20 @@
   {
     return Collections.unmodifiableList(messages);
   }
+  
+  public void marshallProcess(Process proc) 
+  {
+    try
+    {
+      File file = new File(getName() + "-api10.xml");
+      ProcessManager pm = ProcessManager.locateProcessManager();
+      DialectHandler dhapi = pm.getDialectHandler(DialectHandler.DEFAULT_NAMESPACE_URI);
+      dhapi.marshallProcess(proc, new FileWriter(file));
+      System.out.println("marshalled: " + file.getCanonicalPath());
+    }
+    catch (IOException ex)
+    {
+      throw new BPMException("Cannot marshall process", ex);
+    }
+  }
 }

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeProcBuilderTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeProcBuilderTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeProcBuilderTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -0,0 +1,60 @@
+/*
+ * 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.cts.gateway.exclusive;
+
+// $Id$
+
+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.Gateway.GatewayType;
+import org.jboss.bpm.model.Signal.SignalType;
+
+/**
+ * ExclusiveMergeTest using the ProcessBuilder
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class ExclusiveMergeProcBuilderTest extends ExclusiveMergeTest
+{
+  @Override
+  public Process getProcess()
+  {
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+    EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
+    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
+    eventBuilder = procBuilder.addStartEvent("StartB");
+    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
+    procBuilder.addGateway("Merge", GatewayType.Exclusive).addSequenceFlow("TaskC");
+    procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
+    procBuilder.addEndEvent("End");
+    Process proc = procBuilder.getProcess();
+    
+    //marshallProcess(proc);
+    
+    return proc;
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeProcBuilderTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -25,12 +25,8 @@
 
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-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.Gateway.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
@@ -45,7 +41,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public class ExclusiveMergeTest extends DefaultEngineTestCase
+public abstract class ExclusiveMergeTest extends DefaultEngineTestCase
 {
   public void testGateA() throws Exception
   {
@@ -127,21 +123,7 @@
     assertEquals("TaskA", TaskC.taskValue);
   }
 
-  private Process getProcess()
-  {
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
-    eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
-    procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", GatewayType.Exclusive).addSequenceFlow("TaskC");
-    procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
-    procBuilder.addEndEvent("End");
-    Process proc = procBuilder.getProcess();
-    return proc;
-  }
+  public abstract Process getProcess();
 
   public static class MergeListener implements SignalListener
   {

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitProcBuilderTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitProcBuilderTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitProcBuilderTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -0,0 +1,53 @@
+/*
+ * 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.cts.gateway.exclusive;
+
+// $Id$
+
+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.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Gateway.GatewayType;
+
+/**
+ * ExclusiveSplitTest using the ProcessBuilder
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class ExclusiveSplitProcBuilderTest extends ExclusiveSplitTest
+{
+  @Override
+  public Process getProcess()
+  {
+    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");
+    procBuilder.addEndEvent("EndA").addEndEvent("EndB");
+    Process proc = procBuilder.getProcess();
+    return proc;
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitProcBuilderTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -25,13 +25,8 @@
 
 import java.util.List;
 
-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.runtime.BasicAttachments;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -42,7 +37,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public class ExclusiveSplitTest extends DefaultEngineTestCase
+public abstract class ExclusiveSplitTest extends DefaultEngineTestCase
 {
   public void testGateA() throws Exception
   {
@@ -90,15 +85,5 @@
     }
   }
 
-  private Process getProcess()
-  {
-    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");
-    procBuilder.addEndEvent("EndA").addEndEvent("EndB");
-    Process proc = procBuilder.getProcess();
-    return proc;
-  }
+  public abstract Process getProcess();
 }

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeProcBuilderTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeProcBuilderTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeProcBuilderTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -0,0 +1,54 @@
+/*
+ * 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.cts.gateway.inclusive;
+
+// $Id$
+
+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.Gateway.GatewayType;
+import org.jboss.bpm.model.Signal.SignalType;
+
+/**
+ * InclusiveMergeTest using the ProcessBuilder
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class InclusiveMergeProcBuilderTest extends InclusiveMergeTest
+{
+  @Override
+  public Process getProcess()
+  {
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+    EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
+    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
+    eventBuilder = procBuilder.addStartEvent("StartB");
+    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
+    procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End");
+    procBuilder.addEndEvent("End");
+    Process proc = procBuilder.getProcess();
+    return proc;
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeProcBuilderTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -26,12 +26,8 @@
 import java.util.List;
 
 import org.jboss.bpm.client.SignalManager;
-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.Gateway.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -43,7 +39,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public class InclusiveMergeTest extends DefaultEngineTestCase
+public abstract class InclusiveMergeTest extends DefaultEngineTestCase
 {
   public void testGateA() throws Exception
   {
@@ -62,16 +58,5 @@
     assertEquals(2, endSignals.size());
   }
 
-  private Process getProcess()
-  {
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
-    eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End");
-    procBuilder.addEndEvent("End");
-    Process proc = procBuilder.getProcess();
-    return proc;
-  }
+  public abstract Process getProcess();
 }

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitProcBuilderTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitProcBuilderTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitProcBuilderTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -0,0 +1,52 @@
+/*
+ * 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.cts.gateway.inclusive;
+
+// $Id$
+
+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.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Gateway.GatewayType;
+
+/**
+ * InclusiveSplitTest using the ProcessBuilder
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class InclusiveSplitProcBuilderTest extends InclusiveSplitTest
+{
+  public Process getProcess()
+  {
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+    procBuilder.addProcess(getName()).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");
+    procBuilder.addEndEvent("EndA").addEndEvent("EndB");
+    Process proc = procBuilder.getProcess();
+    return proc;
+  }
+}
\ No newline at end of file


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitProcBuilderTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -25,13 +25,8 @@
 
 import java.util.List;
 
-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.runtime.BasicAttachments;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -42,7 +37,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public class InclusiveSplitTest extends DefaultEngineTestCase
+public abstract class InclusiveSplitTest extends DefaultEngineTestCase
 {
   public void testGateA() throws Exception
   {
@@ -71,15 +66,5 @@
     assertEquals("EndB", endSignals.get(0).getFromRef());
   }
 
-  private Process getProcess()
-  {
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    procBuilder.addProcess(getName()).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");
-    procBuilder.addEndEvent("EndA").addEndEvent("EndB");
-    Process proc = procBuilder.getProcess();
-    return proc;
-  }
+  public abstract Process getProcess();
 }
\ No newline at end of file

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeProcBuilderTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeProcBuilderTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeProcBuilderTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -0,0 +1,56 @@
+/*
+ * 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.cts.gateway.parallel;
+
+// $Id$
+
+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.Gateway.GatewayType;
+import org.jboss.bpm.model.Signal.SignalType;
+
+/**
+ * ParallelMergeTest using the ProcessBuilder
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class ParallelMergeProcBuilderTest extends ParallelMergeTest
+{
+  public Process getProcess()
+  {
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+    EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
+    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+    procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
+    eventBuilder = procBuilder.addStartEvent("StartB");
+    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+    procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
+    procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("TaskC");
+    procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
+    procBuilder.addEndEvent("End");
+    Process proc = procBuilder.getProcess();
+    return proc;
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeProcBuilderTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -25,12 +25,8 @@
 
 import org.jboss.bpm.client.SignalListener;
 import org.jboss.bpm.client.SignalManager;
-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.Gateway.GatewayType;
 import org.jboss.bpm.model.Signal.SignalType;
 import org.jboss.bpm.runtime.ExecutionContext;
 import org.jboss.bpm.runtime.ExecutionHandler;
@@ -45,7 +41,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public class ParallelMergeTest extends DefaultEngineTestCase
+public abstract class ParallelMergeTest extends DefaultEngineTestCase
 {
   public void testParallelMerge() throws Exception
   {
@@ -128,21 +124,7 @@
     assertEquals("TaskA:TaskB", TaskC.taskValue);
   }
 
-  private Process getProcess()
-  {
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
-    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
-    procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
-    eventBuilder = procBuilder.addStartEvent("StartB");
-    eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
-    procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
-    procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("TaskC");
-    procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
-    procBuilder.addEndEvent("End");
-    Process proc = procBuilder.getProcess();
-    return proc;
-  }
+  public abstract Process getProcess();
 
   public static class MergeListener implements SignalListener
   {

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitProcBuilderTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitProcBuilderTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitProcBuilderTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -0,0 +1,46 @@
+/*
+ * 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.cts.gateway.parallel;
+
+// $Id$
+
+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;
+
+/**
+ * ParallelMergeTest using the ParallelSplitTest
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class ParallelSplitProcBuilderTest extends ParallelSplitTest
+{
+  public Process getProcess()
+  {
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel).
+    addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess();
+    return proc;
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitProcBuilderTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java	2008-08-13 17:36:40 UTC (rev 1886)
@@ -26,10 +26,7 @@
 import java.util.List;
 
 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.Signal.SignalType;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
@@ -40,7 +37,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public class ParallelSplitTest extends DefaultEngineTestCase
+public abstract class ParallelSplitTest extends DefaultEngineTestCase
 {
   public void testParallelSplit() throws Exception 
   {
@@ -56,11 +53,5 @@
     assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB"));
   }
 
-  private Process getProcess()
-  {
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel).
-    addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess();
-    return proc;
-  }
+  public abstract Process getProcess();
 }

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml	2008-08-13 17:36:40 UTC (rev 1886)
@@ -0,0 +1,24 @@
+<ns2:process name="exclusive-merge" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+  <start>
+    <seqflow to="TaskA" />
+  </start>
+  <task taskType="None" name="TaskA">
+    <seqflow to="Merge" />
+    <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskA" />
+  </task>
+  <start>
+    <seqflow to="TaskB" />
+  </start>
+  <task taskType="None" name="TaskB">
+    <seqflow to="Merge" />
+    <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskB" />
+  </task>
+  <exclusive-gateway name="Merge">
+    <seqflow to="TaskC" />
+  </exclusive-gateway>
+  <task taskType="None" name="TaskC">
+    <seqflow to="End" />
+    <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskC" />
+  </task>
+  <end name="End" />
+</ns2:process>
\ No newline at end of file


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn	2008-08-13 17:36:40 UTC (rev 1886)
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_AXFyUWOSEd2mS_8SFTXMeQ" iD="_AXFyUGOSEd2mS_8SFTXMeQ">
   <pools xmi:type="bpmn:Pool" xmi:id="_AXHAcWOSEd2mS_8SFTXMeQ" iD="_AXHAcGOSEd2mS_8SFTXMeQ" name="Pool">
-    <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_LxpxIWOSEd2mS_8SFTXMeQ" incomingEdges="_ImmxcWOSEd2mS_8SFTXMeQ _JC-kYWOSEd2mS_8SFTXMeQ" activityType="GatewayParallel"/>
-    <vertices xmi:type="bpmn:Activity" xmi:id="_FY9wwWOSEd2mS_8SFTXMeQ" iD="_FY9wwGOSEd2mS_8SFTXMeQ" outgoingEdges="_ImmxcWOSEd2mS_8SFTXMeQ" name="StartA" activityType="EventStartSignal"/>
-    <vertices xmi:type="bpmn:Activity" xmi:id="_FobwIWOSEd2mS_8SFTXMeQ" iD="_FobwIGOSEd2mS_8SFTXMeQ" outgoingEdges="_JC-kYWOSEd2mS_8SFTXMeQ" name="StartB" activityType="EventStartSignal"/>
-    <vertices xmi:type="bpmn:Activity" xmi:id="_LFtRIWOSEd2mS_8SFTXMeQ" iD="_LFtRIGOSEd2mS_8SFTXMeQ" incomingEdges="_LxpxIWOSEd2mS_8SFTXMeQ" activityType="EventEndEmpty"/>
-    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_ImmxcWOSEd2mS_8SFTXMeQ" iD="_ImmxcGOSEd2mS_8SFTXMeQ" source="_FY9wwWOSEd2mS_8SFTXMeQ" target="_EPuQwWOSEd2mS_8SFTXMeQ"/>
-    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_JC-kYWOSEd2mS_8SFTXMeQ" iD="_JC-kYGOSEd2mS_8SFTXMeQ" source="_FobwIWOSEd2mS_8SFTXMeQ" target="_EPuQwWOSEd2mS_8SFTXMeQ"/>
-    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_LxpxIWOSEd2mS_8SFTXMeQ" iD="_LxpxIGOSEd2mS_8SFTXMeQ" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_LFtRIWOSEd2mS_8SFTXMeQ"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_6HqqgWlWEd2VTpmAjt3VIA" incomingEdges="_x1ziAWlWEd2VTpmAjt3VIA _25I5AWlWEd2VTpmAjt3VIA" activityType="GatewayParallel"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_FY9wwWOSEd2mS_8SFTXMeQ" iD="_FY9wwGOSEd2mS_8SFTXMeQ" outgoingEdges="_xbzGkWlWEd2VTpmAjt3VIA" name="StartA" activityType="EventStartSignal"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_FobwIWOSEd2mS_8SFTXMeQ" iD="_FobwIGOSEd2mS_8SFTXMeQ" outgoingEdges="_1inyAWlWEd2VTpmAjt3VIA" name="StartB" activityType="EventStartSignal"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_LFtRIWOSEd2mS_8SFTXMeQ" iD="_LFtRIGOSEd2mS_8SFTXMeQ" incomingEdges="_696WAWlWEd2VTpmAjt3VIA" activityType="EventEndEmpty"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_tQcgcWlWEd2VTpmAjt3VIA" iD="_tQcgcGlWEd2VTpmAjt3VIA" outgoingEdges="_x1ziAWlWEd2VTpmAjt3VIA" incomingEdges="_xbzGkWlWEd2VTpmAjt3VIA" name="TaskA"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_y-u48WlWEd2VTpmAjt3VIA" iD="_y-u48GlWEd2VTpmAjt3VIA" outgoingEdges="_25I5AWlWEd2VTpmAjt3VIA" incomingEdges="_1inyAWlWEd2VTpmAjt3VIA" name="TaskB"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_4Egf8WlWEd2VTpmAjt3VIA" iD="_4Egf8GlWEd2VTpmAjt3VIA" outgoingEdges="_696WAWlWEd2VTpmAjt3VIA" incomingEdges="_6HqqgWlWEd2VTpmAjt3VIA" name="TaskC"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_xbzGkWlWEd2VTpmAjt3VIA" iD="_xbzGkGlWEd2VTpmAjt3VIA" source="_FY9wwWOSEd2mS_8SFTXMeQ" target="_tQcgcWlWEd2VTpmAjt3VIA"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_x1ziAWlWEd2VTpmAjt3VIA" iD="_x1ziAGlWEd2VTpmAjt3VIA" source="_tQcgcWlWEd2VTpmAjt3VIA" target="_EPuQwWOSEd2mS_8SFTXMeQ"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_1inyAWlWEd2VTpmAjt3VIA" iD="_1inyAGlWEd2VTpmAjt3VIA" source="_FobwIWOSEd2mS_8SFTXMeQ" target="_y-u48WlWEd2VTpmAjt3VIA"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_25I5AWlWEd2VTpmAjt3VIA" iD="_25I5AGlWEd2VTpmAjt3VIA" source="_y-u48WlWEd2VTpmAjt3VIA" target="_EPuQwWOSEd2mS_8SFTXMeQ"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_6HqqgWlWEd2VTpmAjt3VIA" iD="_6HqqgGlWEd2VTpmAjt3VIA" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_4Egf8WlWEd2VTpmAjt3VIA"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_696WAWlWEd2VTpmAjt3VIA" iD="_696WAGlWEd2VTpmAjt3VIA" source="_4Egf8WlWEd2VTpmAjt3VIA" target="_LFtRIWOSEd2mS_8SFTXMeQ"/>
   </pools>
 </bpmn:BpmnDiagram>

Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram	2008-08-13 16:04:11 UTC (rev 1885)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram	2008-08-13 17:36:40 UTC (rev 1886)
@@ -10,7 +10,7 @@
         <styles xmi:type="notation:FillStyle" xmi:id="_EPve42OSEd2mS_8SFTXMeQ"/>
         <styles xmi:type="notation:LineStyle" xmi:id="_EPve5GOSEd2mS_8SFTXMeQ" lineColor="0"/>
         <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_EPuQwWOSEd2mS_8SFTXMeQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EPve5WOSEd2mS_8SFTXMeQ" x="108" y="72"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EPve5WOSEd2mS_8SFTXMeQ" x="240" y="72"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_FY--4GOSEd2mS_8SFTXMeQ" type="2001">
         <children xmi:type="notation:Node" xmi:id="_FY_l8GOSEd2mS_8SFTXMeQ" type="4001"/>
@@ -37,8 +37,35 @@
         <styles xmi:type="notation:FillStyle" xmi:id="_LFufQmOSEd2mS_8SFTXMeQ"/>
         <styles xmi:type="notation:LineStyle" xmi:id="_LFufQ2OSEd2mS_8SFTXMeQ" lineColor="0"/>
         <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_LFtRIWOSEd2mS_8SFTXMeQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFufRGOSEd2mS_8SFTXMeQ" x="204" y="84"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFufRGOSEd2mS_8SFTXMeQ" x="492" y="84"/>
       </children>
+      <children xmi:type="notation:Node" xmi:id="_tQlDUGlWEd2VTpmAjt3VIA" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_tQmRcGlWEd2VTpmAjt3VIA" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_tQlDUWlWEd2VTpmAjt3VIA" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_tQlDUmlWEd2VTpmAjt3VIA"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_tQlDU2lWEd2VTpmAjt3VIA"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_tQlDVGlWEd2VTpmAjt3VIA" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_tQcgcWlWEd2VTpmAjt3VIA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tQlDVWlWEd2VTpmAjt3VIA" x="96" y="12"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_y-wHEGlWEd2VTpmAjt3VIA" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_y-wuIGlWEd2VTpmAjt3VIA" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_y-wHEWlWEd2VTpmAjt3VIA" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_y-wHEmlWEd2VTpmAjt3VIA"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_y-wHE2lWEd2VTpmAjt3VIA"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_y-wHFGlWEd2VTpmAjt3VIA" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_y-u48WlWEd2VTpmAjt3VIA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y-wHFWlWEd2VTpmAjt3VIA" x="96" y="132"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_4EhHAGlWEd2VTpmAjt3VIA" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_4EhuEGlWEd2VTpmAjt3VIA" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_4EhHAWlWEd2VTpmAjt3VIA" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_4EhHAmlWEd2VTpmAjt3VIA"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_4EhHA2lWEd2VTpmAjt3VIA"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_4EhHBGlWEd2VTpmAjt3VIA" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_4Egf8WlWEd2VTpmAjt3VIA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4EhHBWlWEd2VTpmAjt3VIA" x="336" y="72"/>
+      </children>
       <styles xmi:type="notation:DrawerStyle" xmi:id="_AXI1omOSEd2mS_8SFTXMeQ"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_AXI1o2OSEd2mS_8SFTXMeQ"/>
       <styles xmi:type="notation:FilteringStyle" xmi:id="_AXI1pGOSEd2mS_8SFTXMeQ"/>
@@ -48,46 +75,82 @@
     <styles xmi:type="notation:FillStyle" xmi:id="_AXIOk2OSEd2mS_8SFTXMeQ" fillColor="16771304"/>
     <styles xmi:type="notation:LineStyle" xmi:id="_AXIOlGOSEd2mS_8SFTXMeQ" lineColor="11119017"/>
     <element xmi:type="bpmn:Pool" href="parallel-merge.bpmn#_AXHAcWOSEd2mS_8SFTXMeQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="424" height="213"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="585" height="213"/>
   </children>
   <styles xmi:type="notation:PageStyle" xmi:id="_AXGZYWOSEd2mS_8SFTXMeQ"/>
   <styles xmi:type="notation:GuideStyle" xmi:id="_AXGZYmOSEd2mS_8SFTXMeQ"/>
   <styles xmi:type="notation:DescriptionStyle" xmi:id="_AXGZY2OSEd2mS_8SFTXMeQ"/>
   <element xmi:type="bpmn:BpmnDiagram" href="parallel-merge.bpmn#_AXFyUWOSEd2mS_8SFTXMeQ"/>
-  <edges xmi:type="notation:Edge" xmi:id="_ImomoGOSEd2mS_8SFTXMeQ" type="3001" source="_FY--4GOSEd2mS_8SFTXMeQ" target="_EPve4GOSEd2mS_8SFTXMeQ">
-    <children xmi:type="notation:Node" xmi:id="_Imp0wGOSEd2mS_8SFTXMeQ" type="4012">
-      <styles xmi:type="notation:FillStyle" xmi:id="_Imp0wWOSEd2mS_8SFTXMeQ" fillColor="16776959"/>
-      <styles xmi:type="notation:LineStyle" xmi:id="_Imp0wmOSEd2mS_8SFTXMeQ" lineColor="16776959"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Imp0w2OSEd2mS_8SFTXMeQ" y="-10"/>
+  <edges xmi:type="notation:Edge" xmi:id="_xb2w8GlWEd2VTpmAjt3VIA" type="3001" source="_FY--4GOSEd2mS_8SFTXMeQ" target="_tQlDUGlWEd2VTpmAjt3VIA">
+    <children xmi:type="notation:Node" xmi:id="_xb5NMGlWEd2VTpmAjt3VIA" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_xb5NMWlWEd2VTpmAjt3VIA" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_xb5NMmlWEd2VTpmAjt3VIA" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_xb5NM2lWEd2VTpmAjt3VIA" y="-10"/>
     </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_ImomoWOSEd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ImomomOSEd2mS_8SFTXMeQ" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_Imomo2OSEd2mS_8SFTXMeQ" lineColor="0"/>
-    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_ImmxcWOSEd2mS_8SFTXMeQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ImompGOSEd2mS_8SFTXMeQ" points="[15, 11, -73, -63]$[106, 80, 18, 6]"/>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_xb2w8WlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xb2w8mlWEd2VTpmAjt3VIA" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_xb2w82lWEd2VTpmAjt3VIA" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_xbzGkWlWEd2VTpmAjt3VIA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xb2w9GlWEd2VTpmAjt3VIA" points="[15, 1, -148, -14]$[217, 23, 54, 8]"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_JC_ygGOSEd2mS_8SFTXMeQ" type="3001" source="_Foc-QGOSEd2mS_8SFTXMeQ" target="_EPve4GOSEd2mS_8SFTXMeQ">
-    <children xmi:type="notation:Node" xmi:id="_JDAZkGOSEd2mS_8SFTXMeQ" type="4012">
-      <styles xmi:type="notation:FillStyle" xmi:id="_JDAZkWOSEd2mS_8SFTXMeQ" fillColor="16776959"/>
-      <styles xmi:type="notation:LineStyle" xmi:id="_JDAZkmOSEd2mS_8SFTXMeQ" lineColor="16776959"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_JDAZk2OSEd2mS_8SFTXMeQ" y="-10"/>
+  <edges xmi:type="notation:Edge" xmi:id="_x11-QGlWEd2VTpmAjt3VIA" type="3001" source="_tQlDUGlWEd2VTpmAjt3VIA" target="_EPve4GOSEd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_x12lUGlWEd2VTpmAjt3VIA" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_x12lUWlWEd2VTpmAjt3VIA" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_x12lUmlWEd2VTpmAjt3VIA" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_x12lU2lWEd2VTpmAjt3VIA" y="-10"/>
     </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_JC_ygWOSEd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_JC_ygmOSEd2mS_8SFTXMeQ" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_JC_yg2OSEd2mS_8SFTXMeQ" lineColor="0"/>
-    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_JC-kYWOSEd2mS_8SFTXMeQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JC_yhGOSEd2mS_8SFTXMeQ" points="[15, -8, -70, 42]$[95, -35, 10, 15]"/>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_x11-QWlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_x11-QmlWEd2VTpmAjt3VIA" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_x11-Q2lWEd2VTpmAjt3VIA" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_x1ziAWlWEd2VTpmAjt3VIA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x11-RGlWEd2VTpmAjt3VIA" points="[54, 6, -189, -37]$[244, 19, 1, -24]"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Lxq_QGOSEd2mS_8SFTXMeQ" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_LFt4MGOSEd2mS_8SFTXMeQ">
-    <children xmi:type="notation:Node" xmi:id="_LxrmUGOSEd2mS_8SFTXMeQ" type="4012">
-      <styles xmi:type="notation:FillStyle" xmi:id="_LxrmUWOSEd2mS_8SFTXMeQ" fillColor="16776959"/>
-      <styles xmi:type="notation:LineStyle" xmi:id="_LxrmUmOSEd2mS_8SFTXMeQ" lineColor="16776959"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_LxrmU2OSEd2mS_8SFTXMeQ" y="-10"/>
+  <edges xmi:type="notation:Edge" xmi:id="_1ipAIGlWEd2VTpmAjt3VIA" type="3001" source="_Foc-QGOSEd2mS_8SFTXMeQ" target="_y-wHEGlWEd2VTpmAjt3VIA">
+    <children xmi:type="notation:Node" xmi:id="_1ipnMGlWEd2VTpmAjt3VIA" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_1ipnMWlWEd2VTpmAjt3VIA" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_1ipnMmlWEd2VTpmAjt3VIA" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1ipnM2lWEd2VTpmAjt3VIA" y="-10"/>
     </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_Lxq_QWOSEd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Lxq_QmOSEd2mS_8SFTXMeQ" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_Lxq_Q2OSEd2mS_8SFTXMeQ" lineColor="0"/>
-    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_LxpxIWOSEd2mS_8SFTXMeQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lxq_RGOSEd2mS_8SFTXMeQ" points="[24, -1, -86, -3]$[125, -4, 15, -6]"/>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_1ipAIWlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1ipAImlWEd2VTpmAjt3VIA" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_1ipAI2lWEd2VTpmAjt3VIA" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_1inyAWlWEd2VTpmAjt3VIA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1ipAJGlWEd2VTpmAjt3VIA" points="[15, -3, -199, 16]$[161, -46, -53, -27]"/>
   </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_25KHIGlWEd2VTpmAjt3VIA" type="3001" source="_y-wHEGlWEd2VTpmAjt3VIA" target="_EPve4GOSEd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_25KuMGlWEd2VTpmAjt3VIA" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_25KuMWlWEd2VTpmAjt3VIA" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_25KuMmlWEd2VTpmAjt3VIA" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_25KuM2lWEd2VTpmAjt3VIA" y="-10"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_25KHIWlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_25KHImlWEd2VTpmAjt3VIA" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_25KHI2lWEd2VTpmAjt3VIA" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_25I5AWlWEd2VTpmAjt3VIA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_25KHJGlWEd2VTpmAjt3VIA" points="[54, -10, -254, 53]$[303, -43, -5, 20]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_6Hr4oGlWEd2VTpmAjt3VIA" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_4EhHAGlWEd2VTpmAjt3VIA">
+    <children xmi:type="notation:Node" xmi:id="_6HsfsWlWEd2VTpmAjt3VIA" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_6HsfsmlWEd2VTpmAjt3VIA" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_6Hsfs2lWEd2VTpmAjt3VIA" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6HsftGlWEd2VTpmAjt3VIA" y="-10"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_6Hr4oWlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6Hr4omlWEd2VTpmAjt3VIA" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_6Hr4o2lWEd2VTpmAjt3VIA" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_6HqqgWlWEd2VTpmAjt3VIA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6HsfsGlWEd2VTpmAjt3VIA" points="[22, -3, -154, -6]$[175, -25, -1, -28]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_697kIGlWEd2VTpmAjt3VIA" type="3001" source="_4EhHAGlWEd2VTpmAjt3VIA" target="_LFt4MGOSEd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_698LMGlWEd2VTpmAjt3VIA" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_698LMWlWEd2VTpmAjt3VIA" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_698LMmlWEd2VTpmAjt3VIA" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_698LM2lWEd2VTpmAjt3VIA" y="-10"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_697kIWlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_697kImlWEd2VTpmAjt3VIA" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_697kI2lWEd2VTpmAjt3VIA" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_696WAWlWEd2VTpmAjt3VIA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_697kJGlWEd2VTpmAjt3VIA" points="[54, -2, -88, -1]$[127, -16, -15, -15]"/>
+  </edges>
 </notation:Diagram>

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the jbpm-commits mailing list