[jbpm-commits] JBoss JBPM SVN: r1681 - in api/trunk: modules/api/src/main/java/org/jboss/bpm/model and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Jul 21 11:28:51 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-07-21 11:28:51 -0400 (Mon, 21 Jul 2008)
New Revision: 1681
Added:
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NameSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java
api/trunk/modules/testsuite/src/test/resources/cts/
api/trunk/modules/testsuite/src/test/resources/cts/cts-specification.txt
Removed:
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java
Modified:
api/trunk/eclipse/jBPMCodeStyle.xml
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.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/Event.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/IntermediateEvent.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/StartEvent.java
api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
Log:
Add more BPMN constructs
Modified: api/trunk/eclipse/jBPMCodeStyle.xml
===================================================================
--- api/trunk/eclipse/jBPMCodeStyle.xml 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/eclipse/jBPMCodeStyle.xml 2008-07-21 15:28:51 UTC (rev 1681)
@@ -70,7 +70,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="168"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -31,7 +31,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public interface Activity extends FlowObject, NamedFlowObject
+public interface Activity extends FlowObject, NameSupport
{
}
\ No newline at end of file
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+
+/**
+ * An ArtifactInput, which is used in the definition of attributes for InputSet
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Artifact extends GraphicalElement
+{
+ /**
+ * Defines the type of an {@link Artifact}
+ */
+ enum ArtifactType
+ {
+ DataObject, Group, Annotation
+ };
+
+ /**
+ * The ArtifactType MAY be set to DataObject, Group, or Annotation.
+ * The ArtifactType list MAY be extended to include new types.
+ */
+ ArtifactType getArtifactType();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+
+/**
+ * An ArtifactInput, which is used in the definition of attributes for @{link InputSet}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface ArtifactInput extends Artifact
+{
+ /**
+ * This attribute identifies an Artifact that will be used as an input to an activity. The
+ * identified Artifact will be part of an InputSet for an activity.
+ */
+ Artifact getArtifactRef();
+
+ /**
+ * The default value for this attribute is True. This means that the Input is required for
+ * an activity to start. If set to False, then the activity MAY start within the input if it
+ * is available, but MAY accept the input (more than once) after the activity has
+ * started. An InputSet may have a some of ArtifactInputs that have this attribute set
+ * to True and some that are set to False.
+ */
+ boolean isRequireForStart();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+
+/**
+ * An ArtifactOutput, which is used in the definition of attributes for @{link OutputSet}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface ArtifactOutput extends Artifact
+{
+ /**
+ * This attribute identifies an Artifact that will be used as an output to an activity. The
+ * identified Artifact will be part of an OutputSet for an activity.
+ */
+ Artifact getArtifactRef();
+
+ /**
+ * The default value for this attribute is True. This means that the Output will be
+ * produced when an activity has been completed. If set to False, then the activity
+ * MAY produce the output (more than once) before it has completed. An OutputSet
+ * may have a some of ArtifactOutputs that have this attribute set to True and some that
+ * are set to False.
+ */
+ boolean isProduceAtCompletion();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,35 @@
+/*
+ * 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$
+
+/**
+ * The Cancel event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface CancelEventDetail extends EventDetail
+{
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+/**
+ * The Compensate event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface CompensateEventDetail extends EventDetail
+{
+ /**
+ * For an End Event:
+ *
+ * If the Result is a Compensation, then the Activity that needs to be compensated MAY be supplied.
+ * If an Activity is not supplied, then the Event broadcast to all completed activities in the Process Instance.
+ *
+ * For an Intermediate Event within Normal Flow: If the Trigger is a Compensation, then the Activity that needs
+ * to be compensated MAY be supplied. If an Activity is not supplied, then the Event broadcast to all completed
+ * activities in the Process Instance. This “throws” the compensation.
+ *
+ * For an Intermediate Event attached to the boundary of an Activity: This Event “catches” the compensation.
+ * No further information is required. The Activity the Event is attached to will provide the Id necessary
+ * to match the compensation event with the event that “threw” the compensation or the compensation will be a
+ * broadcast.
+ */
+ Activity getActivityRef();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+/**
+ * A Condition, which is used in the definition of attributes for Start Event and
+ * Intermediate Event
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Condition
+{
+ /**
+ * Name is an optional attribute that is text description of the Condition. If a Name is
+ * not entered, then a ConditionExpression MUST be entered
+ */
+ String getName();
+
+ /**
+ * A ConditionExpression MAY be entered. In some cases the Condition itself will be
+ * stored and maintained in a separate application (e.g., a Rules Engine). If a ConditionExpression
+ * is not entered, then a Name MUST be entered
+ */
+ Expression getConditionExpression();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,39 @@
+/*
+ * 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$
+
+/**
+ * The Conditional event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface ConditionalEventDetail extends EventDetail
+{
+ /**
+ * If the Trigger is Conditional, then a Condition MUST be entered.
+ */
+ Condition getConditionRef();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+import java.util.List;
+
+//$Id$
+
+
+/**
+ * DataObject, which extends common Artifact
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface DataObject extends Artifact
+{
+ /**
+ * Name is an attribute that is text description of the object.
+ */
+ String getName();
+
+ /**
+ * State is an optional attribute that indicates the impact the Process has had on the Data
+ * Object. Multiple Data Objects with the same name MAY share the same state within one Process.
+ */
+ String getState();
+
+ /**
+ * Modeler-defined Properties MAY be added to a Data Object. The fully delineated name of these
+ * properties are “<process name>.<task name>.<property name>”
+ * (e.g., “Add Customer.Review Credit Report.Score”).
+ */
+ List<Property> getProperties();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -33,7 +33,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public interface EndEvent extends Event, NamedFlowObject, SingleInFlowSupport
+public interface EndEvent extends Event, NameSupport, SingleInFlowSupport
{
/**
* Get the {@link Result}
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,38 @@
+/*
+ * 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 Entity, which is used in the definition of attributes for a @{link Participant}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Entity
+{
+ /**
+ * Name is an attribute that is text description of the Entity.
+ */
+ String getName();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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$
+
+/**
+ * The Error event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface ErrorEventDetail extends EventDetail
+{
+ /**
+ * For an End Event:
+ * If the Result is an Error, then the ErrorCode MUST be supplied.This “throws” the
+ * error.
+ *
+ * For an Intermediate Event within Normal Flow:
+ * If the Trigger is an Error, then the ErrorCode MUST be entered. This “throws”
+ * the error.
+ *
+ * For an Intermediate Event attached to the boundary of an Activity:
+ * If the Trigger is an Error, then the ErrorCode MAY be entered. This Event
+ * “catches” the error. If there is no ErrorCode, then any error SHALL trigger the
+ * Event. If there is an ErrorCode, then only an error that matches the ErrorCode
+ * SHALL trigger the Event.
+ */
+ String getErrorCode();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -34,5 +34,11 @@
*/
public interface Event extends FlowObject
{
-
+ /**
+ * Defines the type of an {@link Event}
+ */
+ enum EventType
+ {
+ Start, End, Intermediate
+ };
}
\ No newline at end of file
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+/**
+ * The base of all supported event details.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface EventDetail extends SupportingElement
+{
+ /**
+ * Defines the type of an {@link Event}
+ */
+ enum EventDetailType
+ {
+ Message, Timer, Error, Conditional, Link, Signal, Compensate, Cancel, Terminate
+ };
+
+ /**
+ * The EventDetailType attribute defines the type of trigger expected for an Event. The
+ * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate,
+ * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each
+ * have a subset of the EventDetailTypes that can be used.
+ * The EventDetailType list MAY be extended to include new types.
+ */
+ EventDetailType getEventDetailType();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+/**
+ * An Expression, which is used in the definition of attributes for @{link StartEvent},
+ * @{link IntermediateEvent}, @{link Activity}, @{link ComplexGateway}, and @{link SequenceFlow}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Expression
+{
+ /**
+ * An ExpressionBody MUST be entered to provide the text of the expression, which
+ * will be written in the language defined by the ExpressionLanguage attribute.
+ */
+ String getExpressionBody();
+
+ /**
+ * A Language MUST be provided to identify the language of the ExpressionBody.
+ * The value of the ExpressionLanguage should follow the naming conventions for the
+ * version of the specified language.
+ */
+ String getExpressionLanguage();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -22,7 +22,7 @@
package org.jboss.bpm.model;
-//$Id: ExecutionHandlerImpl.java 1627 2008-07-14 15:16:28Z thomas.diesler at jboss.com $
+//$Id$
/**
* Gateways are modelling elements that are used to control how Flows interact as they converge and diverge within a Process.
@@ -32,7 +32,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public interface Gateway extends FlowObject, NamedFlowObject, MultipleOutFlowSupport, MultipleInFlowSupport
+public interface Gateway extends FlowObject, NameSupport, MultipleOutFlowSupport, MultipleInFlowSupport
{
}
\ No newline at end of file
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+import java.util.List;
+
+/**
+ * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface InputSet
+{
+ /**
+ * Zero or more ArtifactInputs MAY be defined for each InputSet. For the
+ * combination of ArtifactInputs and PropertyInputs, there MUST be at least one
+ * item defined for the InputSet. An ArtifactInput is an Artifact, usually a Data
+ * Object.
+ */
+ List<ArtifactInput> getArtifactInputs();
+
+ /**
+ * Zero or more PropertyInputs MAY be defined for each InputSet. For the
+ * combination of ArtifactInputs and PropertyInputs, there MUST be at least one
+ * item defined for the InputSet.
+ */
+ List<Property> getPropertyInputs();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -33,6 +33,6 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public interface IntermediateEvent extends Event, NamedFlowObject, SingleInFlowSupport, SingleOutFlowSupport
+public interface IntermediateEvent extends Event, NameSupport, SingleInFlowSupport, SingleOutFlowSupport
{
}
\ No newline at end of file
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,38 @@
+/*
+ * 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$
+
+/**
+ * The Link event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface LinkEventDetail extends EventDetail
+{
+ /**
+ * If the Trigger is a Link, then the Name MUST be entered.
+ */
+ String getName();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+import java.util.List;
+
+//$Id$
+
+/**
+ * A Message, which is used in the definition of attributes for a @{link StartEvent},
+ * @{EndEvent}, @{IntermediateEvent}, @{Task}, and @{MessageFlow}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Message
+{
+ /**
+ * Name is an attribute that is text description of the Message.
+ */
+ String getName();
+
+ /**
+ * Multiple Properties MAY entered for the Message.
+ */
+ List<Property> getProperties();
+
+ /**
+ * This defines the source of the Message.
+ */
+ Participant getFromRef();
+
+ /**
+ * This defines the target of the Message.
+ */
+ Participant getToRef();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+/**
+ * The Message event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface MessageEventDetail extends EventDetail
+{
+ /**
+ * Specifies the technology that will be used to send or receive the
+ * message.
+ */
+ enum Implementation
+ {
+ WebService, Other, Unspecified
+ }
+
+ /**
+ * If the EventDetailType is a MessageRef, then the a Message MUST be supplied.
+ */
+ Message getMessageRef();
+
+ /**
+ * This attribute specifies the technology that will be used to send or receive the
+ * message. A Web service is the default technology.
+ */
+ Implementation getImplementation();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NameSupport.java (from rev 1680, api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java)
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NameSupport.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NameSupport.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,39 @@
+/*
+ * 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$
+
+/**
+ * Implementing {@link BPMNElement} have can be uniquely identified
+ * in the {@link Process} by name.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface NameSupport
+{
+ /**
+ * Get the unique name.
+ */
+ String getName();
+}
\ No newline at end of file
Deleted: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -1,39 +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$
-
-/**
- * Implementing {@link BPMNElement} have can be uniquely identified
- * in the {@link Process} by name.
- *
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface NamedFlowObject
-{
- /**
- * Get the unique name.
- */
- String getName();
-}
\ No newline at end of file
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -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.model;
+
+//$Id$
+
+import java.util.List;
+
+/**
+ * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface OutputSet
+{
+ /**
+ * Zero or more ArtifactOutputs MAY be defined for each OutputSet. For the
+ * combination of ArtifactOutputs and PropertyOutputs, there MUST be at least one
+ * item defined for the OutputSet. An ArtifactOutput is an @{link Artifact},
+ * usually a @{link DataObject}.
+ */
+ List<ArtifactOutput> getArtifactOutputs();
+
+ /**
+ * Zero or more PropertyInputs MAY be defined for each InputSet. For the
+ * combination of ArtifactInputs and PropertyInputs, there MUST be at least one
+ * item defined for the InputSet.
+ */
+ List<Property> getPropertyOutputs();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,55 @@
+/*
+ * 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 Participant, which is used in the definition of attributes for a @{link Pool},
+ *
+ * @{link Message}, and @{link WebService}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Participant
+{
+ enum ParticipantType
+ {
+ Role, Entity
+ }
+
+ /**
+ * Get the type of this participant
+ */
+ ParticipantType getParticipantType();
+
+ /**
+ * If the ParticipantType = Role, then a Role MUST be identified.
+ */
+ Role getRoleRef();
+
+ /**
+ * If the ParticipantType = Entity, then an Entity MUST be identified.
+ */
+ Entity getEntityRef();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -34,38 +34,90 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public interface Process extends GraphicalElement, NamedFlowObject
+public interface Process extends SupportingElement, NameSupport
{
/**
- * Defines the state a {@link Process} can be in
+ * Defines the type of a {@link Process}
*/
- enum ProcessState
+ enum ProcessType
{
- /** The Process is created but not yet initialized */
- CREATED,
- /** The Process is initialized but not yet started */
- INITIALIZED,
- /** The Process is started but has not yet ended */
- STARTED,
- /** The Process has ended */
- ENDED
+ None, Private, Abstract, Collaboration
};
/**
- * Get the start event
+ * Defines the status a {@link Process} can be in
*/
- StartEvent getStartEvent();
+ enum Status
+ {
+ None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
+ };
/**
- * Get the set of end events
+ * Get the process type
*/
- List<EndEvent> getEndEvents();
+ ProcessType getProcessType();
+
+ /**
+ * Get the process state
+ */
+ Status getStatus();
/**
* Get the list of flow objects
*/
List<FlowObject> getFlowObjects();
+ /**
+ * One or more Performers MAY be entered. The Performers attribute defines the
+ * resource that will be responsible for the Process. The Performers entry could be in
+ * the form of a specific individual, a group, an organization role or position, or an
+ * organization.
+ */
+ List<String> getPerformers();
+
+ /**
+ * One or more assignment expressions MAY be made for the object. The
+ * Assignment SHALL be performed as defined by the AssignTime attribute.
+ */
+ List<String> getAssignments();
+
+ /**
+ * 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.
+ */
+ List<Property> getProperties();
+
+ /**
+ * The InputSets attribute defines the data requirements for input to the Process.
+ * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the
+ * Process to be performed (if it has first been instantiated by the appropriate signal
+ * arriving from an incoming Sequence Flow)
+ */
+ List<InputSet> getInputSets();
+
+ /**
+ * The InputSets attribute defines the data requirements for input to the Process.
+ * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the
+ * Process to be performed (if it has first been instantiated by the appropriate signal
+ * arriving from an incoming Sequence Flow)
+ */
+ List<OutputSet> getOutputSets();
+
+ /**
+ * Get the start event
+ */
+ StartEvent getStartEvent();
+
+ /**
+ * Get the set of end events
+ */
+ List<EndEvent> getEndEvents();
+
+
/** Start the process */
Future<Result> startProcess();
@@ -79,9 +131,5 @@
*/
FlowObject findFlowObject(String name);
- /**
- * Get the process state
- */
- ProcessState getProcessState();
}
\ No newline at end of file
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,55 @@
+/*
+ * 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 Property, which is used in the definition of attributes for a Process and common activity attributes
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Property extends SupportingElement
+{
+ /**
+ * Each Property has a Name (e.g., name=”Customer Name”).
+ */
+ String getName();
+
+ /**
+ * Each Property has a Type (e.g., type=”String”). Properties may be defined
+ * hierarchically.
+ */
+ String getType();
+
+ /**
+ * Each Property MAY have a Value specified.
+ */
+ Expression getValue();
+
+ /**
+ * If the Correlation attribute is set to True, then the Property is marked to be used for
+ * correlation (e.g., for incoming Messages).
+ */
+ boolean isCorrelation();
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,39 @@
+/*
+ * 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 Role, which is used in the definition of attributes for a @{link Participant}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Role
+{
+ /**
+ * Name is an attribute that is text description of the Role.
+ */
+ String getName();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,39 @@
+/*
+ * 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$
+
+/**
+ * The Signal event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface SignalEventDetail extends EventDetail
+{
+ /**
+ * If the Trigger is a Signal, then a Signal Shall be entered.
+ */
+ Signal getSignalRef();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -21,6 +21,8 @@
*/
package org.jboss.bpm.model;
+import java.util.List;
+
//$Id$
/**
@@ -34,4 +36,5 @@
*/
public interface StartEvent extends Event, SingleOutFlowSupport
{
+ List<EventDetail> getTrigger();
}
\ No newline at end of file
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,35 @@
+/*
+ * 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$
+
+/**
+ * The Terminate event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface TerminateEventDetail extends EventDetail
+{
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,37 @@
+/*
+ * 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$
+
+
+/**
+ * The TimeDateExpression supporting element is a sub-type of the Expression Element (Expression on page 273) and uses all
+ * the attributes of the @{link Expression} Element.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface TimeDateExpression extends Expression
+{
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+//$Id$
+
+/**
+ * The Timer event detail
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 21-Jul-2008
+ */
+public interface TimerEventDetail extends EventDetail
+{
+ /**
+ * If the Trigger is a Timer, then a TimeDate MAY be entered. If a TimeDate is not
+ * entered, then a TimeCycle MUST be entered
+ */
+ TimeDateExpression getTimeDate();
+
+ /**
+ * If the Trigger is a Timer, then a TimeCycle MAY be entered. If a TimeCycle is
+ * not entered, then a TimeDate MUST be entered
+ */
+ TimeDateExpression getTimeCycle();
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
===================================================================
--- api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -27,7 +27,7 @@
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.MultipleInFlowSupport;
import org.jboss.bpm.model.MultipleOutFlowSupport;
-import org.jboss.bpm.model.NamedFlowObject;
+import org.jboss.bpm.model.NameSupport;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SingleInFlowSupport;
import org.jboss.bpm.model.SingleOutFlowSupport;
@@ -49,19 +49,19 @@
{
super.initialize(proc);
- if (this instanceof NamedFlowObject)
+ if (this instanceof NameSupport)
{
// Check required name
- String name = ((NamedFlowObject)this).getName();
+ String name = ((NameSupport)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)
+ if (aux != this && aux instanceof NameSupport)
{
- String auxName = ((NamedFlowObject)aux).getName();
+ String auxName = ((NameSupport)aux).getName();
if (name.equals(auxName))
throw new NameNotUniqueException("NamedFlowObject: " + this);
}
Modified: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
===================================================================
--- api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -29,12 +29,16 @@
import java.util.concurrent.Future;
import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.FlowObject;
-import org.jboss.bpm.model.NamedFlowObject;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.NameSupport;
+import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Result;
import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.runtime.Attachments;
@@ -49,7 +53,7 @@
{
private String name;
private List<FlowObject> flowObjects = new ArrayList<FlowObject>();
- private ProcessState processState = ProcessState.CREATED;
+ private Status processState = Status.None;
public ProcessImpl(String name)
{
@@ -62,6 +66,36 @@
return name;
}
+ public List<String> getAssignments()
+ {
+ throw new NotImplementedException();
+ }
+
+ public List<InputSet> getInputSets()
+ {
+ throw new NotImplementedException();
+ }
+
+ public List<OutputSet> getOutputSets()
+ {
+ throw new NotImplementedException();
+ }
+
+ public List<String> getPerformers()
+ {
+ throw new NotImplementedException();
+ }
+
+ public ProcessType getProcessType()
+ {
+ throw new NotImplementedException();
+ }
+
+ public List<Property> getProperties()
+ {
+ throw new NotImplementedException();
+ }
+
public void addFlowObject(FlowObject flowObject)
{
flowObjects.add(flowObject);
@@ -97,7 +131,7 @@
public List<FlowObject> getFlowObjects()
{
- if (processState == ProcessState.CREATED)
+ if (processState == Status.None)
return flowObjects;
return Collections.unmodifiableList(flowObjects);
@@ -110,10 +144,10 @@
public Future<Result> startProcess(Attachments att)
{
- if (processState != ProcessState.INITIALIZED)
+ if (processState != Status.Ready)
throw new IllegalStateException("Cannot start process in state: " + processState);
- processState = ProcessState.STARTED;
+ processState = Status.Active;
ExecutionManager exm = ExecutionManager.locateExecutionManager();
return exm.startProcess(new RuntimeProcessImpl(this), att);
}
@@ -126,9 +160,9 @@
FlowObject nfo = null;
for (FlowObject aux : flowObjects)
{
- if (aux instanceof NamedFlowObject)
+ if (aux instanceof NameSupport)
{
- NamedFlowObject auxnfo = (NamedFlowObject)aux;
+ NameSupport auxnfo = (NameSupport)aux;
if (name.equals(auxnfo.getName()))
{
nfo = aux;
@@ -139,7 +173,7 @@
return nfo;
}
- public ProcessState getProcessState()
+ public Status getStatus()
{
return processState;
}
@@ -149,7 +183,7 @@
*/
public void initialize()
{
- if (processState != ProcessState.CREATED)
+ if (processState != Status.None)
throw new IllegalStateException("Cannot initialize process in state: " + processState);
// Set the anonymous default name
@@ -171,7 +205,7 @@
((FlowObjectImpl)aux).initialize(this);
}
- processState = ProcessState.INITIALIZED;
+ processState = Status.Ready;
}
public String toString()
Modified: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
===================================================================
--- api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-07-21 11:34:27 UTC (rev 1680)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-07-21 15:28:51 UTC (rev 1681)
@@ -23,8 +23,12 @@
//$Id$
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.NotImplementedException;
+import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Flow;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.StartEvent;
@@ -49,6 +53,11 @@
private Flow outFlow;
+ public List<EventDetail> getTrigger()
+ {
+ throw new NotImplementedException();
+ }
+
public Flow getOutFlow()
{
return outFlow;
Added: api/trunk/modules/testsuite/src/test/resources/cts/cts-specification.txt
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/cts/cts-specification.txt (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/cts/cts-specification.txt 2008-07-21 15:28:51 UTC (rev 1681)
@@ -0,0 +1,8 @@
+# $Id$
+
+BPM Compatibility Test Specification
+
+1. Process
+
+
+
Property changes on: api/trunk/modules/testsuite/src/test/resources/cts/cts-specification.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbpm-commits
mailing list