[jbpm-commits] JBoss JBPM SVN: r1899 - in jbossbpm/spec/trunk/modules/testsuite/src/test: java/org/jboss/bpm/pattern/control/multichoice and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Aug 15 06:09:45 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-08-15 06:09:45 -0400 (Fri, 15 Aug 2008)
New Revision: 1899

Added:
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceAPITest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeAPITest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/exclusivechoice/pattern-control-exclusive-choice-api10.xml
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice-api10.xml
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn_diagram
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.png
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge-api10.xml
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn_diagram
   jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.png
Log:
Pattern SimpleMerge/MultiChoice - ok

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceAPITest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceAPITest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceAPITest.java	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,48 @@
+/*
+ * 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.pattern.control.multichoice;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * MultiChoiceTest using the API Descriptor
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class MultiChoiceAPITest extends MultiChoiceTest
+{
+  @Override
+  public Process getProcess() throws IOException
+  {
+    URL jpdlURL = getResourceURL("pattern/control/multichoice/pattern-control-multi-choice-api10.xml");
+    ProcessManager pm = ProcessManager.locateProcessManager();
+    Process proc = pm.createProcess(jpdlURL);
+    return proc;
+  }
+}
\ No newline at end of file


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceAPITest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java	2008-08-15 10:09:45 UTC (rev 1899)
@@ -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.pattern.control.multichoice;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * MultiChoiceTest using the ProcessMarshaller
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class MultiChoiceMarshallerTest extends MultiChoiceTest
+{
+  @Override
+  public Process getProcess() throws IOException
+  {
+    Process proc = super.getProcess();
+    
+    // Marshall the process to a string
+    StringWriter strwr = new StringWriter();
+    marshallProcess(proc, strwr);
+    String procXML = strwr.toString();
+    
+    // Recreate the process from the marshalled process
+    ProcessManager procManager = ProcessManager.locateProcessManager();
+    proc = procManager.createProcess(procXML);
+    
+    return proc;
+  }
+}
\ No newline at end of file


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,86 @@
+/*
+ * 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.pattern.control.multichoice;
+
+// $Id$
+
+import java.io.IOException;
+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;
+
+/**
+ * Inclusive gateway that has conditional outgoing sequence flows. 
+ * One or more of them can be taken. 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class MultiChoiceTest extends DefaultEngineTestCase
+{
+  public void testGateA() throws Exception
+  {
+    Process proc = getProcess();
+
+    BasicAttachments att = new BasicAttachments();
+    att.addAttachment("foo", "5");
+    proc.startProcess(att);
+    proc.waitForEnd();
+
+    List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+    assertEquals(2, endSignals.size());
+  }
+
+  public void testGateB() throws Exception
+  {
+    Process proc = getProcess();
+
+    BasicAttachments att = new BasicAttachments();
+    att.addAttachment("foo", "15");
+    proc.startProcess(att);
+    proc.waitForEnd();
+
+    List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+    assertEquals(1, endSignals.size());
+    assertEquals("EndB", endSignals.get(0).getFromRef());
+  }
+
+  public Process getProcess() throws IOException
+  {
+    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/pattern/control/multichoice/MultiChoiceTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeAPITest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeAPITest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeAPITest.java	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,48 @@
+/*
+ * 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.pattern.control.simplemerge;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * InclusiveMergeTest using the API Descriptor
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class SimpleMergeAPITest extends SimpleMergeTest
+{
+  @Override
+  public Process getProcess() throws IOException
+  {
+    URL jpdlURL = getResourceURL("pattern/control/simplemerge/pattern-control-simple-merge-api10.xml");
+    ProcessManager pm = ProcessManager.locateProcessManager();
+    Process proc = pm.createProcess(jpdlURL);
+    return proc;
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeAPITest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java	2008-08-15 10:09:45 UTC (rev 1899)
@@ -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.pattern.control.simplemerge;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * InclusiveMergeTest using the ProcessMarshaller
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class SimpleMergeMarshallerTest extends SimpleMergeTest
+{
+  @Override
+  public Process getProcess() throws IOException
+  {
+    Process proc = super.getProcess();
+    
+    // Marshall the process to a string
+    StringWriter strwr = new StringWriter();
+    marshallProcess(proc, strwr);
+    String procXML = strwr.toString();
+
+    // Recreate the process from the marshalled process
+    ProcessManager procManager = ProcessManager.locateProcessManager();
+    proc = procManager.createProcess(procXML);
+    
+    return proc;
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,107 @@
+/*
+ * 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.pattern.control.simplemerge;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.List;
+
+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.test.DefaultEngineTestCase;
+
+/**
+ * Inclusive gateway that has multiple incoming sequence flows. 
+ * All tokens arriving from incoming sequence flows proceeds unconditionally along the outgoing sequence flow. 
+ * The inclusive join is stateless.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 06-Aug-2008
+ */
+public class SimpleMergeTest extends DefaultEngineTestCase
+{
+  public void testSimpleMerge() throws Exception
+  {
+    Process proc = getProcess();
+    proc.startProcess();
+
+    // Add a signal listener that sends the other start trigger signal
+    SignalManager signalManager = SignalManager.locateSignalManager();
+    Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
+    signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
+    
+    // Send start trigger signals
+    signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+
+    // Wait for the process to end
+    proc.waitForEnd();
+
+    List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+    assertEquals(2, endSignals.size());
+  }
+
+  public Process getProcess() throws IOException
+  {
+    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;
+  }
+
+  class MergeListener implements SignalListener
+  {
+    private String fromRef;
+    private Signal nextSignal;
+
+    public MergeListener(String fromRef, Signal nextSignal)
+    {
+      this.fromRef = fromRef;
+      this.nextSignal = nextSignal;
+    }
+
+    public void catchSignal(Signal signal)
+    {
+      if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER)
+      {
+        if (nextSignal != null)
+        {
+          SignalManager signalManager = SignalManager.locateSignalManager();
+          signalManager.throwSignal(fromRef, nextSignal);
+          nextSignal = null;
+        }
+      }
+    }
+  }
+}


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/exclusivechoice/pattern-control-exclusive-choice-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/exclusivechoice/pattern-control-exclusive-choice-api10.xml	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/exclusivechoice/pattern-control-exclusive-choice-api10.xml	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,15 @@
+<ns2:process name="ExclusiveChoice" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+  <start name="Start">
+    <seqflow to="Split" />
+  </start>
+  <exclusive-gateway name="Split">
+    <seqflow conditionType="Expression" to="EndA">
+      <condition lang="MVEL">foo &lt; 10</condition>
+    </seqflow>
+    <seqflow conditionType="Expression" to="EndB">
+      <condition lang="MVEL">foo &gt; 10</condition>
+    </seqflow>
+  </exclusive-gateway>
+  <end name="EndA"/>
+  <end name="EndB"/>
+</ns2:process>


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

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice-api10.xml	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice-api10.xml	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,15 @@
+<ns2:process name="MultiChoice" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+  <start name="Start">
+    <seqflow to="Split" />
+  </start>
+  <inclusive-gateway name="Split">
+    <seqflow conditionType="Expression" to="EndA">
+      <condition lang="MVEL">foo &lt; 10</condition>
+    </seqflow>
+    <seqflow conditionType="Expression" to="EndB">
+      <condition lang="MVEL">foo &lt; 20</condition>
+    </seqflow>
+  </inclusive-gateway>
+  <end name="EndA"/>
+  <end name="EndB"/>
+</ns2:process>


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice-api10.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,12 @@
+<?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="_Ce5-8GOIEd2mS_8SFTXMeQ" iD="_Ce0fYWOIEd2mS_8SFTXMeQ">
+  <pools xmi:type="bpmn:Pool" xmi:id="_ChQvYWOIEd2mS_8SFTXMeQ" iD="_ChQvYGOIEd2mS_8SFTXMeQ" name="Pool">
+    <vertices xmi:type="bpmn:Activity" xmi:id="_God1UWOIEd2mS_8SFTXMeQ" iD="_God1UGOIEd2mS_8SFTXMeQ" outgoingEdges="_aB8cYWOREd2mS_8SFTXMeQ" activityType="EventStartEmpty"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_NheUgWOIEd2mS_8SFTXMeQ" iD="_NheUgGOIEd2mS_8SFTXMeQ" incomingEdges="_axitUWOREd2mS_8SFTXMeQ" name="EndA" activityType="EventEndEmpty"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_Qpi4sWOIEd2mS_8SFTXMeQ" iD="_Qpi4sGOIEd2mS_8SFTXMeQ" incomingEdges="_bT8PwWOREd2mS_8SFTXMeQ" name="EndB  " activityType="EventEndEmpty"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_ZMKD4WOREd2mS_8SFTXMeQ" iD="_ZMKD4GOREd2mS_8SFTXMeQ" outgoingEdges="_axitUWOREd2mS_8SFTXMeQ _bT8PwWOREd2mS_8SFTXMeQ" incomingEdges="_aB8cYWOREd2mS_8SFTXMeQ" activityType="GatewayDataBasedInclusive"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_aB8cYWOREd2mS_8SFTXMeQ" iD="_aB8cYGOREd2mS_8SFTXMeQ" source="_God1UWOIEd2mS_8SFTXMeQ" target="_ZMKD4WOREd2mS_8SFTXMeQ"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_axitUWOREd2mS_8SFTXMeQ" iD="_axitUGOREd2mS_8SFTXMeQ" source="_ZMKD4WOREd2mS_8SFTXMeQ" target="_NheUgWOIEd2mS_8SFTXMeQ"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_bT8PwWOREd2mS_8SFTXMeQ" iD="_bT8PwGOREd2mS_8SFTXMeQ" source="_ZMKD4WOREd2mS_8SFTXMeQ" target="_Qpi4sWOIEd2mS_8SFTXMeQ"/>
+  </pools>
+</bpmn:BpmnDiagram>

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn_diagram	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.bpmn_diagram	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_CgnPIGOIEd2mS_8SFTXMeQ" type="Bpmn" name="pattern-control-multi-choice.bpmn_diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_CiuH8GOIEd2mS_8SFTXMeQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Ci_NsGOIEd2mS_8SFTXMeQ" type="4008"/>
+    <children xmi:type="notation:Node" xmi:id="_CjEGMGOIEd2mS_8SFTXMeQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_GomYMGOIEd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_GonmUGOIEd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_GomYMWOIEd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_GomYMmOIEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_Gom_QGOIEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_Gom_QWOIEd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-multi-choice.bpmn#_God1UWOIEd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gom_QmOIEd2mS_8SFTXMeQ" x="24" y="84"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_NhfioGOIEd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_NhgJsGOIEd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_NhfioWOIEd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_NhfiomOIEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_Nhfio2OIEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_NhfipGOIEd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-multi-choice.bpmn#_NheUgWOIEd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NhfipWOIEd2mS_8SFTXMeQ" x="180" y="12" width="74"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_QpkG0GOIEd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_Qpkt4GOIEd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_QpkG0WOIEd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_QpkG0mOIEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_QpkG02OIEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_QpkG1GOIEd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-multi-choice.bpmn#_Qpi4sWOIEd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QpkG1WOIEd2mS_8SFTXMeQ" x="179" y="144"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ZMLSAGOREd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_ZML5EGOREd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_ZMLSAWOREd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_ZMLSAmOREd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_ZMLSA2OREd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_ZMLSBGOREd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-multi-choice.bpmn#_ZMKD4WOREd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZMLSBWOREd2mS_8SFTXMeQ" x="96" y="72"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_CjEGMWOIEd2mS_8SFTXMeQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_CjEGMmOIEd2mS_8SFTXMeQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_CjEGM2OIEd2mS_8SFTXMeQ"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_CiuvAGOIEd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_CiuvAWOIEd2mS_8SFTXMeQ"/>
+    <styles xmi:type="notation:FillStyle" xmi:id="_CiuvAmOIEd2mS_8SFTXMeQ" fillColor="16771304"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_CiuvA2OIEd2mS_8SFTXMeQ" lineColor="11119017"/>
+    <element xmi:type="bpmn:Pool" href="pattern-control-multi-choice.bpmn#_ChQvYWOIEd2mS_8SFTXMeQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CjFUUGOIEd2mS_8SFTXMeQ" x="16" y="16" width="393" height="225"/>
+  </children>
+  <styles xmi:type="notation:PageStyle" xmi:id="_CgnPIWOIEd2mS_8SFTXMeQ"/>
+  <styles xmi:type="notation:GuideStyle" xmi:id="_CgnPImOIEd2mS_8SFTXMeQ"/>
+  <styles xmi:type="notation:DescriptionStyle" xmi:id="_CgnPI2OIEd2mS_8SFTXMeQ"/>
+  <element xmi:type="bpmn:BpmnDiagram" href="pattern-control-multi-choice.bpmn#_Ce5-8GOIEd2mS_8SFTXMeQ"/>
+  <edges xmi:type="notation:Edge" xmi:id="_aB9qgGOREd2mS_8SFTXMeQ" type="3001" source="_GomYMGOIEd2mS_8SFTXMeQ" target="_ZMLSAGOREd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_aB-RkGOREd2mS_8SFTXMeQ" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_aB-RkWOREd2mS_8SFTXMeQ" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_aB-RkmOREd2mS_8SFTXMeQ" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aB-Rk2OREd2mS_8SFTXMeQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_aB9qgWOREd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_aB9qgmOREd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_aB9qg2OREd2mS_8SFTXMeQ" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="pattern-control-multi-choice.bpmn#_aB8cYWOREd2mS_8SFTXMeQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aB9qhGOREd2mS_8SFTXMeQ" points="[15, -1, -67, 1]$[84, -25, 2, -23]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_axj7cGOREd2mS_8SFTXMeQ" type="3001" source="_ZMLSAGOREd2mS_8SFTXMeQ" target="_NhfioGOIEd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_axkigGOREd2mS_8SFTXMeQ" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_axkigWOREd2mS_8SFTXMeQ" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_axlJkGOREd2mS_8SFTXMeQ" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_axlJkWOREd2mS_8SFTXMeQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_axj7cWOREd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_axj7cmOREd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_axj7c2OREd2mS_8SFTXMeQ" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="pattern-control-multi-choice.bpmn#_axitUWOREd2mS_8SFTXMeQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_axj7dGOREd2mS_8SFTXMeQ" points="[13, -12, -61, 58]$[89, -71, 15, -1]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_bT9d4GOREd2mS_8SFTXMeQ" type="3001" source="_ZMLSAGOREd2mS_8SFTXMeQ" target="_QpkG0GOIEd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_bT-E8GOREd2mS_8SFTXMeQ" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_bT-E8WOREd2mS_8SFTXMeQ" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_bT-E8mOREd2mS_8SFTXMeQ" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bT-E82OREd2mS_8SFTXMeQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_bT9d4WOREd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_bT9d4mOREd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_bT9d42OREd2mS_8SFTXMeQ" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="pattern-control-multi-choice.bpmn#_bT8PwWOREd2mS_8SFTXMeQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bT9d5GOREd2mS_8SFTXMeQ" points="[12, 12, -62, -50]$[74, 77, 0, 15]"/>
+  </edges>
+</notation:Diagram>

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/multichoice/pattern-control-multi-choice.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge-api10.xml	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge-api10.xml	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,22 @@
+<ns2:process name="SimpleMerge" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+  <start name="StartA">
+    <seqflow to="Merge" />
+    <signal-trigger>
+      <signal type="SYSTEM_START_TRIGGER">
+        <message>A</message>
+      </signal>
+    </signal-trigger>
+  </start>
+  <start name="StartB">
+    <seqflow to="Merge" />
+    <signal-trigger>
+      <signal type="SYSTEM_START_TRIGGER">
+        <message>B</message>
+      </signal>
+    </signal-trigger>
+  </start>
+  <inclusive-gateway name="Merge">
+    <seqflow to="End" />
+  </inclusive-gateway>
+  <end name="End" />
+</ns2:process>
\ No newline at end of file


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

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,12 @@
+<?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="_l8nUEWOQEd2mS_8SFTXMeQ" iD="_l8nUEGOQEd2mS_8SFTXMeQ">
+  <pools xmi:type="bpmn:Pool" xmi:id="_l8n7IWOQEd2mS_8SFTXMeQ" iD="_l8n7IGOQEd2mS_8SFTXMeQ" name="Pool">
+    <vertices xmi:type="bpmn:Activity" xmi:id="_qdNxcWOQEd2mS_8SFTXMeQ" iD="_qdNxcGOQEd2mS_8SFTXMeQ" outgoingEdges="_SIYfIWOREd2mS_8SFTXMeQ" name="StartA" activityType="EventStartSignal"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_rWe7wWOQEd2mS_8SFTXMeQ" iD="_rWe7wGOQEd2mS_8SFTXMeQ" outgoingEdges="_Sr7REWOREd2mS_8SFTXMeQ" name="StartB" activityType="EventStartSignal"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_tWoOkWOQEd2mS_8SFTXMeQ" iD="_tWoOkGOQEd2mS_8SFTXMeQ" incomingEdges="_UaiH8WOREd2mS_8SFTXMeQ" activityType="EventEndEmpty"/>
+    <vertices xmi:type="bpmn:Activity" xmi:id="_ReploWOREd2mS_8SFTXMeQ" iD="_ReploGOREd2mS_8SFTXMeQ" outgoingEdges="_UaiH8WOREd2mS_8SFTXMeQ" incomingEdges="_SIYfIWOREd2mS_8SFTXMeQ _Sr7REWOREd2mS_8SFTXMeQ" activityType="GatewayDataBasedInclusive"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_SIYfIWOREd2mS_8SFTXMeQ" iD="_SIYfIGOREd2mS_8SFTXMeQ" source="_qdNxcWOQEd2mS_8SFTXMeQ" target="_ReploWOREd2mS_8SFTXMeQ"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_Sr7REWOREd2mS_8SFTXMeQ" iD="_Sr7REGOREd2mS_8SFTXMeQ" source="_rWe7wWOQEd2mS_8SFTXMeQ" target="_ReploWOREd2mS_8SFTXMeQ"/>
+    <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_UaiH8WOREd2mS_8SFTXMeQ" iD="_UaiH8GOREd2mS_8SFTXMeQ" source="_ReploWOREd2mS_8SFTXMeQ" target="_tWoOkWOQEd2mS_8SFTXMeQ"/>
+  </pools>
+</bpmn:BpmnDiagram>

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn_diagram	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.bpmn_diagram	2008-08-15 10:09:45 UTC (rev 1899)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_l8nUEmOQEd2mS_8SFTXMeQ" type="Bpmn" name="pattern-control-simple-merge.bpmn_diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_l8pJQGOQEd2mS_8SFTXMeQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_l8pwUGOQEd2mS_8SFTXMeQ" type="4008"/>
+    <children xmi:type="notation:Node" xmi:id="_l8qXYGOQEd2mS_8SFTXMeQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_qdOYgGOQEd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_qdO_kGOQEd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_qdOYgWOQEd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_qdOYgmOQEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_qdOYg2OQEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_qdOYhGOQEd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-simple-merge.bpmn#_qdNxcWOQEd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qdOYhWOQEd2mS_8SFTXMeQ" x="60" y="24"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_rWgJ4GOQEd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_rWgw8GOQEd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_rWgJ4WOQEd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_rWgJ4mOQEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_rWgJ42OQEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_rWgJ5GOQEd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-simple-merge.bpmn#_rWe7wWOQEd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rWgJ5WOQEd2mS_8SFTXMeQ" x="60" y="144"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_tWpcsGOQEd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_tWqDwGOQEd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_tWpcsWOQEd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_tWpcsmOQEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_tWpcs2OQEd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_tWpctGOQEd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-simple-merge.bpmn#_tWoOkWOQEd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tWpctWOQEd2mS_8SFTXMeQ" x="228" y="96"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ReqMsGOREd2mS_8SFTXMeQ" type="2001">
+        <children xmi:type="notation:Node" xmi:id="_ReqzwmOREd2mS_8SFTXMeQ" type="4001"/>
+        <styles xmi:type="notation:FontStyle" xmi:id="_ReqMsWOREd2mS_8SFTXMeQ" fontName="Arial"/>
+        <styles xmi:type="notation:DescriptionStyle" xmi:id="_ReqMsmOREd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:FillStyle" xmi:id="_ReqMs2OREd2mS_8SFTXMeQ"/>
+        <styles xmi:type="notation:LineStyle" xmi:id="_ReqzwGOREd2mS_8SFTXMeQ" lineColor="0"/>
+        <element xmi:type="bpmn:Activity" href="pattern-control-simple-merge.bpmn#_ReploWOREd2mS_8SFTXMeQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ReqzwWOREd2mS_8SFTXMeQ" x="132" y="84"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_l8qXYWOQEd2mS_8SFTXMeQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_l8qXYmOQEd2mS_8SFTXMeQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_l8qXY2OQEd2mS_8SFTXMeQ"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_l8pJQWOQEd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_l8pJQmOQEd2mS_8SFTXMeQ"/>
+    <styles xmi:type="notation:FillStyle" xmi:id="_l8pJQ2OQEd2mS_8SFTXMeQ" fillColor="16771304"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_l8pJRGOQEd2mS_8SFTXMeQ" lineColor="11119017"/>
+    <element xmi:type="bpmn:Pool" href="pattern-control-simple-merge.bpmn#_l8n7IWOQEd2mS_8SFTXMeQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8q-cGOQEd2mS_8SFTXMeQ" x="16" y="16" width="345" height="212"/>
+  </children>
+  <styles xmi:type="notation:PageStyle" xmi:id="_l8nUE2OQEd2mS_8SFTXMeQ"/>
+  <styles xmi:type="notation:GuideStyle" xmi:id="_l8nUFGOQEd2mS_8SFTXMeQ"/>
+  <styles xmi:type="notation:DescriptionStyle" xmi:id="_l8nUFWOQEd2mS_8SFTXMeQ"/>
+  <element xmi:type="bpmn:BpmnDiagram" href="pattern-control-simple-merge.bpmn#_l8nUEWOQEd2mS_8SFTXMeQ"/>
+  <edges xmi:type="notation:Edge" xmi:id="_SIZtQGOREd2mS_8SFTXMeQ" type="3001" source="_qdOYgGOQEd2mS_8SFTXMeQ" target="_ReqMsGOREd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_SIaUUGOREd2mS_8SFTXMeQ" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_SIaUUWOREd2mS_8SFTXMeQ" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_SIaUUmOREd2mS_8SFTXMeQ" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_SIaUU2OREd2mS_8SFTXMeQ" y="-10"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_SIZtQWOREd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_SIZtQmOREd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_SIZtQ2OREd2mS_8SFTXMeQ" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="pattern-control-simple-merge.bpmn#_SIYfIWOREd2mS_8SFTXMeQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SIZtRGOREd2mS_8SFTXMeQ" points="[15, 9, -74, -59]$[112, 66, 23, -2]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Sr9GQGOREd2mS_8SFTXMeQ" type="3001" source="_rWgJ4GOQEd2mS_8SFTXMeQ" target="_ReqMsGOREd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_Sr9tUGOREd2mS_8SFTXMeQ" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_Sr9tUWOREd2mS_8SFTXMeQ" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Sr9tUmOREd2mS_8SFTXMeQ" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Sr9tU2OREd2mS_8SFTXMeQ" y="-10"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_Sr9GQWOREd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Sr9GQmOREd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_Sr9GQ2OREd2mS_8SFTXMeQ" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="pattern-control-simple-merge.bpmn#_Sr7REWOREd2mS_8SFTXMeQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Sr9GRGOREd2mS_8SFTXMeQ" points="[15, -7, -74, 33]$[74, -30, -15, 10]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_UajWEGOREd2mS_8SFTXMeQ" type="3001" source="_ReqMsGOREd2mS_8SFTXMeQ" target="_tWpcsGOQEd2mS_8SFTXMeQ">
+    <children xmi:type="notation:Node" xmi:id="_Uaj9IGOREd2mS_8SFTXMeQ" type="4012">
+      <styles xmi:type="notation:FillStyle" xmi:id="_Uaj9IWOREd2mS_8SFTXMeQ" fillColor="16776959"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Uaj9ImOREd2mS_8SFTXMeQ" lineColor="16776959"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Uaj9I2OREd2mS_8SFTXMeQ" y="-10"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_UajWEWOREd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_UajWEmOREd2mS_8SFTXMeQ" fontName="Arial"/>
+    <styles xmi:type="notation:LineStyle" xmi:id="_UajWE2OREd2mS_8SFTXMeQ" lineColor="0"/>
+    <element xmi:type="bpmn:SequenceEdge" href="pattern-control-simple-merge.bpmn#_UaiH8WOREd2mS_8SFTXMeQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UajWFGOREd2mS_8SFTXMeQ" points="[23, 2, -80, -2]$[118, 2, 15, -2]"/>
+  </edges>
+</notation:Diagram>

Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.png
===================================================================
(Binary files differ)


Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/simplemerge/pattern-control-simple-merge.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the jbpm-commits mailing list