JBoss JBPM SVN: r1993 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-25 06:45:32 -0400 (Mon, 25 Aug 2008)
New Revision: 1993
Removed:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java
Log:
Remove PropertyBuilder
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -22,7 +22,7 @@
package org.jboss.bpm.model;
-//$Id:$
+//$Id$
/**
* The GatewayBuilder can be used to build a Gateway dynamically.
@@ -32,9 +32,18 @@
*/
public interface GatewayBuilder extends ProcessBuilder
{
+ /**
+ * Add the default {@link Gate}
+ */
GatewayBuilder addDefaultGate(String targetName);
+ /**
+ * Add a conditional {@link Gate}
+ */
GatewayBuilder addConditionalGate(String targetName, Expression.ExpressionLanguage exprLang, String exprBody);
+ /**
+ * Add an unconditional {@link Gate}
+ */
GatewayBuilder addGate(String targetName);
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -48,7 +48,7 @@
* Add all elements from another {@link Process}.
* This is typically used by a {@link DialectHandler} when processing an include.
*/
- ProcessBuilder addProcessElements(Process proc);
+ ProcessBuilder addProcess(Process proc);
/**
* Get the {@link Process}.
@@ -62,7 +62,7 @@
* Get the {@link Process} for inclusion in another.
* <p/>
* This is the final call to the ProcessBuilder after all elements have been added.
- * The {@link Process} is not initialized and put in state READY
+ * The {@link Process} is not initialized and stays in state CREATED
*/
Process getProcessForInclude();
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-
-//$Id$
-
-/**
- * A PropertyBuilder can be used to build a {@link Property} dynamically.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface PropertyBuilder extends Builder
-{
- /**
- * Create a {@link Property} with a given name and value
- */
- Property newProperty(String name, Object value);
-}
\ No newline at end of file
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.util.KernelLocator;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-
-/**
- * A Factory for the {@link PropertyBuilder}.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public abstract class PropertyBuilderFactory extends BuilderFactory
-{
- /** The bean name - jBPMMessageBuilderFactory */
- public static final String BEAN_NAME = "jBPMPropertyBuilderFactory";
-
- // Hide the constructor
- protected PropertyBuilderFactory()
- {
- }
-
- /**
- * Get a MessageBuilderFactory instance.
- */
- @SuppressWarnings("deprecation")
- public static PropertyBuilderFactory newInstance()
- {
- // Make sure the engine is bootstrapped
- ProcessEngine.locateProcessEngine();
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
- return (PropertyBuilderFactory)entry.getTarget();
- }
-
- /**
- * Get a {@link PropertyBuilder}.
- */
- public abstract PropertyBuilder newPropertyBuilder();
-}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -32,7 +32,10 @@
*/
public interface TaskBuilder extends ActivityBuilder
{
+ /**
+ * Add a {@link Message} reference.
+ * <p/>
+ * The {@link Message} must be defined at {@link Process} level
+ */
TaskBuilder addMessageRef(String msgName);
-
- TaskBuilder addExecutionHandler(Class<?> clazz);
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -196,7 +196,7 @@
dhapi.marshallProcess(procIncl, strwr);
// System.out.println(strwr);
- procBuilder.addProcessElements(procIncl);
+ procBuilder.addProcess(procIncl);
}
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -69,7 +69,7 @@
return this;
}
- public ProcessBuilder addProcessElements(Process addProc)
+ public ProcessBuilder addProcess(Process addProc)
{
ProcessImpl procImpl = (ProcessImpl)addProc;
for(Message msg : procImpl.getMessages())
Deleted: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.ri.model.impl;
-
-//$Id$
-
-import org.jboss.bpm.model.PropertyBuilder;
-import org.jboss.bpm.model.PropertyBuilderFactory;
-
-/**
- * A Factory for the {@link PropertyBuilder}.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public class PropertyBuilderFactoryImpl extends PropertyBuilderFactory
-{
- @Override
- public PropertyBuilder newPropertyBuilder()
- {
- return new PropertyBuilderImpl();
- }
-}
\ No newline at end of file
Deleted: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.ri.model.impl;
-
-//$Id$
-
-import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.PropertyBuilder;
-
-/**
- * A PropertyBuilder can be used to build a {@link Property} dynamically.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public class PropertyBuilderImpl implements PropertyBuilder
-{
- public Property newProperty(String name, Object value)
- {
- return new PropertyImpl(name, new ExpressionImpl(value));
- }
-}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java 2008-08-25 07:59:14 UTC (rev 1992)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java 2008-08-25 10:45:32 UTC (rev 1993)
@@ -24,7 +24,6 @@
// $Id$
import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.test.DefaultEngineTestCase;
@@ -37,22 +36,13 @@
*/
public class ProcessIntegrityTest extends DefaultEngineTestCase
{
- public void testAnonymousProcess() throws Exception
- {
- // Create a Process through the ProcessBuilder
- ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = builder.addProcess(null).addStartEvent("Start").addSequenceFlow("taskA").addTask("taskA").
- addSequenceFlow("End").addEndEvent("End").getProcess();
- assertEquals("AnonymousProcess#0", proc.getName());
- }
-
public void testNoStartState() throws Exception
{
try
{
// Create a Process through the ProcessBuilder
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- builder.addProcess(null).addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
+ builder.addProcess("NoStartState").addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
fail("InvalidProcessException expected");
}
catch (InvalidProcessException ex)
@@ -67,7 +57,7 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- builder.addProcess(null).addStartEvent("Start").addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").
+ builder.addProcess("NoEndState").addStartEvent("Start").addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").
addTask("end").getProcess();
fail("InvalidProcessException expected");
}
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1992 - in jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts: gateway/exclusive and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-25 03:59:14 -0400 (Mon, 25 Aug 2008)
New Revision: 1992
Added:
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn_diagram
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.png
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn_diagram
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.png
Modified:
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.png
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.png
Log:
Update images
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn 2008-08-25 07:59:14 UTC (rev 1992)
@@ -0,0 +1,10 @@
+<?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="_qoZAsXJ4Ed23zo3wS24Gxw" iD="_qoZAsHJ4Ed23zo3wS24Gxw">
+ <pools xmi:type="bpmn:Pool" xmi:id="_qoZnxXJ4Ed23zo3wS24Gxw" iD="_qoZnxHJ4Ed23zo3wS24Gxw" name="Pool">
+ <vertices xmi:type="bpmn:Activity" xmi:id="_qoZnx3J4Ed23zo3wS24Gxw" iD="_qoZnxnJ4Ed23zo3wS24Gxw" outgoingEdges="_u8TF4XJ4Ed23zo3wS24Gxw" incomingEdges="_s9zY4XJ4Ed23zo3wS24Gxw" name="TaskA" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_sEMQUXJ4Ed23zo3wS24Gxw" iD="_sEMQUHJ4Ed23zo3wS24Gxw" outgoingEdges="_s9zY4XJ4Ed23zo3wS24Gxw" activityType="EventStartEmpty"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_uVJmUXJ4Ed23zo3wS24Gxw" iD="_uVJmUHJ4Ed23zo3wS24Gxw" incomingEdges="_u8TF4XJ4Ed23zo3wS24Gxw" activityType="EventEndMessage"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_s9zY4XJ4Ed23zo3wS24Gxw" iD="_s9zY4HJ4Ed23zo3wS24Gxw" source="_sEMQUXJ4Ed23zo3wS24Gxw" target="_qoZnx3J4Ed23zo3wS24Gxw"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_u8TF4XJ4Ed23zo3wS24Gxw" iD="_u8TF4HJ4Ed23zo3wS24Gxw" source="_qoZnx3J4Ed23zo3wS24Gxw" target="_uVJmUXJ4Ed23zo3wS24Gxw"/>
+ </pools>
+</bpmn:BpmnDiagram>
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn_diagram (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.bpmn_diagram 2008-08-25 07:59:14 UTC (rev 1992)
@@ -0,0 +1,72 @@
+<?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="_qoZnwHJ4Ed23zo3wS24Gxw" type="Bpmn" name="cts-endevent-message.bpmn_diagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_qoaO0HJ4Ed23zo3wS24Gxw" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_qoaO1nJ4Ed23zo3wS24Gxw" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_qoa14HJ4Ed23zo3wS24Gxw" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_qoa15XJ4Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_qobc8HJ4Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qoa15nJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_qoa153J4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_qoa16HJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_qoa16XJ4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="cts-endevent-message.bpmn#_qoZnx3J4Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qobc8XJ4Ed23zo3wS24Gxw" x="72" y="72" width="111" height="61"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_sEOskHJ4Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_sEPToHJ4Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_sEOskXJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_sEOsknJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_sEOsk3J4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_sEOslHJ4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="cts-endevent-message.bpmn#_sEMQUXJ4Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sEOslXJ4Ed23zo3wS24Gxw" x="12" y="84"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_uVKNYHJ4Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_uVK0cHJ4Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_uVKNYXJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_uVKNYnJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_uVKNY3J4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_uVKNZHJ4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="cts-endevent-message.bpmn#_uVJmUXJ4Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uVKNZXJ4Ed23zo3wS24Gxw" x="216" y="84"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_qoa14XJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_qoa14nJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_qoa143J4Ed23zo3wS24Gxw"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qoaO0XJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_qoaO0nJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_qoaO03J4Ed23zo3wS24Gxw" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_qoaO1HJ4Ed23zo3wS24Gxw" lineColor="11119017"/>
+ <element xmi:type="bpmn:Pool" href="cts-endevent-message.bpmn#_qoZnxXJ4Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qoa15HJ4Ed23zo3wS24Gxw" x="16" y="16" width="309" height="200"/>
+ </children>
+ <styles xmi:type="notation:PageStyle" xmi:id="_qoZnwXJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:GuideStyle" xmi:id="_qoZnwnJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_qoZnw3J4Ed23zo3wS24Gxw"/>
+ <element xmi:type="bpmn:BpmnDiagram" href="cts-endevent-message.bpmn#_qoZAsXJ4Ed23zo3wS24Gxw"/>
+ <edges xmi:type="notation:Edge" xmi:id="_s9z_8HJ4Ed23zo3wS24Gxw" type="3001" source="_sEOskHJ4Ed23zo3wS24Gxw" target="_qoa15XJ4Ed23zo3wS24Gxw">
+ <children xmi:type="notation:Node" xmi:id="_s90nAHJ4Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_s90nAXJ4Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_s90nAnJ4Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_s90nA3J4Ed23zo3wS24Gxw" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_s9z_8XJ4Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_s9z_8nJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_s9z_83J4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="cts-endevent-message.bpmn#_s9zY4XJ4Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s9z_9HJ4Ed23zo3wS24Gxw" points="[15, -2, -107, -3]$[94, -27, -28, -28]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_u8UUAHJ4Ed23zo3wS24Gxw" type="3001" source="_qoa15XJ4Ed23zo3wS24Gxw" target="_uVKNYHJ4Ed23zo3wS24Gxw">
+ <children xmi:type="notation:Node" xmi:id="_u8U7EHJ4Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_u8U7EXJ4Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_u8U7EnJ4Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_u8U7E3J4Ed23zo3wS24Gxw" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_u8UUAXJ4Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_u8UUAnJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_u8UUA3J4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="cts-endevent-message.bpmn#_u8TF4XJ4Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u8UUBHJ4Ed23zo3wS24Gxw" points="[54, 2, -93, -4]$[148, -9, 1, -15]"/>
+ </edges>
+</notation:Diagram>
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.png
===================================================================
(Binary files differ)
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/cts-endevent-message.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn 2008-08-25 07:42:15 UTC (rev 1991)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn 2008-08-25 07:59:14 UTC (rev 1992)
@@ -1,12 +1,16 @@
<?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="_uRhwkWOQEd2mS_8SFTXMeQ" name="StartA" activityType="EventStartSignal"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_rWe7wWOQEd2mS_8SFTXMeQ" iD="_rWe7wGOQEd2mS_8SFTXMeQ" outgoingEdges="_u0nPgWOQEd2mS_8SFTXMeQ" name="StartB" activityType="EventStartSignal"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_sa_FsWOQEd2mS_8SFTXMeQ" iD="_sa_FsGOQEd2mS_8SFTXMeQ" outgoingEdges="_glA-AXBZEd26O4vNTVSBiw" incomingEdges="_uRhwkWOQEd2mS_8SFTXMeQ _u0nPgWOQEd2mS_8SFTXMeQ" activityType="GatewayDataBasedExclusive"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_qdNxcWOQEd2mS_8SFTXMeQ" iD="_qdNxcGOQEd2mS_8SFTXMeQ" outgoingEdges="_bRAKgXJ5Ed23zo3wS24Gxw" name="StartA" activityType="EventStartSignal"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_rWe7wWOQEd2mS_8SFTXMeQ" iD="_rWe7wGOQEd2mS_8SFTXMeQ" outgoingEdges="_d4xeAXJ5Ed23zo3wS24Gxw" name="StartB" activityType="EventStartSignal"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_sa_FsWOQEd2mS_8SFTXMeQ" iD="_sa_FsGOQEd2mS_8SFTXMeQ" outgoingEdges="_glA-AXBZEd26O4vNTVSBiw" incomingEdges="_bs7RgXJ5Ed23zo3wS24Gxw _eUeikXJ5Ed23zo3wS24Gxw" activityType="GatewayDataBasedExclusive"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_f-UKYXBZEd26O4vNTVSBiw" iD="_f-UKYHBZEd26O4vNTVSBiw" incomingEdges="_glA-AXBZEd26O4vNTVSBiw" activityType="EventEndMessage"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_uRhwkWOQEd2mS_8SFTXMeQ" iD="_uRhwkGOQEd2mS_8SFTXMeQ" source="_qdNxcWOQEd2mS_8SFTXMeQ" target="_sa_FsWOQEd2mS_8SFTXMeQ"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_u0nPgWOQEd2mS_8SFTXMeQ" iD="_u0nPgGOQEd2mS_8SFTXMeQ" source="_rWe7wWOQEd2mS_8SFTXMeQ" target="_sa_FsWOQEd2mS_8SFTXMeQ"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_Z1lVYXJ5Ed23zo3wS24Gxw" iD="_Z1lVYHJ5Ed23zo3wS24Gxw" outgoingEdges="_bs7RgXJ5Ed23zo3wS24Gxw" incomingEdges="_bRAKgXJ5Ed23zo3wS24Gxw" name="TaskA "/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_c_iv8XJ5Ed23zo3wS24Gxw" iD="_c_iv8HJ5Ed23zo3wS24Gxw" outgoingEdges="_eUeikXJ5Ed23zo3wS24Gxw" incomingEdges="_d4xeAXJ5Ed23zo3wS24Gxw" name="TaskB"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_glA-AXBZEd26O4vNTVSBiw" iD="_glA-AHBZEd26O4vNTVSBiw" source="_sa_FsWOQEd2mS_8SFTXMeQ" target="_f-UKYXBZEd26O4vNTVSBiw"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_bRAKgXJ5Ed23zo3wS24Gxw" iD="_bRAKgHJ5Ed23zo3wS24Gxw" source="_qdNxcWOQEd2mS_8SFTXMeQ" target="_Z1lVYXJ5Ed23zo3wS24Gxw"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_bs7RgXJ5Ed23zo3wS24Gxw" iD="_bs7RgHJ5Ed23zo3wS24Gxw" source="_Z1lVYXJ5Ed23zo3wS24Gxw" target="_sa_FsWOQEd2mS_8SFTXMeQ"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_d4xeAXJ5Ed23zo3wS24Gxw" iD="_d4xeAHJ5Ed23zo3wS24Gxw" source="_rWe7wWOQEd2mS_8SFTXMeQ" target="_c_iv8XJ5Ed23zo3wS24Gxw"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_eUeikXJ5Ed23zo3wS24Gxw" iD="_eUeikHJ5Ed23zo3wS24Gxw" source="_c_iv8XJ5Ed23zo3wS24Gxw" target="_sa_FsWOQEd2mS_8SFTXMeQ"/>
</pools>
</bpmn:BpmnDiagram>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram 2008-08-25 07:42:15 UTC (rev 1991)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram 2008-08-25 07:59:14 UTC (rev 1992)
@@ -10,7 +10,7 @@
<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="exclusive-merge.bpmn#_qdNxcWOQEd2mS_8SFTXMeQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qdOYhWOQEd2mS_8SFTXMeQ" x="60" y="24"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qdOYhWOQEd2mS_8SFTXMeQ" x="24" 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"/>
@@ -19,7 +19,7 @@
<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="exclusive-merge.bpmn#_rWe7wWOQEd2mS_8SFTXMeQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rWgJ5WOQEd2mS_8SFTXMeQ" x="60" y="132"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rWgJ5WOQEd2mS_8SFTXMeQ" x="24" y="132"/>
</children>
<children xmi:type="notation:Node" xmi:id="_sa_swGOQEd2mS_8SFTXMeQ" type="2001">
<children xmi:type="notation:Node" xmi:id="_sbAT0WOQEd2mS_8SFTXMeQ" type="4001"/>
@@ -28,7 +28,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_sa_sw2OQEd2mS_8SFTXMeQ"/>
<styles xmi:type="notation:LineStyle" xmi:id="_sa_sxGOQEd2mS_8SFTXMeQ" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_sa_FsWOQEd2mS_8SFTXMeQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sbAT0GOQEd2mS_8SFTXMeQ" x="134" y="74"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sbAT0GOQEd2mS_8SFTXMeQ" x="252" y="72"/>
</children>
<children xmi:type="notation:Node" xmi:id="_f-Zp8HBZEd26O4vNTVSBiw" type="2001">
<children xmi:type="notation:Node" xmi:id="_f-bfIHBZEd26O4vNTVSBiw" type="4001"/>
@@ -37,8 +37,26 @@
<styles xmi:type="notation:FillStyle" xmi:id="_f-Zp83BZEd26O4vNTVSBiw"/>
<styles xmi:type="notation:LineStyle" xmi:id="_f-Zp9HBZEd26O4vNTVSBiw" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_f-UKYXBZEd26O4vNTVSBiw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-Zp9XBZEd26O4vNTVSBiw" x="238" y="84"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-Zp9XBZEd26O4vNTVSBiw" x="348" y="84"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_Z1l8cHJ5Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_Z1mjgHJ5Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z1l8cXJ5Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_Z1l8cnJ5Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_Z1l8c3J5Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_Z1l8dHJ5Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_Z1lVYXJ5Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1l8dXJ5Ed23zo3wS24Gxw" x="108" y="12"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_c_jXAHJ5Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_c_j-E3J5Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_c_jXAXJ5Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_c_jXAnJ5Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_c_j-EHJ5Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_c_j-EXJ5Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_c_iv8XJ5Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c_j-EnJ5Ed23zo3wS24Gxw" x="108" y="120"/>
+ </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"/>
@@ -48,41 +66,17 @@
<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="exclusive-merge.bpmn#_l8n7IWOQEd2mS_8SFTXMeQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8q-cGOQEd2mS_8SFTXMeQ" x="16" y="16" width="369" height="200"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8q-cGOQEd2mS_8SFTXMeQ" x="16" y="16" width="441" height="200"/>
</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="exclusive-merge.bpmn#_l8nUEWOQEd2mS_8SFTXMeQ"/>
- <edges xmi:type="notation:Edge" xmi:id="_uRi-sGOQEd2mS_8SFTXMeQ" type="3001" source="_qdOYgGOQEd2mS_8SFTXMeQ" target="_sa_swGOQEd2mS_8SFTXMeQ">
- <children xmi:type="notation:Node" xmi:id="_uRjlwmOQEd2mS_8SFTXMeQ" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_uRkM0GOQEd2mS_8SFTXMeQ" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_uRkM0WOQEd2mS_8SFTXMeQ" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_uRkM0mOQEd2mS_8SFTXMeQ" y="-10"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_uRi-sWOQEd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_uRi-smOQEd2mS_8SFTXMeQ" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_uRjlwGOQEd2mS_8SFTXMeQ" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_uRhwkWOQEd2mS_8SFTXMeQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uRjlwWOQEd2mS_8SFTXMeQ" points="[15, 6, -92, -54]$[122, 50, 15, -10]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_u0odoGOQEd2mS_8SFTXMeQ" type="3001" source="_rWgJ4GOQEd2mS_8SFTXMeQ" target="_sa_swGOQEd2mS_8SFTXMeQ">
- <children xmi:type="notation:Node" xmi:id="_u0pEsGOQEd2mS_8SFTXMeQ" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_u0pEsWOQEd2mS_8SFTXMeQ" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_u0pEsmOQEd2mS_8SFTXMeQ" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_u0pEs2OQEd2mS_8SFTXMeQ" y="-10"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_u0odoWOQEd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_u0odomOQEd2mS_8SFTXMeQ" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_u0odo2OQEd2mS_8SFTXMeQ" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_u0nPgWOQEd2mS_8SFTXMeQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u0odpGOQEd2mS_8SFTXMeQ" points="[15, -7, -86, 27]$[112, -48, 11, -14]"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_glDaQHBZEd26O4vNTVSBiw" type="3001" source="_sa_swGOQEd2mS_8SFTXMeQ" target="_f-Zp8HBZEd26O4vNTVSBiw">
<children xmi:type="notation:Node" xmi:id="_glEoYHBZEd26O4vNTVSBiw" type="4012">
<styles xmi:type="notation:FillStyle" xmi:id="_glEoYXBZEd26O4vNTVSBiw" fillColor="16776959"/>
<styles xmi:type="notation:LineStyle" xmi:id="_glEoYnBZEd26O4vNTVSBiw" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_glEoY3BZEd26O4vNTVSBiw" y="40"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_glEoY3BZEd26O4vNTVSBiw" y="-10"/>
</children>
<styles xmi:type="notation:RoutingStyle" xmi:id="_glDaQXBZEd26O4vNTVSBiw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
<styles xmi:type="notation:FontStyle" xmi:id="_glDaQnBZEd26O4vNTVSBiw" fontName="Arial"/>
@@ -90,4 +84,52 @@
<element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_glA-AXBZEd26O4vNTVSBiw"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_glDaRHBZEd26O4vNTVSBiw" points="[24, -1, -70, -1]$[109, -1, 15, -1]"/>
</edges>
+ <edges xmi:type="notation:Edge" xmi:id="_bRBYoHJ5Ed23zo3wS24Gxw" type="3001" source="_qdOYgGOQEd2mS_8SFTXMeQ" target="_Z1l8cHJ5Ed23zo3wS24Gxw">
+ <children xmi:type="notation:Node" xmi:id="_bRB_sHJ5Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_bRB_sXJ5Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_bRB_snJ5Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_bRB_s3J5Ed23zo3wS24Gxw" y="40"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_bRBYoXJ5Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_bRBYonJ5Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_bRBYo3J5Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_bRAKgXJ5Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bRBYpHJ5Ed23zo3wS24Gxw" points="[15, -1, -107, -2]$[176, -1, 54, -2]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_bs8foHJ5Ed23zo3wS24Gxw" type="3001" source="_Z1l8cHJ5Ed23zo3wS24Gxw" target="_sa_swGOQEd2mS_8SFTXMeQ">
+ <children xmi:type="notation:Node" xmi:id="_bs9GsHJ5Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_bs9GsXJ5Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_bs9GsnJ5Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_bs9Gs3J5Ed23zo3wS24Gxw" y="40"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_bs8foXJ5Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_bs8fonJ5Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_bs8fo3J5Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_bs7RgXJ5Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bs8fpHJ5Ed23zo3wS24Gxw" points="[54, 29, -62, -28]$[115, 81, -1, 24]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_d4zTMHJ5Ed23zo3wS24Gxw" type="3001" source="_rWgJ4GOQEd2mS_8SFTXMeQ" target="_c_jXAHJ5Ed23zo3wS24Gxw">
+ <children xmi:type="notation:Node" xmi:id="_d4zTNXJ5Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_d4zTNnJ5Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_d4zTN3J5Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_d4z6QHJ5Ed23zo3wS24Gxw" y="40"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_d4zTMXJ5Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_d4zTMnJ5Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_d4zTM3J5Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_d4xeAXJ5Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d4zTNHJ5Ed23zo3wS24Gxw" points="[15, -2, -107, -3]$[69, -11, -53, -12]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_eUgXwHJ5Ed23zo3wS24Gxw" type="3001" source="_c_jXAHJ5Ed23zo3wS24Gxw" target="_sa_swGOQEd2mS_8SFTXMeQ">
+ <children xmi:type="notation:Node" xmi:id="_eUg-0HJ5Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_eUg-0XJ5Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_eUg-0nJ5Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_eUg-03J5Ed23zo3wS24Gxw" y="40"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_eUgXwXJ5Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_eUgXwnJ5Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_eUgXw3J5Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_eUeikXJ5Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eUgXxHJ5Ed23zo3wS24Gxw" points="[54, -18, -62, 33]$[117, -27, 1, 24]"/>
+ </edges>
</notation:Diagram>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.png
===================================================================
(Binary files differ)
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.png
===================================================================
(Binary files differ)
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn 2008-08-25 07:59:14 UTC (rev 1992)
@@ -0,0 +1,10 @@
+<?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="_t30mkXJ3Ed23zo3wS24Gxw" iD="_t30mkHJ3Ed23zo3wS24Gxw">
+ <pools xmi:type="bpmn:Pool" xmi:id="_t6DbMXJ3Ed23zo3wS24Gxw" iD="_t6DbMHJ3Ed23zo3wS24Gxw" name="Pool">
+ <vertices xmi:type="bpmn:Activity" xmi:id="_t6FQYHJ3Ed23zo3wS24Gxw" iD="_t6EpUHJ3Ed23zo3wS24Gxw" outgoingEdges="_UVV1YXJ4Ed23zo3wS24Gxw" incomingEdges="_K_gHYXJ4Ed23zo3wS24Gxw" name="TaskA" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_I-jjUHJ4Ed23zo3wS24Gxw" iD="_I-i8QHJ4Ed23zo3wS24Gxw" outgoingEdges="_K_gHYXJ4Ed23zo3wS24Gxw" name="StartA" activityType="EventStartSignal"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_SN-gQXJ4Ed23zo3wS24Gxw" iD="_SN-gQHJ4Ed23zo3wS24Gxw" incomingEdges="_UVV1YXJ4Ed23zo3wS24Gxw" activityType="EventEndEmpty"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_K_gHYXJ4Ed23zo3wS24Gxw" iD="_K_gHYHJ4Ed23zo3wS24Gxw" source="_I-jjUHJ4Ed23zo3wS24Gxw" target="_t6FQYHJ3Ed23zo3wS24Gxw"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_UVV1YXJ4Ed23zo3wS24Gxw" iD="_UVV1YHJ4Ed23zo3wS24Gxw" source="_t6FQYHJ3Ed23zo3wS24Gxw" target="_SN-gQXJ4Ed23zo3wS24Gxw"/>
+ </pools>
+</bpmn:BpmnDiagram>
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn_diagram (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.bpmn_diagram 2008-08-25 07:59:14 UTC (rev 1992)
@@ -0,0 +1,72 @@
+<?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="_t377UHJ3Ed23zo3wS24Gxw" type="Bpmn" name="cts-startevent-signal.bpmn_diagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_t6I6wHJ3Ed23zo3wS24Gxw" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_t6KI4HJ3Ed23zo3wS24Gxw" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_t6Kv8HJ3Ed23zo3wS24Gxw" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_t6MlIHJ3Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_t6NMMHJ3Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_t6MlIXJ3Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_t6MlInJ3Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_t6MlI3J3Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_t6MlJHJ3Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="cts-startevent-signal.bpmn#_t6FQYHJ3Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6NzQHJ3Ed23zo3wS24Gxw" x="84" y="72" width="111" height="61"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_I-stQHJ4Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_I-tUUHJ4Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_I-stQXJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_I-stQnJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_I-stQ3J4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_I-stRHJ4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="cts-startevent-signal.bpmn#_I-jjUHJ4Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I-stRXJ4Ed23zo3wS24Gxw" x="12" y="84"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_SN_HUHJ4Ed23zo3wS24Gxw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_SN_uYnJ4Ed23zo3wS24Gxw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_SN_HUXJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_SN_HUnJ4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_SN_HU3J4Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_SN_uYHJ4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="cts-startevent-signal.bpmn#_SN-gQXJ4Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SN_uYXJ4Ed23zo3wS24Gxw" x="240" y="84"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_t6Kv8XJ3Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_t6Kv8nJ3Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_t6Kv83J3Ed23zo3wS24Gxw"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_t6I6wXJ3Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_t6I6wnJ3Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_t6I6w3J3Ed23zo3wS24Gxw" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_t6I6xHJ3Ed23zo3wS24Gxw" lineColor="11119017"/>
+ <element xmi:type="bpmn:Pool" href="cts-startevent-signal.bpmn#_t6DbMXJ3Ed23zo3wS24Gxw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6LXAHJ3Ed23zo3wS24Gxw" x="16" y="16" width="345" height="200"/>
+ </children>
+ <styles xmi:type="notation:PageStyle" xmi:id="_t377UXJ3Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:GuideStyle" xmi:id="_t377UnJ3Ed23zo3wS24Gxw"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_t377U3J3Ed23zo3wS24Gxw"/>
+ <element xmi:type="bpmn:BpmnDiagram" href="cts-startevent-signal.bpmn#_t30mkXJ3Ed23zo3wS24Gxw"/>
+ <edges xmi:type="notation:Edge" xmi:id="_K_jxwHJ4Ed23zo3wS24Gxw" type="3001" source="_I-stQHJ4Ed23zo3wS24Gxw" target="_t6MlIHJ3Ed23zo3wS24Gxw">
+ <children xmi:type="notation:Node" xmi:id="_K_mOAHJ4Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_K_mOAXJ4Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_K_mOAnJ4Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_K_mOA3J4Ed23zo3wS24Gxw" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_K_jxwXJ4Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_K_jxwnJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_K_kY0HJ4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="cts-startevent-signal.bpmn#_K_gHYXJ4Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K_kY0XJ4Ed23zo3wS24Gxw" points="[15, -1, -107, -2]$[69, -26, -53, -27]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_UVYRoHJ4Ed23zo3wS24Gxw" type="3001" source="_t6MlIHJ3Ed23zo3wS24Gxw" target="_SN_HUHJ4Ed23zo3wS24Gxw">
+ <children xmi:type="notation:Node" xmi:id="_UVY4sHJ4Ed23zo3wS24Gxw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_UVY4sXJ4Ed23zo3wS24Gxw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_UVY4snJ4Ed23zo3wS24Gxw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_UVY4s3J4Ed23zo3wS24Gxw" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_UVYRoXJ4Ed23zo3wS24Gxw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_UVYRonJ4Ed23zo3wS24Gxw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_UVYRo3J4Ed23zo3wS24Gxw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="cts-startevent-signal.bpmn#_UVV1YXJ4Ed23zo3wS24Gxw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UVYRpHJ4Ed23zo3wS24Gxw" points="[54, -1, -76, 0]$[130, -1, 0, 0]"/>
+ </edges>
+</notation:Diagram>
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.png
===================================================================
(Binary files differ)
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/cts-startevent-signal.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1991 - in jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm: model and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-08-25 03:42:15 -0400 (Mon, 25 Aug 2008)
New Revision: 1991
Modified:
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ObservableElement.java
Log:
removed imports
Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java 2008-08-23 07:28:47 UTC (rev 1990)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java 2008-08-25 07:42:15 UTC (rev 1991)
@@ -26,7 +26,6 @@
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.model.ObservableElement;
-import org.jbpm.pvm.model.ProcessDefinition;
/** a runtime path of execution.
*
Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ObservableElement.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ObservableElement.java 2008-08-23 07:28:47 UTC (rev 1990)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ObservableElement.java 2008-08-25 07:42:15 UTC (rev 1991)
@@ -21,12 +21,9 @@
*/
package org.jbpm.pvm.model;
-import java.util.HashMap;
import java.util.Set;
-import org.jbpm.pvm.internal.model.EventImpl;
-
/** a super class for process elements that have events.
*
* @author Tom Baeyens
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1989 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 6 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-22 16:13:51 -0400 (Fri, 22 Aug 2008)
New Revision: 1989
Added:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-inputset-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-outputset-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-property-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-property-api10.xml
Removed:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
Log:
Add InputSet/OutputSet tests
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -22,7 +22,7 @@
package org.jboss.bpm.model;
-//$Id$
+//$Id: ActivityBuilder.java 1930 2008-08-19 11:04:43Z thomas.diesler(a)jboss.com $
/**
* The ActivityBuilder can be used to build an Activity dynamically.
@@ -40,7 +40,7 @@
/**
* Add an Property Input
*/
- ActivityBuilder addPropertyInput(String name, String value);
+ ActivityBuilder addPropertyInput(String name);
/**
* Add an OutputSet
@@ -49,6 +49,7 @@
/**
* Add an Property Output
+ * @param value TODO
*/
ActivityBuilder addPropertyOutput(String name, String value);
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -325,7 +325,7 @@
{
taskBuilder.addInputSet();
for (JAXBProperty jaxbProp : jaxbSet.getProperties())
- taskBuilder.addPropertyInput(jaxbProp.getName(), jaxbProp.getValue());
+ taskBuilder.addPropertyInput(jaxbProp.getName());
}
for (JAXBOutputSet jaxbSet : jaxbTask.getOutputSets())
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -51,9 +51,9 @@
return this;
}
- public ActivityBuilder addPropertyInput(String name, String value)
+ public ActivityBuilder addPropertyInput(String name)
{
- Property prop = new PropertyImpl(name, new ExpressionImpl(value));
+ Property prop = new PropertyImpl(name, null);
inputSet.addProperty(prop);
return this;
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -27,6 +27,8 @@
import java.util.Collections;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Activity;
@@ -55,6 +57,9 @@
public abstract class ActivityImpl extends FlowObjectImpl implements Activity, MutablePropertySupport,
SingleInFlowSetterSupport, SingleOutFlowSetterSupport
{
+ // provide logging
+ private static final Log log = LogFactory.getLog(ActivityImpl.class);
+
private List<InputSet> inputSets = new ArrayList<InputSet>();
private List<OutputSet> outputSets = new ArrayList<OutputSet>();
private List<Expression> ioRules = new ArrayList<Expression>();
@@ -222,7 +227,10 @@
}
}
if (inputSet == null)
+ {
+ log.warn("InputSets: " + inputSets);
throw new IllegalStateException("Cannot find matching inputSet for " + exContext + " in Activity: " + getName());
+ }
}
// Create an empty input set
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -87,4 +87,10 @@
{
props.put(prop.getName(), prop);
}
+
+ @Override
+ public String toString()
+ {
+ return "InputSet" + getPropertyNames();
+ }
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -87,4 +87,10 @@
{
props.put(prop.getName(), prop);
}
+
+ @Override
+ public String toString()
+ {
+ return "OutputSet" + getPropertyNames();
+ }
}
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -157,19 +157,19 @@
// Build the CreditCardTask
taskBuilder = procBuilder.addTask(TASK_CREDIT_CARD);
taskBuilder.addInputSet().
- addPropertyInput(PROPERTY_CREDIT_CARD, null).
- addPropertyInput(PROPERTY_EXPIRE, null).
- addPropertyInput(PROPERTY_PRICE, null).
+ addPropertyInput(PROPERTY_CREDIT_CARD).
+ addPropertyInput(PROPERTY_EXPIRE).
+ addPropertyInput(PROPERTY_PRICE).
addSequenceFlow(GATEWAY_SYNC_JOIN);
// Build the BookingTask
taskBuilder = procBuilder.addTask(TASK_BOOKING);
taskBuilder.addInputSet().
- addPropertyInput(PROPERTY_NAME, null).
- addPropertyInput(PROPERTY_FROM, null).
- addPropertyInput(PROPERTY_TO, null).
- addPropertyInput(PROPERTY_DATE, null).
- addPropertyInput(PROPERTY_SEATS, null).
+ addPropertyInput(PROPERTY_NAME).
+ addPropertyInput(PROPERTY_FROM).
+ addPropertyInput(PROPERTY_TO).
+ addPropertyInput(PROPERTY_DATE).
+ addPropertyInput(PROPERTY_SEATS).
addSequenceFlow(GATEWAY_SYNC_JOIN);
// Build the SynchronizedJoinGateway
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetDescriptorTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -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.cts.activity;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test Activity InputSet
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityInputSetDescriptorTest extends ActivityInputSetTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/activity/activity-inputset-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetDescriptorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetMarshallerTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test Activity InputSet
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityInputSetMarshallerTest extends ActivityInputSetTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ //System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetTest.java (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityInputSetTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,94 @@
+/*
+ * 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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.runtime.BasicAttachments;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * InputSets define the data requirements for input to the activity. Zero or more InputSets MAY be defined. Each
+ * InputSet is sufficient to allow the activity to be performed (if it has first been instantiated by the appropriate
+ * signal arriving from an incoming Sequence Flow).
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1702
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityInputSetTest extends DefaultEngineTestCase
+{
+ public void testValidProps() throws Exception
+ {
+ Process proc = getProcess();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("frog", "kermit");
+ proc.startProcess(att);
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("kermit", endMessage.getPropertyValue("frog"));
+ }
+
+ public void testInvalidProps() throws Exception
+ {
+ Process proc = getProcess();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("pig", "piggy");
+ proc.startProcess(att);
+
+ try
+ {
+ proc.waitForEnd();
+ }
+ catch (RuntimeException ex)
+ {
+ // expected
+ }
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("ActivityInputSet").addStartEvent("Start").addSequenceFlow("TaskA");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addInputSet().addPropertyInput("frog").addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("frog", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test Activity OutputSet
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1703
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityOutputSetMarshallerTest extends ActivityOutputSetTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,74 @@
+/*
+ * 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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * OutputSets define the data requirements for output from the activity. Zero or more OutputSets MAY be defined. At the
+ * completion of the activity, only one of the OutputSets may be produced. It is up to the implementation of the
+ * activity to determine which set will be produced. However, the IORules MAY indicate a relationship between an
+ * OutputSet and an InputSet that started the activity.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1703
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityOutputSetTest extends DefaultEngineTestCase
+{
+ public void testValidProps() throws Exception
+ {
+ Process proc = getProcess();
+
+ proc.startProcess();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("kermit", endMessage.getPropertyValue("frog"));
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("ActivityInputSet").addStartEvent("Start").addSequenceFlow("TaskA");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addOutputSet().addPropertyOutput("frog", "kermit").addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("frog", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.activity;
-
-// $Id$
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- *
- * An ActivityPropertyTest using the API Descriptor
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ActivityPropertiesDescriptorTest extends ActivityPropertiesTest
-{
- @Override
- protected Process getProcess() throws IOException
- {
- URL procURL = getResourceURL("cts/activity/activity-properties-" + getDialect() + ".xml");
- ProcessManager pm = ProcessManager.locateProcessManager();
- Process proc = pm.createProcess(procURL);
- return proc;
- }
-}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.activity;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- *
- * An ActivityPropertyTest using the ProcessMarshaller
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ActivityPropertiesMarshallerTest extends ActivityPropertiesTest
-{
- @Override
- protected Process getProcess() throws IOException
- {
- // Marshall the process to a string
- Process proc = super.getProcess();
- String procXML = marshallProcess(proc);
-
- // System.out.println(procXML);
-
- // Recreate the process from the marshalled process
- ProcessManager procManager = ProcessManager.locateProcessManager();
- return procManager.createProcess(procXML);
- }
-}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.activity;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.MessageBuilder;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.ProcessBuilder;
-import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.Assignment.AssignTime;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.test.DefaultEngineTestCase;
-
-/**
- * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These
- * Properties are only for use within the processing of the activity. The fully delineated name of these properties is
- * "<process name>.<activity name>.<property name>" (e.g., "Add Customer.Review Credit.Status").
- *
- * https://jira.jboss.org/jira/browse/JBPM-1621
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ActivityPropertiesTest extends DefaultEngineTestCase
-{
- public void testActivityPropertyRead() throws Exception
- {
- Process proc = getProcess();
- proc.startProcess();
- proc.waitForEnd();
-
- Message endMessage = getMessages().get(0);
- assertNotNull("EndMessage expected", endMessage);
- assertEquals("bar", endMessage.getPropertyValue("propValue"));
- }
-
- protected Process getProcess() throws IOException
- {
- ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA");
- TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
- taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
- taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "propValue");
- procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
- MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
- Process proc = procBuilder.getProcess();
- return proc;
- }
-}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyDescriptorTest.java (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyDescriptorTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,49 @@
+/*
+ * 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.activity;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ActivityPropertyTest using the API Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityPropertyDescriptorTest extends ActivityPropertyTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/activity/activity-property-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ActivityPropertyTest using the ProcessMarshaller
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityPropertyMarshallerTest extends ActivityPropertyTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ // System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,75 @@
+/*
+ * 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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These
+ * Properties are only for use within the processing of the activity. The fully delineated name of these properties is
+ * "<process name>.<activity name>.<property name>" (e.g., "Add Customer.Review Credit.Status").
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1621
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityPropertyTest extends DefaultEngineTestCase
+{
+ public void testActivityPropertyRead() throws Exception
+ {
+ Process proc = getProcess();
+ proc.startProcess();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getPropertyValue("propValue"));
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "propValue");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.process;
-
-// $Id$
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- *
- * An ProcessPropertyTest using the Descriptor
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ProcessPropertiesDescriptorTest extends ProcessPropertiesTest
-{
- protected Process getProcess() throws IOException
- {
- URL procURL = getResourceURL("cts/process/process-properties-" + getDialect() + ".xml");
- ProcessManager pm = ProcessManager.locateProcessManager();
- Process proc = pm.createProcess(procURL);
- return proc;
- }
-}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.process;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- *
- * An ProcessPropertyTest using the ProcessMarshaller
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ProcessPropertiesMarshallerTest extends ProcessPropertiesTest
-{
- protected Process getProcess() throws IOException
- {
- // Marshall the process to a string
- Process proc = super.getProcess();
- String procXML = marshallProcess(proc);
-
- // Recreate the process from the marshalled process
- ProcessManager procManager = ProcessManager.locateProcessManager();
- return procManager.createProcess(procXML);
- }
-}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,79 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.process;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.MessageBuilder;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.ProcessBuilder;
-import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Assignment.AssignTime;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.test.DefaultEngineTestCase;
-
-/**
- * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks,
- * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully delineated
- * name of these properties are "<process name>.<property name>" (e.g., "Add Customer.Customer Name"). If a process is
- * embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent Process name for
- * as many Parents there are until the top level Process.
- *
- * https://jira.jboss.org/jira/browse/JBPM-1392
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ProcessPropertiesTest extends DefaultEngineTestCase
-{
- /**
- * Test the the process properties can be used by Assignments
- * and finally arrive in through the End Message
- */
- public void testProcessProperties() throws Exception
- {
- Process proc = getProcess();
- proc.startProcess();
- proc.waitForEnd();
-
- Message endMessage = getMessages().get(0);
- assertNotNull("EndMessage expected", endMessage);
- assertEquals("bar", endMessage.getPropertyValue("propValue"));
- }
-
- protected Process getProcess() throws IOException
- {
- ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "propValue");
- procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
- procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
- MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
- Process proc = procBuilder.getProcess();
- return proc;
- }
-}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyDescriptorTest.java (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyDescriptorTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -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.cts.process;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ProcessPropertyTest using the Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ProcessPropertyDescriptorTest extends ProcessPropertyTest
+{
+ protected Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/process/process-property-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,50 @@
+/*
+ * 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.process;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ProcessPropertyTest using the ProcessMarshaller
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ProcessPropertyMarshallerTest extends ProcessPropertyTest
+{
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,79 @@
+/*
+ * 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.process;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks,
+ * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully delineated
+ * name of these properties are "<process name>.<property name>" (e.g., "Add Customer.Customer Name"). If a process is
+ * embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent Process name for
+ * as many Parents there are until the top level Process.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1392
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ProcessPropertyTest extends DefaultEngineTestCase
+{
+ /**
+ * Test the the process properties can be used by Assignments
+ * and finally arrive in through the End Message
+ */
+ public void testProcessProperties() throws Exception
+ {
+ Process proc = getProcess();
+ proc.startProcess();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getPropertyValue("propValue"));
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "propValue");
+ procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-inputset-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-inputset-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-inputset-api10.xml 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,24 @@
+<ns2:process name="ActivityInputSet" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="None" name="TaskA">
+ <seqflow to="End" />
+ <input-set>
+ <property>
+ <name>frog</name>
+ </property>
+ </input-set>
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ActivityInputSetTest</to>
+ <property correlation="true">
+ <name>frog</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-inputset-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-outputset-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-outputset-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-outputset-api10.xml 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,25 @@
+<ns2:process name="ActivityInputSet" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="None" name="TaskA">
+ <seqflow to="End" />
+ <output-set>
+ <property>
+ <name>frog</name>
+ <value>kermit</value>
+ </property>
+ </output-set>
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ActivityOutputSetTest</to>
+ <property correlation="true">
+ <name>frog</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-outputset-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,27 +0,0 @@
-<ns2:process name="ActivityProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
- <start name="Start">
- <seqflow to="TaskA" />
- </start>
- <task taskType="None" name="TaskA">
- <assignment time="Start">
- <from lang="MVEL">ActivityProperties_TaskA_foo</from>
- <to>propValue</to>
- </assignment>
- <property>
- <name>foo</name>
- <value>bar</value>
- </property>
- <seqflow to="End" />
- </task>
- <end name="End">
- <message-result>
- <messageRef nameRef="EndMessage" />
- </message-result>
- </end>
- <message name="EndMessage">
- <to>jboss.bpm:test=ActivityPropertiesTest</to>
- <property correlation="true">
- <name>propValue</name>
- </property>
- </message>
-</ns2:process>
\ No newline at end of file
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-property-api10.xml (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-property-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-property-api10.xml 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,27 @@
+<ns2:process name="ActivityProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="None" name="TaskA">
+ <assignment time="Start">
+ <from lang="MVEL">ActivityProperties_TaskA_foo</from>
+ <to>propValue</to>
+ </assignment>
+ <property>
+ <name>foo</name>
+ <value>bar</value>
+ </property>
+ <seqflow to="End" />
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ActivityPropertyTest</to>
+ <property correlation="true">
+ <name>propValue</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml 2008-08-22 18:58:58 UTC (rev 1988)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml 2008-08-22 20:13:51 UTC (rev 1989)
@@ -1,27 +0,0 @@
-<ns2:process name="ProcessProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
- <start name="Start">
- <assignment time="Start">
- <from lang="MVEL">ProcessProperties_foo</from>
- <to>propValue</to>
- </assignment>
- <seqflow to="TaskA" />
- </start>
- <task taskType="None" name="TaskA">
- <seqflow to="End" />
- </task>
- <end name="End">
- <message-result>
- <messageRef nameRef="EndMessage" />
- </message-result>
- </end>
- <message name="EndMessage">
- <to>jboss.bpm:test=ProcessPropertiesTest</to>
- <property correlation="true">
- <name>propValue</name>
- </property>
- </message>
- <property>
- <name>foo</name>
- <value>bar</value>
- </property>
-</ns2:process>
\ No newline at end of file
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-property-api10.xml (from rev 1987, jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-property-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-property-api10.xml 2008-08-22 20:13:51 UTC (rev 1989)
@@ -0,0 +1,27 @@
+<ns2:process name="ProcessProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <assignment time="Start">
+ <from lang="MVEL">ProcessProperties_foo</from>
+ <to>propValue</to>
+ </assignment>
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="None" name="TaskA">
+ <seqflow to="End" />
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ProcessPropertyTest</to>
+ <property correlation="true">
+ <name>propValue</name>
+ </property>
+ </message>
+ <property>
+ <name>foo</name>
+ <value>bar</value>
+ </property>
+</ns2:process>
\ No newline at end of file
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1988 - in jbpm3/branches/jpdl-3.2.3.CP/bpel: container/jboss405 and 17 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-08-22 14:58:58 -0400 (Fri, 22 Aug 2008)
New Revision: 1988
Modified:
jbpm3/branches/jpdl-3.2.3.CP/bpel/container/jboss403/
jbpm3/branches/jpdl-3.2.3.CP/bpel/container/jboss405/
jbpm3/branches/jpdl-3.2.3.CP/bpel/container/jboss420/
jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/
jbpm3/branches/jpdl-3.2.3.CP/bpel/enterprise/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/account/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/atm/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/common/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/hello/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/invoice/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/purchase/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/scheduling/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/shipping/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/ticket/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/
jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/trip/
jbpm3/branches/jpdl-3.2.3.CP/bpel/userguide/
Log:
excluded target directories from version control
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/container/jboss403
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/container/jboss405
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/container/jboss420
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/enterprise
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/account
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/atm
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/common
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/hello
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/invoice
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/purchase
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/scheduling
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/shipping
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/ticket
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/trip
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/userguide
___________________________________________________________________
Name: svn:ignore
+ target
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1987 - in jbossbpm/spec/trunk: docs/VioletUML and 26 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-22 14:56:09 -0400 (Fri, 22 Aug 2008)
New Revision: 1987
Added:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml
Removed:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java
Modified:
jbossbpm/spec/trunk/docs/VioletUML/APIExecution.png
jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java
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/DefaultEngineTestCase.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
jbossbpm/spec/trunk/modules/testsuite/pom.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.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.bpmn
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram
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
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.png
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml
jbossbpm/spec/trunk/pom.xml
Log:
Add more descriptor tests
Modified: jbossbpm/spec/trunk/docs/VioletUML/APIExecution.png
===================================================================
(Binary files differ)
Modified: jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet
===================================================================
--- jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet 2008-08-22 18:56:09 UTC (rev 1987)
@@ -11,7 +11,7 @@
</object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>37.0</double>
+ <double>8.0</double>
<double>0.0</double>
</void>
</object>
@@ -36,24 +36,11 @@
<void method="addChild">
<object id="ActivationBarNode3" class="com.horstmann.violet.CallNode">
<void property="implicitParameter">
- <object idref="LifelineNode1"/>
- </void>
- </object>
- </void>
- <void method="addChild">
- <object id="ActivationBarNode4" class="com.horstmann.violet.CallNode">
- <void property="implicitParameter">
- <object idref="LifelineNode1"/>
- </void>
- </object>
- </void>
- <void method="addChild">
- <object id="ActivationBarNode5" class="com.horstmann.violet.CallNode">
- <void property="implicitParameter">
<object id="LifelineNode2" class="com.horstmann.violet.ImplicitParameterNode">
<void property="name">
<void property="text">
- <string>Flow
+ <string>Token
+Executor
</string>
</void>
</void>
@@ -62,12 +49,13 @@
</object>
</void>
<void method="addChild">
- <object id="ActivationBarNode6" class="com.horstmann.violet.CallNode">
+ <object id="ActivationBarNode4" class="com.horstmann.violet.CallNode">
<void property="implicitParameter">
<object id="LifelineNode3" class="com.horstmann.violet.ImplicitParameterNode">
<void property="name">
<void property="text">
- <string>FlowObject</string>
+ <string>Runnable
+Process</string>
</void>
</void>
</object>
@@ -75,65 +63,112 @@
</object>
</void>
<void method="addChild">
- <object id="ActivationBarNode7" class="com.horstmann.violet.CallNode">
- <void property="implicitParameter">
- <object id="LifelineNode4" class="com.horstmann.violet.ImplicitParameterNode">
- <void property="name">
- <void property="text">
- <string>Execution
+ <object id="ActivationBarNode5" class="com.horstmann.violet.CallNode">
+ <void method="addChild">
+ <object id="ActivationBarNode6" class="com.horstmann.violet.CallNode">
+ <void method="addChild">
+ <object id="ActivationBarNode7" class="com.horstmann.violet.CallNode">
+ <void property="implicitParameter">
+ <object id="LifelineNode4" class="com.horstmann.violet.ImplicitParameterNode">
+ <void property="name">
+ <void property="text">
+ <string>Sequence
+Flow</string>
+ </void>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="addChild">
+ <object id="ActivationBarNode8" class="com.horstmann.violet.CallNode">
+ <void property="implicitParameter">
+ <object id="LifelineNode5" class="com.horstmann.violet.ImplicitParameterNode">
+ <void property="name">
+ <void property="text">
+ <string>Signal
Handler</string>
- </void>
+ </void>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
+ <void method="addChild">
+ <object id="ActivationBarNode9" class="com.horstmann.violet.CallNode">
+ <void property="implicitParameter">
+ <object id="LifelineNode6" class="com.horstmann.violet.ImplicitParameterNode">
+ <void property="name">
+ <void property="text">
+ <string>Execution
+Handler</string>
+ </void>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="addChild">
+ <object id="ActivationBarNode10" class="com.horstmann.violet.CallNode">
+ <void property="implicitParameter">
+ <object id="LifelineNode7" class="com.horstmann.violet.ImplicitParameterNode">
+ <void property="name">
+ <void property="text">
+ <string>Flow
+Handler</string>
+ </void>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="implicitParameter">
+ <object id="LifelineNode8" class="com.horstmann.violet.ImplicitParameterNode">
+ <void property="name">
+ <void property="text">
+ <string>Runnable
+Token</string>
+ </void>
+ </void>
+ </object>
+ </void>
</object>
</void>
+ <void property="implicitParameter">
+ <object idref="LifelineNode2"/>
+ </void>
</object>
</void>
- <void method="addChild">
- <object id="ActivationBarNode8" class="com.horstmann.violet.CallNode">
- <void property="implicitParameter">
- <object idref="LifelineNode3"/>
+ <void property="implicitParameter">
+ <object id="LifelineNode9" class="com.horstmann.violet.ImplicitParameterNode">
+ <void property="name">
+ <void property="text">
+ <string>Execution
+Manager</string>
+ </void>
</void>
</object>
</void>
+ </object>
+ </void>
+ <void method="addChild">
+ <object id="ActivationBarNode11" class="com.horstmann.violet.CallNode">
<void method="addChild">
- <object id="ActivationBarNode9" class="com.horstmann.violet.CallNode">
+ <object id="ActivationBarNode12" class="com.horstmann.violet.CallNode">
<void method="addChild">
- <object id="ActivationBarNode10" class="com.horstmann.violet.CallNode">
+ <object id="ActivationBarNode13" class="com.horstmann.violet.CallNode">
<void property="implicitParameter">
- <object idref="LifelineNode1"/>
+ <object idref="LifelineNode8"/>
</void>
</object>
</void>
<void property="implicitParameter">
- <object id="LifelineNode5" class="com.horstmann.violet.ImplicitParameterNode">
- <void property="name">
- <void property="text">
- <string>FlowHandler</string>
- </void>
- </void>
- </object>
+ <object idref="LifelineNode3"/>
</void>
</object>
</void>
- <void method="addChild">
- <object id="ActivationBarNode11" class="com.horstmann.violet.CallNode">
- <void property="implicitParameter">
- <object idref="LifelineNode1"/>
- </void>
- <void property="openBottom">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
<void property="implicitParameter">
- <object id="LifelineNode6" class="com.horstmann.violet.ImplicitParameterNode">
- <void property="name">
- <void property="text">
- <string>Execution
-Manager</string>
- </void>
- </void>
- </object>
+ <object idref="LifelineNode9"/>
</void>
<void property="openBottom">
<boolean>true</boolean>
@@ -146,193 +181,229 @@
</object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>69.0</double>
+ <double>40.0</double>
<double>80.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="LifelineNode6"/>
+ <object idref="LifelineNode9"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>230.0</double>
+ <double>100.0</double>
<double>0.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="LifelineNode3"/>
+ <object idref="LifelineNode7"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>561.0</double>
+ <double>945.0</double>
<double>0.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="LifelineNode5"/>
+ <object idref="LifelineNode1"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>782.0</double>
+ <double>198.0</double>
<double>0.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="LifelineNode1"/>
+ <object idref="ActivationBarNode1"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>343.0</double>
- <double>0.0</double>
+ <double>132.0</double>
+ <double>103.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode1"/>
+ <object id="NoteNode0" class="com.horstmann.violet.NoteNode">
+ <void property="text">
+ <void property="text">
+ <string>The FlowHandler calls
+create, start, move, suspend,
+activate, destroy on the
+TokenExecutor</string>
+ </void>
+ </void>
+ </object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>262.0</double>
- <double>103.0</double>
+ <double>752.0</double>
+ <double>545.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode4"/>
+ <object id="PointNode0" class="com.horstmann.violet.PointNode">
+ <void id="Rectangle2D$Double0" property="bounds">
+ <void method="setRect">
+ <double>983.0</double>
+ <double>509.0</double>
+ <double>0.0</double>
+ <double>0.0</double>
+ </void>
+ </void>
+ <void property="bounds">
+ <object idref="Rectangle2D$Double0"/>
+ </void>
+ </object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>375.0</double>
- <double>232.0</double>
+ <double>983.0</double>
+ <double>509.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="LifelineNode2"/>
+ <object id="PointNode1" class="com.horstmann.violet.PointNode">
+ <void id="Rectangle2D$Double1" property="bounds">
+ <void method="setRect">
+ <double>550.0</double>
+ <double>420.0</double>
+ <double>0.0</double>
+ <double>0.0</double>
+ </void>
+ </void>
+ <void property="bounds">
+ <object idref="Rectangle2D$Double1"/>
+ </void>
+ </object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>455.0</double>
- <double>0.0</double>
+ <double>550.0</double>
+ <double>420.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode5"/>
+ <object id="NoteNode1" class="com.horstmann.violet.NoteNode">
+ <void property="text">
+ <void property="text">
+ <string>The RunnableToken thread
+ends when destroy is called
+on the TokenExecutor</string>
+ </void>
+ </void>
+ </object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>487.0</double>
- <double>285.0</double>
+ <double>349.0</double>
+ <double>476.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode8"/>
+ <object idref="LifelineNode6"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>593.0</double>
- <double>444.0</double>
+ <double>846.0</double>
+ <double>0.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode9"/>
+ <object idref="ActivationBarNode2"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>814.0</double>
- <double>497.0</double>
+ <double>230.0</double>
+ <double>126.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode10"/>
+ <object idref="LifelineNode2"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>375.0</double>
- <double>520.0</double>
+ <double>293.0</double>
+ <double>0.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode11"/>
+ <object idref="ActivationBarNode3"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>375.0</double>
- <double>593.0</double>
+ <double>325.0</double>
+ <double>179.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object id="NoteNode0" class="com.horstmann.violet.NoteNode">
- <void property="text">
- <void property="text">
- <string>The FlowHandler adds all
-active outgoing Flows to the
-FlowQueue in the Token</string>
- </void>
+ <object idref="LifelineNode3"/>
+ <object class="java.awt.geom.Point2D$Double">
+ <void method="setLocation">
+ <double>400.0</double>
+ <double>0.0</double>
</void>
</object>
+ </void>
+ <void method="addNode">
+ <object idref="ActivationBarNode5"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>831.0</double>
- <double>352.0</double>
+ <double>325.0</double>
+ <double>285.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object id="PointNode0" class="com.horstmann.violet.PointNode">
- <void id="Rectangle2D$Double0" property="bounds">
- <void method="setRect">
- <double>822.0</double>
- <double>521.0</double>
- <double>0.0</double>
- <double>0.0</double>
- </void>
+ <object idref="LifelineNode5"/>
+ <object class="java.awt.geom.Point2D$Double">
+ <void method="setLocation">
+ <double>753.0</double>
+ <double>0.0</double>
</void>
- <void property="bounds">
- <object idref="Rectangle2D$Double0"/>
- </void>
</object>
+ </void>
+ <void method="addNode">
+ <object idref="LifelineNode8"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>822.0</double>
- <double>521.0</double>
+ <double>511.0</double>
+ <double>0.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object id="PointNode1" class="com.horstmann.violet.PointNode">
- <void id="Rectangle2D$Double1" property="bounds">
- <void method="setRect">
- <double>270.0</double>
- <double>593.0</double>
- <double>0.0</double>
- <double>0.0</double>
- </void>
+ <object idref="ActivationBarNode6"/>
+ <object class="java.awt.geom.Point2D$Double">
+ <void method="setLocation">
+ <double>543.0</double>
+ <double>308.0</double>
</void>
- <void property="bounds">
- <object idref="Rectangle2D$Double1"/>
- </void>
</object>
+ </void>
+ <void method="addNode">
+ <object idref="ActivationBarNode8"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>270.0</double>
- <double>593.0</double>
+ <double>785.0</double>
+ <double>384.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object id="NoteNode1" class="com.horstmann.violet.NoteNode">
- <void property="text">
- <void property="text">
- <string>The ExecutionManager
-executes Flows while
-there are any in the
-FlowQueue.</string>
- </void>
+ <object idref="ActivationBarNode9"/>
+ <object class="java.awt.geom.Point2D$Double">
+ <void method="setLocation">
+ <double>878.0</double>
+ <double>437.0</double>
</void>
</object>
+ </void>
+ <void method="addNode">
+ <object idref="ActivationBarNode10"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>96.0</double>
- <double>429.0</double>
+ <double>977.0</double>
+ <double>490.0</double>
</void>
</object>
</void>
@@ -340,60 +411,94 @@
<object idref="LifelineNode4"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>670.0</double>
+ <double>637.0</double>
<double>0.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode6"/>
+ <object idref="ActivationBarNode7"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>593.0</double>
- <double>338.0</double>
+ <double>669.0</double>
+ <double>331.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode7"/>
+ <object idref="ActivationBarNode11"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>702.0</double>
- <double>391.0</double>
+ <double>132.0</double>
+ <double>603.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode2"/>
+ <object id="NoteNode2" class="com.horstmann.violet.NoteNode">
+ <void property="text">
+ <void property="text">
+ <string>The RunnableProcess
+thread ends when there
+are no more RunnableTokens</string>
+ </void>
+ </void>
+ </object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>375.0</double>
- <double>126.0</double>
+ <double>458.0</double>
+ <double>97.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object class="com.horstmann.violet.CallNode">
- <void property="implicitParameter">
- <object idref="LifelineNode0"/>
+ <object id="PointNode2" class="com.horstmann.violet.PointNode">
+ <void id="Rectangle2D$Double2" property="bounds">
+ <void method="setRect">
+ <double>440.0</double>
+ <double>195.0</double>
+ <double>0.0</double>
+ <double>0.0</double>
+ </void>
</void>
+ <void property="bounds">
+ <object idref="Rectangle2D$Double2"/>
+ </void>
</object>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>69.0</double>
- <double>753.0</double>
+ <double>440.0</double>
+ <double>195.0</double>
</void>
</object>
</void>
<void method="addNode">
- <object idref="ActivationBarNode3"/>
+ <object idref="ActivationBarNode4"/>
<object class="java.awt.geom.Point2D$Double">
<void method="setLocation">
- <double>375.0</double>
- <double>179.0</double>
+ <double>432.0</double>
+ <double>232.0</double>
</void>
</object>
</void>
+ <void method="addNode">
+ <object idref="ActivationBarNode12"/>
+ <object class="java.awt.geom.Point2D$Double">
+ <void method="setLocation">
+ <double>432.0</double>
+ <double>626.0</double>
+ </void>
+ </object>
+ </void>
+ <void method="addNode">
+ <object idref="ActivationBarNode13"/>
+ <object class="java.awt.geom.Point2D$Double">
+ <void method="setLocation">
+ <double>543.0</double>
+ <double>649.0</double>
+ </void>
+ </object>
+ </void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
@@ -404,104 +509,137 @@
<object idref="ActivationBarNode1"/>
</void>
<void method="connect">
+ <object class="com.horstmann.violet.NoteEdge"/>
+ <object idref="NoteNode0"/>
+ <object idref="PointNode0"/>
+ </void>
+ <void method="connect">
+ <object class="com.horstmann.violet.NoteEdge"/>
+ <object idref="NoteNode1"/>
+ <object idref="PointNode1"/>
+ </void>
+ <void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>getHeadFlow</string>
+ <string>create</string>
</void>
</object>
<object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode4"/>
+ <object idref="ActivationBarNode2"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>getTarget</string>
+ <string>create</string>
</void>
</object>
<object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode5"/>
+ <object idref="ActivationBarNode3"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>getFlowHandler</string>
+ <string>startToken</string>
</void>
</object>
<object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode8"/>
+ <object idref="ActivationBarNode5"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>transfer(tok)</string>
+ <string>start thread</string>
</void>
</object>
- <object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode9"/>
+ <object idref="ActivationBarNode5"/>
+ <object idref="ActivationBarNode6"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>addTailFlows</string>
+ <string>throwEnterSignal</string>
</void>
</object>
- <object idref="ActivationBarNode9"/>
- <object idref="ActivationBarNode10"/>
+ <object idref="ActivationBarNode6"/>
+ <object idref="ActivationBarNode8"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>getHeadFlow</string>
+ <string>execute</string>
</void>
</object>
- <object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode11"/>
+ <object idref="ActivationBarNode6"/>
+ <object idref="ActivationBarNode9"/>
</void>
<void method="connect">
- <object class="com.horstmann.violet.NoteEdge"/>
- <object idref="NoteNode0"/>
- <object idref="PointNode0"/>
+ <object class="com.horstmann.violet.CallEdge">
+ <void property="middleLabel">
+ <string>execute</string>
+ </void>
+ </object>
+ <object idref="ActivationBarNode6"/>
+ <object idref="ActivationBarNode10"/>
</void>
<void method="connect">
- <object class="com.horstmann.violet.NoteEdge"/>
- <object idref="NoteNode1"/>
- <object idref="PointNode1"/>
+ <object class="com.horstmann.violet.CallEdge">
+ <void property="middleLabel">
+ <string>getTarget</string>
+ </void>
+ </object>
+ <object idref="ActivationBarNode6"/>
+ <object idref="ActivationBarNode7"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>getExecutionHandler</string>
+ <string>waitForEnd</string>
</void>
</object>
- <object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode6"/>
+ <object idref="ActivationBarNode0"/>
+ <object idref="ActivationBarNode11"/>
</void>
<void method="connect">
+ <object class="com.horstmann.violet.NoteEdge"/>
+ <object idref="NoteNode2"/>
+ <object idref="PointNode2"/>
+ </void>
+ <void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>execute(tok)</string>
+ <string>start thread</string>
</void>
</object>
<object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode7"/>
+ <object idref="ActivationBarNode4"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>createToken</string>
+ <string>waitForEnd</string>
</void>
</object>
- <object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode2"/>
+ <object idref="ActivationBarNode11"/>
+ <object idref="ActivationBarNode12"/>
</void>
<void method="connect">
<object class="com.horstmann.violet.CallEdge">
<void property="middleLabel">
- <string>addTailFlow</string>
+ <string>hasRunnableTokens</string>
</void>
</object>
- <object idref="ActivationBarNode1"/>
- <object idref="ActivationBarNode3"/>
+ <object idref="ActivationBarNode12"/>
+ <object idref="ActivationBarNode13"/>
</void>
+ <void method="connect">
+ <object class="com.horstmann.violet.ReturnEdge"/>
+ <object idref="ActivationBarNode12"/>
+ <object idref="ActivationBarNode11"/>
+ </void>
+ <void method="connect">
+ <object class="com.horstmann.violet.ReturnEdge"/>
+ <object idref="ActivationBarNode11"/>
+ <object idref="ActivationBarNode0"/>
+ </void>
</object>
</java>
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -74,7 +74,8 @@
{
synchronized (listeners)
{
- return Collections.unmodifiableSet(listeners);
+ HashSet<SignalListener> set = new HashSet<SignalListener>(listeners);
+ return Collections.unmodifiableSet(set);
}
}
@@ -96,8 +97,8 @@
public void throwSignal(Signal signal)
{
log.debug("throwSignal: " + signal);
- Set<SignalListener> currentListeners = getSignalListeners();
- for (SignalListener listener : currentListeners)
+ Set<SignalListener> currentSet = getSignalListeners();
+ for (SignalListener listener : currentSet)
{
if (failsafeAccept(listener, signal))
failsafeThrow(listener, signal);
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-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -270,7 +270,10 @@
public ObjectName getTestID()
{
- return ObjectNameFactory.create(Constants.ID_DOMAIN, "test", getShortName());
+ String shortName = getShortName();
+ shortName = shortName.replace("DescriptorTest", "Test");
+ shortName = shortName.replace("MarshallerTest", "Test");
+ return ObjectNameFactory.create(Constants.ID_DOMAIN, "test", shortName);
}
public List<Message> getMessages()
@@ -292,7 +295,7 @@
{
if (out == null)
{
- File file = new File("target/" + getName() + "-api10.xml");
+ File file = new File("target/" + getName() + "-" + getDialect() + ".xml");
out = new FileWriter(file);
System.out.println("Marshall process to: " + file.getCanonicalPath());
}
@@ -314,11 +317,11 @@
*/
public String marshallProcess(Process proc) throws IOException
{
- ProcessManager pm = ProcessManager.locateProcessManager();
- DialectHandler dhapi = pm.getDialectHandler(DialectHandler.DEFAULT_NAMESPACE_URI);
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ DialectHandler dialectHandler = procManager.getDialectHandler(getDialectURI());
StringWriter strwr = new StringWriter();
- dhapi.marshallProcess(proc, strwr);
+ dialectHandler.marshallProcess(proc, strwr);
return strwr.toString();
}
@@ -328,6 +331,25 @@
protected String getShortName()
{
String shortName = getClass().getName();
- return shortName.substring(shortName.lastIndexOf(".") + 1);
+ shortName = shortName.substring(shortName.lastIndexOf(".") + 1);
+ return shortName;
}
+
+ /**
+ * Get the BPM descriptor dialect ID
+ */
+ protected String getDialect()
+ {
+ String dialect = System.getProperty("jbpm.dialect", "api10");
+ return dialect;
+ }
+
+ /**
+ * Get the BPM descriptor dialect ID
+ */
+ protected String getDialectURI()
+ {
+ String dialect = System.getProperty("jbpm.dialect.uri", DialectHandler.DEFAULT_NAMESPACE_URI);
+ return dialect;
+ }
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -32,13 +32,4 @@
{
return ProcessEngine.JBPM_ENGINE_CONFIG;
}
-
- /**
- * Get the jBPM descriptor dialect.
- */
- protected String getDialect()
- {
- String dialect = System.getProperty("jbpm.dialect", "api10");
- return dialect;
- }
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -46,4 +46,10 @@
this.name = name;
}
+
+ @Override
+ public String toString()
+ {
+ return getParticipantType() + "[" + getName() + "]";
+ }
}
Modified: jbossbpm/spec/trunk/modules/testsuite/pom.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/pom.xml 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/pom.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -115,6 +115,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>jbpm.dialect</name>
+ <value>api10</value>
+ </property>
+ <property>
+ <name>jbpm.dialect.uri</name>
+ <value>urn:bpm.jboss:pdl-0.1</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -133,6 +152,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>org/jboss/bpm/cts/**/*DescriptorTest.java</exclude>
<exclude>org/jboss/bpm/cts/**/*MarshallerTest.java</exclude>
<exclude>org/jboss/bpm/cts/**/*APITest.java</exclude>
<exclude>org/jboss/bpm/cts/**/*STPTest.java</exclude>
@@ -160,6 +180,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>org/jboss/bpm/pattern/**/*DescriptorTest.java</exclude>
<exclude>org/jboss/bpm/pattern/**/*MarshallerTest.java</exclude>
<exclude>org/jboss/bpm/pattern/**/*APITest.java</exclude>
<exclude>org/jboss/bpm/pattern/**/*STPTest.java</exclude>
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,49 @@
+/*
+ * 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.activity;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ActivityPropertyTest using the API Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityPropertiesDescriptorTest extends ActivityPropertiesTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/activity/activity-properties-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ActivityPropertyTest using the ProcessMarshaller
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityPropertiesMarshallerTest extends ActivityPropertiesTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ // System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,75 @@
+/*
+ * 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.activity;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These
+ * Properties are only for use within the processing of the activity. The fully delineated name of these properties is
+ * "<process name>.<activity name>.<property name>" (e.g., "Add Customer.Review Credit.Status").
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1621
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ActivityPropertiesTest extends DefaultEngineTestCase
+{
+ public void testActivityPropertyRead() throws Exception
+ {
+ Process proc = getProcess();
+ proc.startProcess();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getPropertyValue("propValue"));
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "propValue");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.activity;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- *
- * An ActivityPropertyTest using the ProcessMarshaller
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ActivityPropertyMarshallerTest extends ActivityPropertyTest
-{
- @Override
- protected Process getProcess() throws IOException
- {
- // Marshall the process to a string
- Process proc = super.getProcess();
- String procXML = marshallProcess(proc);
-
- // Recreate the process from the marshalled process
- ProcessManager procManager = ProcessManager.locateProcessManager();
- return procManager.createProcess(procXML);
- }
-}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.activity;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.MessageBuilder;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.ProcessBuilder;
-import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.Assignment.AssignTime;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.test.DefaultEngineTestCase;
-
-/**
- * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These
- * Properties are only for use within the processing of the activity. The fully delineated name of these properties is
- * "<process name>.<activity name>.<property name>" (e.g., "Add Customer.Review Credit.Status").
- *
- * https://jira.jboss.org/jira/browse/JBPM-1621
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ActivityPropertyTest extends DefaultEngineTestCase
-{
- public void testActivityPropertyRead() throws Exception
- {
- Process proc = getProcess();
- proc.startProcess();
- proc.waitForEnd();
-
- Message endMessage = getMessages().get(0);
- assertNotNull("EndMessage expected", endMessage);
- assertEquals("bar", endMessage.getPropertyValue("foo"));
- }
-
- protected Process getProcess() throws IOException
- {
- ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA");
- TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
- taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
- taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "foo");
- procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
- MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("foo", null, true);
- Process proc = procBuilder.getProcess();
- return proc;
- }
-}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.cts.endevent;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test end event with message result
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class EndEventMessageDescriptorTest extends EndEventMessageTest
+{
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/endevent/endevent-message-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,51 @@
+/*
+ * 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.endevent;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test end event with message result
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class EndEventMessageMarshallerTest extends EndEventMessageTest
+{
+ public Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ //System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,73 @@
+/*
+ * 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.endevent;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
+import org.jboss.bpm.runtime.BasicAttachments;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Test end event with message result
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class EndEventMessageTest extends DefaultEngineTestCase
+{
+ public void testStart() throws Exception
+ {
+ Process proc = getProcess();
+
+ // Start the process
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("kermit", "the frog");
+ proc.startProcess(att);
+
+ // Wait for the process to end
+ proc.waitForEnd();
+
+ // Verify the result
+ Message endMessage = getMessages().get(0);
+ assertEquals("the frog", endMessage.getPropertyValue("kermit"));
+ }
+
+ public Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("EndEventMessage").addStartEvent("Start");
+ procBuilder.addSequenceFlow("TaskA").addTask("TaskA").addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("kermit", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.gateway.exclusive;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * ExclusiveMergeTest using the Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class ExclusiveGatewayMergeDescriptorTest extends ExclusiveGatewayMergeTest
+{
+ @Override
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/gateway/exclusive/exclusive-merge-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.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/ExclusiveGatewayMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -29,7 +29,7 @@
import org.jboss.bpm.model.Process;
/**
- * ExclusiveMergeTest using the API Descriptor
+ * ExclusiveMergeTest using the process Marshaller
*
* @author thomas.diesler(a)jboss.com
* @since 06-Aug-2008
@@ -43,6 +43,8 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
+ //System.out.println(procXML);
+
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
return procManager.createProcess(procXML);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -29,7 +29,6 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.EventBuilder;
import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
@@ -39,6 +38,7 @@
import org.jboss.bpm.model.TaskBuilder;
import org.jboss.bpm.model.Assignment.AssignTime;
import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Gateway.GatewayType;
import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.test.DefaultEngineTestCase;
@@ -168,18 +168,16 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow(
- "TaskA");
- TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
+ TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").addTask("TaskA");
taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValue");
taskBuilder.addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
- eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow(
- "TaskB");
- taskBuilder = procBuilder.addTask("TaskB");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
+ taskBuilder = procBuilder.addSequenceFlow("TaskB").addTask("TaskB");
taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValue");
taskBuilder.addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Gateway.GatewayType.Exclusive).addSequenceFlow("End");
+ procBuilder.addGateway("Merge", GatewayType.Exclusive).addSequenceFlow("End");
procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true);
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.gateway.exclusive;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * ExclusiveSplitTest using the API Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class ExclusiveGatewaySplitDescriptorTest extends ExclusiveGatewaySplitTest
+{
+ @Override
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/gateway/exclusive/exclusive-split-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.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/ExclusiveGatewaySplitMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -43,6 +43,8 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
+ //System.out.println(procXML);
+
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
return procManager.createProcess(procXML);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -26,13 +26,13 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.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;
@@ -95,9 +95,9 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo > 10");
+ 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;
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.gateway.inclusive;
+
+// $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(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class InclusiveGatewayMergeDescriptorTest extends InclusiveGatewayMergeTest
+{
+ @Override
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/gateway/inclusive/inclusive-merge-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.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/InclusiveGatewayMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -43,6 +43,8 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
+ //System.out.println(procXML);
+
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
return procManager.createProcess(procXML);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -30,11 +30,11 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.EventBuilder;
import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
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;
@@ -81,7 +81,7 @@
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB");
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
- procBuilder.addSequenceFlow("Merge").addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End");
+ procBuilder.addSequenceFlow("Merge").addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End");
procBuilder.addEndEvent("End");
Process proc = procBuilder.getProcess();
return proc;
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.gateway.inclusive;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * InclusiveSplitTest using the API Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class InclusiveGatewaySplitDescriptorTest extends InclusiveGatewaySplitTest
+{
+ @Override
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/gateway/inclusive/inclusive-split-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ 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/InclusiveGatewaySplitDescriptorTest.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/InclusiveGatewaySplitMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -43,6 +43,8 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
+ //System.out.println(procXML);
+
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
return procManager.createProcess(procXML);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -26,13 +26,13 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.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;
@@ -76,9 +76,9 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("InclusiveGatewaySplitTest").addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive);
- gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo < 20");
+ 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;
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,49 @@
+/*
+ * 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 java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+
+/**
+ * ParallelMergeTest using the API Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class ParallelGatewayMergeDescriptorTest extends ParallelGatewayMergeTest
+{
+ @Override
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/gateway/parallel/parallel-merge-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.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/ParallelGatewayMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -44,6 +44,8 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
+ //System.out.println(procXML);
+
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
return procManager.createProcess(procXML);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -28,8 +28,6 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.EventBuilder;
-import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
@@ -38,7 +36,9 @@
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.TaskBuilder;
import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Gateway.GatewayType;
import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.test.DefaultEngineTestCase;
@@ -160,17 +160,17 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
+ eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").addTask("TaskA");
taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA");
taskBuilder.addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
- eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
+ eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
taskBuilder = procBuilder.addSequenceFlow("TaskB").addTask("TaskB");
taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB");
taskBuilder.addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("End");
- procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage");
MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true);
Process proc = procBuilder.getProcess();
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.gateway.parallel;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * ParallelSplitTest using the API Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class ParallelGatewaySplitDescriptorTest extends ParallelGatewaySplitTest
+{
+ @Override
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/gateway/parallel/parallel-split-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.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/ParallelGatewaySplitMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -43,6 +43,8 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
+ //System.out.println(procXML);
+
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
return procManager.createProcess(procXML);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -28,29 +28,29 @@
import javax.management.ObjectName;
-import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.Gateway.GatewayType;
import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
- * Parallel gateway that has uncontrolled outgoing sequence flows.
- * All of them are taken, which leads to parallel paths of execution.
+ * Parallel gateway that has uncontrolled outgoing sequence flows. All of them are taken, which leads to parallel paths
+ * of execution.
*
* @author thomas.diesler(a)jboss.com
* @since 06-Aug-2008
*/
public class ParallelGatewaySplitTest extends DefaultEngineTestCase
{
- public void testParallelSplit() throws Exception
+ public void testParallelSplit() throws Exception
{
Process proc = getProcess();
proc.startProcess();
proc.waitForEnd();
-
+
// Validate received signals
List<Signal> signals = getSignals(SignalType.SYSTEM_END_EVENT_ENTER);
assertEquals(2, signals.size());
@@ -64,8 +64,9 @@
public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel).
- addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess();
+ procBuilder.addProcess("ParallelGatewaySplit").addStartEvent("Start").addSequenceFlow("Split");
+ procBuilder.addGateway("Split", GatewayType.Parallel).addSequenceFlow("EndA").addSequenceFlow("EndB");
+ Process proc = procBuilder.addEndEvent("EndA").addEndEvent("EndB").getProcess();
return proc;
}
}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.process;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ProcessPropertyTest using the Descriptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ProcessPropertiesDescriptorTest extends ProcessPropertiesTest
+{
+ protected Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/process/process-properties-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,50 @@
+/*
+ * 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.process;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ *
+ * An ProcessPropertyTest using the ProcessMarshaller
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ProcessPropertiesMarshallerTest extends ProcessPropertiesTest
+{
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java)
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,79 @@
+/*
+ * 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.process;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks,
+ * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully delineated
+ * name of these properties are "<process name>.<property name>" (e.g., "Add Customer.Customer Name"). If a process is
+ * embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent Process name for
+ * as many Parents there are until the top level Process.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1392
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class ProcessPropertiesTest extends DefaultEngineTestCase
+{
+ /**
+ * Test the the process properties can be used by Assignments
+ * and finally arrive in through the End Message
+ */
+ public void testProcessProperties() throws Exception
+ {
+ Process proc = getProcess();
+ proc.startProcess();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getPropertyValue("propValue"));
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "propValue");
+ procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.process;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-
-/**
- *
- * An ProcessPropertyTest using the ProcessMarshaller
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ProcessPropertyMarshallerTest extends ProcessPropertyTest
-{
- protected Process getProcess() throws IOException
- {
- // Marshall the process to a string
- Process proc = super.getProcess();
- String procXML = marshallProcess(proc);
-
- // Recreate the process from the marshalled process
- ProcessManager procManager = ProcessManager.locateProcessManager();
- return procManager.createProcess(procXML);
- }
-}
Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.process;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.MessageBuilder;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.ProcessBuilder;
-import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Assignment.AssignTime;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.test.DefaultEngineTestCase;
-
-/**
- * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks,
- * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully delineated
- * name of these properties are "<process name>.<property name>" (e.g., "Add Customer.Customer Name"). If a process is
- * embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent Process name for
- * as many Parents there are until the top level Process.
- *
- * https://jira.jboss.org/jira/browse/JBPM-1392
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class ProcessPropertyTest extends DefaultEngineTestCase
-{
- public void testProcessProperties() throws Exception
- {
- Process proc = getProcess();
- proc.startProcess();
- proc.waitForEnd();
-
- Message endMessage = getMessages().get(0);
- assertNotNull("EndMessage expected", endMessage);
- assertEquals("bar", endMessage.getPropertyValue("foo"));
- }
-
- protected Process getProcess() throws IOException
- {
- ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "foo");
- procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
- procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
- MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("foo", null, true);
- Process proc = procBuilder.getProcess();
- return proc;
- }
-}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.cts.startevent;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test start event with signal trigger
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class StartEventSignalDescriptorTest extends StartEventSignalTest
+{
+ public Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/startevent/startevent-signal-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,51 @@
+/*
+ * 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.startevent;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test start event with signal trigger
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class StartEventSignalMarshallerTest extends StartEventSignalTest
+{
+ public Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ //System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -29,7 +29,6 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.EventBuilder;
-import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
@@ -38,6 +37,7 @@
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.TaskBuilder;
import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.test.DefaultEngineTestCase;
@@ -126,13 +126,12 @@
public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A")
- .addSequenceFlow("TaskA");
- TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ EventBuilder eventBuilder = procBuilder.addProcess("StartEventSignal").addStartEvent("StartA");
+ eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
+ TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").addTask("TaskA");
taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValue");
taskBuilder.addSequenceFlow("End");
- procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage");
MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true);
Process proc = procBuilder.getProcess();
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.task;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test Receive Task
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class ReceiveTaskDescriptorTest extends ReceiveTaskTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/task/task-receive-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.task;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test Receive Task
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class ReceiveTaskMarshallerTest extends ReceiveTaskTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ //System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -23,13 +23,14 @@
// $Id$
+import java.io.IOException;
+
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.client.MessageManager;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.EventBuilder;
-import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.MessageBuilderFactory;
@@ -37,12 +38,13 @@
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Task;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
import org.jboss.bpm.model.Signal.SignalType;
+import org.jboss.bpm.model.Task.TaskType;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
- * Test process messages
+ * Test Receive Task
*
* @author thomas.diesler(a)jboss.com
* @since 03-Jul-2008
@@ -53,7 +55,7 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("ReceiveTaskTest").addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA", Task.TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
+ procBuilder.addTask("TaskA", TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
try
{
procBuilder.getProcess();
@@ -147,7 +149,7 @@
return msg;
}
- private Process getProcess()
+ protected Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
MessageBuilder msgBuilder = procBuilder.addProcess("ReceiveTaskTest").addMessage("ReceiveTaskMessage");
@@ -155,9 +157,9 @@
msgBuilder = procBuilder.addMessage("EndEventMessage");
msgBuilder.addToRef(getTestID()).addProperty("foo", null, true);
procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA", Task.TaskType.Receive).addMessageRef("ReceiveTaskMessage");
+ procBuilder.addTask("TaskA", TaskType.Receive).addMessageRef("ReceiveTaskMessage");
EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End");
- eventBuilder.addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndEventMessage");
+ eventBuilder.addEventDetail(EventDetailType.Message).addMessageRef("EndEventMessage");
return procBuilder.getProcess();
}
}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.cts.task;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test Send Task
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class SendTaskDescriptorTest extends SendTaskTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ URL procURL = getResourceURL("cts/task/task-send-" + getDialect() + ".xml");
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(procURL);
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -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.task;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test Send Task
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class SendTaskMarshallerTest extends SendTaskTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ //System.out.println(procXML);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -23,25 +23,46 @@
// $Id$
+import java.io.IOException;
+import java.util.List;
+
import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Task;
+import org.jboss.bpm.model.Task.TaskType;
+import org.jboss.bpm.runtime.BasicAttachments;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
- * Test process messages
+ * Test Send Task
*
* @author thomas.diesler(a)jboss.com
* @since 03-Jul-2008
*/
public class SendTaskTest extends DefaultEngineTestCase
{
+ public void testSendTask() throws Exception
+ {
+ Process proc = getProcess();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("foo", "bar");
+ proc.startProcess(att);
+ proc.waitForEnd();
+
+ List<Message> messages = getMessages();
+ assertEquals(1, messages.size());
+ assertEquals("bar", messages.get(0).getPropertyValue("foo"));
+ }
+
public void testSendTaskWithNoMessage() throws Exception
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA", Task.TaskType.Send).addSequenceFlow("End").addEndEvent("End");
+ procBuilder.addProcess("SendTaskTest").addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addTask("TaskA", TaskType.Send).addSequenceFlow("End").addEndEvent("End");
try
{
procBuilder.getProcess();
@@ -52,4 +73,16 @@
// expected
}
}
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ MessageBuilder msgBuilder = procBuilder.addProcess("SendTaskTest").addMessage("SendTaskMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("foo", null, true);
+ procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addTask("TaskA", TaskType.Send).addMessageRef("SendTaskMessage");
+ procBuilder.addSequenceFlow("End").addEndEvent("End");
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -45,6 +45,8 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
+ //System.out.println(procXML);
+
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
return procManager.createProcess(procXML);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-22 18:56:09 UTC (rev 1987)
@@ -54,18 +54,19 @@
Message endMessage = getMessages().get(0);
assertNotNull("EndMessage expected", endMessage);
- assertEquals("bar", endMessage.getPropertyValue("foo"));
+ assertEquals("bar", endMessage.getPropertyValue("propValue"));
}
protected Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- procBuilder.addProcess("CaseData").addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "foo");
- procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
+ procBuilder.addProcess("CaseData");
+ procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "propValue");
+ procBuilder.addProperty("foo", "bar").addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addTask("TaskA").addSequenceFlow("End");
procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("foo", null, true);
+ msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
Process proc = procBuilder.getProcess();
return proc;
}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,27 @@
+<ns2:process name="ActivityProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="None" name="TaskA">
+ <assignment time="Start">
+ <from lang="MVEL">ActivityProperties_TaskA_foo</from>
+ <to>propValue</to>
+ </assignment>
+ <property>
+ <name>foo</name>
+ <value>bar</value>
+ </property>
+ <seqflow to="End" />
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ActivityPropertiesTest</to>
+ <property correlation="true">
+ <name>propValue</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,19 @@
+<ns2:process name="EndEventMessage" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="None" name="TaskA">
+ <seqflow to="End" />
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=EndEventMessageTest</to>
+ <property correlation="true">
+ <name>kermit</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: 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 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,24 +1,46 @@
-<ns2:process name="exclusive-merge" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
- <start>
+<ns2:process name="testGateA" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="StartA">
<seqflow to="TaskA" />
+ <signal-trigger>
+ <signal type="SYSTEM_START_TRIGGER">
+ <message>A</message>
+ </signal>
+ </signal-trigger>
</start>
<task taskType="None" name="TaskA">
+ <assignment time="Start">
+ <from lang="MVEL">'TaskA'</from>
+ <to>taskValue</to>
+ </assignment>
<seqflow to="Merge" />
- <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskA" />
</task>
- <start>
+ <start name="StartB">
<seqflow to="TaskB" />
+ <signal-trigger>
+ <signal type="SYSTEM_START_TRIGGER">
+ <message>B</message>
+ </signal>
+ </signal-trigger>
</start>
<task taskType="None" name="TaskB">
+ <assignment time="Start">
+ <from lang="MVEL">'TaskB'</from>
+ <to>taskValue</to>
+ </assignment>
<seqflow to="Merge" />
- <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskB" />
</task>
<exclusive-gateway name="Merge">
- <seqflow to="TaskC" />
+ <seqflow to="End" />
</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" />
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ExclusiveGatewayMergeTest</to>
+ <property correlation="true">
+ <name>taskValue</name>
+ </property>
+ </message>
</ns2:process>
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn 2008-08-22 18:56:09 UTC (rev 1987)
@@ -3,10 +3,10 @@
<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="_uRhwkWOQEd2mS_8SFTXMeQ" name="StartA" activityType="EventStartSignal"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_rWe7wWOQEd2mS_8SFTXMeQ" iD="_rWe7wGOQEd2mS_8SFTXMeQ" outgoingEdges="_u0nPgWOQEd2mS_8SFTXMeQ" name="StartB" activityType="EventStartSignal"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_sa_FsWOQEd2mS_8SFTXMeQ" iD="_sa_FsGOQEd2mS_8SFTXMeQ" outgoingEdges="_w0h40WOQEd2mS_8SFTXMeQ" incomingEdges="_uRhwkWOQEd2mS_8SFTXMeQ _u0nPgWOQEd2mS_8SFTXMeQ" activityType="GatewayDataBasedExclusive"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_tWoOkWOQEd2mS_8SFTXMeQ" iD="_tWoOkGOQEd2mS_8SFTXMeQ" incomingEdges="_w0h40WOQEd2mS_8SFTXMeQ" activityType="EventEndEmpty"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_sa_FsWOQEd2mS_8SFTXMeQ" iD="_sa_FsGOQEd2mS_8SFTXMeQ" outgoingEdges="_glA-AXBZEd26O4vNTVSBiw" incomingEdges="_uRhwkWOQEd2mS_8SFTXMeQ _u0nPgWOQEd2mS_8SFTXMeQ" activityType="GatewayDataBasedExclusive"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_f-UKYXBZEd26O4vNTVSBiw" iD="_f-UKYHBZEd26O4vNTVSBiw" incomingEdges="_glA-AXBZEd26O4vNTVSBiw" activityType="EventEndMessage"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_uRhwkWOQEd2mS_8SFTXMeQ" iD="_uRhwkGOQEd2mS_8SFTXMeQ" source="_qdNxcWOQEd2mS_8SFTXMeQ" target="_sa_FsWOQEd2mS_8SFTXMeQ"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_u0nPgWOQEd2mS_8SFTXMeQ" iD="_u0nPgGOQEd2mS_8SFTXMeQ" source="_rWe7wWOQEd2mS_8SFTXMeQ" target="_sa_FsWOQEd2mS_8SFTXMeQ"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_w0h40WOQEd2mS_8SFTXMeQ" iD="_w0h40GOQEd2mS_8SFTXMeQ" source="_sa_FsWOQEd2mS_8SFTXMeQ" target="_tWoOkWOQEd2mS_8SFTXMeQ"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_glA-AXBZEd26O4vNTVSBiw" iD="_glA-AHBZEd26O4vNTVSBiw" source="_sa_FsWOQEd2mS_8SFTXMeQ" target="_f-UKYXBZEd26O4vNTVSBiw"/>
</pools>
</bpmn:BpmnDiagram>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram 2008-08-22 18:56:09 UTC (rev 1987)
@@ -30,14 +30,14 @@
<element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_sa_FsWOQEd2mS_8SFTXMeQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sbAT0GOQEd2mS_8SFTXMeQ" x="134" y="74"/>
</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="exclusive-merge.bpmn#_tWoOkWOQEd2mS_8SFTXMeQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tWpctWOQEd2mS_8SFTXMeQ" x="252" y="84"/>
+ <children xmi:type="notation:Node" xmi:id="_f-Zp8HBZEd26O4vNTVSBiw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_f-bfIHBZEd26O4vNTVSBiw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_f-Zp8XBZEd26O4vNTVSBiw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_f-Zp8nBZEd26O4vNTVSBiw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_f-Zp83BZEd26O4vNTVSBiw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_f-Zp9HBZEd26O4vNTVSBiw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_f-UKYXBZEd26O4vNTVSBiw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-Zp9XBZEd26O4vNTVSBiw" x="238" y="84"/>
</children>
<styles xmi:type="notation:DrawerStyle" xmi:id="_l8qXYWOQEd2mS_8SFTXMeQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_l8qXYmOQEd2mS_8SFTXMeQ"/>
@@ -78,16 +78,16 @@
<element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_u0nPgWOQEd2mS_8SFTXMeQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u0odpGOQEd2mS_8SFTXMeQ" points="[15, -7, -86, 27]$[112, -48, 11, -14]"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_w0jG8GOQEd2mS_8SFTXMeQ" type="3001" source="_sa_swGOQEd2mS_8SFTXMeQ" target="_tWpcsGOQEd2mS_8SFTXMeQ">
- <children xmi:type="notation:Node" xmi:id="_w0juAGOQEd2mS_8SFTXMeQ" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_w0juAWOQEd2mS_8SFTXMeQ" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_w0juAmOQEd2mS_8SFTXMeQ" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w0juA2OQEd2mS_8SFTXMeQ" y="40"/>
+ <edges xmi:type="notation:Edge" xmi:id="_glDaQHBZEd26O4vNTVSBiw" type="3001" source="_sa_swGOQEd2mS_8SFTXMeQ" target="_f-Zp8HBZEd26O4vNTVSBiw">
+ <children xmi:type="notation:Node" xmi:id="_glEoYHBZEd26O4vNTVSBiw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_glEoYXBZEd26O4vNTVSBiw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_glEoYnBZEd26O4vNTVSBiw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_glEoY3BZEd26O4vNTVSBiw" y="40"/>
</children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w0jG8WOQEd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w0jG8mOQEd2mS_8SFTXMeQ" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_w0jG82OQEd2mS_8SFTXMeQ" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_w0h40WOQEd2mS_8SFTXMeQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w0jG9GOQEd2mS_8SFTXMeQ" points="[23, 1, -85, 1]$[109, 15, 1, 15]"/>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_glDaQXBZEd26O4vNTVSBiw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_glDaQnBZEd26O4vNTVSBiw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_glDaQ3BZEd26O4vNTVSBiw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_glA-AXBZEd26O4vNTVSBiw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_glDaRHBZEd26O4vNTVSBiw" points="[24, -1, -70, -1]$[109, -1, 15, -1]"/>
</edges>
</notation:Diagram>
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,15 @@
+<ns2:process name="testGateA" 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 < 10</condition>
+ </seqflow>
+ <seqflow conditionType="Expression" to="EndB">
+ <condition lang="MVEL">foo > 10</condition>
+ </seqflow>
+ </exclusive-gateway>
+ <end name="EndA"/>
+ <end name="EndB"/>
+</ns2:process>
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,22 @@
+<ns2:process name="testGateA" 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/cts/gateway/inclusive/inclusive-merge-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,15 @@
+<ns2:process name="InclusiveGatewaySplitTest" 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 < 10</condition>
+ </seqflow>
+ <seqflow conditionType="Expression" to="EndB">
+ <condition lang="MVEL">foo < 20</condition>
+ </seqflow>
+ </inclusive-gateway>
+ <end name="EndA"/>
+ <end name="EndB"/>
+</ns2:process>
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,49 @@
+<ns2:process name="testParallelMerge" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="StartA">
+ <seqflow to="TaskA" />
+ <signal-trigger>
+ <signal type="SYSTEM_START_TRIGGER">
+ <message>A</message>
+ </signal>
+ </signal-trigger>
+ </start>
+ <task taskType="None" name="TaskA">
+ <assignment time="Start">
+ <from lang="MVEL">'TaskA'</from>
+ <to>taskValueA</to>
+ </assignment>
+ <seqflow to="Merge" />
+ </task>
+ <start name="StartB">
+ <seqflow to="TaskB" />
+ <signal-trigger>
+ <signal type="SYSTEM_START_TRIGGER">
+ <message>B</message>
+ </signal>
+ </signal-trigger>
+ </start>
+ <task taskType="None" name="TaskB">
+ <assignment time="Start">
+ <from lang="MVEL">'TaskB'</from>
+ <to>taskValueB</to>
+ </assignment>
+ <seqflow to="Merge" />
+ </task>
+ <parallel-gateway name="Merge">
+ <seqflow to="End" />
+ </parallel-gateway>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ParallelGatewayMergeTest</to>
+ <property correlation="true">
+ <name>taskValueA</name>
+ </property>
+ <property correlation="true">
+ <name>taskValueB</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,18 +1,16 @@
<?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="_6HqqgWlWEd2VTpmAjt3VIA" incomingEdges="_x1ziAWlWEd2VTpmAjt3VIA _25I5AWlWEd2VTpmAjt3VIA" activityType="GatewayParallel"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_wcB6AXBZEd26O4vNTVSBiw" 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"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_vxNbYXBZEd26O4vNTVSBiw" iD="_vxNbYHBZEd26O4vNTVSBiw" incomingEdges="_wcB6AXBZEd26O4vNTVSBiw" activityType="EventEndMessage"/>
<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"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_wcB6AXBZEd26O4vNTVSBiw" iD="_wcB6AHBZEd26O4vNTVSBiw" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_vxNbYXBZEd26O4vNTVSBiw"/>
</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-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram 2008-08-22 18:56:09 UTC (rev 1987)
@@ -30,15 +30,6 @@
<element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_FobwIWOSEd2mS_8SFTXMeQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Foc-RWOSEd2mS_8SFTXMeQ" x="36" y="144"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_LFt4MGOSEd2mS_8SFTXMeQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_LFufRWOSEd2mS_8SFTXMeQ" type="4001"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_LFufQGOSEd2mS_8SFTXMeQ" fontName="Arial"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_LFufQWOSEd2mS_8SFTXMeQ"/>
- <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="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"/>
@@ -57,14 +48,14 @@
<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 xmi:type="notation:Node" xmi:id="_vxOpgHBZEd26O4vNTVSBiw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_vxPQkHBZEd26O4vNTVSBiw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_vxOpgXBZEd26O4vNTVSBiw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_vxOpgnBZEd26O4vNTVSBiw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_vxOpg3BZEd26O4vNTVSBiw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_vxOphHBZEd26O4vNTVSBiw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_vxNbYXBZEd26O4vNTVSBiw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vxOphXBZEd26O4vNTVSBiw" x="348" y="84"/>
</children>
<styles xmi:type="notation:DrawerStyle" xmi:id="_AXI1omOSEd2mS_8SFTXMeQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_AXI1o2OSEd2mS_8SFTXMeQ"/>
@@ -75,7 +66,7 @@
<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="585" height="213"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="441" height="213"/>
</children>
<styles xmi:type="notation:PageStyle" xmi:id="_AXGZYWOSEd2mS_8SFTXMeQ"/>
<styles xmi:type="notation:GuideStyle" xmi:id="_AXGZYmOSEd2mS_8SFTXMeQ"/>
@@ -129,28 +120,16 @@
<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"/>
+ <edges xmi:type="notation:Edge" xmi:id="_wcDIIHBZEd26O4vNTVSBiw" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_vxOpgHBZEd26O4vNTVSBiw">
+ <children xmi:type="notation:Node" xmi:id="_wcDvMHBZEd26O4vNTVSBiw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_wcDvMXBZEd26O4vNTVSBiw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_wcDvMnBZEd26O4vNTVSBiw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_wcDvM3BZEd26O4vNTVSBiw" 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]"/>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_wcDIIXBZEd26O4vNTVSBiw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_wcDIInBZEd26O4vNTVSBiw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_wcDII3BZEd26O4vNTVSBiw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_wcB6AXBZEd26O4vNTVSBiw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wcDIJHBZEd26O4vNTVSBiw" points="[23, -2, -63, -4]$[101, -13, 15, -15]"/>
</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-split-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,11 @@
+<ns2:process name="ParallelGatewaySplit" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="Split" />
+ </start>
+ <parallel-gateway name="Split">
+ <seqflow to="EndA" />
+ <seqflow to="EndB" />
+ </parallel-gateway>
+ <end name="EndA" />
+ <end name="EndB" />
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,27 @@
+<ns2:process name="ProcessProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <assignment time="Start">
+ <from lang="MVEL">ProcessProperties_foo</from>
+ <to>propValue</to>
+ </assignment>
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="None" name="TaskA">
+ <seqflow to="End" />
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=ProcessPropertiesTest</to>
+ <property correlation="true">
+ <name>propValue</name>
+ </property>
+ </message>
+ <property>
+ <name>foo</name>
+ <value>bar</value>
+ </property>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,28 @@
+<ns2:process name="testStart" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="StartA">
+ <seqflow to="TaskA" />
+ <signal-trigger>
+ <signal type="SYSTEM_START_TRIGGER">
+ <message>A</message>
+ </signal>
+ </signal-trigger>
+ </start>
+ <task taskType="None" name="TaskA">
+ <assignment time="Start">
+ <from lang="MVEL">'TaskA'</from>
+ <to>taskValue</to>
+ </assignment>
+ <seqflow to="End" />
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:test=StartEventSignalTest</to>
+ <property correlation="true">
+ <name>taskValue</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,25 @@
+<ns2:process name="ReceiveTaskTest" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="Receive" name="TaskA">
+ <seqflow to="End" />
+ <msgref nameRef="ReceiveTaskMessage" />
+ </task>
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndEventMessage" />
+ </message-result>
+ </end>
+ <message name="ReceiveTaskMessage">
+ <property correlation="true">
+ <name>foo</name>
+ </property>
+ </message>
+ <message name="EndEventMessage">
+ <to>jboss.bpm:test=ReceiveTaskTest</to>
+ <property correlation="true">
+ <name>foo</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -0,0 +1,16 @@
+<ns2:process name="SendTaskTest" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="TaskA" />
+ </start>
+ <task taskType="Send" name="TaskA">
+ <seqflow to="End" />
+ <msgref nameRef="SendTaskMessage" />
+ </task>
+ <end name="End" />
+ <message name="SendTaskMessage">
+ <to>jboss.bpm:test=SendTaskTest</to>
+ <property correlation="true">
+ <name>foo</name>
+ </property>
+ </message>
+</ns2:process>
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -38,7 +38,7 @@
</message-result>
</end>
<message name="EndMessage">
- <to>jboss.bpm:test=SynchronizationDescriptorTest</to>
+ <to>jboss.bpm:test=SynchronizationTest</to>
<property correlation="true">
<name>taskValueA</name>
</property>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,12 +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="_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="_YRqagWo0Ed2rarCPPgIl8w" incomingEdges="_YxTj4Wo0Ed2rarCPPgIl8w _ZZSw8Wo0Ed2rarCPPgIl8w" activityType="GatewayParallel"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_8DqrgXBZEd26O4vNTVSBiw" incomingEdges="_YxTj4Wo0Ed2rarCPPgIl8w _ZZSw8Wo0Ed2rarCPPgIl8w" activityType="GatewayParallel"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_FY9wwWOSEd2mS_8SFTXMeQ" iD="_FY9wwGOSEd2mS_8SFTXMeQ" outgoingEdges="_YxTj4Wo0Ed2rarCPPgIl8w" name="StartA" activityType="EventStartSignal"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_FobwIWOSEd2mS_8SFTXMeQ" iD="_FobwIGOSEd2mS_8SFTXMeQ" outgoingEdges="_ZZSw8Wo0Ed2rarCPPgIl8w" name="StartB" activityType="EventStartSignal"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_LFtRIWOSEd2mS_8SFTXMeQ" iD="_LFtRIGOSEd2mS_8SFTXMeQ" incomingEdges="_YRqagWo0Ed2rarCPPgIl8w" activityType="EventEndEmpty"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_YRqagWo0Ed2rarCPPgIl8w" iD="_YRqagGo0Ed2rarCPPgIl8w" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_LFtRIWOSEd2mS_8SFTXMeQ"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_7UIE8XBZEd26O4vNTVSBiw" iD="_7UIE8HBZEd26O4vNTVSBiw" incomingEdges="_8DqrgXBZEd26O4vNTVSBiw" activityType="EventEndMessage"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_YxTj4Wo0Ed2rarCPPgIl8w" iD="_YxTj4Go0Ed2rarCPPgIl8w" source="_FY9wwWOSEd2mS_8SFTXMeQ" target="_EPuQwWOSEd2mS_8SFTXMeQ"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_ZZSw8Wo0Ed2rarCPPgIl8w" iD="_ZZSw8Go0Ed2rarCPPgIl8w" source="_FobwIWOSEd2mS_8SFTXMeQ" target="_EPuQwWOSEd2mS_8SFTXMeQ"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_8DqrgXBZEd26O4vNTVSBiw" iD="_8DqrgHBZEd26O4vNTVSBiw" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_7UIE8XBZEd26O4vNTVSBiw"/>
</pools>
</bpmn:BpmnDiagram>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram 2008-08-22 18:56:09 UTC (rev 1987)
@@ -30,14 +30,14 @@
<element xmi:type="bpmn:Activity" href="pattern-control-synchronization.bpmn#_FobwIWOSEd2mS_8SFTXMeQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Foc-RWOSEd2mS_8SFTXMeQ" x="36" y="144"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_LFt4MGOSEd2mS_8SFTXMeQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_LFufRWOSEd2mS_8SFTXMeQ" type="4001"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_LFufQGOSEd2mS_8SFTXMeQ" fontName="Arial"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_LFufQWOSEd2mS_8SFTXMeQ"/>
- <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="pattern-control-synchronization.bpmn#_LFtRIWOSEd2mS_8SFTXMeQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFufRGOSEd2mS_8SFTXMeQ" x="252" y="84"/>
+ <children xmi:type="notation:Node" xmi:id="_7UJTEHBZEd26O4vNTVSBiw" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_7UJ6IHBZEd26O4vNTVSBiw" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_7UJTEXBZEd26O4vNTVSBiw" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_7UJTEnBZEd26O4vNTVSBiw"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_7UJTE3BZEd26O4vNTVSBiw"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_7UJTFHBZEd26O4vNTVSBiw" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="pattern-control-synchronization.bpmn#_7UIE8XBZEd26O4vNTVSBiw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UJTFXBZEd26O4vNTVSBiw" x="240" y="84"/>
</children>
<styles xmi:type="notation:DrawerStyle" xmi:id="_AXI1omOSEd2mS_8SFTXMeQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_AXI1o2OSEd2mS_8SFTXMeQ"/>
@@ -48,24 +48,12 @@
<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="pattern-control-synchronization.bpmn#_AXHAcWOSEd2mS_8SFTXMeQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="357" height="213"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="345" 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="pattern-control-synchronization.bpmn#_AXFyUWOSEd2mS_8SFTXMeQ"/>
- <edges xmi:type="notation:Edge" xmi:id="_YRv6EGo0Ed2rarCPPgIl8w" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_LFt4MGOSEd2mS_8SFTXMeQ">
- <children xmi:type="notation:Node" xmi:id="_YRzkcGo0Ed2rarCPPgIl8w" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_YRzkcWo0Ed2rarCPPgIl8w" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_YRzkcmo0Ed2rarCPPgIl8w" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YRzkc2o0Ed2rarCPPgIl8w" y="-10"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_YRv6EWo0Ed2rarCPPgIl8w" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_YRv6Emo0Ed2rarCPPgIl8w" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_YRv6E2o0Ed2rarCPPgIl8w" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="pattern-control-synchronization.bpmn#_YRqagWo0Ed2rarCPPgIl8w"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YRv6FGo0Ed2rarCPPgIl8w" points="[24, 1, -218, -1]$[243, -13, 1, -15]"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_YxWnMGo0Ed2rarCPPgIl8w" type="3001" source="_FY--4GOSEd2mS_8SFTXMeQ" target="_EPve4GOSEd2mS_8SFTXMeQ">
<children xmi:type="notation:Node" xmi:id="_YxXOQGo0Ed2rarCPPgIl8w" type="4012">
<styles xmi:type="notation:FillStyle" xmi:id="_YxXOQWo0Ed2rarCPPgIl8w" fillColor="16776959"/>
@@ -90,4 +78,16 @@
<element xmi:type="bpmn:SequenceEdge" href="pattern-control-synchronization.bpmn#_ZZSw8Wo0Ed2rarCPPgIl8w"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZZT_FGo0Ed2rarCPPgIl8w" points="[15, -5, -199, 57]$[198, -53, -16, 9]"/>
</edges>
+ <edges xmi:type="notation:Edge" xmi:id="_8DsgsHBZEd26O4vNTVSBiw" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_7UJTEHBZEd26O4vNTVSBiw">
+ <children xmi:type="notation:Node" xmi:id="_8DtHwHBZEd26O4vNTVSBiw" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_8DtHwXBZEd26O4vNTVSBiw" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_8DtHwnBZEd26O4vNTVSBiw" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8DtHw3BZEd26O4vNTVSBiw" y="40"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_8DsgsXBZEd26O4vNTVSBiw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_8DsgsnBZEd26O4vNTVSBiw" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_8Dsgs3BZEd26O4vNTVSBiw" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="pattern-control-synchronization.bpmn#_8DqrgXBZEd26O4vNTVSBiw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8DsgtHBZEd26O4vNTVSBiw" points="[24, -1, -74, -3]$[83, -5, -15, -7]"/>
+ </edges>
</notation:Diagram>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.png
===================================================================
(Binary files differ)
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -1,9 +1,5 @@
<ns2:process name="CaseData" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start name="Start">
- <assignment time="Start">
- <from lang="MVEL">CaseData_foo</from>
- <to>foo</to>
- </assignment>
<seqflow to="TaskA" />
</start>
<task taskType="None" name="TaskA">
@@ -14,10 +10,14 @@
<messageRef nameRef="EndMessage" />
</message-result>
</end>
+ <assignment time="Start">
+ <from lang="MVEL">CaseData_foo</from>
+ <to>propValue</to>
+ </assignment>
<message name="EndMessage">
- <to>jboss.bpm:test=CaseDataDescriptorTest</to>
+ <to>jboss.bpm:test=CaseDataTest</to>
<property correlation="true">
- <name>foo</name>
+ <name>propValue</name>
</property>
</message>
<property>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -19,7 +19,7 @@
</message-result>
</end>
<message name="EndMessage">
- <to>jboss.bpm:test=TaskDataDescriptorTest</to>
+ <to>jboss.bpm:test=TaskDataTest</to>
<property correlation="true">
<name>foo</name>
</property>
Modified: jbossbpm/spec/trunk/pom.xml
===================================================================
--- jbossbpm/spec/trunk/pom.xml 2008-08-22 15:26:15 UTC (rev 1986)
+++ jbossbpm/spec/trunk/pom.xml 2008-08-22 18:56:09 UTC (rev 1987)
@@ -157,10 +157,6 @@
<configuration>
<systemProperties>
<property>
- <name>jbpm.dialect</name>
- <value>api10</value>
- </property>
- <property>
<name>log4j.output.dir</name>
<value>${project.build.directory}</value>
</property>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1986 - in jbpm3/trunk: modules/console and 10 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-22 11:26:15 -0400 (Fri, 22 Aug 2008)
New Revision: 1986
Added:
jbpm3/trunk/modules/console/.classpath
jbpm3/trunk/modules/console/.project
jbpm3/trunk/modules/distribution/.classpath
jbpm3/trunk/modules/distribution/.project
jbpm3/trunk/modules/enterprise/.classpath
jbpm3/trunk/modules/enterprise/.project
jbpm3/trunk/modules/jbpm4jsf/.classpath
jbpm3/trunk/modules/jbpm4jsf/.project
jbpm3/trunk/modules/jpdl/core/.classpath
jbpm3/trunk/modules/jpdl/core/.project
jbpm3/trunk/modules/jpdl/db/.classpath
jbpm3/trunk/modules/jpdl/db/.project
jbpm3/trunk/modules/jpdl/examples/.classpath
jbpm3/trunk/modules/jpdl/examples/.project
jbpm3/trunk/modules/jpdl/identity/.classpath
jbpm3/trunk/modules/jpdl/identity/.project
jbpm3/trunk/modules/jpdl/simulation/.classpath
jbpm3/trunk/modules/jpdl/simulation/.project
jbpm3/trunk/modules/jpdl/userguide/.classpath
jbpm3/trunk/modules/jpdl/userguide/.project
jbpm3/trunk/modules/jpdl/ws/.classpath
jbpm3/trunk/modules/jpdl/ws/.project
Modified:
jbpm3/trunk/modules/console/
jbpm3/trunk/modules/distribution/
jbpm3/trunk/modules/enterprise/
jbpm3/trunk/modules/jbpm4jsf/
jbpm3/trunk/modules/jpdl/core/
jbpm3/trunk/modules/jpdl/db/
jbpm3/trunk/modules/jpdl/examples/
jbpm3/trunk/modules/jpdl/identity/
jbpm3/trunk/modules/jpdl/simulation/
jbpm3/trunk/modules/jpdl/userguide/
jbpm3/trunk/modules/jpdl/ws/
jbpm3/trunk/pom.xml
Log:
Add eclipse project files
Property changes on: jbpm3/trunk/modules/console
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/console/.classpath
===================================================================
--- jbpm3/trunk/modules/console/.classpath (rev 0)
+++ jbpm3/trunk/modules/console/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/console/.project
===================================================================
--- jbpm3/trunk/modules/console/.project (rev 0)
+++ jbpm3/trunk/modules/console/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-console</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/distribution
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/distribution/.classpath
===================================================================
--- jbpm3/trunk/modules/distribution/.classpath (rev 0)
+++ jbpm3/trunk/modules/distribution/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/distribution/.project
===================================================================
--- jbpm3/trunk/modules/distribution/.project (rev 0)
+++ jbpm3/trunk/modules/distribution/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-distribution</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/enterprise
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/enterprise/.classpath
===================================================================
--- jbpm3/trunk/modules/enterprise/.classpath (rev 0)
+++ jbpm3/trunk/modules/enterprise/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/enterprise/.project
===================================================================
--- jbpm3/trunk/modules/enterprise/.project (rev 0)
+++ jbpm3/trunk/modules/enterprise/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-enterprise</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jbpm4jsf
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jbpm4jsf/.classpath
===================================================================
--- jbpm3/trunk/modules/jbpm4jsf/.classpath (rev 0)
+++ jbpm3/trunk/modules/jbpm4jsf/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jbpm4jsf/.project
===================================================================
--- jbpm3/trunk/modules/jbpm4jsf/.project (rev 0)
+++ jbpm3/trunk/modules/jbpm4jsf/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jbpm4jsf</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jpdl/core
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jpdl/core/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/core/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/core/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/core/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jpdl/db
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jpdl/db/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/db/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/db/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/db/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/db/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/db/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-db</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jpdl/examples
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jpdl/examples/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/examples/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/examples/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/examples/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/examples/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/examples/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-examples</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jpdl/identity
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jpdl/identity/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/identity/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/identity/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/identity/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/identity/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/identity/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-identity</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jpdl/simulation
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jpdl/simulation/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/simulation/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/simulation/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/simulation/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-simulation</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jpdl/userguide
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jpdl/userguide/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/userguide/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/userguide/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/userguide/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/userguide/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/userguide/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-userguide</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: jbpm3/trunk/modules/jpdl/ws
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Added: jbpm3/trunk/modules/jpdl/ws/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/ws/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/ws/.classpath 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/ws/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/ws/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/ws/.project 2008-08-22 15:26:15 UTC (rev 1986)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-ws</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-08-22 13:51:28 UTC (rev 1985)
+++ jbpm3/trunk/pom.xml 2008-08-22 15:26:15 UTC (rev 1986)
@@ -20,9 +20,9 @@
<!-- Parent -->
<parent>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>jboss-bpm-parent</artifactId>
+ <version>1.0.0.GA</version>
</parent>
<!-- Modules -->
@@ -381,6 +381,14 @@
</site>
</distributionManagement>
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
<!-- Profiles -->
<profiles>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1985 - jbossbpm.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-22 09:51:28 -0400 (Fri, 22 Aug 2008)
New Revision: 1985
Removed:
jbossbpm/impl/
Log:
Delete jbossbpm/impl
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1984 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/model and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-22 08:31:53 -0400 (Fri, 22 Aug 2008)
New Revision: 1984
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
Log:
Refactor Participant
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-22 11:12:51 UTC (rev 1983)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-22 12:31:53 UTC (rev 1984)
@@ -33,7 +33,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.Event;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Participant;
+import org.jboss.bpm.model.Task;
/**
* The ProcessEngine sends mesages through the MessageManager. <p/> A {@link Message} has an ID and is targeted to a
@@ -120,20 +123,24 @@
}
/**
- * Send a message to a given Task or Event
+ * Send a message to a given {@link Task} or {@link Event}
*/
public abstract void sendMessage(ObjectName procID, String targetName, Message msg);
-
+
/**
* Send a message to a given {@link MessageListener}
*/
- public void sendMessage(ObjectName targetID, Message msg)
+ public void sendMessage(Message msg)
{
- MessageListener msgListener = getMessageListener(targetID);
+ Participant toRef = msg.getToRef().getEntityRef();
+ if (toRef == null)
+ throw new IllegalArgumentException("Target entity cannot be null");
+
+ MessageListener msgListener = getMessageListener(toRef.getName());
if (msgListener == null)
- throw new IllegalStateException("No message listener registered for: " + targetID);
+ throw new IllegalStateException("No message listener registered for: " + toRef);
- log.debug("sendMessage to '" + targetID + "' => " + msg);
+ log.debug("sendMessage to '" + toRef + "' => " + msg);
msgListener.catchMessage(msg);
}
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-22 11:12:51 UTC (rev 1983)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-22 12:31:53 UTC (rev 1984)
@@ -23,7 +23,6 @@
// $Id: $
-import javax.management.ObjectName;
/**
* An Entity, which is used in the definition of attributes for a {@link Participant}
@@ -31,10 +30,6 @@
* @author thomas.diesler(a)jboss.com
* @since 21-Jul-2008
*/
-public interface Entity
+public interface Entity extends Participant
{
- /**
- * Name is an attribute that is text description of the Entity.
- */
- ObjectName getName();
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-22 11:12:51 UTC (rev 1983)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-22 12:31:53 UTC (rev 1984)
@@ -21,9 +21,11 @@
*/
package org.jboss.bpm.model;
+import javax.management.ObjectName;
+
//$Id$
/**
@@ -47,6 +49,11 @@
ParticipantType getParticipantType();
/**
+ * The name of this participant
+ */
+ ObjectName getName();
+
+ /**
* If the ParticipantType = Role, then a Role MUST be identified.
*/
Role getRoleRef();
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-22 11:12:51 UTC (rev 1983)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-22 12:31:53 UTC (rev 1984)
@@ -23,7 +23,6 @@
// $Id: $
-import javax.management.ObjectName;
/**
* A Role, which is used in the definition of attributes for a {@link Participant}
@@ -31,11 +30,6 @@
* @author thomas.diesler(a)jboss.com
* @since 21-Jul-2008
*/
-public interface Role
+public interface Role extends Participant
{
- /**
- * Name is an attribute that is text description of the Role.
- */
- ObjectName getName();
-
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java 2008-08-22 11:12:51 UTC (rev 1983)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java 2008-08-22 12:31:53 UTC (rev 1984)
@@ -51,6 +51,7 @@
/**
* Send a message to a given {@link Task} or {@link Event}
*/
+ @Override
public void sendMessage(ObjectName procID, String targetName, Message msg)
{
ProcessManager pm = ProcessManager.locateProcessManager();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java 2008-08-22 11:12:51 UTC (rev 1983)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java 2008-08-22 12:31:53 UTC (rev 1984)
@@ -93,6 +93,6 @@
msg.setFromRef(fromRef);
MessageManager mm = MessageManager.locateMessageManager();
- mm.sendMessage(targetID, msg);
+ mm.sendMessage(msg);
}
}
\ No newline at end of file
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1983 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-22 07:12:51 -0400 (Fri, 22 Aug 2008)
New Revision: 1983
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
Log:
Refactor Participant
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,10 +21,10 @@
*/
package org.jboss.bpm.model;
+// $Id: $
+import javax.management.ObjectName;
-//$Id$
-
/**
* An Entity, which is used in the definition of attributes for a {@link Participant}
*
@@ -36,5 +36,5 @@
/**
* Name is an attribute that is text description of the Entity.
*/
- String getName();
+ ObjectName getName();
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -53,11 +53,6 @@
Participant getFromRef();
/**
- * Get the source of the source {@link FlowObject} for this message
- */
- FlowObject getFrom();
-
- /**
* This defines the target of the Message.
*/
Participant getToRef();
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -44,7 +44,7 @@
/**
* Get the type of this participant
*/
- Participant.ParticipantType getParticipantType();
+ ParticipantType getParticipantType();
/**
* If the ParticipantType = Role, then a Role MUST be identified.
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,10 +21,10 @@
*/
package org.jboss.bpm.model;
+// $Id: $
+import javax.management.ObjectName;
-//$Id$
-
/**
* A Role, which is used in the definition of attributes for a {@link Participant}
*
@@ -36,6 +36,6 @@
/**
* Name is an attribute that is text description of the Role.
*/
- String getName();
+ ObjectName getName();
}
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -413,9 +413,9 @@
if (par != null)
{
if (par.getEntityRef() != null)
- parName = par.getEntityRef().getName();
+ parName = par.getEntityRef().getName().getCanonicalName();
else if (par.getRoleRef() != null)
- parName = par.getRoleRef().getName();
+ parName = par.getRoleRef().getName().getCanonicalName();
}
return parName;
}
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -202,8 +202,14 @@
private void adaptJAXBMessage(MessageBuilder msgBuilder, JAXBMessage jaxbMsg)
{
- msgBuilder.addFromRef(getObjectName(jaxbMsg.getFromRef()));
- msgBuilder.addToRef(getObjectName(jaxbMsg.getToRef()));
+ String fromRef = jaxbMsg.getFromRef();
+ if (fromRef != null)
+ msgBuilder.addFromRef(getObjectName(fromRef));
+
+ String toRef = jaxbMsg.getToRef();
+ if (toRef != null)
+ msgBuilder.addToRef(getObjectName(toRef));
+
for (JAXBProperty jaxbProp : jaxbMsg.getProperties())
{
boolean isCorrelation = jaxbProp.isCorrelation() != null ? jaxbProp.isCorrelation() : false;
@@ -211,9 +217,9 @@
}
}
- private ObjectName getObjectName(String toStr)
+ private ObjectName getObjectName(String objName)
{
- return (toStr != null ? ObjectNameFactory.create(toStr) : null);
+ return ObjectNameFactory.create(objName);
}
private void adaptJAXBEvent(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBEvent jaxb)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,8 +21,10 @@
*/
package org.jboss.bpm.ri.model.impl;
+import javax.management.ObjectName;
+
import org.jboss.bpm.model.Entity;
-import org.jboss.bpm.model.Participant;
+import org.jboss.bpm.model.Role;
//$Id$
@@ -35,21 +37,29 @@
@SuppressWarnings("serial")
public class EntityImpl extends ParticipantImpl implements Entity
{
- private String name;
- public EntityImpl(String name)
+ public EntityImpl(ObjectName name)
{
- this.name = name;
- this.entityRef = this;
+ super(name);
}
- public Participant.ParticipantType getParticipantType()
+ public ParticipantType getParticipantType()
{
- return Participant.ParticipantType.Entity;
+ return ParticipantType.Entity;
}
- public String getName()
+ public ObjectName getName()
{
return name;
}
+
+ public Entity getEntityRef()
+ {
+ return this;
+ }
+
+ public Role getRoleRef()
+ {
+ return null;
+ }
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -47,13 +47,13 @@
public MessageBuilder addToRef(ObjectName toRef)
{
- message.setTargetID(toRef);
+ message.setToRef(new EntityImpl(toRef));
return this;
}
public MessageBuilder addFromRef(ObjectName fromRef)
{
- message.setSourceID(fromRef);
+ message.setFromRef(new EntityImpl(fromRef));
return this;
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -25,9 +25,6 @@
import java.util.Collections;
import java.util.List;
-import javax.management.ObjectName;
-
-import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MutablePropertySupport;
import org.jboss.bpm.model.Participant;
@@ -47,9 +44,8 @@
public class MessageImpl extends SupportingElementImpl implements Message, MutablePropertySupport
{
private String name;
- private ObjectName sourceID;
- private FlowObject sourceFO;
- private ObjectName targetID;
+ private Participant fromRef;
+ private Participant toRef;
private List<Property> props = new ArrayList<Property>();
public MessageImpl(String name)
@@ -60,11 +56,11 @@
this.name = name;
}
- public MessageImpl(String name, ObjectName targetID, FlowObject sourceFO)
+ public MessageImpl(String name, Participant targetID, Participant sourceID)
{
this(name);
- this.targetID = targetID;
- this.sourceFO = sourceFO;
+ this.toRef = targetID;
+ this.fromRef = sourceID;
}
public String getName()
@@ -72,26 +68,6 @@
return name;
}
- public ObjectName getSourceID()
- {
- return sourceID;
- }
-
- public void setSourceID(ObjectName sourceID)
- {
- this.sourceID = sourceID;
- }
-
- public ObjectName getTargetID()
- {
- return targetID;
- }
-
- public void setTargetID(ObjectName targetID)
- {
- this.targetID = targetID;
- }
-
public Property getProperty(String name)
{
for (Property prop : props)
@@ -136,22 +112,22 @@
public Participant getFromRef()
{
- return sourceID != null ? new EntityImpl(sourceID.getCanonicalName()) : null;
+ return fromRef;
}
- public FlowObject getFrom()
+ public void setFromRef(Participant fromRef)
{
- return sourceFO;
+ this.fromRef = fromRef;
}
-
- public void setFrom(FlowObject sourceFO)
+
+ public Participant getToRef()
{
- this.sourceFO = sourceFO;
+ return toRef;
}
- public Participant getToRef()
+ public void setToRef(Participant toRef)
{
- return targetID != null ? new EntityImpl(targetID.getCanonicalName()) : null;
+ this.toRef = toRef;
}
public String toString()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -31,7 +31,6 @@
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.MessageBuilderFactory;
-import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.Participant;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.runtime.ExecutionContext;
@@ -45,12 +44,13 @@
*/
class MessageSender
{
- private FlowObject fromRef;
+ private Participant fromRef;
private Message messageRef;
- public MessageSender(FlowObject fromRef, Message messageRef)
+ public MessageSender(FlowObject fromFlowObject, Message messageRef)
{
- this.fromRef = fromRef;
+ ObjectName procID = fromFlowObject.getProcess().getID();
+ this.fromRef = new EntityImpl(procID);
this.messageRef = messageRef;
if (messageRef == null)
@@ -74,7 +74,7 @@
throw new IllegalStateException("Cannot obtain target participant");
Entity entityRef = toRef.getEntityRef();
- ObjectName targetID = ObjectNameFactory.create(entityRef.getName());
+ ObjectName targetID = entityRef.getName();
msgBuilder.newMessage(messageRef.getName());
msgBuilder.addToRef(targetID);
@@ -90,7 +90,7 @@
msgBuilder.addProperty(key, value);
}
MessageImpl msg = (MessageImpl)msgBuilder.getMessage();
- msg.setFrom(fromRef);
+ msg.setFromRef(fromRef);
MessageManager mm = MessageManager.locateMessageManager();
mm.sendMessage(targetID, msg);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,12 +21,12 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.Entity;
-import org.jboss.bpm.model.Participant;
-import org.jboss.bpm.model.Role;
-
//$Id$
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.Participant;
+
/**
* A Participant, which is used in the definition of attributes for a @{link Pool}, @{link Message}, and @{link
* WebService}
@@ -37,16 +37,13 @@
@SuppressWarnings("serial")
public abstract class ParticipantImpl extends SupportingElementImpl implements Participant
{
- protected Entity entityRef;
- protected Role roleRef;
+ protected ObjectName name;
- public Entity getEntityRef()
+ public ParticipantImpl(ObjectName name)
{
- return entityRef;
+ if (name == null)
+ throw new IllegalArgumentException("Cannot create participant with name: null");
+
+ this.name = name;
}
-
- public Role getRoleRef()
- {
- return roleRef;
- }
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -380,10 +380,10 @@
throw new IllegalStateException("Cannot obtain process message: " + msgName);
MessageImpl msgImpl = (MessageImpl)msgRef;
- if (msgImpl.getSourceID() == null && procMsg.getSourceID() != null)
- msgImpl.setSourceID(procMsg.getSourceID());
- if (msgImpl.getTargetID() == null && procMsg.getTargetID() != null)
- msgImpl.setTargetID(procMsg.getTargetID());
+ if (msgImpl.getFromRef() == null && procMsg.getFromRef() != null)
+ msgImpl.setFromRef(procMsg.getFromRef());
+ if (msgImpl.getToRef() == null && procMsg.getToRef() != null)
+ msgImpl.setToRef(procMsg.getToRef());
for (Property prop : procMsg.getProperties())
((MessageImpl)msgRef).addProperty(prop);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,11 +21,14 @@
*/
package org.jboss.bpm.ri.model.impl;
+//$Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.Entity;
import org.jboss.bpm.model.Participant;
import org.jboss.bpm.model.Role;
-//$Id$
-
/**
* A Role, which is used in the definition of attributes for a @{link Participant}
*
@@ -35,12 +38,9 @@
@SuppressWarnings("serial")
public class RoleImpl extends ParticipantImpl implements Role
{
- private String name;
-
- public RoleImpl(String name)
+ public RoleImpl(ObjectName name)
{
- this.name = name;
- this.roleRef = this;
+ super(name);
}
public Participant.ParticipantType getParticipantType()
@@ -48,8 +48,18 @@
return Participant.ParticipantType.Role;
}
- public String getName()
+ public ObjectName getName()
{
return name;
}
+
+ public Entity getEntityRef()
+ {
+ return null;
+ }
+
+ public Role getRoleRef()
+ {
+ return this;
+ }
}
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-22 11:12:51 UTC (rev 1983)
@@ -159,7 +159,7 @@
public void catchMessage(Message msg)
{
log.debug("catchMessage: " + msg);
- ObjectName procID = msg.getFrom().getProcess().getID();
+ ObjectName procID = msg.getFromRef().getEntityRef().getName();
MessageManager mm = MessageManager.locateMessageManager();
if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA))
mm.sendMessage(procID, AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());
17 years, 8 months
- 1
- 0