JBoss JBPM SVN: r1615 - jbpm4/jpdl.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-14 09:44:56 -0400 (Mon, 14 Jul 2008)
New Revision: 1615
Removed:
jbpm4/jpdl/trunk/
Log:
Prj organization
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1614 - in jbpm4: jpdl and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-14 09:44:24 -0400 (Mon, 14 Jul 2008)
New Revision: 1614
Added:
jbpm4/jpdl/
jbpm4/jpdl/trunk/
Log:
Distinct projects
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1613 - jbpm4/trunk.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-14 04:09:32 -0400 (Mon, 14 Jul 2008)
New Revision: 1613
Modified:
jbpm4/trunk/pom.xml
Log:
Add default repos to the top level pom
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2008-07-14 08:04:27 UTC (rev 1612)
+++ jbpm4/trunk/pom.xml 2008-07-14 08:09:32 UTC (rev 1613)
@@ -134,4 +134,31 @@
</plugins>
</reporting>
-</project>
\ No newline at end of file
+ <repositories>
+ <repository>
+ <id>maven2.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1612 - pvm/trunk.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-14 04:04:27 -0400 (Mon, 14 Jul 2008)
New Revision: 1612
Modified:
pvm/trunk/pom.xml
Log:
Add default repos to the top level pom
Modified: pvm/trunk/pom.xml
===================================================================
--- pvm/trunk/pom.xml 2008-07-14 05:02:27 UTC (rev 1611)
+++ pvm/trunk/pom.xml 2008-07-14 08:04:27 UTC (rev 1612)
@@ -31,7 +31,7 @@
<!-- Modules -->
<modules>
- <module>modules/core</module>
+ <module>modules/core</module>
</modules>
<!-- Properties -->
@@ -184,5 +184,31 @@
</plugins>
</reporting>
+ <repositories>
+ <repository>
+ <id>maven2.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1611 - in api/branches/tdiesler: modules/api/src/main/java/org/jboss/bpm/model and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-14 01:02:27 -0400 (Mon, 14 Jul 2008)
New Revision: 1611
Added:
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityImpl.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObjectImpl.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayImpl.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBActivity.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBFlowObject.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBGateway.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/
Removed:
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractActivity.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlowObject.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractGateway.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
Modified:
api/branches/tdiesler/.classpath
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractEvent.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractProcess.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractTask.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Flow.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java
api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
Log:
wip
Modified: api/branches/tdiesler/.classpath
===================================================================
--- api/branches/tdiesler/.classpath 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/.classpath 2008-07-14 05:02:27 UTC (rev 1611)
@@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="src" output="modules/api/target/classes" path="modules/api/src/main/java"/>
<classpathentry kind="src" output="modules/api/target/test-classes" path="modules/api/src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="modules/api/target/classes" path="modules/api/src/main/resources"/>
<classpathentry excluding="**" kind="src" output="modules/api/target/test-classes" path="modules/api/src/test/resources"/>
<classpathentry kind="src" output="modules/testsuite/target/test-classes" path="modules/testsuite/src/test/java"/>
<classpathentry excluding="**" kind="src" output="modules/testsuite/target/test-classes" path="modules/testsuite/src/test/resources"/>
Deleted: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractActivity.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractActivity.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractActivity.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -1,77 +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 javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * An activity is a generic term for work that a company or organization performs via business processes.
- * An activity can be atomic or non-atomic (compound).
- * The types of activities that are a part of a Process Model are: Process, Sub-Process, and Task.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-@XmlType(name="AbstractActivity")
-abstract class AbstractActivity extends FlowObject implements NamedFlowObject
-{
- protected String name;
-
- /**
- * Construct an anonymous Activity
- */
- public AbstractActivity()
- {
- }
-
- /**
- * Construct a Activity with a given name
- */
- public AbstractActivity(String name)
- {
- this.name = name;
- }
-
- /**
- * Get the name
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * Set the name.
- * Note, this MUST NOT leak into the public API.
- */
- @XmlAttribute(required = true)
- public void setName(String name)
- {
- if (this.name != null)
- throw new IllegalStateException("Cannot rename: " + name);
-
- this.name = name;
- }
-}
\ No newline at end of file
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractEvent.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractEvent.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractEvent.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -26,6 +26,7 @@
+
// $Id$
/**
@@ -36,7 +37,7 @@
* @since 08-Jul-2008
*/
@XmlType(name="AbstractEvent")
-abstract class AbstractEvent extends FlowObject
+abstract class AbstractEvent extends FlowObjectImpl
{
protected ExecutionHandler executionHandler;
protected FlowHandler flowHandler;
Deleted: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlowObject.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlowObject.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlowObject.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -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.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-@XmlType(name = "AbstractFlowObject")
-abstract class AbstractFlowObject
-{
- private Process process;
-
- public Process getProcess()
- {
- return process;
- }
-
- @XmlTransient
- public void setProcess(Process process)
- {
- this.process = process;
- }
-}
\ No newline at end of file
Deleted: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractGateway.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractGateway.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractGateway.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -1,151 +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 java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process. If the flow does not need to be
- * controlled, then a Gateway is not needed.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-@XmlType(name = "AbstractGateway")
-abstract class AbstractGateway extends FlowObject implements NamedFlowObject, MultipleOutFlowSupport, MultipleInFlowSupport
-{
- private String name;
- protected ExecutionHandler executionHandler;
- protected FlowHandler flowHandler;
- protected SignalHandler signalHandler;
-
- @XmlElements( {
- @XmlElement(name = "sequence", type = SequenceFlow.class),
- @XmlElement(name = "message", type = MessageFlow.class)
- })
- protected List<Flow> outFlows = new ArrayList<Flow>();
-
- /**
- * Construct an anonymous Gateway
- */
- public AbstractGateway()
- {
- }
-
- /**
- * Construct a Activity with a given name
- */
- public AbstractGateway(String name)
- {
- this.name = name;
- }
-
- /**
- * Get the name
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * Set the name.
- * Note, this MUST NOT leak into the public API.
- */
- @XmlAttribute(required = true)
- protected void setName(String name)
- {
- if (this.name != null)
- throw new IllegalStateException("Cannot rename: " + name);
-
- this.name = name;
- }
-
- public List<Flow> getOutFlows()
- {
- return outFlows;
- }
-
- protected void setOutFlow(List<Flow> outFlow)
- {
- this.outFlows = outFlow;
- }
-
- /**
- * Get the ExecutionHandler for this Event
- */
- public ExecutionHandler getExecutionHandler()
- {
- return executionHandler;
- }
-
- /**
- * Set the ExecutionHandler for this Event
- */
- @XmlElement(name = "execution-handler")
- protected void setExecutionHandler(ExecutionHandler executionHandler)
- {
- this.executionHandler = executionHandler;
- }
-
- /**
- * Get the FlowHandler for this Event
- */
- public FlowHandler getFlowHandler()
- {
- return flowHandler;
- }
-
- /**
- * Set the FlowHandler for this Event
- */
- @XmlElement(name = "flow-handler")
- protected void setFlowHandler(FlowHandler flowHandler)
- {
- this.flowHandler = flowHandler;
- }
-
- /**
- * Get the SignalHandler for this Event
- */
- public SignalHandler getSignalHandler()
- {
- return signalHandler;
- }
-
- /**
- * Set the SignalHandler for this Event
- */
- @XmlElement(name = "signal-handler")
- protected void setSignalHandler(SignalHandler signalHandler)
- {
- this.signalHandler = signalHandler;
- }
-}
\ No newline at end of file
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractProcess.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractProcess.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractProcess.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -31,6 +31,7 @@
import javax.xml.bind.annotation.XmlType;
+
/**
* A Process is any Activity performed within a company or organization.
*
@@ -38,7 +39,7 @@
* @since 08-Jul-2008
*/
@XmlType(name = "AbstractProcess")
-abstract class AbstractProcess extends Activity
+abstract class AbstractProcess extends ActivityImpl
{
@XmlElements( {
@XmlElement(name = "start", type = StartEvent.class),
@@ -51,7 +52,7 @@
@XmlElement(name = "sub-process", type = SubProcess.class),
@XmlElement(name = "end", type = EndEvent.class)
})
- protected List<FlowObject> flowObjects = new ArrayList<FlowObject>();
+ protected List<FlowObjectImpl> flowObjects = new ArrayList<FlowObjectImpl>();
/**
* Construct an anonymous process
@@ -71,7 +72,7 @@
/**
* Get the list of flow objects
*/
- public List<FlowObject> getFlowObjects()
+ public List<FlowObjectImpl> getFlowObjects()
{
return flowObjects;
}
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractTask.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractTask.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractTask.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -38,7 +38,7 @@
* @since 08-Jul-2008
*/
@XmlType(name = "AbstractTask")
-abstract class AbstractTask extends Activity implements SingleOutFlowSupport
+abstract class AbstractTask extends ActivityImpl implements SingleOutFlowSupport
{
protected ExecutionHandler executionHandler;
protected FlowHandler flowHandler;
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -1,55 +1,6 @@
-/*
- * 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;
-import javax.xml.bind.annotation.XmlType;
-
-// $Id$
-
-/**
- * An activity is a generic term for work that a company or organization performs via business processes.
- * An activity can be atomic or non-atomic (compound).
- * The types of activities that are a part of a Process Model are: Process, Sub-Process, and Task.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-@XmlType(name="Activity")
-public abstract class Activity extends AbstractActivity implements NamedFlowObject
+public interface Activity extends NamedFlowObject
{
- /**
- * Construct an anonymous Activity
- * Note, this MUST NOT leak into the public API.
- */
- protected Activity()
- {
- }
- /**
- * Construct a Activity with a given name
- * Note, this MUST NOT leak into the public API.
- */
- public Activity(String name)
- {
- super(name);
- }
}
\ No newline at end of file
Copied: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityImpl.java (from rev 1610, api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java)
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityImpl.java (rev 0)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityImpl.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -0,0 +1,71 @@
+/*
+ * 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$
+
+/**
+ * An activity is a generic term for work that a company or organization performs via business processes.
+ * An activity can be atomic or non-atomic (compound).
+ * The types of activities that are a part of a Process Model are: Process, Sub-Process, and Task.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public abstract class ActivityImpl extends FlowObjectImpl implements Activity
+{
+ private JAXBActivity delegate;
+
+ /**
+ * Construct an anonymous Activity
+ * Note, this MUST NOT leak into the public API.
+ */
+ protected ActivityImpl()
+ {
+ }
+
+ /**
+ * Construct a Activity with a given name
+ * Note, this MUST NOT leak into the public API.
+ */
+ public ActivityImpl(String name)
+ {
+ delegate.setName(name);
+ }
+
+ /**
+ * Get the name
+ */
+ public String getName()
+ {
+ return delegate.getName();
+ }
+
+ public void setName(String name)
+ {
+ if (delegate.getName() != null)
+ throw new IllegalStateException("Cannot rename: " + name);
+
+ delegate.setName(name);
+ }
+}
\ No newline at end of file
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -37,7 +37,7 @@
* @since 08-Jul-2008
*/
@XmlType(name="ComplexGateway")
-public class ComplexGateway extends Gateway
+public class ComplexGateway extends GatewayImpl
{
/**
* Construct an anonymous Task
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -33,7 +33,7 @@
* @since 08-Jul-2008
*/
@XmlType(name="ExclusiveGateway")
-public class ExclusiveGateway extends Gateway
+public class ExclusiveGateway extends GatewayImpl
{
/**
* Construct an anonymous Task
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Flow.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Flow.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Flow.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -74,7 +74,7 @@
* Note, this MUST NOT leak into the public API.
*/
@XmlTransient
- protected void setSource(FlowObject source)
+ public void setSource(FlowObject source)
{
this.source = source;
}
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -1,147 +1,10 @@
-/*
- * 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;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.NameNotUniqueException;
-
-//$Id$
-
-/**
- * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-@XmlType(name="FlowObject")
-public abstract class FlowObject extends AbstractFlowObject
+public interface FlowObject
{
- /**
- * Construct an anonymous StartEvent.
- * Note, this MUST NOT leak into the public API.
- */
- protected FlowObject()
- {
- }
-
- /**
- * Initialize the flow object
- */
- protected void initialize(Process proc)
- {
- setProcess(proc);
-
- if (this instanceof NamedFlowObject)
- {
- // Check required name
- String name = ((NamedFlowObject)this).getName();
- if (name == null)
- throw new InvalidProcessException("Name is required for: " + this);
-
- // Check name uniqueness
- for (FlowObject aux : proc.getFlowObjects())
- {
- if (aux != this && aux instanceof NamedFlowObject)
- {
- String auxName = ((NamedFlowObject)aux).getName();
- if (name.equals(auxName))
- throw new NameNotUniqueException("NamedFlowObject: " + this);
- }
- }
- }
-
- // Initialize in/out flows
- Flow outFlow = null;
- if (this instanceof SingleOutFlowSupport)
- {
- SingleOutFlowSupport sof = (SingleOutFlowSupport)this;
- outFlow = sof.getOutFlow();
- initFlow(proc, outFlow);
- }
- else if (this instanceof MultipleOutFlowSupport)
- {
- MultipleOutFlowSupport mof = (MultipleOutFlowSupport)this;
- for (Flow flow : mof.getOutFlows())
- {
- outFlow = flow;
- initFlow(proc, flow);
- }
- }
-
- Flow inFlow = null;
- if (this instanceof SingleInFlowSupport)
- {
- SingleInFlowSupport sif = (SingleInFlowSupport)this;
- inFlow = sif.getInFlow();
- }
- else if (this instanceof MultipleInFlowSupport)
- {
- MultipleInFlowSupport mif = (MultipleInFlowSupport)this;
- for (Flow flow : mif.getInFlows())
- {
- inFlow = flow;
- }
- }
-
- if (inFlow == null && outFlow == null)
- throw new InvalidProcessException("Unconnected flow object: " + this);
- }
-
- private void initFlow(Process proc, Flow flow)
- {
- if (flow != null)
- {
- String name = flow.getTargetName();
- FlowObject target = proc.findFlowObject(name);
- if (target == null)
- throw new InvalidProcessException("Cannot find target for out flow: " + name);
-
- if (target instanceof SingleInFlowSupport)
- {
- SingleInFlowSupport sif = (SingleInFlowSupport)target;
- sif.setInFlow(flow);
- }
- else if (target instanceof MultipleInFlowSupport)
- {
- MultipleInFlowSupport mif = (MultipleInFlowSupport)target;
- mif.addInFlow(flow);
- }
- else
- {
- throw new InvalidProcessException("Target does not support in flow: " + target);
- }
-
- flow.setSource(this);
- flow.setTarget(target);
- }
- }
-
/**
* Get the associated Process
*/
- public Process getProcess()
- {
- return super.getProcess();
- }
+ Process getProcess();
+
}
\ No newline at end of file
Added: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObjectImpl.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObjectImpl.java (rev 0)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObjectImpl.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -0,0 +1,148 @@
+/*
+ * 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;
+
+import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.NameNotUniqueException;
+
+//$Id$
+
+/**
+ * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public abstract class FlowObjectImpl implements FlowObject
+{
+ private JAXBFlowObject delegate;
+
+ /**
+ * Construct an anonymous StartEvent.
+ * Note, this MUST NOT leak into the public API.
+ */
+ protected FlowObjectImpl()
+ {
+ }
+
+ public Process getProcess()
+ {
+ return delegate.getProcess();
+ }
+
+ protected void setProcess(Process process)
+ {
+ delegate.setProcess(process);
+ }
+
+ /**
+ * Initialize the flow object
+ */
+ protected void initialize(Process proc)
+ {
+ delegate.setProcess(proc);
+
+ if (this instanceof NamedFlowObject)
+ {
+ // Check required name
+ String name = ((NamedFlowObject)this).getName();
+ if (name == null)
+ throw new InvalidProcessException("Name is required for: " + this);
+
+ // Check name uniqueness
+ for (FlowObject aux : proc.getFlowObjects())
+ {
+ if (aux != this && aux instanceof NamedFlowObject)
+ {
+ String auxName = ((NamedFlowObject)aux).getName();
+ if (name.equals(auxName))
+ throw new NameNotUniqueException("NamedFlowObject: " + this);
+ }
+ }
+ }
+
+ // Initialize in/out flows
+ Flow outFlow = null;
+ if (this instanceof SingleOutFlowSupport)
+ {
+ SingleOutFlowSupport sof = (SingleOutFlowSupport)this;
+ outFlow = sof.getOutFlow();
+ initFlow(proc, outFlow);
+ }
+ else if (this instanceof MultipleOutFlowSupport)
+ {
+ MultipleOutFlowSupport mof = (MultipleOutFlowSupport)this;
+ for (Flow flow : mof.getOutFlows())
+ {
+ outFlow = flow;
+ initFlow(proc, flow);
+ }
+ }
+
+ Flow inFlow = null;
+ if (this instanceof SingleInFlowSupport)
+ {
+ SingleInFlowSupport sif = (SingleInFlowSupport)this;
+ inFlow = sif.getInFlow();
+ }
+ else if (this instanceof MultipleInFlowSupport)
+ {
+ MultipleInFlowSupport mif = (MultipleInFlowSupport)this;
+ for (Flow flow : mif.getInFlows())
+ {
+ inFlow = flow;
+ }
+ }
+
+ if (inFlow == null && outFlow == null)
+ throw new InvalidProcessException("Unconnected flow object: " + this);
+ }
+
+ private void initFlow(Process proc, Flow flow)
+ {
+ if (flow != null)
+ {
+ String name = flow.getTargetName();
+ FlowObject target = proc.findFlowObject(name);
+ if (target == null)
+ throw new InvalidProcessException("Cannot find target for out flow: " + name);
+
+ if (target instanceof SingleInFlowSupport)
+ {
+ SingleInFlowSupport sif = (SingleInFlowSupport)target;
+ sif.setInFlow(flow);
+ }
+ else if (target instanceof MultipleInFlowSupport)
+ {
+ MultipleInFlowSupport mif = (MultipleInFlowSupport)target;
+ mif.addInFlow(flow);
+ }
+ else
+ {
+ throw new InvalidProcessException("Target does not support in flow: " + target);
+ }
+
+ flow.setSource(this);
+ flow.setTarget(target);
+ }
+ }
+ }
\ No newline at end of file
Deleted: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -1,127 +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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.runtime.Token;
-
-/**
- * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process. If the flow does not need to be
- * controlled, then a Gateway is not needed.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-@XmlType(name = "Gateway")
-public abstract class Gateway extends AbstractGateway implements NamedFlowObject, Executable
-{
- // provide logging
- private static final Log log = LogFactory.getLog(Gateway.class);
-
- @XmlTransient
- protected List<Flow> inFlows = new ArrayList<Flow>();
-
- /**
- * Construct an anonymous Gateway Note, this MUST NOT leak into the public API.
- */
- protected Gateway()
- {
- }
-
- /**
- * Construct a Gateway with a given name Note, this MUST NOT leak into the public API.
- */
- protected Gateway(String name)
- {
- super(name);
- }
-
- public void addOutFlow(Flow flow)
- {
- outFlows.add(flow);
- }
-
- public List<Flow> getInFlows()
- {
- return Collections.unmodifiableList(inFlows);
- }
-
- public void addInFlow(Flow inFlow)
- {
- this.inFlows.add(inFlow);
- }
-
- @XmlTransient
- public FlowHandler getDefaultFlowHandler()
- {
- return new FlowHandler()
- {
- @Override
- public void transfer(Token token)
- {
- List<Flow> outFlows = getOutFlows();
- if (outFlows.size() == 1)
- token.addTailFlow(outFlows.get(0));
- }
- };
- }
-
- public SignalHandler getDefaultSignalHandler()
- {
- final FlowObject gateway = this;
- return new SignalHandler()
- {
- public Signal getEnterSignal()
- {
- return new Signal(gateway, Signal.Type.ENTER_GATEWAY);
- }
-
- public Signal getExitSignal()
- {
- return new Signal(gateway, Signal.Type.EXIT_GATEWAY);
- }
- };
- }
-
- @XmlTransient
- public ExecutionHandler getDefaultExecutionHandler()
- {
- return new ExecutionHandler()
- {
- @Override
- public void execute(Token token)
- {
- log.debug("Nothing to do in gateway: " + getName());
- }
- };
- }
-}
\ No newline at end of file
Copied: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayImpl.java (from rev 1610, api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java)
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayImpl.java (rev 0)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayImpl.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -0,0 +1,127 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.runtime.Token;
+
+/**
+ * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process. If the flow does not need to be
+ * controlled, then a Gateway is not needed.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+@XmlType(name = "Gateway")
+public abstract class GatewayImpl extends JAXBGateway implements NamedFlowObject, Executable
+{
+ // provide logging
+ private static final Log log = LogFactory.getLog(GatewayImpl.class);
+
+ @XmlTransient
+ protected List<Flow> inFlows = new ArrayList<Flow>();
+
+ /**
+ * Construct an anonymous Gateway Note, this MUST NOT leak into the public API.
+ */
+ protected GatewayImpl()
+ {
+ }
+
+ /**
+ * Construct a Gateway with a given name Note, this MUST NOT leak into the public API.
+ */
+ protected GatewayImpl(String name)
+ {
+ super(name);
+ }
+
+ public void addOutFlow(Flow flow)
+ {
+ outFlows.add(flow);
+ }
+
+ public List<Flow> getInFlows()
+ {
+ return Collections.unmodifiableList(inFlows);
+ }
+
+ public void addInFlow(Flow inFlow)
+ {
+ this.inFlows.add(inFlow);
+ }
+
+ @XmlTransient
+ public FlowHandler getDefaultFlowHandler()
+ {
+ return new FlowHandler()
+ {
+ @Override
+ public void transfer(Token token)
+ {
+ List<Flow> outFlows = getOutFlows();
+ if (outFlows.size() == 1)
+ token.addTailFlow(outFlows.get(0));
+ }
+ };
+ }
+
+ public SignalHandler getDefaultSignalHandler()
+ {
+ final FlowObject gateway = this;
+ return new SignalHandler()
+ {
+ public Signal getEnterSignal()
+ {
+ return new Signal(gateway, Signal.Type.ENTER_GATEWAY);
+ }
+
+ public Signal getExitSignal()
+ {
+ return new Signal(gateway, Signal.Type.EXIT_GATEWAY);
+ }
+ };
+ }
+
+ @XmlTransient
+ public ExecutionHandler getDefaultExecutionHandler()
+ {
+ return new ExecutionHandler()
+ {
+ @Override
+ public void execute(Token token)
+ {
+ log.debug("Nothing to do in gateway: " + getName());
+ }
+ };
+ }
+}
\ No newline at end of file
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -35,7 +35,7 @@
* @since 08-Jul-2008
*/
@XmlType(name="InclusiveGateway")
-public class InclusiveGateway extends Gateway
+public class InclusiveGateway extends GatewayImpl
{
/**
* Construct an anonymous Task
Copied: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBActivity.java (from rev 1610, api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractActivity.java)
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBActivity.java (rev 0)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBActivity.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -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.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * An activity is a generic term for work that a company or organization performs via business processes.
+ * An activity can be atomic or non-atomic (compound).
+ * The types of activities that are a part of a Process Model are: Process, Sub-Process, and Task.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+@XmlType(name="Activity")
+abstract class JAXBActivity extends FlowObjectImpl implements Activity
+{
+ protected String name;
+
+ /**
+ * Construct an anonymous Activity
+ */
+ public JAXBActivity()
+ {
+ }
+
+ /**
+ * Construct a Activity with a given name
+ */
+ public JAXBActivity(String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Set the name.
+ * Note, this MUST NOT leak into the public API.
+ */
+ @XmlAttribute(required = true)
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+}
\ No newline at end of file
Added: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBFlowObject.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBFlowObject.java (rev 0)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBFlowObject.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -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.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+@XmlType(name = "FlowObject")
+abstract class JAXBFlowObject implements FlowObject
+{
+ private Process process;
+
+ public Process getProcess()
+ {
+ return process;
+ }
+
+ @XmlTransient
+ public void setProcess(Process process)
+ {
+ this.process = process;
+ }
+}
\ No newline at end of file
Copied: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBGateway.java (from rev 1610, api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractGateway.java)
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBGateway.java (rev 0)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/JAXBGateway.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -0,0 +1,152 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process. If the flow does not need to be
+ * controlled, then a Gateway is not needed.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+@XmlType(name = "AbstractGateway")
+abstract class JAXBGateway extends FlowObjectImpl implements NamedFlowObject, MultipleOutFlowSupport, MultipleInFlowSupport
+{
+ private String name;
+ protected ExecutionHandler executionHandler;
+ protected FlowHandler flowHandler;
+ protected SignalHandler signalHandler;
+
+ @XmlElements( {
+ @XmlElement(name = "sequence", type = SequenceFlow.class),
+ @XmlElement(name = "message", type = MessageFlow.class)
+ })
+ protected List<Flow> outFlows = new ArrayList<Flow>();
+
+ /**
+ * Construct an anonymous Gateway
+ */
+ public JAXBGateway()
+ {
+ }
+
+ /**
+ * Construct a Activity with a given name
+ */
+ public JAXBGateway(String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Set the name.
+ * Note, this MUST NOT leak into the public API.
+ */
+ @XmlAttribute(required = true)
+ protected void setName(String name)
+ {
+ if (this.name != null)
+ throw new IllegalStateException("Cannot rename: " + name);
+
+ this.name = name;
+ }
+
+ public List<Flow> getOutFlows()
+ {
+ return outFlows;
+ }
+
+ protected void setOutFlow(List<Flow> outFlow)
+ {
+ this.outFlows = outFlow;
+ }
+
+ /**
+ * Get the ExecutionHandler for this Event
+ */
+ public ExecutionHandler getExecutionHandler()
+ {
+ return executionHandler;
+ }
+
+ /**
+ * Set the ExecutionHandler for this Event
+ */
+ @XmlElement(name = "execution-handler")
+ protected void setExecutionHandler(ExecutionHandler executionHandler)
+ {
+ this.executionHandler = executionHandler;
+ }
+
+ /**
+ * Get the FlowHandler for this Event
+ */
+ public FlowHandler getFlowHandler()
+ {
+ return flowHandler;
+ }
+
+ /**
+ * Set the FlowHandler for this Event
+ */
+ @XmlElement(name = "flow-handler")
+ protected void setFlowHandler(FlowHandler flowHandler)
+ {
+ this.flowHandler = flowHandler;
+ }
+
+ /**
+ * Get the SignalHandler for this Event
+ */
+ public SignalHandler getSignalHandler()
+ {
+ return signalHandler;
+ }
+
+ /**
+ * Set the SignalHandler for this Event
+ */
+ @XmlElement(name = "signal-handler")
+ protected void setSignalHandler(SignalHandler signalHandler)
+ {
+ this.signalHandler = signalHandler;
+ }
+}
\ No newline at end of file
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -35,7 +35,7 @@
* @since 08-Jul-2008
*/
@XmlType(name="ParallelGateway")
-public class ParallelGateway extends Gateway
+public class ParallelGateway extends GatewayImpl
{
/**
* Construct an anonymous Task
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -75,7 +75,7 @@
/**
* Add a flow object. Note, this MUST NOT leak into the public API.
*/
- protected void addFlowObject(FlowObject flowObject)
+ protected void addFlowObject(FlowObjectImpl flowObject)
{
flowObjects.add(flowObject);
}
@@ -116,7 +116,7 @@
/**
* Get the list of flow objects
*/
- public List<FlowObject> getFlowObjects()
+ public List<FlowObjectImpl> getFlowObjects()
{
if (processState == ProcessState.CREATED)
return flowObjects;
@@ -197,7 +197,7 @@
throw new InvalidProcessException("Process does not have end events");
// Set the associated process
- for (FlowObject aux : flowObjects)
+ for (FlowObjectImpl aux : flowObjects)
aux.initialize(this);
processState = ProcessState.INITIALIZED;
Modified: api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
===================================================================
--- api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-07-14 04:30:53 UTC (rev 1610)
+++ api/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-07-14 05:02:27 UTC (rev 1611)
@@ -22,6 +22,7 @@
package org.jboss.bpm.model;
+
// $Id$
/**
@@ -33,7 +34,7 @@
public class ProcessBuilder
{
private Process proc;
- private FlowObject flowObject;
+ private FlowObjectImpl flowObject;
public ProcessBuilder (String procName)
{
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1610 - api/branches.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-14 00:30:53 -0400 (Mon, 14 Jul 2008)
New Revision: 1610
Added:
api/branches/tdiesler/
Log:
recreate userbranch
Copied: api/branches/tdiesler (from rev 1609, api/trunk)
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1609 - api/branches.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-14 00:30:35 -0400 (Mon, 14 Jul 2008)
New Revision: 1609
Removed:
api/branches/tdiesler/
Log:
recreate userbranch
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1608 - in api/trunk/modules: api/src/main/java/org/jboss/bpm/model and 5 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-13 12:37:21 -0400 (Sun, 13 Jul 2008)
New Revision: 1608
Added:
api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/
api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java
api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
Modified:
api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ItermediateEvent.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java
api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java
api/trunk/modules/testsuite/pom.xml
Log:
Add ParallelSplit
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -109,7 +109,7 @@
public void throwSignal(Signal signal)
{
log.debug("throwSignal: " + signal);
- String procName = signal.getProcess().getName();
+ String procName = signal.getProcessName();
Set<SignalListener> set = listeners.get(procName);
if (set != null)
{
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -108,16 +108,17 @@
public SignalHandler getDefaultSignalHandler()
{
+ final FlowObject end = this;
return new SignalHandler()
{
public Signal getEnterSignal()
{
- return new Signal(getProcess(), Signal.Type.ENTER_END_EVENT);
+ return new Signal(end, Signal.Type.ENTER_END_EVENT);
}
public Signal getExitSignal()
{
- return new Signal(getProcess(), Signal.Type.EXIT_END_EVENT);
+ return new Signal(end, Signal.Type.EXIT_END_EVENT);
}
};
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -35,32 +35,30 @@
import org.jboss.bpm.runtime.Token;
/**
- * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process.
- * If the flow does not need to be controlled, then a Gateway is not needed.
+ * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process. If the flow does not need to be
+ * controlled, then a Gateway is not needed.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
*/
-@XmlType(name="Gateway")
+@XmlType(name = "Gateway")
public abstract class Gateway extends AbstractGateway implements NamedFlowObject, Executable
{
// provide logging
private static final Log log = LogFactory.getLog(Gateway.class);
-
+
@XmlTransient
protected List<Flow> inFlows = new ArrayList<Flow>();
-
+
/**
- * Construct an anonymous Gateway
- * Note, this MUST NOT leak into the public API.
+ * Construct an anonymous Gateway Note, this MUST NOT leak into the public API.
*/
protected Gateway()
{
}
/**
- * Construct a Gateway with a given name
- * Note, this MUST NOT leak into the public API.
+ * Construct a Gateway with a given name Note, this MUST NOT leak into the public API.
*/
protected Gateway(String name)
{
@@ -71,7 +69,7 @@
{
outFlows.add(flow);
}
-
+
public List<Flow> getInFlows()
{
return Collections.unmodifiableList(inFlows);
@@ -81,7 +79,7 @@
{
this.inFlows.add(inFlow);
}
-
+
@XmlTransient
public FlowHandler getDefaultFlowHandler()
{
@@ -99,16 +97,17 @@
public SignalHandler getDefaultSignalHandler()
{
+ final FlowObject gateway = this;
return new SignalHandler()
{
public Signal getEnterSignal()
{
- return new Signal(getProcess(), Signal.Type.ENTER_GATEWAY);
+ return new Signal(gateway, Signal.Type.ENTER_GATEWAY);
}
public Signal getExitSignal()
{
- return new Signal(getProcess(), Signal.Type.EXIT_GATEWAY);
+ return new Signal(gateway, Signal.Type.EXIT_GATEWAY);
}
};
}
@@ -125,4 +124,4 @@
}
};
}
- }
\ No newline at end of file
+}
\ No newline at end of file
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ItermediateEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ItermediateEvent.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ItermediateEvent.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -103,16 +103,17 @@
public SignalHandler getDefaultSignalHandler()
{
+ final FlowObject event = this;
return new SignalHandler()
{
public Signal getEnterSignal()
{
- return new Signal(getProcess(), Signal.Type.ENTER_EVENT);
+ return new Signal(event, Signal.Type.ENTER_EVENT);
}
public Signal getExitSignal()
{
- return new Signal(getProcess(), Signal.Type.EXIT_EVENT);
+ return new Signal(event, Signal.Type.EXIT_EVENT);
}
};
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -23,7 +23,9 @@
import javax.xml.bind.annotation.XmlType;
+import org.jboss.bpm.runtime.Token;
+
// $Id$
/**
@@ -52,6 +54,23 @@
super(name);
}
+ /**
+ * The DefaultFlowHandler adds all out flows to the queue
+ */
+ @Override
+ public FlowHandler getDefaultFlowHandler()
+ {
+ return new FlowHandler()
+ {
+ @Override
+ public void transfer(Token token)
+ {
+ for(Flow outFlow : getOutFlows())
+ token.addTailFlow(outFlow);
+ }
+ };
+ }
+
public String toString()
{
return "ParallelGateway[" + getName() + "]";
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -59,6 +59,7 @@
*/
protected Process()
{
+ setProcess(this);
}
/**
@@ -68,6 +69,7 @@
protected Process(String name)
{
super(name);
+ setProcess(this);
}
/**
@@ -200,4 +202,9 @@
processState = ProcessState.INITIALIZED;
}
+
+ public String toString()
+ {
+ return "Process[" + getName() + "]";
+ }
}
\ No newline at end of file
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -51,30 +51,31 @@
USER_SIGNAL
}
- private Process proc;
private Type type;
+ private FlowObject flowObject;
private String message;
/** Create the signal for a given process */
- public Signal(Process proc, Type type)
+ public Signal(FlowObject flowObject, Type type)
{
- this.proc = proc;
+ this.flowObject = flowObject;
this.type = type;
+ validateSignal();
}
/** Create the signal for a given process */
- public Signal(Process proc, Type type, String message)
+ public Signal(FlowObject flowObject, Type type, String message)
{
- this.proc = proc;
+ this.flowObject = flowObject;
this.type = type;
this.message = message;
-
+ validateSignal();
}
- /** Get the proccess */
- public Process getProcess()
+ /** Get the proccess name */
+ public String getProcessName()
{
- return proc;
+ return flowObject.getProcess().getName();
}
public Type getType()
@@ -82,14 +83,31 @@
return type;
}
+ public String getSource()
+ {
+ return flowObject.toString();
+ }
+
public String getMessage()
{
return message;
}
+ private void validateSignal()
+ {
+ if (flowObject == null)
+ throw new IllegalArgumentException("FlowObject cannot be null");
+ if (type == null)
+ throw new IllegalArgumentException("SignalType cannot be null");
+ }
+
public String toString()
{
- StringBuilder string = new StringBuilder(type + "[" + proc.getName());
+ StringBuilder string = new StringBuilder(type + "[" + getProcessName());
+ if (flowObject instanceof Process == false)
+ {
+ string.append(":" + flowObject);
+ }
if (message != null)
{
string.append(":" + message);
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -68,16 +68,17 @@
public SignalHandler getDefaultSignalHandler()
{
+ final FlowObject start = this;
return new SignalHandler()
{
public Signal getEnterSignal()
{
- return new Signal(getProcess(), Signal.Type.ENTER_START_EVENT);
+ return new Signal(start, Signal.Type.ENTER_START_EVENT);
}
public Signal getExitSignal()
{
- return new Signal(getProcess(), Signal.Type.EXIT_START_EVENT);
+ return new Signal(start, Signal.Type.EXIT_START_EVENT);
}
};
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -88,16 +88,17 @@
public SignalHandler getDefaultSignalHandler()
{
+ final FlowObject subproc = this;
return new SignalHandler()
{
public Signal getEnterSignal()
{
- return new Signal(getProcess(), Signal.Type.ENTER_SUB_PROCESS);
+ return new Signal(subproc, Signal.Type.ENTER_SUB_PROCESS);
}
public Signal getExitSignal()
{
- return new Signal(getProcess(), Signal.Type.EXIT_SUB_PROCESS);
+ return new Signal(subproc, Signal.Type.EXIT_SUB_PROCESS);
}
};
}
Added: api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java
===================================================================
--- api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java (rev 0)
+++ api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.pattern.parallelsplit;
+
+// $Id$
+
+import java.util.List;
+import java.util.concurrent.Future;
+
+import org.jboss.bpm.MockEngineTestCase;
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.Result;
+import org.jboss.bpm.model.Signal;
+
+/**
+ * A point in the workflow process where a single thread of control splits
+ * into multiple threads of control which can be executed in parallel,
+ * thus allowing activities to be executed simultaneously or in any order.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class ParallelSplitTest extends MockEngineTestCase
+{
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ SignalManager em = SignalManager.locateSignalManager();
+ em.addListener(getName(), this);
+ }
+
+ /**
+ * The ParallelGateway uses non threaded SequenceFlows
+ */
+ public void testNonThreadedSplit() throws Exception
+ {
+ Process proc = new ProcessBuilder(getName()).addStartEvent().addSequenceFlow("gateway").addParallelGateway("gateway").
+ addSequenceFlow("endA").addSequenceFlow("endB").addEndEvent("endA").addEndEvent("endB").getProcess();
+
+ // Create a Process through the ProcessManager
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ pm.registerProcess(proc);
+
+ // Start the Process
+ Future<Result> end = proc.startProcess();
+ Result result = end.get();
+
+ // Validate the Result
+ assertNotNull("Result expected", result);
+ assertEquals("No attachments expected", 0, result.getAttachments().getAttachmentKeys().size());
+
+ // Validate received signals
+ List<Signal> signals = getSignals();
+ assertEquals(Signal.Type.ENTER_PROCESS, signals.get(0).getType());
+ assertEquals(Signal.Type.ENTER_START_EVENT, signals.get(1).getType());
+ assertEquals(Signal.Type.EXIT_START_EVENT, signals.get(2).getType());
+ assertEquals(Signal.Type.ENTER_GATEWAY, signals.get(3).getType());
+ assertEquals(Signal.Type.EXIT_GATEWAY, signals.get(4).getType());
+ assertEquals(Signal.Type.ENTER_END_EVENT, signals.get(5).getType());
+ assertEquals("EndEvent[endA]", signals.get(5).getSource());
+ assertEquals(Signal.Type.EXIT_END_EVENT, signals.get(6).getType());
+ assertEquals(Signal.Type.ENTER_END_EVENT, signals.get(7).getType());
+ assertEquals("EndEvent[endB]", signals.get(7).getSource());
+ assertEquals(Signal.Type.EXIT_END_EVENT, signals.get(8).getType());
+ assertEquals(Signal.Type.EXIT_PROCESS, signals.get(9).getType());
+ }
+}
Property changes on: api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java
===================================================================
--- api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java 2008-07-13 16:37:21 UTC (rev 1608)
@@ -35,7 +35,8 @@
import org.jboss.bpm.model.Signal;
/**
- * Test the basic sequence
+ * An activity in a workflow process is enabled after the completion
+ * of another activity in the same process.
*
* @author thomas.diesler(a)jboss.com
* @since 03-Jul-2008
@@ -53,7 +54,7 @@
/**
* Test a basic sequence
*/
- public void testBasicSequence() throws Exception
+ public void testSequence() throws Exception
{
Process proc = new ProcessBuilder(getName()).addStartEvent().addSequenceFlow("task").addTask("task").
addSequenceFlow("end").addEndEvent("end").getProcess();
Modified: api/trunk/modules/testsuite/pom.xml
===================================================================
--- api/trunk/modules/testsuite/pom.xml 2008-07-13 15:46:45 UTC (rev 1607)
+++ api/trunk/modules/testsuite/pom.xml 2008-07-13 16:37:21 UTC (rev 1608)
@@ -110,46 +110,5 @@
<!-- Profiles -->
<profiles>
- <!--
- Name: jbpm3
- Desc: Execute tests against jBPM3 integration
- -->
- <profile>
- <id>jbpm3</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
- <version>${jboss.jbpm3.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
- <version>${jboss.jbpm3.version}</version>
- <classifier>config</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>jbpm.dialect</name>
- <value>jbpm32</value>
- </property>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
\ No newline at end of file
Added: api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-07-13 16:37:21 UTC (rev 1608)
@@ -0,0 +1,28 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The Kernel Locator -->
+ <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
+
+ <!-- The process engine -->
+ <bean name="jBPMProcessEngine" class="org.jboss.bpm.client.internal.ProcessEngineImpl">
+ <property name="processManager"><inject bean="jBPMProcessManager"/></property>
+ <property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
+ <property name="signalManager"><inject bean="jBPMSignalManager"/></property>
+ </bean>
+
+ <!-- The process manager -->
+ <bean name="jBPMProcessManager" class="org.jboss.bpm.client.internal.ProcessManagerImpl">
+ <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
+ </bean>
+
+ <!-- The execution manager -->
+ <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl">
+ <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
+ </bean>
+
+ <!-- The execution manager -->
+ <bean name="jBPMSignalManager" class="org.jboss.bpm.client.internal.SignalManagerImpl">
+ <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1607 - in jbpm3/trunk/modules/jpdl/core: src/main/java/org/jbpm/integration/model and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-13 11:46:45 -0400 (Sun, 13 Jul 2008)
New Revision: 1607
Modified:
jbpm3/trunk/modules/jpdl/core/pom.xml
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java
Log:
Provide API1.0 dialect for tests
Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml 2008-07-13 15:46:20 UTC (rev 1606)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml 2008-07-13 15:46:45 UTC (rev 1607)
@@ -116,6 +116,9 @@
<build>
<testResources>
<testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
<directory>src/testsuite/resources</directory>
</testResource>
</testResources>
@@ -207,6 +210,16 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <systemProperties>
+ <property>
+ <name>jbpm.dialect</name>
+ <value>jbpm32</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ </systemProperties>
<excludes>
<exclude>org/jbpm/mail/MailTest.java</exclude>
<exclude>org/jbpm/mail/TaskMailTest.java</exclude>
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java 2008-07-13 15:46:20 UTC (rev 1606)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java 2008-07-13 15:46:45 UTC (rev 1607)
@@ -33,7 +33,6 @@
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.SingleOutFlowSupport;
-import org.jboss.bpm.model.Task;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Node;
@@ -96,6 +95,7 @@
throw new InvalidProcessException("Node action is not of type ExecutionHandler");
delegate = (ExecutionHandler)obj;
+ delegate.setClassName(obj.getClass().getName());
}
flowObject = new TaskImpl(apiProc, oldNode, delegate);
initTranstions(flowObject, oldNode);
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1606 - in api/trunk/modules: api/src/main/java/org/jboss/bpm/model and 7 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-13 11:46:20 -0400 (Sun, 13 Jul 2008)
New Revision: 1606
Added:
api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml
api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml
api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml
api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml
Removed:
api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml
api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml
api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml
api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml
Modified:
api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java
api/trunk/modules/testsuite/pom.xml
api/trunk/modules/testsuite/scripts/assembly-testsuite.xml
api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java
Log:
Provide API1.0 dialect for tests
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-13 15:46:20 UTC (rev 1606)
@@ -166,7 +166,7 @@
{
try
{
- File file = new File("target/" + proc.getName() + ".xml").getCanonicalFile();
+ File file = new File("target/" + proc.getName() + "-api10.xml").getCanonicalFile();
log.debug("Generate: " + file);
FileWriter writer = new FileWriter(file);
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java 2008-07-13 15:46:20 UTC (rev 1606)
@@ -23,7 +23,6 @@
//$Id$
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.jboss.bpm.runtime.Token;
@@ -35,9 +34,8 @@
* @since 08-Jul-2008
*/
@XmlType(name = "ExecutionHandler")
-public abstract class ExecutionHandler extends Handler
+public class ExecutionHandler extends Handler
{
- @XmlTransient
private ExecutionHandler delegate;
/**
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java 2008-07-13 15:46:20 UTC (rev 1606)
@@ -34,7 +34,7 @@
* @since 08-Jul-2008
*/
@XmlType(name = "FlowHandler")
-public abstract class FlowHandler extends Handler
+public class FlowHandler extends Handler
{
private FlowHandler delegate;
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java 2008-07-13 15:46:20 UTC (rev 1606)
@@ -23,11 +23,12 @@
//$Id$
-import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import org.jboss.bpm.NotImplementedException;
+
/**
* Implement to handle the outgoing Flows for an FlowObject
*
@@ -37,11 +38,31 @@
@XmlType(name = "Handler")
public abstract class Handler
{
- @XmlElement(name = "class")
private String className;
- @XmlElement(name = "bean")
private String beanRef;
+ public String getClassName()
+ {
+ return className;
+ }
+
+ @XmlAttribute(name = "class", required = false)
+ public void setClassName(String className)
+ {
+ this.className = className;
+ }
+
+ public String getBeanRef()
+ {
+ return beanRef;
+ }
+
+ @XmlAttribute(name = "bean", required = false)
+ public void setBeanRef(String beanRef)
+ {
+ this.beanRef = beanRef;
+ }
+
@SuppressWarnings("unchecked")
protected <T> T newInstance(Class<T> clazz)
{
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java 2008-07-13 15:46:20 UTC (rev 1606)
@@ -33,7 +33,7 @@
* @since 08-Jul-2008
*/
@XmlType(name = "SignalHandler")
-public abstract class SignalHandler extends Handler
+public class SignalHandler extends Handler
{
private SignalHandler delegate;
Modified: api/trunk/modules/testsuite/pom.xml
===================================================================
--- api/trunk/modules/testsuite/pom.xml 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/testsuite/pom.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -90,6 +90,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>jbpm.dialect</name>
+ <value>api10</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -126,6 +141,10 @@
<name>jbpm.dialect</name>
<value>jbpm32</value>
</property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified: api/trunk/modules/testsuite/scripts/assembly-testsuite.xml
===================================================================
--- api/trunk/modules/testsuite/scripts/assembly-testsuite.xml 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/testsuite/scripts/assembly-testsuite.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -9,6 +9,9 @@
<fileSet>
<directory>src/test</directory>
<outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>resources/jbpm-beans.xml</exclude>
+ </excludes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java 2008-07-13 15:46:20 UTC (rev 1606)
@@ -47,7 +47,7 @@
protected void setUp() throws Exception
{
super.setUp();
- jpdlURL = getResourceURL("samples/engine/basic-engine.xml");
+ jpdlURL = getResourceURL("samples/engine/basic-engine-" + getDialect() + ".xml");
engine = ProcessEngineLocator.locateProcessEngine();
engine.cancelShutdown();
}
Copied: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml (from rev 1602, api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml)
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -0,0 +1,10 @@
+<ns2:process name="basic-context" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+ <start>
+ <sequence to="stateA" />
+ </start>
+ <task name="stateA">
+ <sequence to="end" />
+ <execution-handler class="org.jboss.bpm.samples.context.TaskA" />
+ </task>
+ <end name="end" />
+</ns2:process>
\ No newline at end of file
Deleted: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -1,12 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-context'>
- <start-state>
- <transition to='stateA' />
- </start-state>
- <state name='stateA'>
- <event type='node-enter'>
- <action class='org.jboss.bpm.samples.context.TaskA' />
- </event>
- <transition to='end' />
- </state>
- <end-state name='end' />
-</process-definition>
\ No newline at end of file
Copied: api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml (from rev 1598, api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml)
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -0,0 +1,9 @@
+<ns2:process name="basic-engine" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+ <start>
+ <sequence to="stateA" />
+ </start>
+ <task name="stateA">
+ <sequence to="end" />
+ </task>
+ <end name="end" />
+</ns2:process>
\ No newline at end of file
Deleted: api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -1,9 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-engine'>
- <start-state>
- <transition to='stateA' />
- </start-state>
- <state name='stateA'>
- <transition to='end' />
- </state>
- <end-state name='end' />
-</process-definition>
\ No newline at end of file
Copied: api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml (from rev 1602, api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml)
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -0,0 +1,9 @@
+<ns2:process name="basic-sequence" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+ <start>
+ <sequence to="stateA" />
+ </start>
+ <task name="stateA">
+ <sequence to="end" />
+ </task>
+ <end name="end" />
+</ns2:process>
\ No newline at end of file
Deleted: api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -1,9 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-sequence'>
- <start-state>
- <transition to='stateA' />
- </start-state>
- <state name='stateA'>
- <transition to='end' />
- </state>
- <end-state name='end' />
-</process-definition>
\ No newline at end of file
Copied: api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml (from rev 1602, api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml)
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -0,0 +1,10 @@
+<ns2:process name="basic-task" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1">
+ <start>
+ <sequence to="stateA" />
+ </start>
+ <task name="stateA">
+ <sequence to="end" />
+ <execution-handler class="org.jboss.bpm.samples.task.TaskA" />
+ </task>
+ <end name="end" />
+</ns2:process>
\ No newline at end of file
Deleted: api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml 2008-07-13 14:59:38 UTC (rev 1605)
+++ api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml 2008-07-13 15:46:20 UTC (rev 1606)
@@ -1,12 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-task'>
- <start-state>
- <transition to='stateA' />
- </start-state>
- <state name='stateA'>
- <event type='node-enter'>
- <action class='org.jboss.bpm.samples.task.TaskA' />
- </event>
- <transition to='end' />
- </state>
- <end-state name='end' />
-</process-definition>
\ No newline at end of file
15 years, 11 months
- 1
- 0