JBoss JBPM SVN: r1931 - in jbpm3/trunk/modules/gwt-console/war/src/main: java/org/jboss/bpm/console/client/process and 4 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-08-19 10:57:31 -0400 (Tue, 19 Aug 2008)
New Revision: 1931
Added:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/HelpPanel.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/05.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/05_1.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/14.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/29.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/31.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/36.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/41.png
Modified:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/MainMenu.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Add metric menu and teaser. Update icons
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java 2008-08-19 11:04:43 UTC (rev 1930)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -54,6 +54,7 @@
tab.setBorder(false);
tab.setFrame(false);
tab.setHideBorders(true);
+ tab.setIconCls(editorView.getIconCSS());
this.add(tab);
return tab;
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/MainMenu.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/MainMenu.java 2008-08-19 11:04:43 UTC (rev 1930)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/MainMenu.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -22,6 +22,8 @@
package org.jboss.bpm.console.client;
import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.tree.TreePanel;
+import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.layout.AccordionLayout;
/**
@@ -44,19 +46,58 @@
this.setLayout(accordion);
Panel navPanel = new Panel();
- navPanel.setHtml("<p>Hi. I'm the west panel.</p>");
- navPanel.setTitle("Navigation");
+ navPanel.setTitle("Process Management");
navPanel.setBorder(false);
- navPanel.setIconCls("forlder-icon");
+ navPanel.setHideBorders(true);
+ navPanel.setIconCls("bpm-process-icon");
+ navPanel.add(new ProcessTree());
this.add(navPanel);
+ Panel taskPanel = new Panel();
+ taskPanel.setHtml("<p>Task Management</p>");
+ taskPanel.setTitle("Task Management");
+ taskPanel.setBorder(false);
+ taskPanel.setIconCls("bpm-task-icon");
+ this.add(taskPanel);
+
+ Panel metricPanel = new Panel();
+ metricPanel.setHtml("<p>Metrics and Stats</p>");
+ metricPanel.setTitle("Metrics and Stats");
+ metricPanel.setBorder(false);
+ metricPanel.setIconCls("bpm-metric-icon");
+ this.add(metricPanel);
+
Panel settingsPanel = new Panel();
- settingsPanel.setHtml("<p>Some settings in here.</p>");
+ settingsPanel.setHtml("<p>Settings</p>");
settingsPanel.setTitle("Settings");
settingsPanel.setBorder(false);
- settingsPanel.setIconCls("settings-icon");
+ settingsPanel.setIconCls("bpm-settings-icon");
this.add(settingsPanel);
}
+ class ProcessTree extends TreePanel
+ {
+ public ProcessTree() {
+
+ TreeNode root = new TreeNode("Process Definitions");
+
+ TreeNode view = new TreeNode("View definitions");
+ view.setExpanded(true);
+ TreeNode upload = new TreeNode("Upload new definitions");
+ upload.setExpanded(true);
+
+ root.appendChild(view);
+ root.appendChild(upload);
+
+ setRootVisible(true);
+
+ /*setTitle("Company");
+ setWidth(200);
+ setHeight(400);*/
+ setRootNode(root);
+ root.setExpanded(true);
+ }
+ }
+
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-19 11:04:43 UTC (rev 1930)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -22,14 +22,26 @@
package org.jboss.bpm.console.client.process;
import com.gwtext.client.widgets.layout.ColumnLayout;
+import com.gwtext.client.widgets.layout.ColumnLayoutData;
+import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.*;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.core.EventObject;
+import com.google.gwt.user.client.ui.HTML;
import org.jboss.bpm.console.client.ConsoleView;
import org.jboss.bpm.console.client.widgets.EditorView;
+import org.jboss.bpm.console.client.widgets.PieChart;
+import org.jboss.bpm.console.client.widgets.HelpPanel;
+import java.util.Map;
+import java.util.HashMap;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class ProcessDefinitionListEditor extends EditorView
-{
+{
public final static String ID = "org.jboss.bpm.process.ProcessList";
private ProcessDefinitionList processDefinitions;
@@ -40,13 +52,14 @@
{
super();
this.setId(ID);
-
+
this.view = view;
+ this.setLayout( new ColumnLayout() );
+ this.setWidth(680);
+
// ----------------------------------
- //this.setLayout( new ColumnLayout() );
-
// stats
/*Map barValues = new HashMap();
@@ -72,17 +85,73 @@
processDefinitions = new ProcessDefinitionList("Process Definitions", view);
// ----------------------------------
+ // TODO: introduce abstractions and integrate with DAO
+ Map chartValues = new HashMap();
+ chartValues.put("1", new Double(0.65));
+ chartValues.put("2", new Double(0.20));
+ chartValues.put("3", new Double(0.10));
+ chartValues.put("4", new Double(0.5));
- /*PaddedPanel rightPanel = new PaddedPanel(processDefinitions, 5, 5, 0, 5);
- PaddedPanel leftPanel = new PaddedPanel( new Panel("Metrics", 200, 150) , 5, 5, 0, 5);
+ PieChart pieChart = new PieChart(180, 120, "", chartValues);
+ Panel metricPanel = new Panel("Most active process", 200, 300);
+ metricPanel.setLayout(new VerticalLayout());
+ metricPanel.setIconCls("bpm-metric-icon");
+ metricPanel.add(pieChart);
+ HTML legend = new HTML(
+ "<ol class='piechart-types'>" +
+ "<li>1. Order Process" +
+ "<li>2. Loan application" +
+ "<li>3. Expense claim" +
+ "<li>4. Credit approval" +
+ "</ol>"
+ );
+ Panel legendPanel = new Panel();
+ legendPanel.setBorder(false);
+ legendPanel.setFrame(false);
+ legendPanel.setHideBorders(true);
+ legendPanel.setPaddings(5);
+ legendPanel.add(legend);
+ metricPanel.add(legendPanel);
+
+ // toolbar
+
+ Toolbar bottomToolbar = new Toolbar();
+ bottomToolbar.addFill();
+ bottomToolbar.addButton(
+ new ToolbarButton("More metrics", new ButtonListenerAdapter() {
+ public void onClick(Button button, EventObject e)
+ {
+ // TODO: display metric tab
+ }
+ })
+ );
+
+ metricPanel.setBottomToolbar(bottomToolbar);
+
// ----------------------------------
- this.add(rightPanel, new ColumnLayoutData(0.7) );
+ HelpPanel help = new HelpPanel(200, 180, "About process definitions");
+ help.setContent("Process definitions are the base classs for any process instance. " +
+ "They act as an execution template for BPM engine");
+
+
+ Panel leftPanel = new Panel();
+ leftPanel.setPaddings(10,0,0,5);
+ leftPanel.setLayout(new VerticalLayout(10));
+ leftPanel.setHideBorders(true);
+ leftPanel.setFrame(false);
+ leftPanel.setBorder(false);
+
+ leftPanel.add(help);
+ leftPanel.add(metricPanel);
+
+ this.add(processDefinitions, new ColumnLayoutData(0.7) );
this.add(leftPanel , new ColumnLayoutData(0.3) );
- */
- this.add(processDefinitions);
+ // init gchart
+ pieChart.update();
+
}
@@ -95,4 +164,9 @@
{
return "Processes";
}
+
+ public String getIconCSS()
+ {
+ return "bpm-process-icon";
+ }
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-08-19 11:04:43 UTC (rev 1930)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -84,4 +84,10 @@
{
return "#"+processInstance.getId()+" ("+processDefinition.getName()+")";
}
+
+
+ public String getIconCSS()
+ {
+ return "bpm-instance-icon";
+ }
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-08-19 11:04:43 UTC (rev 1930)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -59,4 +59,10 @@
{
return parent.getName();
}
+
+
+ public String getIconCSS()
+ {
+ return "bpm-instance-icon";
+ }
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java 2008-08-19 11:04:43 UTC (rev 1930)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -36,4 +36,5 @@
public abstract String getEditorId();
public abstract String getTitle();
+ public abstract String getIconCSS();
}
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/HelpPanel.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/HelpPanel.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/HelpPanel.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.console.client.widgets;
+
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.layout.FitLayout;
+import com.google.gwt.user.client.ui.HTML;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class HelpPanel extends Panel
+{
+ private int width, height;
+
+ public HelpPanel(int width, int height, String title)
+ {
+ super();
+ setTitle(title);
+ setWidth(width);
+ setHeight(height);
+ setIconCls("bpm-help-icon");
+
+ this.width = width;
+ this.height = height;
+ }
+
+ public void setContent(String content)
+ {
+ Panel wrapper = new Panel();
+ wrapper.setBaseCls("bpm-help-panel");
+ wrapper.setFrame(false);
+ wrapper.setHideBorders(true);
+ wrapper.setPaddings(5);
+ wrapper.add(new HTML(content));
+ wrapper.setLayout(new FitLayout());
+ wrapper.setWidth(width);
+ wrapper.setHeight(height);
+ this.add(wrapper);
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/HelpPanel.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java 2008-08-19 14:57:31 UTC (rev 1931)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.console.client.widgets;
+
+import com.googlecode.gchart.client.GChart;
+
+import java.util.Map;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class PieChart extends GChart
+{
+ public PieChart(int width, int height, String title, Map typeValues)
+ {
+ String[] pieColors = {"green", "red", "maroon", "yellow"};
+
+ this.setChartSize(width, height);
+ setChartTitle(title);
+ this.setLegendVisible(false);
+
+ getXAxis().setAxisVisible(false);
+ getYAxis().setAxisVisible(false);
+ getXAxis().setAxisMin(0);
+ getXAxis().setAxisMax(10);
+ getXAxis().setTickCount(0);
+ getYAxis().setAxisMin(0);
+ getYAxis().setAxisMax(10);
+ getYAxis().setTickCount(0);
+
+ // --------------------
+ // this line orients the center of the first slice (apple) due east
+ String[] pieTypes = (String[])typeValues.keySet().toArray(new String[] {});
+
+ double[] pieValues = new double[pieTypes.length];
+ for(int i=0; i<pieTypes.length; i++)
+ {
+ pieValues[i] = ((Double)typeValues.get(pieTypes[i])).doubleValue();
+ }
+
+ // --------------------
+
+ setInitialPieSliceOrientation(0.75 - pieValues[0]/2);
+ for (int i=0; i < pieValues.length; i++)
+ {
+ addCurve();
+ getCurve().addPoint(5,5);
+ getCurve().getSymbol().setSymbolType( SymbolType.PIE_SLICE_OPTIMAL_SHADING );
+ getCurve().getSymbol().setBorderColor("white");
+ getCurve().getSymbol().setBackgroundColor(pieColors[i]);
+
+ // next two lines define pie diameter as 6 x-axis model units
+ getCurve().getSymbol().setModelWidth(6);
+ getCurve().getSymbol().setHeight(0);
+ getCurve().getSymbol().setFillSpacing(3);
+ getCurve().getSymbol().setFillThickness(3);
+ getCurve().getSymbol().setHovertextTemplate(pieTypes[i] + ", " + Math.round(100*pieValues[i])+"%");
+
+ getCurve().getSymbol().setPieSliceSize(pieValues[i]);
+ getCurve().getPoint().setAnnotationText( pieTypes[i] );
+ getCurve().getPoint().setAnnotationLocation( AnnotationLocation.OUTSIDE_PIE_ARC);
+ }
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-08-19 11:04:43 UTC (rev 1930)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-08-19 14:57:31 UTC (rev 1931)
@@ -40,12 +40,44 @@
border: 0px;
}
-.div {
- border: 1px dashed red;
-}
-
.bpm-SplitPanel {
border: 1px dashed green;
vertical-align: top;
position:relative; top:5px; left:5px;
}
+
+.piechart-types {
+ font-size: small;
+ list-style-type:decimal;
+ font-family: sans-serif;
+}
+
+.bpm-help-panel {
+ background-color:#F0F0F0;
+ font-family: sans-serif;
+}
+
+.bpm-help-icon {
+ background-image: url( images/icons/14.png)
+}
+
+.bpm-metric-icon {
+ background-image: url( images/icons/31.png)
+}
+
+.bpm-process-icon {
+ background-image: url( images/icons/41.png)
+}
+
+.bpm-task-icon {
+ background-image: url( images/icons/29.png)
+}
+
+.bpm-instance-icon {
+ background-image: url( images/icons/05_1.png)
+}
+
+.bpm-settings-icon {
+ background-image: url( images/icons/36.png)
+}
+
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/05.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/05.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/05_1.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/05_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/14.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/14.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/29.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/29.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/31.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/31.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/36.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/41.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/41.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1930 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/model and 19 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 07:04:43 -0400 (Tue, 19 Aug 2008)
New Revision: 1930
Added:
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java
Removed:
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java
jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java
Log:
Restructure API packages
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -41,7 +41,6 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.EngineShutdownException;
import org.jboss.bpm.client.internal.DialectRegistry;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.runtime.Attachments;
import org.w3c.dom.Document;
@@ -115,7 +114,7 @@
* @param status The optional process status
* @return An empty set if the process cannot be found
*/
- public Set<Process> getProcesses(String name, Constants.ProcessStatus status)
+ public Set<Process> getProcesses(String name, Process.ProcessStatus status)
{
Set<Process> procSet = new HashSet<Process>();
for (Process aux : procs.values())
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -54,7 +54,7 @@
/**
* Add an IORule Expression
*/
- ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang);
+ ActivityBuilder addIORule(String body, Expression.ExpressionLanguage lang);
/**
* Add an activity property
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.Constants.AssignTime;
//$Id$
@@ -34,6 +33,11 @@
*/
public interface Assignment
{
+ public enum AssignTime
+ {
+ Start, End
+ }
+
/**
* The target for the Assignment MUST be a Property of the Process or the activity
* itself.
@@ -58,5 +62,5 @@
* This can be used to assign the (local) Properties of the activity to the higher-level
* (global) Properties of the Process as an output to the activity.
*/
- AssignTime getAssignTime();
+ Assignment.AssignTime getAssignTime();
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,7 +25,7 @@
/**
- * DEfines the constants used by the JBossBPM spec
+ * Defines the constants used by the JBossBPM spec
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
@@ -33,60 +33,4 @@
public interface Constants
{
static final String ID_DOMAIN = "jboss.bpm";
-
- public enum AssignTime
- {
- Start, End
- }
-
- /**
- * Defines the type of an Event
- */
- public enum EventDetailType
- {
- Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate
- }
-
- public enum ExpressionLanguage
- {
- MVEL, String, Object
- }
-
- /**
- * The GatewayType
- *
- */
- public enum GatewayType
- {
- Exclusive, Inclusive, Complex, Parallel
- }
-
- /**
- * The TaskType
- */
- public enum TaskType
- {
- Service, Receive, Send, User, Script, Manual, Reference, None
- }
-
- /**
- * Defines the type of a {@link Process}
- */
- public enum ProcessType
- {
- None, Private, Abstract, Collaboration
- }
-
- /**
- * Defines the status a {@link Process} can be in
- */
- public enum ProcessStatus
- {
- None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
- }
-
- public enum ParticipantType
- {
- Role, Entity
- }
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -36,7 +36,7 @@
/**
* Add an event detail to the last added Event
*/
- EventBuilder addEventDetail(Constants.EventDetailType detailType);
+ EventBuilder addEventDetail(EventDetail.EventDetailType detailType);
/**
* Add a signal ref to the last added EventDetail
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.Constants.EventDetailType;
//$Id$
@@ -34,11 +33,19 @@
public interface EventDetail
{
/**
+ * Defines the type of an Event
+ */
+ public enum EventDetailType
+ {
+ Message, Timer, Error, Conditional, Link, Signal, Compensation, 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();
+ EventDetail.EventDetailType getEventDetailType();
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
//$Id$
@@ -34,6 +33,11 @@
*/
public interface Expression
{
+ public enum ExpressionLanguage
+ {
+ MVEL, String, Object
+ }
+
/**
* An ExpressionBody MUST be entered to provide the text of the expression, which
* will be written in the language defined by the ExpressionLanguage attribute.
@@ -50,6 +54,6 @@
* The value of the ExpressionLanguage should follow the naming conventions for the
* version of the specified language.
*/
- ExpressionLanguage getExpressionLanguage();
+ Expression.ExpressionLanguage getExpressionLanguage();
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -23,7 +23,6 @@
import java.util.List;
-import org.jboss.bpm.model.Constants.GatewayType;
//$Id$
@@ -40,10 +39,19 @@
public interface Gateway extends FlowObject
{
/**
+ * The GatewayType
+ *
+ */
+ public enum GatewayType
+ {
+ Exclusive, Inclusive, Complex, Parallel
+ }
+
+ /**
* GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway,
* both for incoming and outgoing Sequence Flow
*/
- GatewayType getGatewayType();
+ Gateway.GatewayType getGatewayType();
/**
* There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -33,7 +33,7 @@
{
GatewayBuilder addDefaultGate(String targetName);
- GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage exprLang, String exprBody);
+ GatewayBuilder addConditionalGate(String targetName, Expression.ExpressionLanguage exprLang, String exprBody);
GatewayBuilder addGate(String targetName);
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.Constants.ParticipantType;
//$Id$
@@ -36,10 +35,15 @@
*/
public interface Participant
{
+ public enum ParticipantType
+ {
+ Role, Entity
+ }
+
/**
* Get the type of this participant
*/
- ParticipantType getParticipantType();
+ Participant.ParticipantType getParticipantType();
/**
* If the ParticipantType = Role, then a Role MUST be identified.
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,6 @@
import javax.management.ObjectName;
-import org.jboss.bpm.model.Constants.ProcessStatus;
-import org.jboss.bpm.model.Constants.ProcessType;
import org.jboss.bpm.runtime.Attachments;
/**
@@ -40,6 +38,22 @@
public interface Process extends GraphicalElement, PropertySupport
{
/**
+ * Defines the type of a {@link Process}
+ */
+ public enum ProcessType
+ {
+ None, Private, Abstract, Collaboration
+ }
+
+ /**
+ * Defines the status a {@link Process} can be in
+ */
+ public enum ProcessStatus
+ {
+ None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
+ }
+
+ /**
* Get the unique name.
*/
String getName();
@@ -47,12 +61,12 @@
/**
* Get the process state
*/
- ProcessStatus getProcessStatus();
+ Process.ProcessStatus getProcessStatus();
/**
* Get the process type
*/
- ProcessType getProcessType();
+ Process.ProcessType getProcessType();
/**
* Get the list of flow objects
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -22,10 +22,8 @@
package org.jboss.bpm.model;
import org.jboss.bpm.client.DialectHandler;
-import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.Constants.TaskType;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.SignalHandler;
@@ -94,19 +92,19 @@
EventBuilder addEndEvent(String name);
/**
- * Add a Task of {@link TaskType} NONE with a given name
+ * Add a Task of {@link Task.TaskType} NONE with a given name
*/
TaskBuilder addTask(String name);
/**
* Add a Task with a given name and type
*/
- TaskBuilder addTask(String name, TaskType type);
+ TaskBuilder addTask(String name, Task.TaskType type);
/**
* Add a Gateway with a given name
*/
- GatewayBuilder addGateway(String name, GatewayType type);
+ GatewayBuilder addGateway(String name, Gateway.GatewayType type);
/**
* Add a {@link Message} with a given name.
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -38,6 +38,14 @@
public interface Task extends Activity
{
/**
+ * The TaskType
+ */
+ public enum TaskType
+ {
+ Service, Receive, Send, User, Script, Manual, Reference, None
+ }
+
+ /**
* TaskType is an attribute that has a default of None, but MAY be set to Send,
* Receive, User, Script, Manual, Reference, or Service. The TaskType will be
* impacted by the Message Flow to and/or from the Task, if Message Flow are
@@ -46,5 +54,5 @@
* Script or Manual MUST NOT have an incoming or an outgoing Message Flow.
* The TaskType list MAY be extended to include new types.
*/
- Constants.TaskType getTaskType();
+ Task.TaskType getTaskType();
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -61,7 +61,6 @@
import org.jboss.bpm.model.Assignment;
import org.jboss.bpm.model.ComplexGateway;
import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.Event;
import org.jboss.bpm.model.EventDetail;
@@ -181,20 +180,20 @@
for (EventDetail trigger : start.getTrigger())
{
- Constants.EventDetailType detailType = trigger.getEventDetailType();
- if (detailType == Constants.EventDetailType.Message)
+ EventDetail.EventDetailType detailType = trigger.getEventDetailType();
+ if (detailType == EventDetail.EventDetailType.Message)
{
throw new NotImplementedException("JBPM-1657", "StartTrigger Message");
}
- else if (detailType == Constants.EventDetailType.Timer)
+ else if (detailType == EventDetail.EventDetailType.Timer)
{
throw new NotImplementedException("JBPM-1658", "StartTrigger Timer");
}
- else if (detailType == Constants.EventDetailType.Conditional)
+ else if (detailType == EventDetail.EventDetailType.Conditional)
{
throw new NotImplementedException("JBPM-1659", "StartTrigger Conditional");
}
- else if (detailType == Constants.EventDetailType.Signal)
+ else if (detailType == EventDetail.EventDetailType.Signal)
{
SignalEventDetail signalTrigger = (SignalEventDetail)trigger;
Signal signal = signalTrigger.getSignalRef();
@@ -224,8 +223,8 @@
for (EventDetail result : end.getResult())
{
- Constants.EventDetailType detailType = result.getEventDetailType();
- if (detailType == Constants.EventDetailType.Message)
+ EventDetail.EventDetailType detailType = result.getEventDetailType();
+ if (detailType == EventDetail.EventDetailType.Message)
{
MessageEventDetail msgEventDetail = (MessageEventDetail)result;
Message message = msgEventDetail.getMessageRef();
@@ -234,23 +233,23 @@
jaxbResult.setMessageRef(jaxbMessageRef);
jaxbEnd.getResult().add(jaxbResult);
}
- else if (detailType == Constants.EventDetailType.Error)
+ else if (detailType == EventDetail.EventDetailType.Error)
{
throw new NotImplementedException("JBPM-1677", "EndEvent Error Result");
}
- else if (detailType == Constants.EventDetailType.Cancel)
+ else if (detailType == EventDetail.EventDetailType.Cancel)
{
throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result");
}
- else if (detailType == Constants.EventDetailType.Compensation)
+ else if (detailType == EventDetail.EventDetailType.Compensation)
{
throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result");
}
- else if (detailType == Constants.EventDetailType.Signal)
+ else if (detailType == EventDetail.EventDetailType.Signal)
{
throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result");
}
- else if (detailType == Constants.EventDetailType.Terminate)
+ else if (detailType == EventDetail.EventDetailType.Terminate)
{
throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result");
}
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -73,8 +73,9 @@
import org.jboss.bpm.dialect.api10.model.JAXBTerminateEventDetail;
import org.jboss.bpm.dialect.api10.model.JAXBTimerEventDetail;
import org.jboss.bpm.dialect.api10.model.ObjectFactory;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.ObjectNameFactory;
@@ -244,7 +245,7 @@
{
JAXBSignalEventDetail jaxbSignalTrigger = (JAXBSignalEventDetail)jaxbTrigger;
JAXBSignal jaxbSignal = jaxbSignalTrigger.getSignal();
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(jaxbSignal.getType(),
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(jaxbSignal.getType(),
jaxbSignal.getMessage());
}
else
@@ -270,7 +271,7 @@
if (jaxbResult instanceof JAXBMessageEventDetail)
{
JAXBMessageEventDetail jaxbMessageResult = (JAXBMessageEventDetail)jaxbResult;
- eventBuilder.addEventDetail(Constants.EventDetailType.Message);
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Message);
JAXBMessageRef jaxbMsg = jaxbMessageResult.getMessageRef();
eventBuilder.addMessageRef(jaxbMsg.getNameRef());
}
@@ -350,19 +351,19 @@
GatewayBuilder gwBuilder;
if (jaxb instanceof JAXBExclusiveGateway)
{
- gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Exclusive);
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Exclusive);
}
else if (jaxb instanceof JAXBInclusiveGateway)
{
- gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Inclusive);
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Inclusive);
}
else if (jaxb instanceof JAXBComplexGateway)
{
- gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Complex);
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Complex);
}
else if (jaxb instanceof JAXBParallelGateway)
{
- gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Parallel);
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Parallel);
}
else
{
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,8 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.Assignment.AssignTime;
/**
* An Assignment, which is used in the definition of attributes for Process,
@@ -65,13 +66,13 @@
this.from = from;
}
- public AssignTime getAssignTime()
+ public Assignment.AssignTime getAssignTime()
{
return assignTime;
}
@XmlAttribute(name = "time")
- public void setAssignTime(AssignTime assignTime)
+ public void setAssignTime(Assignment.AssignTime assignTime)
{
this.assignTime = assignTime;
}
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
/**
* An Expression, which is used in the definition of attributes for @{link StartEvent},
@@ -40,16 +40,16 @@
@XmlType(name = "Expression")
public class JAXBExpression
{
- private Constants.ExpressionLanguage lang;
+ private Expression.ExpressionLanguage lang;
private String body;
- public Constants.ExpressionLanguage getLang()
+ public Expression.ExpressionLanguage getLang()
{
return lang;
}
@XmlAttribute(required = true)
- public void setLang(Constants.ExpressionLanguage lang)
+ public void setLang(Expression.ExpressionLanguage lang)
{
this.lang = lang;
}
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -30,8 +30,8 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.model.Message.Implementation;
//$Id$
@@ -49,7 +49,7 @@
"messageRef", "inputSets", "outputSets" })
public class JAXBTask extends JAXBActivity
{
- private Constants.TaskType taskType;
+ private Task.TaskType taskType;
private Implementation implementation;
private List<JAXBInputSet> inputSets = new ArrayList<JAXBInputSet>();
private List<JAXBOutputSet> outputSets = new ArrayList<JAXBOutputSet>();
@@ -76,13 +76,13 @@
this.outFlow = outFlow;
}
- public Constants.TaskType getTaskType()
+ public Task.TaskType getTaskType()
{
return taskType;
}
@XmlAttribute
- public void setTaskType(Constants.TaskType taskType)
+ public void setTaskType(Task.TaskType taskType)
{
this.taskType = taskType;
}
Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,10 +34,11 @@
import org.jboss.bpm.dialect.jpdl32.model.JPDL32StartState;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32State;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32Transition;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.runtime.ExecutionHandler;
/**
@@ -94,7 +95,7 @@
private void adaptState(ProcessBuilder builder, JPDL32State jpdlState)
{
- builder.addTask(jpdlState.getName(), Constants.TaskType.None);
+ builder.addTask(jpdlState.getName(), Task.TaskType.None);
adaptTransitions(builder, jpdlState.getDescriptionOrEventOrExceptionHandler());
for (Object jpdlObj : jpdlState.getDescriptionOrEventOrExceptionHandler())
@@ -123,7 +124,7 @@
private void adaptFork(ProcessBuilder builder, JPDL32Fork jpdlObj)
{
- builder.addGateway(jpdlObj.getName(), Constants.GatewayType.Parallel);
+ builder.addGateway(jpdlObj.getName(), Gateway.GatewayType.Parallel);
adaptTransitions(builder, jpdlObj.getScriptOrDescriptionOrEvent());
}
Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -42,10 +42,11 @@
import org.jboss.bpm.dialect.stp.model.ObjectFactory;
import org.jboss.bpm.dialect.stp.model.Pool;
import org.jboss.bpm.dialect.stp.model.SequenceEdge;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
import org.jboss.util.xml.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -168,11 +169,11 @@
{
String name = stpActivity.getLabel();
- Constants.TaskType taskType = Constants.TaskType.None;
+ Task.TaskType taskType = Task.TaskType.None;
if (name.startsWith("Send"))
- taskType = Constants.TaskType.Send;
+ taskType = Task.TaskType.Send;
if (name.startsWith("Receive"))
- taskType = Constants.TaskType.Receive;
+ taskType = Task.TaskType.Receive;
builder.addTask(name, taskType);
adaptOutgoingEdges(builder, stpActivity);
@@ -180,13 +181,13 @@
else if (activityType == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE)
{
String name = stpActivity.getLabel();
- builder.addGateway(name, Constants.GatewayType.Exclusive);
+ builder.addGateway(name, Gateway.GatewayType.Exclusive);
adaptOutgoingEdges(builder, stpActivity);
}
else if (activityType == ActivityType.GATEWAY_PARALLEL)
{
String name = stpActivity.getLabel();
- builder.addGateway(name, Constants.GatewayType.Parallel);
+ builder.addGateway(name, Gateway.GatewayType.Parallel);
adaptOutgoingEdges(builder, stpActivity);
}
else
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -35,12 +35,11 @@
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Assignment;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.StartEvent;
-import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.model.Assignment.AssignTime;
import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.ri.model.impl.ExpressionEvaluator;
import org.jboss.bpm.ri.model.impl.ProcessImpl;
@@ -49,8 +48,8 @@
import org.jboss.bpm.ri.model.impl.TokenExecutorImpl;
import org.jboss.bpm.ri.runtime.DelegatingToken;
import org.jboss.bpm.ri.runtime.MutableToken;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.ri.runtime.TokenImpl;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
@@ -74,7 +73,7 @@
public void startProcess(final Process proc, final Attachments att)
{
final ProcessImpl procImpl = (ProcessImpl)proc;
- procImpl.setProcessStatus(Constants.ProcessStatus.Active);
+ procImpl.setProcessStatus(Process.ProcessStatus.Active);
SignalManager signalManager = SignalManager.locateSignalManager();
signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_PROCESS_ENTER));
@@ -188,13 +187,13 @@
ProcessImpl proc = (ProcessImpl)rtProc.getProcess();
String procName = proc.getName();
- Constants.ProcessStatus procStatus = proc.getProcessStatus();
+ Process.ProcessStatus procStatus = proc.getProcessStatus();
boolean hasActiveTokens = tokenExecutor.hasRunnableTokens();
try
{
synchronized (proc)
{
- while (procStatus == Constants.ProcessStatus.Active && hasActiveTokens)
+ while (procStatus == Process.ProcessStatus.Active && hasActiveTokens)
{
try
{
@@ -215,10 +214,10 @@
SignalManager signalManager = SignalManager.locateSignalManager();
signalManager.throwSignal(procName, new Signal(procName, Signal.SignalType.SYSTEM_PROCESS_EXIT));
- if (procStatus == Constants.ProcessStatus.Active)
+ if (procStatus == Process.ProcessStatus.Active)
{
ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
- procImpl.setProcessStatus(Constants.ProcessStatus.Completed);
+ procImpl.setProcessStatus(Process.ProcessStatus.Completed);
}
ProcessManager procManager = ProcessManager.locateProcessManager();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,13 +26,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.ri.model.impl.FlowObjectImpl;
import org.jboss.bpm.ri.model.impl.ProcessImpl;
import org.jboss.bpm.ri.runtime.DelegatingToken;
import org.jboss.bpm.ri.runtime.MutableToken;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.HandlerSupport;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
@@ -75,8 +75,8 @@
throw new IllegalStateException("Cannot obtain initial flow");
TokenStatus tokStatus = token.getTokenStatus();
- Constants.ProcessStatus procStatus = procImpl.getProcessStatus();
- while (procStatus == Constants.ProcessStatus.Active && tokStatus == TokenStatus.Started)
+ Process.ProcessStatus procStatus = procImpl.getProcessStatus();
+ while (procStatus == Process.ProcessStatus.Active && tokStatus == TokenStatus.Started)
{
flow = token.getFlow();
@@ -120,7 +120,7 @@
catch (RuntimeException rte)
{
log.error("Process aborted: " + procImpl, rte);
- procImpl.setProcessStatus(Constants.ProcessStatus.Aborted);
+ procImpl.setProcessStatus(Process.ProcessStatus.Aborted);
procImpl.setRuntimeException(rte);
}
finally
Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java (from rev 1928, jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java)
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.impl;
+
+//$Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.AbstractElement;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.ObjectNameFactory;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Task;
+import org.jboss.util.id.UID;
+
+/**
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+@SuppressWarnings("serial")
+public class AbstractElementImpl implements AbstractElement
+{
+ private ObjectName id;
+
+ public ObjectName getID()
+ {
+ return id;
+ }
+
+ /**
+ * Initialize the flow object
+ */
+ protected void initialize(ProcessImpl proc)
+ {
+ assignElementID();
+ }
+
+ protected void assignElementID()
+ {
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+ if (this instanceof Event)
+ {
+ Event event = (Event)this;
+ str.append("type=Event,name=" + event.getName());
+ }
+ else if (this instanceof Process)
+ {
+ Process proc = (Process)this;
+ str.append("type=Process,name=" + proc.getName());
+ }
+ else if (this instanceof Task)
+ {
+ Task task = (Task)this;
+ str.append("type=Task,name=" + task.getName());
+ }
+ else if (this instanceof Gateway)
+ {
+ Gateway gateway = (Gateway)this;
+ str.append("type=Gateway,name=" + gateway.getName());
+ }
+ else if (this instanceof ConnectingObject)
+ {
+ str.append("type=Flow");
+ }
+ else
+ {
+ str.append("type=Other");
+ }
+ str.append(",id=" + new UID());
+ this.id = ObjectNameFactory.create(str.toString());
+ }
+}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
import org.jboss.bpm.model.Activity;
import org.jboss.bpm.model.ActivityBuilder;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
/**
* The ActivityBuilder can be used to build an {@link Activity} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -45,7 +45,7 @@
/**
* 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.
+ * Sub-Process, and
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,6 @@
import org.jboss.bpm.model.Assignment;
import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.Constants.AssignTime;
/**
* An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates.
Deleted: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.ri.model.impl;
-
-//$Id$
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.model.AbstractElement;
-import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
-import org.jboss.bpm.model.Event;
-import org.jboss.bpm.model.Gateway;
-import org.jboss.bpm.model.ObjectNameFactory;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.Task;
-import org.jboss.util.id.UID;
-
-/**
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-@SuppressWarnings("serial")
-public class BPMNElementImpl implements AbstractElement
-{
- private ObjectName id;
-
- public ObjectName getID()
- {
- return id;
- }
-
- /**
- * Initialize the flow object
- */
- protected void initialize(ProcessImpl proc)
- {
- assignElementID();
- }
-
- protected void assignElementID()
- {
- StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
- if (this instanceof Event)
- {
- Event event = (Event)this;
- str.append("type=Event,name=" + event.getName());
- }
- else if (this instanceof Process)
- {
- Process proc = (Process)this;
- str.append("type=Process,name=" + proc.getName());
- }
- else if (this instanceof Task)
- {
- Task task = (Task)this;
- str.append("type=Task,name=" + task.getName());
- }
- else if (this instanceof Gateway)
- {
- Gateway gateway = (Gateway)this;
- str.append("type=Gateway,name=" + gateway.getName());
- }
- else if (this instanceof ConnectingObject)
- {
- str.append("type=Flow");
- }
- else
- {
- str.append("type=Other");
- }
- str.append(",id=" + new UID());
- this.id = ObjectNameFactory.create(str.toString());
- }
-}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,14 +26,13 @@
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.ComplexGateway;
import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Constants.GatewayType;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
/**
* A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex
* Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers
- * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway.
+ * can provide complex expressions that determine the merging and/or splitting behavior of the
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -35,7 +35,7 @@
import org.jboss.bpm.model.MessageEventDetail;
import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,8 +21,8 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Entity;
+import org.jboss.bpm.model.Participant;
//$Id$
@@ -43,9 +43,9 @@
this.entityRef = this;
}
- public Constants.ParticipantType getParticipantType()
+ public Participant.ParticipantType getParticipantType()
{
- return Constants.ParticipantType.Entity;
+ return Participant.ParticipantType.Entity;
}
public String getName()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -31,7 +31,7 @@
import org.jboss.bpm.model.IntermediateEvent;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.StartEvent;
-import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.model.EventDetail.EventDetailType;
import org.jboss.bpm.model.Signal.SignalType;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,7 +34,6 @@
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Gate;
import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.Constants.GatewayType;
import org.jboss.bpm.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,7 @@
import java.util.Map;
import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.Attachments.Key;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,7 +24,6 @@
//$Id$
import org.jboss.bpm.model.Expression;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
/**
* An Expression, which is used in the definition of attributes for @{link StartEvent},
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -36,7 +36,7 @@
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SingleInFlowSupport;
import org.jboss.bpm.model.SingleOutFlowSupport;
-import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.model.Assignment.AssignTime;
import org.jboss.bpm.ri.model.spec.MultipleInFlowSupport;
import org.jboss.bpm.ri.model.spec.MultipleOutFlowSupport;
import org.jboss.bpm.runtime.ExecutionContext;
@@ -49,7 +49,7 @@
//$Id$
/**
- * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
+ * A Flow Object is one of the set of following graphical objects: Event, Activity, and
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
import org.jboss.bpm.model.Gate;
import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.model.SequenceFlow.ConditionType;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -31,6 +31,6 @@
* @since 08-Jul-2008
*/
@SuppressWarnings("serial")
-public abstract class GraphicalElementImpl extends BPMNElementImpl implements GraphicalElement
+public abstract class GraphicalElementImpl extends AbstractElementImpl implements GraphicalElement
{
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -35,8 +35,7 @@
import org.jboss.bpm.model.Gate;
import org.jboss.bpm.model.InclusiveGateway;
import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.Constants.GatewayType;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,6 @@
import org.jboss.bpm.model.Event;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageEventDetail;
-import org.jboss.bpm.model.Constants.EventDetailType;
/**
* The message event detail
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,6 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.Constants.TaskType;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -32,7 +32,6 @@
import org.jboss.bpm.model.Gate;
import org.jboss.bpm.model.ParallelGateway;
import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.Constants.GatewayType;
import org.jboss.bpm.ri.runtime.TokenImpl;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,10 +34,10 @@
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.Constants.TaskType;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Gateway.GatewayType;
+import org.jboss.bpm.model.Task.TaskType;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.SignalHandler;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -41,7 +41,6 @@
import org.jboss.bpm.ProcessTimeoutException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Assignment;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.InputSet;
@@ -77,7 +76,7 @@
// The process assignments
private List<Assignment> assignments = new ArrayList<Assignment>();
// the status of the process
- private Constants.ProcessStatus status = Constants.ProcessStatus.None;
+ private Process.ProcessStatus status = Process.ProcessStatus.None;
// The possible exception that caused the process to abort
private RuntimeException runtimeException;
// The thread of the executor
@@ -118,7 +117,7 @@
throw new NotImplementedException("JBPM-1646", "Process Performers");
}
- public Constants.ProcessType getProcessType()
+ public Process.ProcessType getProcessType()
{
throw new NotImplementedException("JBPM-1647", "Process Type");
}
@@ -177,7 +176,7 @@
public List<FlowObject> getFlowObjects()
{
- if (status == Constants.ProcessStatus.None)
+ if (status == Process.ProcessStatus.None)
return flowObjects;
return Collections.unmodifiableList(flowObjects);
@@ -214,10 +213,10 @@
{
ProcessManager pm = ProcessManager.locateProcessManager();
- if (status == Constants.ProcessStatus.Aborted || status == Constants.ProcessStatus.Completed)
+ if (status == Process.ProcessStatus.Aborted || status == Process.ProcessStatus.Completed)
resetProcess();
- if (status != Constants.ProcessStatus.Ready)
+ if (status != Process.ProcessStatus.Ready)
throw new IllegalStateException("Cannot start process in state: " + status);
// Register the process if needed
@@ -239,7 +238,7 @@
FlowObjectImpl foImpl = (FlowObjectImpl)fo;
foImpl.reset();
}
- status = Constants.ProcessStatus.Ready;
+ status = Process.ProcessStatus.Ready;
runtimeException = null;
}
@@ -260,7 +259,7 @@
*/
private void waitForEndInternal(long timeout)
{
- if (status == Constants.ProcessStatus.None || status == Constants.ProcessStatus.Ready)
+ if (status == Process.ProcessStatus.None || status == Process.ProcessStatus.Ready)
throw new IllegalStateException("Cannot wait for process in state: " + status);
if (executorThread == null)
@@ -314,7 +313,7 @@
private boolean isProcessTerminated()
{
- return status == Constants.ProcessStatus.Cancelled || status == Constants.ProcessStatus.Completed || status == Constants.ProcessStatus.Aborted;
+ return status == Process.ProcessStatus.Cancelled || status == Process.ProcessStatus.Completed || status == Process.ProcessStatus.Aborted;
}
public FlowObject getFlowObject(String name)
@@ -346,12 +345,12 @@
return retFlowObjects;
}
- public Constants.ProcessStatus getProcessStatus()
+ public Process.ProcessStatus getProcessStatus()
{
return status;
}
- public void setProcessStatus(Constants.ProcessStatus status)
+ public void setProcessStatus(Process.ProcessStatus status)
{
this.status = status;
}
@@ -391,7 +390,7 @@
public void initialize()
{
- if (status != Constants.ProcessStatus.None)
+ if (status != Process.ProcessStatus.None)
throw new IllegalStateException("Cannot initialize process in state: " + status);
// Initialize the Element
@@ -417,7 +416,7 @@
foImpl.initialize(this);
}
- status = Constants.ProcessStatus.Ready;
+ status = Process.ProcessStatus.Ready;
}
protected void initializeMessageRef(Message msgRef)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -32,7 +32,6 @@
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.ReceiveTask;
-import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Participant;
import org.jboss.bpm.model.Role;
//$Id$
@@ -43,9 +43,9 @@
this.roleRef = this;
}
- public Constants.ParticipantType getParticipantType()
+ public Participant.ParticipantType getParticipantType()
{
- return Constants.ParticipantType.Role;
+ return Participant.ParticipantType.Role;
}
public String getName()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.TokenExecutor;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,7 +27,6 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.SendTask;
-import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,7 +25,6 @@
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.SignalEventDetail;
-import org.jboss.bpm.model.Constants.EventDetailType;
/**
* The Signal event detail
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -32,15 +32,15 @@
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.SignalEventDetail;
import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.ri.client.ExecutionManagerImpl;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.ri.runtime.TokenImpl;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -140,7 +140,7 @@
if (startSignal.getSignalType() == signal.getSignalType() && startSignal.getMessage().equals(signal.getMessage()))
{
log.debug("catchSignal: " + signal);
- if (proc.getProcessStatus() == Constants.ProcessStatus.Active)
+ if (proc.getProcessStatus() == Process.ProcessStatus.Active)
{
log.debug("Start process from signal: " + signal);
ExecutionManagerImpl exManager = (ExecutionManagerImpl)ExecutionManager.locateExecutionManager();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -31,6 +31,6 @@
* @since 08-Jul-2008
*/
@SuppressWarnings("serial")
-public abstract class SupportingElementImpl extends BPMNElementImpl implements SupportingElement
+public abstract class SupportingElementImpl extends AbstractElementImpl implements SupportingElement
{
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,7 +24,6 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Task;
-import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.runtime.SignalHandler;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -34,12 +34,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.ConnectingObject;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.ri.client.RunnableToken;
import org.jboss.bpm.ri.runtime.MutableToken;
-import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -98,7 +97,7 @@
public void start(Token token)
{
Process proc = rtProc.getProcess();
- if (proc.getProcessStatus() != Constants.ProcessStatus.Active)
+ if (proc.getProcessStatus() != Process.ProcessStatus.Active)
throw new IllegalStateException("Cannot start token to process in state: " + proc.getProcessStatus());
log.debug("Start Token: " + token);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -30,7 +30,7 @@
/**
* The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based
* Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing
- * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken
+ * Sequence Flow of the These expressions use the values of process data to determine which path should be taken
* (hence the name Data-Based).
*
* The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will
@@ -39,7 +39,7 @@
* and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be
* chosen—along with its associated Sequence Flow.
*
- * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure
+ * The default Gate is not mandatory for a This means that if it is not used, then it is up to the modeler to insure
* that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However,
* BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed
* through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,7 +28,7 @@
//$Id$
/**
- * A Service Task.
+ * A Service
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
@@ -42,7 +42,7 @@
* Message Flows MAY be shown on the diagram. However, the display of the
* Message Flow is not required. The Message is applied to all incoming
* Message Flow, but can arrive for only one of the incoming Message Flow
- * for a single instance of the Task.
+ * for a single instance of the
*/
Message getInMessageRef();
@@ -53,7 +53,7 @@
* Flow MAY be shown on the diagram. However, the display of the Message
* Flow is not required. The Message is applied to all outgoing Message Flow
* and the Message will be sent down all outgoing Message Flow at the
- * completion of a single instance of the Task.
+ * completion of a single instance of the
*/
Message getOutMessageRef();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -43,7 +43,7 @@
* Message Flows MAY be shown on the diagram. However, the display of the
* Message Flow is not required. The Message is applied to all incoming
* Message Flow, but can arrive for only one of the incoming Message Flow
- * for a single instance of the Task.
+ * for a single instance of the
*/
Message getInMessageRef();
@@ -54,7 +54,7 @@
* Flow MAY be shown on the diagram. However, the display of the Message
* Flow is not required. The Message is applied to all outgoing Message Flow
* and the Message will be sent down all outgoing Message Flow at the
- * completion of a single instance of the Task.
+ * completion of a single instance of the
*/
Message getOutMessageRef();
Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java (from rev 1929, jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/RuntimeProcess.java)
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.runtime;
+
+//$Id$
+
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.runtime.TokenExecutor;
+
+/**
+ * A RuntimeProcess add runtime behaviour to the {@link Process} <p/> To protect the engine from maligious user code it
+ * does not extend {@link Process} directly.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface RuntimeProcess
+{
+ /**
+ * Get the associated {@link Process}
+ */
+ Process getProcess();
+
+ /**
+ * Get the {@link TokenExecutor} for this {@link Process}
+ */
+ TokenExecutor getTokenExecutor();
+}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,11 +25,13 @@
import javax.management.ObjectName;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.model.TaskBuilder;
/**
@@ -99,7 +101,7 @@
procBuilder.addStartEvent("Start").addSequenceFlow(TASK_RECEIVE_REQUEST);
// Build the ReceiveReqTask
- TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Constants.TaskType.Receive);
+ TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Task.TaskType.Receive);
taskBuilder.addMessageRef(MESSAGE_REQ_DATA).
addSequenceFlow(TASK_VALIDATE);
@@ -117,8 +119,8 @@
addSequenceFlow(GATEWAY_IS_VALID);
// Build the ValidateGateway
- GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Constants.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Constants.ExpressionLanguage.MVEL, "isReqDataValid == true").
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Gateway.GatewayType.Exclusive);
+ gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Expression.ExpressionLanguage.MVEL, "isReqDataValid == true").
addDefaultGate(TASK_SEND_INVALID);
// Build the CheckAvailabilityTask
@@ -135,37 +137,37 @@
addSequenceFlow(GATEWAY_IS_AVAILABLE);
// Build the SendInvalidTask
- taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Constants.TaskType.Send);
+ taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Task.TaskType.Send);
taskBuilder.addMessageRef(MESSAGE_INVALID_DATA).
addSequenceFlow(TASK_RECEIVE_REQUEST);
// Build the AvailabilityGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Constants.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Constants.ExpressionLanguage.MVEL, "isAvailable == true").
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Gateway.GatewayType.Exclusive);
+ gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Expression.ExpressionLanguage.MVEL, "isAvailable == true").
addDefaultGate(TASK_SEND_NOT_AVAILABLE);
// Build the SendOfferTask
- taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Constants.TaskType.Send);
+ taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Task.TaskType.Send);
taskBuilder.addMessageRef(MESSAGE_OFFER).
addSequenceFlow(TASK_RECEIVE_ORDER);
// Build the SendNotAvailableTask
- taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Constants.TaskType.Send);
+ taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Task.TaskType.Send);
taskBuilder.addMessageRef(MESSAGE_NOT_AVAILABLE).
addSequenceFlow(TASK_RECEIVE_REQUEST);
// Build the ReceiveReqTask
- taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Constants.TaskType.Receive);
+ taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Task.TaskType.Receive);
taskBuilder.addMessageRef(MESSAGE_ACCEPT_OFFER).
addSequenceFlow(GATEWAY_IS_ACCEPTED);
// Build the AcceptOfferGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Constants.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Constants.ExpressionLanguage.MVEL, "isOfferAccepted == true").
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Gateway.GatewayType.Exclusive);
+ gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Expression.ExpressionLanguage.MVEL, "isOfferAccepted == true").
addDefaultGate(TASK_RECEIVE_REQUEST);
// Build the AcceptOfferGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, Constants.GatewayType.Parallel);
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, Gateway.GatewayType.Parallel);
gatewayBuilder.addGate(TASK_CREDIT_CARD).
addGate(TASK_BOOKING);
@@ -188,11 +190,11 @@
addSequenceFlow(GATEWAY_SYNC_JOIN);
// Build the SynchronizedJoinGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, Constants.GatewayType.Parallel);
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, Gateway.GatewayType.Parallel);
gatewayBuilder.addGate(TASK_SEND_CONFIRM);
// Build the SendConfirmTask
- taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Constants.TaskType.Send);
+ taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Task.TaskType.Send);
taskBuilder.addMessageRef(MESSAGE_CONFIRM).
addSequenceFlow(EVENT_END);
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.Collection;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
@@ -78,7 +78,7 @@
msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true).addProperty("attKeys", null, true);
TaskBuilder taskBuilder = procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class);
taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
- procBuilder.addEndEvent("End").addEventDetail(Constants.EventDetailType.Message).addMessageRef("EndMessage");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
Process proc = procBuilder.getProcess();
return proc;
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,9 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -133,12 +134,12 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Constants.GatewayType.Exclusive).addSequenceFlow("TaskC");
+ procBuilder.addGateway("Merge", Gateway.GatewayType.Exclusive).addSequenceFlow("TaskC");
procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
procBuilder.addEndEvent("End");
Process proc = procBuilder.getProcess();
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
@@ -94,9 +95,9 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo > 10");
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive);
+ gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+ gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo > 10");
procBuilder.addEndEvent("EndA").addEndEvent("EndB");
Process proc = procBuilder.getProcess();
return proc;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,8 +28,9 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -71,10 +72,10 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Constants.GatewayType.Inclusive).addSequenceFlow("End");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge");
+ procBuilder.addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End");
procBuilder.addEndEvent("End");
Process proc = procBuilder.getProcess();
return proc;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
@@ -75,9 +76,9 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("InclusiveGatewaySplitTest").addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive);
- gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo < 20");
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive);
+ gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+ gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo < 20");
procBuilder.addEndEvent("EndA").addEndEvent("EndB");
Process proc = procBuilder.getProcess();
return proc;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,9 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -134,12 +135,12 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Constants.GatewayType.Parallel).addSequenceFlow("TaskC");
+ procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("TaskC");
procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
procBuilder.addEndEvent("End");
Process proc = procBuilder.getProcess();
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -60,7 +60,7 @@
public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.GatewayType.Parallel).
+ Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel).
addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess();
return proc;
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,8 +28,8 @@
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.MessageBuilderFactory;
@@ -37,6 +37,7 @@
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.test.DefaultEngineTestCase;
@@ -52,7 +53,7 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("ReceiveTaskTest").addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA", Constants.TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
+ procBuilder.addTask("TaskA", Task.TaskType.Receive).addSequenceFlow("End").addEndEvent("End");
try
{
procBuilder.getProcess();
@@ -144,9 +145,9 @@
msgBuilder = procBuilder.addMessage("EndEventMessage");
msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true);
procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA", Constants.TaskType.Receive).addMessageRef("ReceiveTaskMessage");
+ procBuilder.addTask("TaskA", Task.TaskType.Receive).addMessageRef("ReceiveTaskMessage");
EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End");
- eventBuilder.addEventDetail(Constants.EventDetailType.Message).addMessageRef("EndEventMessage");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndEventMessage");
return procBuilder.getProcess();
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -24,9 +24,9 @@
// $Id$
import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -41,7 +41,7 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA", Constants.TaskType.Send).addSequenceFlow("End").addEndEvent("End");
+ procBuilder.addTask("TaskA", Task.TaskType.Send).addSequenceFlow("End").addEndEvent("End");
try
{
procBuilder.getProcess();
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -25,7 +25,8 @@
import java.io.IOException;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -59,11 +60,11 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("TaskExecutionHandlerTest").addProperty("procProp", "kermit");
- procBuilder.addAssignment(Constants.AssignTime.Start, Constants.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign");
+ procBuilder.addAssignment(Assignment.AssignTime.Start, Expression.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign");
procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
taskBuilder.addProperty("taskProp", "piggy").addExecutionHandler(TaskA.class).addSequenceFlow("End");
- taskBuilder.addAssignment(Constants.AssignTime.Start, Constants.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign");
+ taskBuilder.addAssignment(Assignment.AssignTime.Start, Expression.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign");
procBuilder.addEndEvent("End");
return procBuilder.getProcess();
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
@@ -94,9 +95,9 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo > 10");
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive);
+ gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+ gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo > 10");
procBuilder.addEndEvent("EndA").addEndEvent("EndB");
Process proc = procBuilder.getProcess();
return proc;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,8 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
@@ -75,9 +76,9 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("MultiChoiceTest").addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive);
- gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo < 20");
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive);
+ gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10");
+ gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo < 20");
procBuilder.addEndEvent("EndA").addEndEvent("EndB");
Process proc = procBuilder.getProcess();
return proc;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -60,7 +60,7 @@
public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.GatewayType.Parallel).
+ Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel).
addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess();
return proc;
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -28,8 +28,9 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -71,10 +72,10 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A");
eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
- procBuilder.addSequenceFlow("Merge").addGateway("Merge", Constants.GatewayType.Inclusive).addSequenceFlow("End");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B");
+ procBuilder.addSequenceFlow("Merge").addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End");
procBuilder.addEndEvent("End");
Process proc = procBuilder.getProcess();
return proc;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-19 10:48:17 UTC (rev 1929)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-19 11:04:43 UTC (rev 1930)
@@ -27,8 +27,9 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
@@ -134,12 +135,12 @@
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
- eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Constants.GatewayType.Parallel).addSequenceFlow("TaskC");
+ procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("TaskC");
procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
procBuilder.addEndEvent("End");
Process proc = procBuilder.getProcess();
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1929 - in jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri: model/spec and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 06:48:17 -0400 (Tue, 19 Aug 2008)
New Revision: 1929
Added:
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CancelEventDetail.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CompensateEventDetail.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ConditionalEventDetail.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/DataObject.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ErrorEventDetail.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayEventBased.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/LinkEventDetail.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ManualTask.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleInFlowSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleOutFlowSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ReferenceTask.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ScriptTask.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SubProcess.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TerminateEventDetail.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimeDateExpression.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimerEventDetail.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/RuntimeProcess.java
Log:
Restructure API packages
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CancelEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CancelEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CancelEventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.EventDetail;
+
+//$Id$
+
+/**
+ * The Cancel event detail
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface CancelEventDetail extends EventDetail
+{
+
+}
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CancelEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CompensateEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CompensateEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CompensateEventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.Activity;
+import org.jboss.bpm.model.EventDetail;
+
+//$Id$
+
+/**
+ * The Compensate event detail
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/CompensateEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.Expression;
+
+//$Id$
+
+/**
+ * A Condition, which is used in the definition of attributes for Start Event and
+ * Intermediate Event
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Condition extends SupportingElement
+{
+ /**
+ * 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: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ConditionalEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ConditionalEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ConditionalEventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.EventDetail;
+
+//$Id$
+
+/**
+ * The Conditional event detail
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ConditionalEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/DataObject.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/DataObject.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/DataObject.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import java.util.List;
+
+import org.jboss.bpm.model.Artifact;
+import org.jboss.bpm.model.Property;
+
+//$Id$
+
+
+/**
+ * DataObject, which extends common Artifact
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/DataObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ErrorEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ErrorEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ErrorEventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.EventDetail;
+
+//$Id$
+
+/**
+ * The Error event detail
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ErrorEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.ExclusiveGateway;
+import org.jboss.bpm.model.Gate;
+
+
+//$Id$
+
+/**
+ * The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based
+ * Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing
+ * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken
+ * (hence the name Data-Based).
+ *
+ * The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will
+ * determine the Sequence Flow that will be taken. Since the behavior of this Gateway is exclusive, any other conditions that
+ * may actually be TRUE will be ignored--only one Gate can be chosen. One of the Gates may be “default” (or otherwise),
+ * and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be
+ * chosen—along with its associated Sequence Flow.
+ *
+ * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure
+ * that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However,
+ * BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed
+ * through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid
+ * Gate at runtime is an invalid model.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ExclusiveGatewayDataBased extends ExclusiveGateway
+{
+ /**
+ * A Default Gate MAY be specified
+ */
+ Gate getDefaultGate();
+
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayDataBased.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayEventBased.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayEventBased.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayEventBased.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.ExclusiveGateway;
+
+
+//$Id$
+
+/**
+ * The inclusion of Event-Based Exclusive Gateways is the result of recent developments in the handling of distributed
+ * systems (e.g., with pi-calculus) and was derived from the BPEL4WS pick. On the input side, their behavior is the same as
+ * a Data-Based Exclusive Gateway (see “Data-Based” on page 73). On the output side, the basic idea is that this Decision
+ * represents a branching point in the process where the alternatives are based on events that occurs at that point in the
+ * Process, rather than the evaluation of expressions using process data. A specific event, usually the receipt of a message,
+ * determines which of the paths will be taken. For example, if a company is waiting for a response from a customer, they
+ * will perform one set of activities if the customer responds “Yes” and another set of activities if the customer responds
+ * “No.” The customer’s response determines which path is taken. The identity of the Message determines which path is taken.
+ * That is, the “Yes” Message and the “No” message are different messages—they are not the same message with different values
+ * within a property of the Message. The receipt of the message can be modeled with a Task of TaskType Receive or an
+ * Intermediate Event with a Message Trigger. In addition to Messages, other Triggers for Intermediate Events can be used, such as Timers.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ExclusiveGatewayEventBased extends ExclusiveGateway
+{
+ /**
+ * Event-Based Gateways can be defined as the instantiation mechanism for the
+ * Process with the Instantiate attribute. This attribute MAY be set to true if the
+ * Gateway is the first element after the Start Event or a starting Gateway if there is
+ * no Start Event (i.e., there are no incoming Sequence Flow).
+ */
+ boolean isInstantiate();
+
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ExclusiveGatewayEventBased.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/LinkEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/LinkEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/LinkEventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.EventDetail;
+
+//$Id$
+
+/**
+ * The Link event detail
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/LinkEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ManualTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ManualTask.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ManualTask.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.Task;
+
+//$Id$
+
+/**
+ * A Manual Task is a Task that is expected to be performed without the aid of any business process execution engine or any
+ * application. An example of this could be a telephone technician installing a telephone at a customer location.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ManualTask extends Task
+{
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ManualTask.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleInFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleInFlowSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleInFlowSupport.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import java.util.List;
+
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.FlowObject;
+
+//$Id$
+
+/**
+ * Implementing {@link FlowObject}s support multiple incomming {@link ConnectingObject}s.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface MultipleInFlowSupport
+{
+ /**
+ * Get the list of in flows
+ */
+ List<ConnectingObject> getInFlows();
+}
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleInFlowSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleOutFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleOutFlowSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleOutFlowSupport.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import java.util.List;
+
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.FlowObject;
+
+//$Id$
+
+/**
+ * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface MultipleOutFlowSupport
+{
+ /**
+ * Get the list of out flows
+ */
+ List<ConnectingObject> getOutFlows();
+}
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleOutFlowSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ReferenceTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ReferenceTask.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ReferenceTask.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.Task;
+
+//$Id$
+
+/**
+ * There may be times where a modeler may want to reference another activity that has been defined. If the two (or more)
+ * activities share the exact same behavior, then by one referencing the other, the attributes that define the behavior only
+ * have to be created once and maintained in only one location.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ReferenceTask extends Task
+{
+ /**
+ * The Task being referenced MUST be identified.
+ */
+ Task getTaskRef();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ReferenceTask.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ScriptTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ScriptTask.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ScriptTask.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.Task;
+
+//$Id$
+
+/**
+ * A Script Task is executed by a business process engine. The modeler or implementer defines a script in a language that
+ * the engine can interpret. When the Task is ready to start, the engine will execute the script. When the script is completed,
+ * the Task will also be completed.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ScriptTask extends Task
+{
+ /**
+ * The modeler MAY include a script that can be run when the Task is performed. If
+ * a script is not included, then the Task will act equivalent to a TaskType of None.
+ */
+ String getScript();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ScriptTask.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Task;
+import org.jboss.bpm.model.Message.Implementation;
+
+//$Id$
+
+/**
+ * A Service Task.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ServiceTask extends Task
+{
+ /**
+ * A Message for the InMessageRef attribute MUST be entered. This indicates
+ * that the Message will be received at the start of the Task, after the
+ * availability of any defined InputSets. One or more corresponding incoming
+ * Message Flows MAY be shown on the diagram. However, the display of the
+ * Message Flow is not required. The Message is applied to all incoming
+ * Message Flow, but can arrive for only one of the incoming Message Flow
+ * for a single instance of the Task.
+ */
+ Message getInMessageRef();
+
+ /**
+ * A Message for the OutMessageRef attribute MUST be entered. The sending
+ * of this message marks the completion of the Task, which may cause the
+ * production of an OutputSet. One or more corresponding outgoing Message
+ * Flow MAY be shown on the diagram. However, the display of the Message
+ * Flow is not required. The Message is applied to all outgoing Message Flow
+ * and the Message will be sent down all outgoing Message Flow at the
+ * completion of a single instance of the Task.
+ */
+ Message getOutMessageRef();
+
+ /**
+ * This attribute specifies the technology that will be used to send or receive the
+ * message. A Web service is the default technology.
+ */
+ Implementation getImplementation();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/ServiceTask.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SubProcess.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SubProcess.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SubProcess.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.Activity;
+import org.jboss.bpm.model.SingleInFlowSupport;
+import org.jboss.bpm.model.SingleOutFlowSupport;
+
+
+//$Id$
+
+/**
+ * A Sub-Process is Process that is included within another Process.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SubProcess extends Activity, SingleInFlowSupport, SingleOutFlowSupport
+{
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SubProcess.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.AbstractElement;
+
+//$Id$
+
+/**
+ * A graphical BPMN element
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SupportingElement extends AbstractElement
+{
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TerminateEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TerminateEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TerminateEventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.EventDetail;
+
+//$Id$
+
+/**
+ * The Terminate event detail
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface TerminateEventDetail extends EventDetail
+{
+
+}
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TerminateEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimeDateExpression.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimeDateExpression.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimeDateExpression.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.Expression;
+
+//$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(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface TimeDateExpression extends Expression
+{
+
+}
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimeDateExpression.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimerEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimerEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimerEventDetail.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -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.ri.model.spec;
+
+import org.jboss.bpm.model.EventDetail;
+
+//$Id$
+
+/**
+ * The Timer event detail
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/TimerEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.spec;
+
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Task;
+import org.jboss.bpm.model.Message.Implementation;
+
+//$Id$
+
+/**
+ * A User Task is a typical “workflow” task where a human performer performs the Task with the assistance of a software
+ * application and is scheduled through a task list manager of some sort.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface UserTask extends Task
+{
+ /**
+ * A Message for the InMessageRef attribute MUST be entered. This indicates
+ * that the Message will be received at the start of the Task, after the
+ * availability of any defined InputSets. One or more corresponding incoming
+ * Message Flows MAY be shown on the diagram. However, the display of the
+ * Message Flow is not required. The Message is applied to all incoming
+ * Message Flow, but can arrive for only one of the incoming Message Flow
+ * for a single instance of the Task.
+ */
+ Message getInMessageRef();
+
+ /**
+ * A Message for the OutMessageRef attribute MUST be entered. The sending
+ * of this message marks the completion of the Task, which may cause the
+ * production of an OutputSet. One or more corresponding outgoing Message
+ * Flow MAY be shown on the diagram. However, the display of the Message
+ * Flow is not required. The Message is applied to all outgoing Message Flow
+ * and the Message will be sent down all outgoing Message Flow at the
+ * completion of a single instance of the Task.
+ */
+ Message getOutMessageRef();
+
+ /**
+ * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology.
+ */
+ Implementation getImplementation();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/UserTask.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/RuntimeProcess.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/RuntimeProcess.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/RuntimeProcess.java 2008-08-19 10:48:17 UTC (rev 1929)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.runtime.spec;
+
+//$Id$
+
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.runtime.TokenExecutor;
+
+/**
+ * A RuntimeProcess add runtime behaviour to the {@link Process} <p/> To protect the engine from maligious user code it
+ * does not extend {@link Process} directly.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface RuntimeProcess
+{
+ /**
+ * Get the associated {@link Process}
+ */
+ Process getProcess();
+
+ /**
+ * Get the {@link TokenExecutor} for this {@link Process}
+ */
+ TokenExecutor getTokenExecutor();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/spec/RuntimeProcess.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1928 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/client and 15 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 06:45:22 -0400 (Tue, 19 Aug 2008)
New Revision: 1928
Added:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MutablePropertySupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ObjectNameFactory.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java
Removed:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java
jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayDataBasedImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GateImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageFlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleOutFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
Log:
Restructure API packages
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,15 +21,9 @@
*/
package org.jboss.bpm.client;
-// $Id$
+// $Id: $
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.ObjectName;
-
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.Attachments;
/**
@@ -40,9 +34,6 @@
*/
public abstract class ExecutionManager
{
- // The map of active runtime processes
- private Map<ObjectName, RuntimeProcess> runtimeProcesses = new HashMap<ObjectName, RuntimeProcess>();
-
// Hide public constructor
protected ExecutionManager()
{
@@ -64,24 +55,4 @@
* @param att The Attachments in the ExecutionContext
*/
public abstract void startProcess(Process proc, Attachments att);
-
- /**
- * Get a {@link RuntimeProcess} for a given processID
- * @return null if there is no such process
- */
- public RuntimeProcess getRuntimeProcess(ObjectName procID)
- {
- return runtimeProcesses.get(procID);
- }
-
- protected void addRuntimeProcess(RuntimeProcess rtProc)
- {
- ObjectName procID = rtProc.getProcess().getID();
- runtimeProcesses.put(procID, rtProc);
- }
-
- protected void removeRuntimeProcess(RuntimeProcess rtProc)
- {
- runtimeProcesses.remove(rtProc.getProcess().getID());
- }
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -31,13 +31,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.Participant;
-import org.jboss.bpm.ri.model.Task;
/**
* The ProcessEngine sends mesages through the MessageManager. <p/> A {@link Message} has an ID and is targeted to a
- * specific {@link Participant}. A component can register a {@link MessageListener} with the MessageManager.
+ * specific Participant. A component can register a {@link MessageListener} with the MessageManager.
*
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
@@ -99,7 +96,7 @@
}
/**
- * Send a message to a given {@link Task} or {@link Event}
+ * Send a message to a given Task or Event
*/
public abstract void sendMessage(ObjectName procID, String targetName, Message msg);
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -1,74 +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.client;
-
-// $Id$
-
-import java.util.Hashtable;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-/**
- * A simple factory for creating safe object names.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-May-2006
- */
-public class ObjectNameFactory
-{
- public static ObjectName create(String name)
- {
- try
- {
- return new ObjectName(name);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + name + "; " + e);
- }
- }
-
- public static ObjectName create(String domain, String key, String value)
- {
- try
- {
- return new ObjectName(domain, key, value);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
- }
- }
-
- public static ObjectName create(String domain, Hashtable<String, String> table)
- {
- try
- {
- return new ObjectName(domain, table);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
- }
- }
-}
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,42 @@
+/*
+ * 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.io.Serializable;
+
+import javax.management.ObjectName;
+
+/**
+ * The parrent of all BPMN elements
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface AbstractElement extends Serializable
+{
+ /**
+ * Get the ID of this element
+ */
+ ObjectName getID();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,112 @@
+/*
+ * 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$
+
+/**
+ * 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, SubProcess, and Task.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Activity extends FlowObject, PropertySupport, SingleInFlowSupport, SingleOutFlowSupport
+{
+ /**
+ * The ActivityType MUST be of type Task or Sub-Process.
+ */
+ enum ActivityType
+ {
+ Task, SubProcess
+ }
+
+ /**
+ * The Activity LoopType
+ */
+ enum LoopType
+ {
+ None, Standard, MultiInstance
+ }
+
+ /**
+ * The ActivityType MUST be of type Task or Sub-Process.
+ */
+ ActivityType getActivityType();
+
+ /**
+ * One or more Performers MAY be entered. The Performer attribute defines the
+ * resource that will perform or will be responsible for the activity. The Performer
+ * entry could be in the form of a specific individual, a group, an organization role
+ * or position, or an organization.
+ */
+ List<String> getPerformers();
+
+ /**
+ * The InputSets attribute defines the data requirements for input to the Activity.
+ * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the
+ * Activity to be performed (if it has first been instantiated by the appropriate signal
+ * arriving from an incoming Sequence Flow)
+ */
+ List<InputSet> getInputSets();
+
+ /**
+ * The OutputSets attribute defines the data requirements for output from the
+ * activity. Zero or more OutputSets MAY be defined. At the completion of the
+ * activity, only one of the OutputSets may be produced--It is up to the
+ * implementation of the activity to determine which set will be produced. However,
+ * the IORules attribute MAY indicate a relationship between an OutputSet and an
+ * InputSet that started the activity.
+ */
+ List<OutputSet> getOutputSets();
+
+ /**
+ * The IORules attribute is a collection of expressions, each of which specifies the
+ * required relationship between one input and one output. That is, if the activity is
+ * instantiated with a specified input, that activity shall complete with the specified
+ * output.
+ */
+ List<Expression> getIORules();
+
+ /**
+ * The default value is 1. The value MUST NOT be less than 1. This attribute
+ * defines the number of Tokens that must arrive before the activity can begin.
+ */
+ int getStartQuantity();
+
+ /**
+ * The default value is 1. The value MUST NOT be less than 1. This attribute
+ * defines the number of Tokens that must be generated from the activity. This
+ * number of Tokens will be sent down any outgoing Sequence Flow (assuming any
+ * Sequence Flow Conditions are satisfied).
+ */
+ int getCompletionQuantity();
+
+ /**
+ * LoopType is an attribute and is by default None, but MAY be set to Standard or
+ * MultiInstance. A Task of type Receive that has its Instantiate attribute set to True MUST NOT
+ * have a Standard or MultiInstance LoopType.
+ */
+ LoopType getLoopType();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,63 @@
+/*
+ * 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 ActivityBuilder can be used to build an Activity dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ActivityBuilder extends ProcessBuilder
+{
+ /**
+ * Add an InputSet
+ */
+ ActivityBuilder addInputSet();
+
+ /**
+ * Add an Property Input
+ */
+ ActivityBuilder addPropertyInput(String name, String value);
+
+ /**
+ * Add an OutputSet
+ */
+ ActivityBuilder addOutputSet();
+
+ /**
+ * Add an Property Output
+ */
+ ActivityBuilder addPropertyOutput(String name, String value);
+
+ /**
+ * Add an IORule Expression
+ */
+ ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang);
+
+ /**
+ * Add an activity property
+ */
+ ActivityBuilder addProperty(String name, String value);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+//$Id$
+
+
+/**
+ * An ArtifactInput, which is used in the definition of attributes for InputSet
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Artifact
+{
+ /**
+ * 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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+
+/**
+ * An ArtifactInput, which is used in the definition of attributes for {@link InputSet}
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+
+/**
+ * An ArtifactOutput, which is used in the definition of attributes for {@link OutputSet}
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,62 @@
+/*
+ * 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.model.Constants.AssignTime;
+
+//$Id$
+
+/**
+ * An Assignment, which is used in the definition of attributes for Process,
+ * Activity, Event, Gateway, and Gate.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Assignment
+{
+ /**
+ * The target for the Assignment MUST be a Property of the Process or the activity
+ * itself.
+ */
+ Property getTo();
+
+ /**
+ * The Expression MUST be made up of a combination of Values, Properties, and
+ * Attributes, which are separated by operators such as add or multiply. The expression
+ * language is defined in the ExpressionLanguage attribute of the Business Process
+ * Diagram
+ */
+ Expression getFrom();
+
+ /**
+ * An Assignment MAY have a AssignTime setting. If the Object is an activity (Task,
+ * Sub-Process, or Process), then the Assignment MUST have an AssignTime.
+ * A value of Start means that the assignment SHALL occur at the start of the activity.
+ * This can be used to assign the higher-level (global) Properties of the Process to the
+ * (local) Properties of the activity as an input to the activity.
+ * A value of End means that the assignment SHALL occur at the end of the activity.
+ * This can be used to assign the (local) Properties of the activity to the higher-level
+ * (global) Properties of the Process as an output to the activity.
+ */
+ AssignTime getAssignTime();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+/**
+ * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex
+ * Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers
+ * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ComplexGateway extends Gateway
+{
+ /**
+ * If there are multiple incoming Sequence Flow, an IncomingCondition expression
+ * MUST be set by the modeler. This will consist of an expression that can reference
+ * Sequence Flow names and/or Process Properties (Data).
+ */
+ Expression getIncommingCondition();
+
+ /**
+ * If there are multiple outgoing Sequence Flow, an OutgoingCondition expression
+ * MUST be set by the modeler. This will consist of an expression that can reference
+ * (outgoing) Sequence Flow Ids and/or Process Properties (Data).
+ */
+ Expression getOutgoingCondition();
+
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,59 @@
+/*
+ * 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$
+
+/**
+ * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence
+ * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model,
+ * although they both affect the performance of activities within a Process.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ConnectingObject
+{
+ /**
+ * Name is an optional attribute that is text description of the Connecting Object.
+ */
+ String getName();
+
+ /**
+ * SourceRef is an attribute that identifies which Graphical Element the Connecting
+ * Object is connected from. Note: there are restrictions as to what objects Sequence
+ * Flow and Message Flow can connect.
+ */
+ FlowObject getSourceRef();
+
+ /**
+ * TargetRef is an attribute that identifies which Graphical Element the Connecting
+ * Object is connected to. Note: there are restrictions as to what objects Sequence
+ * Flow and Message Flow can connect.
+ */
+ FlowObject getTargetRef();
+
+ /**
+ * Get the required target name
+ */
+ String getTargetName();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,20 +21,18 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.ri.model.Activity;
-import org.jboss.bpm.ri.model.Event;
+//$Id: $
-//$Id$
-
/**
- * A Process is any {@link Activity} performed within a company or organization.
+ * DEfines the constants used by the JBossBPM spec
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
*/
public interface Constants
{
+ static final String ID_DOMAIN = "jboss.bpm";
public enum AssignTime
{
@@ -42,7 +40,7 @@
}
/**
- * Defines the type of an {@link Event}
+ * Defines the type of an Event
*/
public enum EventDetailType
{
@@ -86,4 +84,9 @@
{
None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
}
+
+ public enum ParticipantType
+ {
+ Role, Entity
+ }
}
\ No newline at end of file
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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 java.util.List;
+
+
+/**
+ * As the name implies, the End Event indicates where a Process will end.
+ *
+ * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow.
+ * An End Event can have a specific Result that will appear as a marker within the center of the End Event shape.
+ * End Event Results are Message, Error, Compensation, Link, and Multiple.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface EndEvent extends Event, SingleInFlowSupport
+{
+ /**
+ * Result defines the type of result expected for an End Event.
+ * Of the set of EventDetailTypes only six can be applied to an
+ * End Event: Message, Error, Cancel, Compensation, Signal, and Terminate.
+ *
+ * If there is no EventDetail defined, then this is considered a None End Event.
+ * If there is more than one EventDetail defined, this is considered a Multiple EndEvent.
+ */
+ List<EventDetail> getResult();
+
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+/**
+ * An Entity, which is used in the definition of attributes for a {@link Participant}
+ *
+ * @author thomas.diesler(a)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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,45 @@
+/*
+ * 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 Event is something that “happens” during the course of a business process.
+ * <p/>
+ * These Events affect the flow of the Process and usually have a cause or an impact.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Event extends FlowObject
+{
+ /**
+ * Defines the type of an {@link Event}
+ */
+ enum EventType
+ {
+ Start, End, Intermediate
+ };
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,11 +24,9 @@
//$Id$
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.EventDetail;
/**
- * The EventBuilder can be used to build an {@link Event} dynamically.
+ * The EventBuilder can be used to build an Event dynamically.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
@@ -36,17 +34,17 @@
public interface EventBuilder extends ProcessBuilder
{
/**
- * Add an event detail to the last added {@link Event}
+ * Add an event detail to the last added Event
*/
EventBuilder addEventDetail(Constants.EventDetailType detailType);
/**
- * Add a signal ref to the last added {@link EventDetail}
+ * Add a signal ref to the last added EventDetail
*/
EventBuilder addSignalRef(SignalType signalType, String signalMessage);
/**
- * Add a message ref to the last added {@link EventDetail}
+ * Add a message ref to the last added EventDetail
*/
EventBuilder addMessageRef(String msgName);
}
\ No newline at end of file
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,44 @@
+/*
+ * 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.model.Constants.EventDetailType;
+
+//$Id$
+
+/**
+ * The base of all supported event details.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface EventDetail
+{
+ /**
+ * 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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,58 @@
+/*
+ * 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$
+
+/**
+ * Exclusive Gateways (Decisions) are locations within a business process where the Sequence Flow can take two or more
+ * alternative paths. This is basically the “fork in the road” for a process. For a given performance (or instance) of the
+ * process, only one of the paths can be taken (this should not be confused with forking of paths—refer to “Forking Flow”)
+ *
+ * A Decision is not an activity from the business process perspective, but is a type of Gateway that controls
+ * the Sequence Flow between activities. It can be thought of as a question that is asked at that point in the Process. The
+ * question has a defined set of alternative answers (Gates). Each Decision Gate is associated with a condition expression
+ * found within an outgoing Sequence Flow. When a Gate is chosen during the performance of the Process, the
+ * corresponding Sequence Flow is then chosen. A Token arriving at the Decision would be directed down the appropriate
+ * path, based on the chosen Gate.
+ *
+ * The Exclusive Decision has two or more outgoing Sequence Flow, but only one of them may be taken during the
+ * performance of the Process. Thus, the Exclusive Decision defines a set of alternative paths for the Token to take as it
+ * traverses the Flow. There are two types of Exclusive Decisions: Data-Based and Event-Based.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ExclusiveGateway extends Gateway
+{
+ enum ExclusiveType
+ {
+ Data, Event
+ }
+
+ /**
+ * ExclusiveType is by default Data. The ExclusiveType MAY be set to Event.
+ */
+ ExclusiveType getExclusiveType();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+import org.jboss.bpm.model.Constants.ExpressionLanguage;
+
+//$Id$
+
+/**
+ * An Expression, which is used in the definition of attributes for StartEvent,
+ * IntermediateEvent, Activity, ComplexGateway, and SequenceFlow
+ *
+ * @author thomas.diesler(a)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();
+
+ /**
+ * An ExpressionValue MAY be available if the Expression is used as a {@link Property} value.
+ */
+ Object getExpressionValue();
+
+ /**
+ * 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.
+ */
+ ExpressionLanguage getExpressionLanguage();
+
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+import java.util.List;
+
+//$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 interface FlowObject extends GraphicalElement
+{
+ /**
+ * Get the unique name.
+ */
+ String getName();
+
+ /**
+ * Get the associated Process
+ */
+ Process getProcess();
+
+ /**
+ * One or more assignment expressions MAY be made for the object. For activities (Task, Sub-Process, and Process), the
+ * Assignment SHALL be performed as defined by the AssignTime attribute.
+ */
+ List<Assignment> getAssignments();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+import java.util.List;
+
+
+
+//$Id$
+
+/**
+ * There MAY be zero or more Gates (except where noted below). Zero Gates are
+ * allowed if the Gateway is last object in a Process flow and there are no Start or
+ * End Events for the Process. If there are zero or only one incoming Sequence
+ * Flow, then there MUST be at least two Gates.
+ *
+ * For Exclusive Data-Based Gateways
+ * When two Gates are required, one of them MAY be the DefaultGate.
+ *
+ * For Exclusive Event-Based Gateways
+ * There MUST be two or more Gates. (Note that this type of Gateway does not act
+ * only as a Merge--it is always a Decision, at least.)
+ *
+ * For Inclusive Gateways
+ * When two Gates are required, one of them MAY be the DefaultGate.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Gate
+{
+ /**
+ * Each Gate MUST have an associated (outgoing) Sequence Flow.
+ *
+ * For Exclusive Event-Based, Complex, and Parallel Gateways:
+ * The Sequence Flow MUST have its Condition attribute set to None (there is not an
+ * evaluation of a condition expression).
+ *
+ * For Exclusive Data-Based, and Inclusive Gateways:
+ * The Sequence Flow MUST have its Condition attribute set to Expression and
+ * MUST have a valid ConditionExpression. The ConditionExpression MUST be
+ * unique for all the Gates within the Gateway. If there is only one Gate (i.e., the
+ * Gateway is acting only as a Merge), then Sequence Flow MUST have its Condition
+ * set to None.
+ *
+ * For DefaultGates:
+ * The Sequence Flow MUST have its Condition attribute set to Otherwise
+ */
+ SequenceFlow getOutgoingSequenceFlow();
+
+ /**
+ * One or more assignment expressions MAY be made for each Gate. The
+ * Assignment SHALL be performed when the Gate is selected.
+ */
+ List<Assignment> getAssignments();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+import java.util.List;
+
+import org.jboss.bpm.model.Constants.GatewayType;
+
+//$Id$
+
+/**
+ * Gateways are modeling 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. The term “Gateway” implies that
+ * there is a gating mechanism that either allows or disallows passage through the Gateway--that is, as Tokens arrive at a
+ * Gateway, they can be merged together on input and/or split apart on output as the Gateway mechanisms are invoked. To
+ * be more descriptive, a Gateway is actually a collection of “Gates.”
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Gateway extends FlowObject
+{
+ /**
+ * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway,
+ * both for incoming and outgoing Sequence Flow
+ */
+ GatewayType getGatewayType();
+
+ /**
+ * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End
+ * Events for the Process. If there are zero or only one incoming Sequence Flow, then there MUST be at least two Gates.
+ *
+ * For Exclusive Data-Based Gateways.
+ * When two Gates are required, one of them MAY be the DefaultGate.
+ *
+ * For Exclusive Event-Based Gateways.
+ * There MUST be two or more Gates. (Note that this type of Gateway does not act only as a Merge--it is always a Decision, at
+ * least.)
+ *
+ * For Inclusive Gateways.
+ * When two Gates are required, one of them MAY be the DefaultGate.
+ */
+ List<Gate> getGates();
+
+ /**
+ * Get the optional default gate
+ * @return null if there is none
+ */
+ Gate getDefaultGate();
+
+ /**
+ * Get the gate for the given target name
+ * @return null if there is none
+ */
+ Gate getGateByTargetName(String targetName);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,13 +21,10 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.ri.model.Gateway;
+//$Id:$
-
-//$Id$
-
/**
- * The GatewayBuilder can be used to build a {@link Gateway} dynamically.
+ * The GatewayBuilder can be used to build a Gateway dynamically.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+/**
+ * A graphical BPMN element
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface GraphicalElement extends AbstractElement
+{
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,44 @@
+/*
+ * 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$
+
+/**
+ * This Decision represents a branching point where Alternatives are based on conditional expressions contained within
+ * outgoing Sequence Flow. However, in this case, the True evaluation of one condition expression does not exclude the
+ * evaluation of other condition expressions. All Sequence Flow with a True evaluation will be traversed by a Token. In
+ * some sense it’s like a grouping of related independent Binary (Yes/No) Decisions--and can be modeled that way. Since
+ * each path is independent, all combinations of the paths may be taken, from zero to all. However, it should be
+ * designed so that at least one path is taken.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface InclusiveGateway extends Gateway
+{
+ /**
+ * A Default Gate MAY be specified
+ */
+ Gate getDefaultGate();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface InputSet extends MutablePropertySupport
+{
+ /**
+ * 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> getProperties();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+/**
+ * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started.
+ * <p/>
+ * It will affect the {@link ConnectingObject} of the {@link Process}, but will not start or (directly) terminate
+ * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process},
+ * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface IntermediateEvent extends Event, SingleInFlowSupport, SingleOutFlowSupport
+{
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,28 +21,16 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.ri.model.EndEvent;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.IntermediateEvent;
-import org.jboss.bpm.ri.model.MessageFlow;
-import org.jboss.bpm.ri.model.Participant;
-import org.jboss.bpm.ri.model.PropertySupport;
-import org.jboss.bpm.ri.model.StartEvent;
-import org.jboss.bpm.ri.model.SupportingElement;
-import org.jboss.bpm.ri.model.Task;
+//$Id: $
-
-
-//$Id$
-
/**
- * A Message, which is used in the definition of attributes for a {@link StartEvent},
- * {@link EndEvent}, {@link IntermediateEvent}, {@link Task}, and {@link MessageFlow}
+ * A Message, which is used in the definition of attributes for a StartEvent,
+ * EndEvent, IntermediateEvent, Task, and MessageFlow
*
* @author thomas.diesler(a)jboss.com
* @since 21-Jul-2008
*/
-public interface Message extends SupportingElement, PropertySupport
+public interface Message extends PropertySupport
{
/**
* Specifies the technology that will be used to send or receive the
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,45 @@
+/*
+ * 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(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface MessageEventDetail extends EventDetail
+{
+ /**
+ * 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.
+ */
+ Message.Implementation getImplementation();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,43 @@
+/*
+ * 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 Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to
+ * send and receive them. In BPMN, two separate Pools in the Diagram will represent the two entities.
+ *
+ * Message Flow MUST connect two Pools, either to the Pools themselves or to Flow Objects within the Pools. They cannot
+ * connect two objects within the same Pool.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface MessageFlow extends ConnectingObject
+{
+ /**
+ * MessageRef is an optional attribute that identifies the Message that is being sent.
+ */
+ Message getMessageRef();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MutablePropertySupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MutablePropertySupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MutablePropertySupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+/**
+ * Mutable property support
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface MutablePropertySupport extends PropertySupport
+{
+ /**
+ * Add a property
+ */
+ void addProperty(Property prop);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MutablePropertySupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ObjectNameFactory.java (from rev 1925, jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java)
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ObjectNameFactory.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ObjectNameFactory.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+// $Id$
+
+import java.util.Hashtable;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+/**
+ * A simple factory for creating safe object names.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-May-2006
+ */
+public class ObjectNameFactory
+{
+ public static ObjectName create(String name)
+ {
+ try
+ {
+ return new ObjectName(name);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + name + "; " + e);
+ }
+ }
+
+ public static ObjectName create(String domain, String key, String value)
+ {
+ try
+ {
+ return new ObjectName(domain, key, value);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
+ }
+ }
+
+ public static ObjectName create(String domain, Hashtable<String, String> table)
+ {
+ try
+ {
+ return new ObjectName(domain, table);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
+ }
+ }
+}
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface OutputSet extends MutablePropertySupport
+{
+ /**
+ * 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 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> getProperties();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,36 @@
+/*
+ * 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$
+
+/**
+ * Parallel Gateway is required when two or more Activities need to be executed in parallel.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ParallelGateway extends Gateway
+{
+
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+import org.jboss.bpm.model.Constants.ParticipantType;
+
+
+//$Id$
+
+/**
+ * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService
+ *
+ * TODO: Add javadoc links for Pool, WebService
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Participant
+{
+ /**
+ * 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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,26 +23,23 @@
//$Id: Process.java 1919 2008-08-18 10:40:03Z thomas.diesler(a)jboss.com $
+import java.util.List;
+
import javax.management.ObjectName;
import org.jboss.bpm.model.Constants.ProcessStatus;
-import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.model.Constants.ProcessType;
import org.jboss.bpm.runtime.Attachments;
/**
- * A Process is any {@link Activity} performed within a company or organization.
+ * A Process is any Activity performed within a company or organization.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
*/
-public interface Process
+public interface Process extends GraphicalElement, PropertySupport
{
/**
- * Get the ID of this element
- */
- ObjectName getID();
-
- /**
* Get the unique name.
*/
String getName();
@@ -53,6 +50,69 @@
ProcessStatus getProcessStatus();
/**
+ * Get the process type
+ */
+ ProcessType getProcessType();
+
+ /**
+ * Get the list of flow objects
+ */
+ List<FlowObject> getFlowObjects();
+
+ /**
+ * Get a list of flow objects of a given type.
+ */
+ <T extends FlowObject> List<T> getFlowObjects(Class<T> clazz);
+
+ /**
+ * Get a flow object by name.
+ * @return null if not found
+ */
+ FlowObject getFlowObject(String name);
+
+ /**
+ * 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<Assignment> getAssignments();
+
+ /**
+ * 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 OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be
+ * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the
+ * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate
+ * a relationship between an OutputSet and an InputSet that started the Process.
+ */
+ List<OutputSet> getOutputSets();
+
+ /**
+ * Get the list of associated {@link Message} objects.
+ * @return An empty list if there are none
+ */
+ List<Message> getMessages();
+
+ /**
+ * Get an associated {@link Message} by name.
+ * @return null if not found
+ */
+ Message getMessage(String msgName);
+
+ // Runtime Aspects ====================================================================================================
+
+ /**
* Start the process
*/
ObjectName startProcess();
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,8 +21,6 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.SupportingElement;
//$Id$
@@ -32,7 +30,7 @@
* @author thomas.diesler(a)jboss.com
* @since 21-Jul-2008
*/
-public interface Property extends SupportingElement
+public interface Property
{
/**
* Supported property types
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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 PropertyBuilder can be used to build a {@link Property} dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface PropertyBuilder
+{
+ /**
+ * Create a {@link Property} with a given name and value
+ */
+ Property newProperty(String name, Object value);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+//$Id$
+
+import org.jboss.bpm.client.ProcessEngine;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+
+/**
+ * A Factory for the {@link PropertyBuilder}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public abstract class PropertyBuilderFactory
+{
+ /** The bean name - jBPMMessageBuilderFactory */
+ public static final String BEAN_NAME = "jBPMPropertyBuilderFactory";
+
+ // Hide the constructor
+ protected PropertyBuilderFactory()
+ {
+ }
+
+ /**
+ * Get a MessageBuilderFactory instance.
+ */
+ @SuppressWarnings("deprecation")
+ public static PropertyBuilderFactory newInstance()
+ {
+ // Make sure the engine is bootstrapped
+ ProcessEngine.locateProcessEngine();
+ Kernel kernel = KernelLocator.getKernel();
+ KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
+ return (PropertyBuilderFactory)entry.getTarget();
+ }
+
+ /**
+ * Get a {@link PropertyBuilder}.
+ */
+ public abstract PropertyBuilder newPropertyBuilder();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+//$Id$
+
+import java.util.List;
+
+
+/**
+ * Property support
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface PropertySupport
+{
+ /**
+ * Get a Property with a given name.
+ */
+ Property getProperty(String name);
+
+ /**
+ * Get a Property value with a given name.
+ */
+ String getPropertyValue(String name);
+
+ /**
+ * Multiple Properties MAY entered for the Message.
+ */
+ List<Property> getProperties();
+
+ /**
+ * Get the list of property names
+ */
+ List<String> getPropertyNames();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,59 @@
+/*
+ * 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.model.Message.Implementation;
+
+
+//$Id$
+
+/**
+ * A Receive Task is a simple Task that is designed to wait for a message to arrive from an external participant
+ * (relative to the Business Process). Once the message has been received, the Task is completed.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ReceiveTask extends Task
+{
+ /**
+ * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be received by the
+ * Task. The Message in this context is equivalent to an in-only message pattern (Web service). One or more
+ * corresponding incoming Message Flows MAY be shown on the diagram. However, the display of the Message Flow is not
+ * required. The Message is applied to all incoming Message Flow, but can arrive for only one of the incoming Message
+ * Flow for a single instance of the Task.
+ */
+ Message getMessageRef();
+
+ /**
+ * Receive Tasks can be defined as the instantiation mechanism for the Process with the Instantiate attribute. This
+ * attribute MAY be set to true if the Task is the first activity after the Start Event or a starting Task if there is
+ * no Start Event (i.e., there are no incoming Sequence Flow). Multiple Tasks MAY have this attribute set to True.
+ */
+ boolean isInstantiate();
+
+ /**
+ * This attribute specifies the technology that will be used to send or receive the message. A Web service is the
+ * default technology.
+ */
+ Implementation getImplementation();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,40 @@
+/*
+ * 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(a)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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+import org.jboss.bpm.model.Message.Implementation;
+
+
+
+//$Id$
+
+/**
+ * A Send Task.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SendTask extends Task
+{
+ /**
+ * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be sent by the Task. The Message in this context is equivalent to an
+ * out-only message pattern (Web service). One or more corresponding outgoing Message Flow MAY be shown on the diagram. However, the display of the Message Flow is
+ * not required. The Message is applied to all outgoing Message Flow and the Message will be sent down all outgoing Message Flow at the completion of a single
+ * instance of the Task.
+ */
+ 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();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,72 @@
+/*
+ * 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 Sequence Flow is used to show the order that activities will be performed in a Process. Each Flow has only one
+ * source and only one target. The source and target must be from the set of the following Flow Objects: Events (Start,
+ * Intermediate, and End), Activities (Task and Sub-Process), and Gateways. During performance (or simulation) of the
+ * process, a Token will leave the source Flow Object, traverse down the Sequence Flow, and enter the target Flow
+ * Object.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SequenceFlow extends ConnectingObject
+{
+ /**
+ * The ConditionType
+ */
+ public enum ConditionType
+ {
+ None, Expression, Default
+ }
+
+ /**
+ * By default, the ConditionType of a Sequence Flow is None. This means that there is no evaluation at runtime to
+ * determine whether or not the Sequence Flow will be used. Once a Token is ready to traverse the Sequence Flow (i.e.,
+ * the Source is an activity that has completed), then the Token will do so. The normal, uncontrolled use of Sequence
+ * Flow, in a sequence of activities, will have a None ConditionType. A None ConditionType MUST NOT be used if the
+ * Source of the Sequence Flow is an Exclusive Data-Based or Inclusive Gateway. The ConditionType attribute MAY be set
+ * to Expression if the Source of the Sequence Flow is a Task, a Sub-Process, or a Gateway of type Exclusive-Data-
+ * Based or Inclusive. If the ConditionType attribute is set to Expression, then a condition marker SHALL be added to
+ * the line if the Sequence Flow is outgoing from an activity. However, a condition indicator MUST NOT be added to the
+ * line if the Sequence Flow is outgoing from a Gateway. An Expression ConditionType MUST NOT be used if the Source of
+ * the Sequence Flow is an Event-Based Exclusive Gateway, a Complex Gateway, a Parallel Gateway, a Start Event, or an
+ * Intermediate Event. In addition, an Expression ConditionType MUST NOT be used if the Sequence Flow is associated
+ * with the Default Gate of a Gateway. The ConditionType attribute MAY be set to Default only if the Source of the
+ * Sequence Flow is an activity or an Exclusive Data-Based Gateway.
+ */
+ ConditionType getConditionType();
+
+ /**
+ * If the ConditionType attribute is set to Expression, then the ConditionExpression attribute MUST be defined as a
+ * valid expression. The expression will be evaluated at runtime. If the result of the evaluation is TRUE, then a
+ * Token will be generated and will traverse the Sequence--Subject to any constraints imposed by a Source that is a
+ * Gateway.
+ */
+ Expression getConditionExpression();
+
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,40 @@
+/*
+ * 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(a)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: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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 FlowObject} support a single incomming {@link ConnectingObject}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SingleInFlowSupport
+{
+ /**
+ * Get the out flow
+ */
+ ConnectingObject getInFlow();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,40 @@
+/*
+ * 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 FlowObject}s support a single outgoing {@link ConnectingObject}s.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SingleOutFlowSupport
+{
+ /**
+ * Get the out flow
+ */
+ SequenceFlow getOutFlow();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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;
+
+import java.util.List;
+
+//$Id$
+
+/**
+ * A Start Event indicates where a particular Process will start. <p/> In terms of Sequence Flow, the Start Event starts
+ * the Flow of the Process, and thus, will not have any incoming Sequence Flow. A Start Event can have a Trigger that
+ * indicates how the Process starts: Message, Timer, Rule, Link, or Multiple.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface StartEvent extends Event, SingleOutFlowSupport
+{
+ /**
+ * Trigger is an attribute that defines the type of trigger expected for a Start Event. Of the set of
+ * EventDetailTypes, only four (4) can be applied to a Start Event: Message, Timer, Conditional, and Signal. If there
+ * is no EventDetail defined, then this is considered a None Start Event and the Event will not have an internal
+ * marker. If there is more than one EventDetail defined, this is considered a Multiple Start Event
+ * and the Event will have the pentagon internal marker.
+ */
+ List<EventDetail> getTrigger();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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$
+
+/**
+ * A Task is an Atomic Activity that is included within a Process.
+ *
+ * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to
+ * perform the Task when it is executed.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Task extends Activity
+{
+ /**
+ * TaskType is an attribute that has a default of None, but MAY be set to Send,
+ * Receive, User, Script, Manual, Reference, or Service. The TaskType will be
+ * impacted by the Message Flow to and/or from the Task, if Message Flow are
+ * used. A TaskType of Receive MUST NOT have an outgoing Message Flow. A
+ * TaskType of Send MUST NOT have an incoming Message Flow. A TaskType of
+ * Script or Manual MUST NOT have an incoming or an outgoing Message Flow.
+ * The TaskType list MAY be extended to include new types.
+ */
+ Constants.TaskType getTaskType();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,14 +21,10 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.ri.model.ActivityBuilder;
-import org.jboss.bpm.ri.model.Task;
+//$Id: $
-//$Id$
-
-
/**
- * The TaskBuilder can be used to build a {@link Task} dynamically.
+ * The TaskBuilder can be used to build a Task dynamically.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,15 +21,12 @@
*/
package org.jboss.bpm.runtime;
-//$Id$
+//$Id: $
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.runtime.Handler;
/**
- * The {@link ProcessEngine} invokes the ExecutionHandler on a
- * {@link FlowObject} to execute user provided business logic.
+ * The ProcessEngine invokes the ExecutionHandler on a
+ * FlowObject to execute user provided business logic.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,9 +24,7 @@
//$Id$
import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.runtime.Handler;
-import org.jboss.bpm.ri.runtime.HandlerSupport;
+import org.jboss.bpm.model.FlowObject;
/**
* The {@link ProcessEngine} invokes the FlowHandler on an {@link HandlerSupport}
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -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.runtime;
+
+import java.io.Serializable;
+
+//$Id$
+
+/**
+ * The generic base for handlers that can be associated with a FlowObject.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface Handler extends Serializable
+{
+
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,44 @@
+/*
+ * 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.runtime;
+
+
+
+//$Id$
+
+/**
+ * A combined interface for execution aspects
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface HandlerSupport
+{
+ /** Get the associated ExecutionHandler */
+ ExecutionHandler getExecutionHandler();
+
+ /** Get the associated SignalHandler */
+ SignalHandler getSignalHandler();
+
+ /** Get the associated FlowHandler */
+ FlowHandler getFlowHandler();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,10 +24,8 @@
//$Id$
import org.jboss.bpm.client.ProcessEngine;
+import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.runtime.Handler;
-import org.jboss.bpm.ri.runtime.HandlerSupport;
/**
* The {@link ProcessEngine} invokes the SignalHandler on an {@link HandlerSupport}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,10 +23,9 @@
//$Id$
-import org.jboss.bpm.ri.model.Activity;
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.OutputSet;
+import org.jboss.bpm.model.SequenceFlow;
/**
* A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime.
@@ -69,20 +68,20 @@
/**
* Get the active {@link InputSet}
- * @return null if the {@link Activity} does not define one
+ * @return null if the Activity does not define one
*/
InputSet getInputSet();
/**
* Get the active {@link OutputSet}
- * @return null if the {@link Activity} does not define one
+ * @return null if the Activity does not define one
*/
OutputSet getOutputSet();
/**
* Create a schallow copy of this Token.
* <p/>
- * The content in the {@link ExecutionContext} will be copied by reference.
+ * The content in the ExecutionContext will be copied by reference.
*/
Token copyToken();
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,11 +21,11 @@
*/
package org.jboss.bpm.runtime;
-//$Id$
+//$Id: $
import java.util.Set;
-import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.model.SequenceFlow;
/**
* The {@link FlowHandler} invokes the TokenExecutor to move {@link Token}s
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -44,15 +44,15 @@
import org.jboss.bpm.client.DialectHandler;
import org.jboss.bpm.client.MessageListener;
import org.jboss.bpm.client.MessageManager;
-import org.jboss.bpm.client.ObjectNameFactory;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.client.internal.EmbeddedBeansDeployer;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.ri.model.BPMNElement;
public abstract class AbstractAPITestCase extends TestCase
{
@@ -225,7 +225,7 @@
public ObjectName getMessageListenerID()
{
- return ObjectNameFactory.create(BPMNElement.ID_DOMAIN, "msgListener", getShortName());
+ return ObjectNameFactory.create(Constants.ID_DOMAIN, "msgListener", getShortName());
}
public List<Message> getMessages()
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -58,40 +58,40 @@
import org.jboss.bpm.dialect.api10.model.JAXBStartEvent;
import org.jboss.bpm.dialect.api10.model.JAXBTask;
import org.jboss.bpm.dialect.api10.model.ObjectFactory;
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.ComplexGateway;
+import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.EndEvent;
+import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.ExclusiveGateway;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.InclusiveGateway;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.IntermediateEvent;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageEventDetail;
+import org.jboss.bpm.model.MessageFlow;
+import org.jboss.bpm.model.OutputSet;
+import org.jboss.bpm.model.ParallelGateway;
+import org.jboss.bpm.model.Participant;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
+import org.jboss.bpm.model.ReceiveTask;
+import org.jboss.bpm.model.SendTask;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.ri.model.Assignment;
-import org.jboss.bpm.ri.model.ComplexGateway;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.EndEvent;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.EventDetail;
-import org.jboss.bpm.ri.model.ExclusiveGateway;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.Gateway;
-import org.jboss.bpm.ri.model.InclusiveGateway;
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.IntermediateEvent;
-import org.jboss.bpm.ri.model.MessageEventDetail;
-import org.jboss.bpm.ri.model.MessageFlow;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.ParallelGateway;
-import org.jboss.bpm.ri.model.Participant;
-import org.jboss.bpm.ri.model.ReceiveTask;
-import org.jboss.bpm.ri.model.SendTask;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SignalEventDetail;
-import org.jboss.bpm.ri.model.StartEvent;
-import org.jboss.bpm.ri.model.Task;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
-import org.jboss.bpm.ri.runtime.HandlerSupport;
+import org.jboss.bpm.model.SignalEventDetail;
+import org.jboss.bpm.model.StartEvent;
+import org.jboss.bpm.model.Task;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
+import org.jboss.bpm.runtime.HandlerSupport;
import org.jboss.bpm.runtime.SignalHandler;
/**
@@ -104,7 +104,7 @@
{
public void marshallProcess(Process proc, Writer out) throws JAXBException, IOException
{
- JAXBProcess jaxbProc = adaptProcess((org.jboss.bpm.ri.model.ProcessModel)proc);
+ JAXBProcess jaxbProc = adaptProcess(proc);
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
@@ -113,7 +113,7 @@
marshaller.marshal(jaxbProc, out);
}
- private JAXBProcess adaptProcess(org.jboss.bpm.ri.model.ProcessModel proc)
+ private JAXBProcess adaptProcess(Process proc)
{
JAXBProcess jaxbProc = new JAXBProcess();
jaxbProc.setName(proc.getName());
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -37,7 +37,6 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.client.DialectHandler;
-import org.jboss.bpm.client.ObjectNameFactory;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.dialect.api10.model.JAXBAssignment;
import org.jboss.bpm.dialect.api10.model.JAXBCancelEventDetail;
@@ -78,12 +77,13 @@
import org.jboss.bpm.model.EventBuilder;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
-import org.jboss.bpm.ri.runtime.Handler;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.runtime.Handler;
/**
* A JAXB unmarshaller for a Process
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -27,16 +27,11 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.ri.model.Activity;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.Gateway;
/**
- * An Assignment, which is used in the definition of attributes for {@link Process},
- * {@link Activity}, {@link Event}, {@link Gateway}, and {@link Gate}.
+ * An Assignment, which is used in the definition of attributes for Process,
+ * Activity, Event, Gateway, and Gate.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
/**
* A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process.
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-19 10:45:22 UTC (rev 1928)
@@ -4,12 +4,12 @@
<bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
<!-- The Builder Factories -->
- <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.model.internal.ProcessBuilderFactoryImpl"/>
- <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.model.internal.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.model.internal.PropertyBuilderFactoryImpl"/>
+ <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
+ <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
+ <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
- <bean name="jBPMProcessEngine" class="org.jboss.bpm.client.internal.ProcessEngineImpl">
+ <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
<property name="processManager"><inject bean="jBPMProcessManager"/></property>
<property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
<property name="signalManager"><inject bean="jBPMSignalManager"/></property>
@@ -17,12 +17,12 @@
</bean>
<!-- The Managers -->
- <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl"/>
- <bean name="jBPMSignalManager" class="org.jboss.bpm.client.internal.SignalManagerImpl"/>
- <bean name="jBPMMessageManager" class="org.jboss.bpm.client.internal.MessageManagerImpl"/>
+ <bean name="jBPMExecutionManager" class="org.jboss.bpm.ri.client.ExecutionManagerImpl"/>
+ <bean name="jBPMSignalManager" class="org.jboss.bpm.ri.client.SignalManagerImpl"/>
+ <bean name="jBPMMessageManager" class="org.jboss.bpm.ri.client.MessageManagerImpl"/>
<!-- The ProcessManager -->
- <bean name="jBPMProcessManager" class="org.jboss.bpm.client.internal.ProcessManagerImpl">
+ <bean name="jBPMProcessManager" class="org.jboss.bpm.ri.client.ProcessManagerImpl">
<property name="dialectRegistry"><inject bean="jBPMDialectRegistry"/></property>
<property name="dialectHandlers">
<map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler">
Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-19 10:45:22 UTC (rev 1928)
@@ -3,11 +3,13 @@
<!-- The KernelLocator -->
<bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
- <!-- The ProcessBuilderFactory -->
- <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.model.internal.ProcessBuilderFactoryImpl"/>
+ <!-- The Builder Factories -->
+ <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
+ <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
+ <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
- <bean name="jBPMProcessEngine" class="org.jboss.bpm.client.internal.ProcessEngineImpl">
+ <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
<property name="processManager"><inject bean="jBPMProcessManager"/></property>
<property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
<property name="signalManager"><inject bean="jBPMSignalManager"/></property>
@@ -15,12 +17,12 @@
</bean>
<!-- The Managers -->
- <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl"/>
- <bean name="jBPMSignalManager" class="org.jboss.bpm.client.internal.SignalManagerImpl"/>
- <bean name="jBPMMessageManager" class="org.jboss.bpm.client.internal.MessageManagerImpl"/>
+ <bean name="jBPMExecutionManager" class="org.jboss.bpm.ri.client.ExecutionManagerImpl"/>
+ <bean name="jBPMSignalManager" class="org.jboss.bpm.ri.client.SignalManagerImpl"/>
+ <bean name="jBPMMessageManager" class="org.jboss.bpm.ri.client.MessageManagerImpl"/>
<!-- The ProcessManager -->
- <bean name="jBPMProcessManager" class="org.jboss.bpm.client.internal.ProcessManagerImpl">
+ <bean name="jBPMProcessManager" class="org.jboss.bpm.ri.client.ProcessManagerImpl">
<property name="dialectRegistry"><inject bean="jBPMDialectRegistry"/></property>
<property name="dialectHandlers">
<map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler">
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,20 +23,25 @@
// $Id$
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.ObjectName;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.Assignment;
import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.model.Constants.AssignTime;
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.ri.model.Assignment;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.StartEvent;
import org.jboss.bpm.ri.model.impl.ExpressionEvaluator;
import org.jboss.bpm.ri.model.impl.ProcessImpl;
import org.jboss.bpm.ri.model.impl.RuntimeProcessImpl;
@@ -44,8 +49,8 @@
import org.jboss.bpm.ri.model.impl.TokenExecutorImpl;
import org.jboss.bpm.ri.runtime.DelegatingToken;
import org.jboss.bpm.ri.runtime.MutableToken;
-import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.ri.runtime.TokenImpl;
+import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
@@ -62,6 +67,9 @@
// provide logging
private static final Log log = LogFactory.getLog(ExecutionManager.class);
+ // The map of active runtime processes
+ private Map<ObjectName, RuntimeProcess> runtimeProcesses = new HashMap<ObjectName, RuntimeProcess>();
+
@Override
public void startProcess(final Process proc, final Attachments att)
{
@@ -143,6 +151,26 @@
}
}
+ /**
+ * Get a {@link RuntimeProcess} for a given processID
+ * @return null if there is no such process
+ */
+ public RuntimeProcess getRuntimeProcess(ObjectName procID)
+ {
+ return runtimeProcesses.get(procID);
+ }
+
+ protected void addRuntimeProcess(RuntimeProcess rtProc)
+ {
+ ObjectName procID = rtProc.getProcess().getID();
+ runtimeProcesses.put(procID, rtProc);
+ }
+
+ protected void removeRuntimeProcess(RuntimeProcess rtProc)
+ {
+ runtimeProcesses.remove(rtProc.getProcess().getID());
+ }
+
class RunnableProcess implements Runnable
{
RuntimeProcess rtProc;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -30,11 +30,11 @@
import org.jboss.bpm.client.MessageListener;
import org.jboss.bpm.client.MessageManager;
import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.Task;
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.ri.model.impl.ProcessImpl;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -25,15 +25,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.Constants;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.ri.model.impl.FlowObjectImpl;
import org.jboss.bpm.ri.model.impl.ProcessImpl;
import org.jboss.bpm.ri.runtime.DelegatingToken;
-import org.jboss.bpm.ri.runtime.HandlerSupport;
import org.jboss.bpm.ri.runtime.MutableToken;
-import org.jboss.bpm.ri.runtime.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
+import org.jboss.bpm.runtime.HandlerSupport;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,10 +23,10 @@
//$Id$
+import org.jboss.bpm.model.Activity;
+import org.jboss.bpm.model.ActivityBuilder;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.ri.model.Activity;
-import org.jboss.bpm.ri.model.ActivityBuilder;
/**
* The ActivityBuilder can be used to build an {@link Activity} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -29,15 +29,14 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
+import org.jboss.bpm.model.Activity;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.MutablePropertySupport;
+import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.Activity;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.runtime.MutablePropertySupport;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.ri.runtime.MutableToken;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
@@ -294,7 +293,7 @@
}
@Override
- protected void initialize(ProcessModel proc)
+ protected void initialize(ProcessImpl proc)
{
super.initialize(proc);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,10 +23,10 @@
//$Id$
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.ri.model.Assignment;
-import org.jboss.bpm.ri.model.Expression;
/**
* An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -25,13 +25,14 @@
import javax.management.ObjectName;
-import org.jboss.bpm.client.ObjectNameFactory;
-import org.jboss.bpm.ri.model.BPMNElement;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.Gateway;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.Task;
+import org.jboss.bpm.model.AbstractElement;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.ObjectNameFactory;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Task;
import org.jboss.util.id.UID;
/**
@@ -40,7 +41,7 @@
* @since 08-Jul-2008
*/
@SuppressWarnings("serial")
-public class BPMNElementImpl implements BPMNElement
+public class BPMNElementImpl implements AbstractElement
{
private ObjectName id;
@@ -52,22 +53,22 @@
/**
* Initialize the flow object
*/
- protected void initialize(ProcessModel proc)
+ protected void initialize(ProcessImpl proc)
{
assignElementID();
}
protected void assignElementID()
{
- StringBuilder str = new StringBuilder(ID_DOMAIN + ":");
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
if (this instanceof Event)
{
Event event = (Event)this;
str.append("type=Event,name=" + event.getName());
}
- else if (this instanceof ProcessModel)
+ else if (this instanceof Process)
{
- ProcessModel proc = (ProcessModel)this;
+ Process proc = (Process)this;
str.append("type=Process,name=" + proc.getName());
}
else if (this instanceof Task)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,9 +24,9 @@
//$Id$
import org.jboss.bpm.NotImplementedException;
+import org.jboss.bpm.model.ComplexGateway;
+import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.ri.model.ComplexGateway;
-import org.jboss.bpm.ri.model.Expression;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -30,13 +30,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.EndEvent;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.MessageEventDetail;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.EventDetailType;
-import org.jboss.bpm.ri.model.EndEvent;
-import org.jboss.bpm.ri.model.EventDetail;
-import org.jboss.bpm.ri.model.MessageEventDetail;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -135,7 +134,7 @@
}
@Override
- protected void initialize(ProcessModel proc)
+ protected void initialize(ProcessImpl proc)
{
super.initialize(proc);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,7 +21,8 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.model.Entity;
+import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Entity;
//$Id$
@@ -42,9 +43,9 @@
this.entityRef = this;
}
- public ParticipantType getParticipantType()
+ public Constants.ParticipantType getParticipantType()
{
- return ParticipantType.Entity;
+ return Constants.ParticipantType.Entity;
}
public String getName()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,15 +24,15 @@
//$Id$
import org.jboss.bpm.NotImplementedException;
+import org.jboss.bpm.model.EndEvent;
+import org.jboss.bpm.model.Event;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.IntermediateEvent;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.model.Constants.EventDetailType;
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.ri.model.EndEvent;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.EventDetail;
-import org.jboss.bpm.ri.model.IntermediateEvent;
-import org.jboss.bpm.ri.model.StartEvent;
/**
* The EventBuilder can be used to build an {@link Event} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventDetailImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventDetailImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.EventDetail;
+import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.EventDetail;
/**
* The base of all supported event details.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.model.Event;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayDataBasedImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayDataBasedImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayDataBasedImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.ri.model.ExclusiveGatewayDataBased;
+import org.jboss.bpm.ri.model.spec.ExclusiveGatewayDataBased;
/**
* A point in the workflow process where, based on a decision or workflow control data, one of several branches is chosen.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -28,14 +28,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.ExclusiveGateway;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.ExclusiveGateway;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -26,8 +26,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.ri.model.Expression;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.Attachments.Key;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,8 +23,8 @@
//$Id$
+import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.ri.model.Expression;
/**
* An Expression, which is used in the definition of attributes for @{link StartEvent},
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.FlowObject;
/**
* A Flow is a graphical line connecting two objects in a BPD. There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -27,18 +27,18 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NameNotUniqueException;
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.SingleInFlowSupport;
+import org.jboss.bpm.model.SingleOutFlowSupport;
import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.ri.model.Assignment;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.Gateway;
-import org.jboss.bpm.ri.model.MultipleInFlowSupport;
-import org.jboss.bpm.ri.model.MultipleOutFlowSupport;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.SingleInFlowSupport;
-import org.jboss.bpm.ri.model.SingleOutFlowSupport;
+import org.jboss.bpm.ri.model.spec.MultipleInFlowSupport;
+import org.jboss.bpm.ri.model.spec.MultipleOutFlowSupport;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
@@ -58,7 +58,7 @@
public abstract class FlowObjectImpl extends GraphicalElementImpl implements FlowObject, HandlerSetterSupport
{
private String name;
- private ProcessModel proc;
+ private ProcessImpl proc;
private FlowHandler flowHandler;
private SignalHandler signalHandler;
private ExecutionHandler executionHandler;
@@ -69,7 +69,7 @@
this.name = name;
}
- public ProcessModel getProcess()
+ public Process getProcess()
{
return proc;
}
@@ -204,7 +204,7 @@
}
@Override
- protected void initialize(ProcessModel proc)
+ protected void initialize(ProcessImpl proc)
{
super.initialize(proc);
this.proc = proc;
@@ -267,7 +267,7 @@
throw new InvalidProcessException("Unconnected flow object: " + this);
}
- private void initFlow(ProcessModel proc, SequenceFlowImpl flow)
+ private void initFlow(Process proc, SequenceFlowImpl flow)
{
if (flow != null)
{
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GateImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GateImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GateImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -26,12 +26,12 @@
import java.util.List;
import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.ri.model.Assignment;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.Gateway;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.model.Assignment;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.SequenceFlow;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
/**
* A {@link Gate} associated with a {@link Gateway}.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,11 +23,11 @@
//$Id$
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.Gateway;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
/**
* The GatewayBuilder can be used to build a {@link Gateway} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -30,12 +30,12 @@
import java.util.Map;
import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.Gateway;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.ri.model.GraphicalElement;
+import org.jboss.bpm.model.GraphicalElement;
/**
*
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.ri.runtime.Handler;
+import org.jboss.bpm.runtime.Handler;
/**
* Base implementation of all handlers
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerSetterSupport.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerSetterSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,9 +21,9 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.runtime.HandlerSupport;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
+import org.jboss.bpm.runtime.HandlerSupport;
import org.jboss.bpm.runtime.SignalHandler;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -30,14 +30,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.InclusiveGateway;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.GraphicalElement;
-import org.jboss.bpm.ri.model.InclusiveGateway;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -71,7 +71,7 @@
@Override
protected void defaultFlowHandler(TokenExecutor tokenExecutor, Token token)
{
- GraphicalElement sourceRef = token.getFlow().getSourceRef();
+ FlowObject sourceRef = token.getFlow().getSourceRef();
log.debug("Propagate token comming from: " + sourceRef);
// Get the applicable gates
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -29,10 +29,10 @@
import java.util.List;
import java.util.Map;
+import org.jboss.bpm.model.ArtifactInput;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.MutablePropertySupport;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.ArtifactInput;
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.runtime.MutablePropertySupport;
/**
* An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -28,11 +28,11 @@
import java.util.List;
import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.IntermediateEvent;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.EventDetail;
-import org.jboss.bpm.ri.model.IntermediateEvent;
-import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,10 +23,10 @@
//$Id$
+import org.jboss.bpm.model.Event;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageEventDetail;
import org.jboss.bpm.model.Constants.EventDetailType;
-import org.jboss.bpm.ri.model.Event;
-import org.jboss.bpm.ri.model.MessageEventDetail;
/**
* The message event detail
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageFlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageFlowImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageFlowImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -25,7 +25,7 @@
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.ri.model.MessageFlow;
+import org.jboss.bpm.model.MessageFlow;
/**
* A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to send and receive them.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -27,11 +27,11 @@
import javax.management.ObjectName;
+import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MutablePropertySupport;
+import org.jboss.bpm.model.Participant;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.Participant;
-import org.jboss.bpm.ri.runtime.MutablePropertySupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -26,14 +26,14 @@
import javax.management.ObjectName;
import org.jboss.bpm.client.MessageManager;
-import org.jboss.bpm.client.ObjectNameFactory;
+import org.jboss.bpm.model.Entity;
+import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.MessageBuilderFactory;
+import org.jboss.bpm.model.ObjectNameFactory;
+import org.jboss.bpm.model.Participant;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.Entity;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.Participant;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,9 +21,9 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.MultipleInFlowSupport;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.ri.model.spec.MultipleInFlowSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,9 +21,9 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.MultipleOutFlowSupport;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.ri.model.spec.MultipleOutFlowSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -29,10 +29,10 @@
import java.util.List;
import java.util.Map;
+import org.jboss.bpm.model.ArtifactOutput;
+import org.jboss.bpm.model.MutablePropertySupport;
+import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.ArtifactOutput;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.runtime.MutablePropertySupport;
/**
* An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -28,11 +28,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Gate;
+import org.jboss.bpm.model.ParallelGateway;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.Gate;
-import org.jboss.bpm.ri.model.ParallelGateway;
-import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.ri.runtime.TokenImpl;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,9 +21,9 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.model.Entity;
-import org.jboss.bpm.ri.model.Participant;
-import org.jboss.bpm.ri.model.Role;
+import org.jboss.bpm.model.Entity;
+import org.jboss.bpm.model.Participant;
+import org.jboss.bpm.model.Role;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -25,6 +25,8 @@
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
@@ -36,8 +38,6 @@
import org.jboss.bpm.model.Constants.ExpressionLanguage;
import org.jboss.bpm.model.Constants.GatewayType;
import org.jboss.bpm.model.Constants.TaskType;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.Gateway;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.SignalHandler;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -40,19 +40,18 @@
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.ProcessTimeoutException;
import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Assignment;
import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.EndEvent;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.InputSet;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MutablePropertySupport;
+import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
+import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.ri.client.ProcessManagerImpl;
-import org.jboss.bpm.ri.model.Assignment;
-import org.jboss.bpm.ri.model.EndEvent;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.StartEvent;
-import org.jboss.bpm.ri.runtime.MutablePropertySupport;
import org.jboss.bpm.runtime.Attachments;
/**
@@ -62,7 +61,7 @@
* @since 08-Jul-2008
*/
@SuppressWarnings("serial")
-public class ProcessImpl extends SupportingElementImpl implements ProcessModel, Process, MutablePropertySupport
+public class ProcessImpl extends SupportingElementImpl implements Process, MutablePropertySupport
{
// provide logging
private static final Log log = LogFactory.getLog(ProcessImpl.class);
@@ -187,7 +186,7 @@
/**
* A naive copy implementation that relies on serialization
*/
- public ProcessModel copyProcess()
+ public Process copyProcess()
{
try
{
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.bpm.ri.model.PropertyBuilder;
-import org.jboss.bpm.ri.model.PropertyBuilderFactory;
+import org.jboss.bpm.model.PropertyBuilder;
+import org.jboss.bpm.model.PropertyBuilderFactory;
/**
* A Factory for the {@link PropertyBuilder}.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.PropertyBuilder;
+import org.jboss.bpm.model.PropertyBuilder;
/**
* A PropertyBuilder can be used to build a {@link Property} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,8 +23,8 @@
//$Id$
+import org.jboss.bpm.model.Expression;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.Expression;
/**
* A Property, which is used in the definition of attributes for a Process and common activity attributes
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -31,10 +31,9 @@
import org.jboss.bpm.client.MessageListener;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Property;
+import org.jboss.bpm.model.ReceiveTask;
import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.ReceiveTask;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -162,14 +161,13 @@
}
@Override
- protected void initialize(ProcessModel proc)
+ protected void initialize(ProcessImpl proc)
{
super.initialize(proc);
if (messageRef == null)
throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered");
- ProcessImpl procImpl = (ProcessImpl)proc;
- procImpl.initializeMessageRef(messageRef);
+ proc.initializeMessageRef(messageRef);
}
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,7 +21,8 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.model.Role;
+import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.Role;
//$Id$
@@ -42,9 +43,9 @@
this.roleRef = this;
}
- public ParticipantType getParticipantType()
+ public Constants.ParticipantType getParticipantType()
{
- return ParticipantType.Role;
+ return Constants.ParticipantType.Role;
}
public String getName()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.ri.runtime.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
import org.jboss.bpm.runtime.TokenExecutor;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -26,10 +26,9 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.SendTask;
import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.SendTask;
import org.jboss.bpm.runtime.Token;
/**
@@ -81,15 +80,14 @@
}
@Override
- protected void initialize(ProcessModel proc)
+ protected void initialize(ProcessImpl proc)
{
super.initialize(proc);
if (messageRef == null)
throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered");
- ProcessImpl procImpl = (ProcessImpl)proc;
- procImpl.initializeMessageRef(messageRef);
+ proc.initializeMessageRef(messageRef);
if (messageRef.getToRef() == null)
throw new IllegalArgumentException("Message targetID cannot be null for: " + this);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,9 +23,9 @@
//$Id$
-import org.jboss.bpm.ri.model.Expression;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.model.Expression;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.SequenceFlow;
/**
* A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -24,8 +24,8 @@
//$Id$
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.SignalEventDetail;
import org.jboss.bpm.model.Constants.EventDetailType;
-import org.jboss.bpm.ri.model.SignalEventDetail;
/**
* The Signal event detail
Deleted: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.ri.model.impl;
-
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SingleInFlowSupport;
-
-
-//$Id$
-
-/**
- * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface SingleInFlowSetterSupport extends SingleInFlowSupport
-{
- /**
- * Set the incomming Flow
- */
- void setInFlow(SequenceFlow flow);
-}
Added: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.model.impl;
+
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.SequenceFlow;
+import org.jboss.bpm.model.SingleInFlowSupport;
+
+
+
+//$Id$
+
+/**
+ * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SingleInFlowSetterSupport extends SingleInFlowSupport
+{
+ /**
+ * Set the incomming Flow
+ */
+ void setInFlow(SequenceFlow flow);
+}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleOutFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleOutFlowSetterSupport.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleOutFlowSetterSupport.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -21,10 +21,10 @@
*/
package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SingleOutFlowSupport;
+import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.SequenceFlow;
+import org.jboss.bpm.model.SingleOutFlowSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -33,14 +33,14 @@
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.ri.model.EventDetail;
-import org.jboss.bpm.ri.model.ProcessModel;
-import org.jboss.bpm.ri.model.SequenceFlow;
-import org.jboss.bpm.ri.model.SignalEventDetail;
-import org.jboss.bpm.ri.model.StartEvent;
-import org.jboss.bpm.ri.runtime.RuntimeProcess;
+import org.jboss.bpm.model.SignalEventDetail;
+import org.jboss.bpm.model.StartEvent;
+import org.jboss.bpm.ri.client.ExecutionManagerImpl;
import org.jboss.bpm.ri.runtime.TokenImpl;
+import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -118,7 +118,7 @@
}
@Override
- protected void initialize(final ProcessModel proc)
+ protected void initialize(final ProcessImpl proc)
{
super.initialize(proc);
@@ -143,7 +143,7 @@
if (proc.getProcessStatus() == Constants.ProcessStatus.Active)
{
log.debug("Start process from signal: " + signal);
- ExecutionManager exManager = ExecutionManager.locateExecutionManager();
+ ExecutionManagerImpl exManager = (ExecutionManagerImpl)ExecutionManager.locateExecutionManager();
RuntimeProcess rtProc = exManager.getRuntimeProcess(start.getProcess().getID());
TokenExecutor tokenExecutor = rtProc.getTokenExecutor();
TokenImpl token = new TokenImpl(null);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -25,7 +25,7 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.ri.model.SubProcess;
+import org.jboss.bpm.ri.model.spec.SubProcess;
import org.jboss.bpm.runtime.SignalHandler;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.ri.model.SupportingElement;
+import org.jboss.bpm.ri.model.spec.SupportingElement;
/**
*
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskBuilderImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskBuilderImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,8 +23,8 @@
//$Id$
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.ri.model.Task;
/**
* The TaskBuilder can be used to dynamically build {@link Task}.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,8 +23,8 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.Task;
import org.jboss.bpm.model.Constants.TaskType;
-import org.jboss.bpm.ri.model.Task;
import org.jboss.bpm.runtime.SignalHandler;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -33,13 +33,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.ri.client.RunnableToken;
-import org.jboss.bpm.ri.model.ConnectingObject;
-import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.ri.runtime.MutableToken;
-import org.jboss.bpm.ri.runtime.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.spec.RuntimeProcess;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -28,14 +28,14 @@
import java.util.HashMap;
import java.util.Map;
+import org.jboss.bpm.model.Activity;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.ri.model.Activity;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.ProcessModel;
import org.jboss.bpm.runtime.ExecutionContext;
/**
- * An ExecutionContext that delegates to the current {@link Activity} or {@link ProcessModel} for property rerieval.
+ * An ExecutionContext that delegates to the current {@link Activity} or {@link Process} for property rerieval.
*
* @author Thomas.Diesler(a)jboss.com
* @since 15-Aug-2008
@@ -46,14 +46,14 @@
private ExecutionContext delegate;
private String activityPrefix;
private String procPrefix;
- private ProcessModel proc;
+ private Process proc;
DelegatingExecutionContext(FlowObject flowObject, ExecutionContext delegate)
{
this.flowObject = flowObject;
this.delegate = delegate;
- proc = flowObject.getProcess();
+ proc = (Process)flowObject.getProcess();
procPrefix = proc.getName() + ".";
activityPrefix = procPrefix + flowObject.getName() + ".";
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,11 +23,11 @@
//$Id$
-import org.jboss.bpm.ri.model.Activity;
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.model.Activity;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.OutputSet;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,9 +23,9 @@
//$Id$
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.OutputSet;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.runtime.Token;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,10 +23,10 @@
//$Id$
-import org.jboss.bpm.ri.model.FlowObject;
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.OutputSet;
+import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,10 +23,10 @@
// $Id$
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.PropertyBuilder;
-import org.jboss.bpm.ri.model.PropertyBuilderFactory;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.OutputSet;
+import org.jboss.bpm.model.PropertyBuilder;
+import org.jboss.bpm.model.PropertyBuilderFactory;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -23,10 +23,10 @@
// $Id$
-import org.jboss.bpm.ri.model.InputSet;
-import org.jboss.bpm.ri.model.OutputSet;
-import org.jboss.bpm.ri.model.PropertyBuilder;
-import org.jboss.bpm.ri.model.PropertyBuilderFactory;
+import org.jboss.bpm.model.InputSet;
+import org.jboss.bpm.model.OutputSet;
+import org.jboss.bpm.model.PropertyBuilder;
+import org.jboss.bpm.model.PropertyBuilderFactory;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -8,13 +8,13 @@
import org.jboss.bpm.client.MessageListener;
import org.jboss.bpm.client.MessageManager;
-import org.jboss.bpm.client.ObjectNameFactory;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.MessageBuilderFactory;
+import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.samples.airticket.AirticketProcessBuilder;
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-19 10:45:22 UTC (rev 1928)
@@ -4,12 +4,12 @@
<bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
<!-- The Builder Factories -->
- <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.model.internal.ProcessBuilderFactoryImpl"/>
- <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.model.internal.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.model.internal.PropertyBuilderFactoryImpl"/>
+ <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
+ <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
+ <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
- <bean name="jBPMProcessEngine" class="org.jboss.bpm.client.internal.ProcessEngineImpl">
+ <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
<property name="processManager"><inject bean="jBPMProcessManager"/></property>
<property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
<property name="signalManager"><inject bean="jBPMSignalManager"/></property>
@@ -17,12 +17,12 @@
</bean>
<!-- The Managers -->
- <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl"/>
- <bean name="jBPMSignalManager" class="org.jboss.bpm.client.internal.SignalManagerImpl"/>
- <bean name="jBPMMessageManager" class="org.jboss.bpm.client.internal.MessageManagerImpl"/>
+ <bean name="jBPMExecutionManager" class="org.jboss.bpm.ri.client.ExecutionManagerImpl"/>
+ <bean name="jBPMSignalManager" class="org.jboss.bpm.ri.client.SignalManagerImpl"/>
+ <bean name="jBPMMessageManager" class="org.jboss.bpm.ri.client.MessageManagerImpl"/>
<!-- The ProcessManager -->
- <bean name="jBPMProcessManager" class="org.jboss.bpm.client.internal.ProcessManagerImpl">
+ <bean name="jBPMProcessManager" class="org.jboss.bpm.ri.client.ProcessManagerImpl">
<property name="dialectRegistry"><inject bean="jBPMDialectRegistry"/></property>
<property name="dialectHandlers">
<map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler">
@@ -44,4 +44,4 @@
</property>
</bean>
-</deployment>
\ No newline at end of file
+</deployment>
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -29,10 +29,10 @@
import org.jboss.bpm.client.MessageListener;
import org.jboss.bpm.client.MessageManager;
-import org.jboss.bpm.client.ObjectNameFactory;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.MessageBuilderFactory;
+import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.test.DefaultEngineTestCase;
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java 2008-08-19 10:45:22 UTC (rev 1928)
@@ -30,8 +30,8 @@
import javax.management.ObjectName;
import org.jboss.bpm.client.DialectHandler;
-import org.jboss.bpm.client.ObjectNameFactory;
import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.test.DefaultEngineTestCase;
import org.jboss.util.xml.DOMUtils;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-19 10:19:38 UTC (rev 1927)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-19 10:45:22 UTC (rev 1928)
@@ -4,12 +4,12 @@
<bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
<!-- The Builder Factories -->
- <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.model.internal.ProcessBuilderFactoryImpl"/>
- <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.model.internal.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.model.internal.PropertyBuilderFactoryImpl"/>
+ <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
+ <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
+ <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
- <bean name="jBPMProcessEngine" class="org.jboss.bpm.client.internal.ProcessEngineImpl">
+ <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
<property name="processManager"><inject bean="jBPMProcessManager"/></property>
<property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
<property name="signalManager"><inject bean="jBPMSignalManager"/></property>
@@ -17,12 +17,12 @@
</bean>
<!-- The Managers -->
- <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl"/>
- <bean name="jBPMSignalManager" class="org.jboss.bpm.client.internal.SignalManagerImpl"/>
- <bean name="jBPMMessageManager" class="org.jboss.bpm.client.internal.MessageManagerImpl"/>
+ <bean name="jBPMExecutionManager" class="org.jboss.bpm.ri.client.ExecutionManagerImpl"/>
+ <bean name="jBPMSignalManager" class="org.jboss.bpm.ri.client.SignalManagerImpl"/>
+ <bean name="jBPMMessageManager" class="org.jboss.bpm.ri.client.MessageManagerImpl"/>
<!-- The ProcessManager -->
- <bean name="jBPMProcessManager" class="org.jboss.bpm.client.internal.ProcessManagerImpl">
+ <bean name="jBPMProcessManager" class="org.jboss.bpm.ri.client.ProcessManagerImpl">
<property name="dialectRegistry"><inject bean="jBPMDialectRegistry"/></property>
<property name="dialectHandlers">
<map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler">
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1927 - in jbpm3/trunk/modules/gwt-console/war: src/main/java/org/jboss/bpm/console/client and 5 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-08-19 06:19:38 -0400 (Tue, 19 Aug 2008)
New Revision: 1927
Added:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/GChartExample.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java
Removed:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java
Modified:
jbpm3/trunk/modules/gwt-console/war/pom.xml
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/processSample.jpg
Log:
Layout enhancements. Added first gchart samples
Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-08-19 10:19:38 UTC (rev 1927)
@@ -30,6 +30,10 @@
<groupId>com.gwtext</groupId>
<artifactId>gwtext</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gchart</artifactId>
+ </dependency>
</dependencies>
<!-- Plugins -->
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -32,6 +32,7 @@
import com.gwtext.client.widgets.layout.FitLayout;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
import org.jboss.bpm.console.client.widgets.EditorView;
+import org.jboss.bpm.console.client.widgets.UIConstants;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -50,12 +51,12 @@
public ConsoleView()
{
mainPanel.setBorder(false);
- mainPanel.setPaddings(15);
+ mainPanel.setPaddings(5); // outer most padding
mainPanel.setLayout(new FitLayout());
initWidget( mainPanel );
- borderPanel.setLayout(new BorderLayout());
+ borderPanel.setLayout(new BorderLayout());
// ------------------------------------------
@@ -67,8 +68,8 @@
mainMenu = new MainMenu(this);
BorderLayoutData menuData = new BorderLayoutData(RegionPosition.WEST);
menuData.setSplit(false);
- menuData.setMinSize(175);
- menuData.setMaxSize(400);
+ menuData.setMinSize(UIConstants.MAIN_MENU_MIN);
+ menuData.setMaxSize(UIConstants.MAIN_MENU_MAX);
menuData.setMargins(new Margins(0, 5, 0, 0));
borderPanel.add(mainMenu, menuData);
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -41,7 +41,8 @@
this.setResizeTabs(true);
this.setMinTabWidth(115);
this.setTabWidth(135);
- this.setEnableTabScroll(true);
+ this.setEnableTabScroll(true);
+ this.setAutoScroll(true);
this.setActiveTab(0);
}
@@ -50,7 +51,9 @@
tab.setAutoScroll(true);
tab.setTitle(editorView.getTitle());
tab.setClosable(closeable);
- tab.setLayout(new FitLayout());
+ tab.setBorder(false);
+ tab.setFrame(false);
+ tab.setHideBorders(true);
this.add(tab);
return tab;
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -29,17 +29,27 @@
*/
public class MockProcessDefinitionDAO implements ProcessDefinitionDAO
{
- final static List defs = new ArrayList();
+ public final static List defs = new ArrayList();
static
{
defs.add( new ProcessDefinition(1, "OrderProcess", "1"));
defs.add( new ProcessDefinition(2, "VacationManagement", "1"));
defs.add( new ProcessDefinition(3, "New Employee walkthrough", "1"));
- defs.add( new ProcessDefinition(4, "Source code review", "1"));
+ defs.add( new ProcessDefinition(4, "Source code review", "2"));
+ defs.add( new ProcessDefinition(5, "Loan application", "1"));
+ defs.add( new ProcessDefinition(6, "Expense report review", "4"));
+ defs.add( new ProcessDefinition(7, "Expense claim", "4"));
+ defs.add( new ProcessDefinition(8, "Credit approval", "4"));
+
}
public List getAllProcessDefinitions()
{
return defs;
}
+
+ public List getMostActiveProcesses()
+ {
+ return defs;
+ }
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -35,9 +35,9 @@
static
{
instances.add( new ProcessInstance(2, -1, "Running", new Date(), null));
- instances.add( new ProcessInstance(3, -1, "Stopped", new Date(), null));
- instances.add( new ProcessInstance(4, -1, "Ended", new Date(System.currentTimeMillis()-(1000*60*60)), null));
- instances.add( new ProcessInstance(5, -1, "Suspended", new Date(System.currentTimeMillis()-(1000*60*90)), null));
+ instances.add( new ProcessInstance(3, -1, "Stopped", new Date(System.currentTimeMillis()-(1000*60*120)), new Date(System.currentTimeMillis()-(1000*60*12))));
+ instances.add( new ProcessInstance(4, -1, "Ended", new Date(System.currentTimeMillis()-(1000*60*60)), new Date(System.currentTimeMillis()-(1000*60*24))));
+ instances.add( new ProcessInstance(5, -1, "Suspended", new Date(System.currentTimeMillis()-(1000*60*90)), new Date(System.currentTimeMillis()-(1000*60*17))));
instances.add( new ProcessInstance(6, -1, "Running", new Date(), null));
instances.add( new ProcessInstance(7, -1, "Running", new Date(), null));
}
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/GChartExample.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/GChartExample.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/GChartExample.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.console.client.process;
+
+import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Button;
+import com.googlecode.gchart.client.GChart;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class GChartExample extends GChart
+{
+ final String[] groupLabels = { "O Seven", "Owe Ate", "Oh Nein!"};
+
+ final String[] barLabels = { "Q1", "Q2", "Q3", "Q4"};
+
+ final String[] barColors = { "red", "blue", "green", "silver"};
+
+ final int MAX_REVENUE = 1000;
+ final int WIDTH = 300;
+ final int HEIGHT = 200;
+
+ //Button updateButton = new Button( "Update");
+
+ public GChartExample() {
+ setChartSize(WIDTH, HEIGHT);
+ setChartTitle("<b><big><big>" + "Simulated Quarterly Revenues" +"</big></big><br> </b>");
+
+ /*updateButton.addClickListener(
+ new ClickListener()
+ {
+ public void onClick(Widget w) {
+ for (int iCurve=0; iCurve < getNCurves(); iCurve++)
+ {
+ for (int iPoint=0; iPoint < getCurve(iCurve).getNPoints(); iPoint++)
+ {
+ getCurve(iCurve).getPoint(iPoint).setY( Math.random()*MAX_REVENUE);
+ }
+ }
+ update();
+ updateButton.setFocus(true);
+ }
+ }
+ );
+
+ setChartFootnotes(updateButton);*/
+
+ for (int iCurve=0; iCurve < barLabels.length; iCurve++)
+ {
+ addCurve(); // one curve per quarter
+ getCurve().getSymbol().setSymbolType(SymbolType.VBAR_SOUTHWEST);
+ getCurve().getSymbol().setBackgroundColor(barColors[iCurve]);
+ getCurve().setLegendLabel(barLabels[iCurve]);
+ getCurve().getSymbol().setHovertextTemplate(
+ barLabels[iCurve] + " revenue=${y}");
+ getCurve().getSymbol().setModelWidth(1.02);
+ getCurve().getSymbol().setBorderColor("black");
+ getCurve().getSymbol().setBorderWidth(1);
+ for (int jGroup=0; jGroup < groupLabels.length; jGroup++) {
+ // the '+1' creates a bar-sized gap between groups
+ getCurve().addPoint(1+iCurve+jGroup*(barLabels.length+1),
+ Math.random()*MAX_REVENUE);
+ getCurve().getPoint().setAnnotationText(barLabels[iCurve]);
+ getCurve().getPoint().setAnnotationLocation(
+ AnnotationLocation.NORTH);
+ }
+ }
+
+ for (int i = 0; i < groupLabels.length; i++)
+ {
+ // formula centers tick-label horizontally on each group
+ getXAxis().addTick(
+ barLabels.length/2. + i*(barLabels.length+1),
+ groupLabels[i]
+ );
+ getXAxis().setTickLabelFontSize(20);
+ }
+ getXAxis().setTickLength(6); // small tick-like gap...
+ getXAxis().setTickThickness(0); // but with invisible ticks
+ getXAxis().setAxisMin(0); // keeps first bar on chart
+
+ getYAxis().setAxisMin(0); // Based on sim revenue range
+ getYAxis().setAxisMax(MAX_REVENUE); // of 0 to MAX_REVENUE.
+ getYAxis().setTickCount(11);
+ getYAxis().setHasGridlines(true);
+ getYAxis().setTickLabelFormat("$#,###");
+ }
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/GChartExample.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -65,7 +65,7 @@
new ColumnConfig[]
{
new ColumnConfig("Process ID", "processId", 75, true),
- new ColumnConfig("Name", "name", 200, true, null, "name"),
+ new ColumnConfig("Name", "name", 300, true, null, "name"),
new ColumnConfig("Version", "version", 75, true)
}
);
@@ -78,9 +78,8 @@
store.load();
grid.setStore(store);
-
grid.setAutoExpandColumn("name");
- grid.setAutoExpandMin(200);
+ grid.setAutoExpandMin(300);
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -21,6 +21,7 @@
*/
package org.jboss.bpm.console.client.process;
+import com.gwtext.client.widgets.layout.ColumnLayout;
import org.jboss.bpm.console.client.ConsoleView;
import org.jboss.bpm.console.client.widgets.EditorView;
@@ -41,8 +42,46 @@
this.setId(ID);
this.view = view;
+
+ // ----------------------------------
+
+ //this.setLayout( new ColumnLayout() );
+
+ // stats
+ /*Map barValues = new HashMap();
+ barValues.put("Order Process", new Double(12.00));
+ barValues.put("VacationManagement", new Double(24.00));
+ barValues.put("New Employee walkthrough", new Double(5.00));
+ barValues.put("Source code review", new Double(8.00));
+ barValues.put("Loan application", new Double(54.00));
+ barValues.put("Expense report review", new Double(10.00));
+
+ BarChart chart = new BarChart(320,240, "Most used processes", "process", barValues );
+
+ Panel chartPanel = new Panel("Most active process definitions");
+ chartPanel.setPaddings(15);
+ chartPanel.setHeader(false);
+ chartPanel.setBorder(false);
+ chartPanel.setWidth(UIConstants.EDITOR_PANEL_WIDTH);
+ chartPanel.add( chart );
+ this.add(chartPanel);
+ chart.update();*/
+
+ // definitions
processDefinitions = new ProcessDefinitionList("Process Definitions", view);
+
+ // ----------------------------------
+
+ /*PaddedPanel rightPanel = new PaddedPanel(processDefinitions, 5, 5, 0, 5);
+ PaddedPanel leftPanel = new PaddedPanel( new Panel("Metrics", 200, 150) , 5, 5, 0, 5);
+
+ // ----------------------------------
+
+ this.add(rightPanel, new ColumnLayoutData(0.7) );
+ this.add(leftPanel , new ColumnLayoutData(0.3) );
+ */
+
this.add(processDefinitions);
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -21,8 +21,10 @@
*/
package org.jboss.bpm.console.client.process;
+import com.gwtext.client.widgets.PaddedPanel;
import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.layout.ColumnLayout;
+import com.gwtext.client.widgets.layout.ColumnLayoutData;
import org.jboss.bpm.console.client.ConsoleView;
import org.jboss.bpm.console.client.model.ProcessDefinition;
import org.jboss.bpm.console.client.model.ProcessInstance;
@@ -52,17 +54,25 @@
this.processInstance = instance;
this.view = view;
+ // ----------------------------------
+
this.setPaddings(15);
this.setWidth(800);
+ this.setLayout( new ColumnLayout() );
this.setBorder(false);
this.setHeader(false);
-
- this.setLayout( new HorizontalLayout(10) );
- this.add( new Panel("A", 220, 250) );
- this.add( new Panel("B", 200, 150) );
+ // ----------------------------------
+ PaddedPanel rightPanel = new PaddedPanel(new ProcessImageView(instance), 5, 5, 0, 5);
+ PaddedPanel leftPanel = new PaddedPanel( new Panel("Tasks", 200, 150) , 5, 5, 0, 5);
+ leftPanel.add( new PaddedPanel(new Panel("Comments" , 200, 150), 5, 0, 0, 5) );
+
+ // ----------------------------------
+
+ this.add(rightPanel, new ColumnLayoutData(0.7) );
+ this.add(leftPanel , new ColumnLayoutData(0.3) );
}
public String getEditorId()
@@ -72,6 +82,6 @@
public String getTitle()
{
- return processDefinition.getName() + " #"+processInstance.getId();
+ return "#"+processInstance.getId()+" ("+processDefinition.getName()+")";
}
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -24,6 +24,7 @@
import com.gwtext.client.data.*;
import com.gwtext.client.widgets.grid.ColumnConfig;
import com.gwtext.client.widgets.grid.ColumnModel;
+import com.google.gwt.i18n.client.DateTimeFormat;
import org.jboss.bpm.console.client.ConsoleView;
import org.jboss.bpm.console.client.model.DAOFactory;
import org.jboss.bpm.console.client.model.ProcessDefinition;
@@ -70,8 +71,8 @@
new ColumnConfig("Instance ID", "instanceId", 50, true),
new ColumnConfig("key", "key", 50, true),
new ColumnConfig("Status", "status", 100, true, null, "status"),
- new ColumnConfig("Start Date", "start", 75, true),
- new ColumnConfig("End Date", "end", 75, true)
+ new ColumnConfig("Start Date", "start", 125, true),
+ new ColumnConfig("End Date", "end", 125, true)
}
);
@@ -108,6 +109,8 @@
Object[][] records = new Object[processDefs.size()][];
+ //DateTimeFormat df = DateTimeFormat.getFormat("yyyy.MM.dd - HH:mm:ss");
+
Iterator it = processDefs.iterator();
int row = 0;
while(it.hasNext())
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.console.client.widgets;
+
+import com.googlecode.gchart.client.GChart;
+
+import java.util.Map;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class BarChart extends GChart
+{
+ String[] groupLabels;
+
+ final static String BAR_COLOR = "blue";
+
+ final int MAX_REVENUE = 1000;
+
+ public BarChart(int width, int height, String title, String groupName, Map barValues)
+ {
+
+ // limit to a single group
+ this.groupLabels = new String[] { groupName };
+
+ setChartSize(width, height);
+ setChartTitle(title);
+
+ String[] labels = (String[])barValues.keySet().toArray( new String[]{} );
+
+ for (int iCurve=0; iCurve < labels.length; iCurve++)
+ {
+ addCurve(); // one curve per quarter
+ getCurve().getSymbol().setSymbolType(GChart.SymbolType.VBAR_SOUTHWEST);
+ getCurve().getSymbol().setBackgroundColor(BAR_COLOR);
+ getCurve().setLegendLabel(labels[iCurve]);
+
+ getCurve().getSymbol().setHovertextTemplate(
+ labels[iCurve] + " value=${y}"
+ );
+
+ getCurve().getSymbol().setModelWidth(1.02);
+ getCurve().getSymbol().setBorderColor("black");
+ getCurve().getSymbol().setBorderWidth(1);
+ for (int jGroup=0; jGroup < groupLabels.length; jGroup++)
+ {
+ // the '+1' creates a bar-sized gap between groups
+ getCurve().addPoint(1+iCurve+jGroup*(labels.length+1), Math.random()*MAX_REVENUE);
+ getCurve().getPoint().setAnnotationText(labels[iCurve]);
+ getCurve().getPoint().setAnnotationLocation( GChart.AnnotationLocation.NORTH);
+ }
+ }
+
+ for (int i = 0; i < groupLabels.length; i++)
+ {
+ // formula centers tick-label horizontally on each group
+ getXAxis().addTick(
+ labels.length/2. + i*(labels.length+1),
+ groupLabels[i]
+ );
+ getXAxis().setTickLabelFontSize(20);
+ }
+
+ getXAxis().setTickLength(6); // small tick-like gap...
+ getXAxis().setTickThickness(0); // but with invisible ticks
+ getXAxis().setAxisMin(0); // keeps first bar on chart
+
+ getYAxis().setAxisMin(0); // Based on sim revenue range
+ getYAxis().setAxisMax(MAX_REVENUE); // of 0 to MAX_REVENUE.
+ getYAxis().setTickCount(11);
+ getYAxis().setHasGridlines(true);
+ getYAxis().setTickLabelFormat("###");
+ }
+
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.console.client.widgets;
-
-import com.gwtext.client.widgets.Component;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class BareEditorView extends EditorView
-{
-
- private Component comp;
-
- public BareEditorView(Component comp)
- {
- this.add(comp);
- }
-
- public String getEditorId()
- {
- return super.getId();
- }
-
- public String getTitle()
- {
- return "";
- }
-}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -28,6 +28,12 @@
*/
public abstract class EditorView extends Panel
{
+
+ protected EditorView()
+ {
+ super();
+ }
+
public abstract String getEditorId();
public abstract String getTitle();
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -46,9 +46,10 @@
// ----------------------------------
- this.setPaddings(15);
+ this.setPaddings(10);
this.setHeader(false);
this.setBorder(false);
+ this.setFrame(false);
// ----------------------------------
@@ -110,11 +111,11 @@
// ----------------------------------------
- grid.setFrame(true);
+ grid.setFrame(false);
grid.setStripeRows(true);
grid.setTitle(titleName);
- grid.setWidth(350);
+ grid.setWidth(UIConstants.EDITOR_PANEL_WIDTH);
grid.setEnableHdMenu(false);
grid.setEnableColumnMove(false);
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java 2008-08-19 10:19:38 UTC (rev 1927)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.console.client.widgets;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class UIConstants
+{
+ final static int EDITOR_PANEL_WIDTH = 450;
+ public static final int MAIN_MENU_MIN = 175;
+ public static final int MAIN_MENU_MAX = 400;
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-08-19 07:49:22 UTC (rev 1926)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-08-19 10:19:38 UTC (rev 1927)
@@ -3,6 +3,9 @@
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User' />
<inherits name='com.gwtext.GwtExt' />
+ <inherits name='com.googlecode.gchart.GChart'/>
+
+
<!-- Specify the app entry point class. -->
<entry-point class='org.jboss.bpm.console.client.Application' />
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/processSample.jpg
===================================================================
(Binary files differ)
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1926 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/client and 15 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 03:49:22 -0400 (Tue, 19 Aug 2008)
New Revision: 1926
Added:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/
Removed:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Activity.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ActivityBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Artifact.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ArtifactInput.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ArtifactOutput.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Assignment.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/BPMNElement.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/CancelEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/CompensateEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ComplexGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Condition.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ConditionalEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ConnectingObject.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/DataObject.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/EndEvent.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Entity.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ErrorEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Event.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/EventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayDataBased.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayEventBased.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Expression.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/FlowObject.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Gate.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Gateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/GraphicalElement.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/InclusiveGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/InputSet.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/IntermediateEvent.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/LinkEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ManualTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MessageEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MessageFlow.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MultipleInFlowSupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MultipleOutFlowSupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/OutputSet.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ParallelGateway.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Participant.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ProcessModel.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertyBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertyBuilderFactory.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertySupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ReceiveTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ReferenceTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Role.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ScriptTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SendTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SequenceFlow.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ServiceTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SignalEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SingleInFlowSupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SingleOutFlowSupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/StartEvent.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SubProcess.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SupportingElement.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Task.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TerminateEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TimeDateExpression.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TimerEventDetail.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/UserTask.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/Handler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/HandlerSupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/MutablePropertySupport.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/SignalManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayDataBasedImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GateImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderFactoryImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageFlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderFactoryImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleOutFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/BasicExecutionContext.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java
Log:
WIP
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -29,8 +29,8 @@
import javax.management.ObjectName;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.Attachments;
-import org.jboss.bpm.runtime.internal.RuntimeProcess;
/**
* The ExecutionManager executes processes
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -31,9 +31,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.Participant;
-import org.jboss.bpm.model.internal.Task;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.Participant;
+import org.jboss.bpm.ri.model.Task;
/**
* The ProcessEngine sends mesages through the MessageManager. <p/> A {@link Message} has an ID and is targeted to a
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -21,8 +21,8 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.Event;
+import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.ri.model.Event;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -24,8 +24,8 @@
//$Id$
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.EventDetail;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.EventDetail;
/**
* The EventBuilder can be used to build an {@link Event} dynamically.
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.internal.Gateway;
+import org.jboss.bpm.ri.model.Gateway;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -21,15 +21,15 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.internal.EndEvent;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.IntermediateEvent;
-import org.jboss.bpm.model.internal.MessageFlow;
-import org.jboss.bpm.model.internal.Participant;
-import org.jboss.bpm.model.internal.PropertySupport;
-import org.jboss.bpm.model.internal.StartEvent;
-import org.jboss.bpm.model.internal.SupportingElement;
-import org.jboss.bpm.model.internal.Task;
+import org.jboss.bpm.ri.model.EndEvent;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.IntermediateEvent;
+import org.jboss.bpm.ri.model.MessageFlow;
+import org.jboss.bpm.ri.model.Participant;
+import org.jboss.bpm.ri.model.PropertySupport;
+import org.jboss.bpm.ri.model.StartEvent;
+import org.jboss.bpm.ri.model.SupportingElement;
+import org.jboss.bpm.ri.model.Task;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -26,7 +26,7 @@
import javax.management.ObjectName;
import org.jboss.bpm.model.Constants.ProcessStatus;
-import org.jboss.bpm.model.internal.Activity;
+import org.jboss.bpm.ri.model.Activity;
import org.jboss.bpm.runtime.Attachments;
/**
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -21,8 +21,8 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.SupportingElement;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.SupportingElement;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -21,8 +21,8 @@
*/
package org.jboss.bpm.model;
-import org.jboss.bpm.model.internal.ActivityBuilder;
-import org.jboss.bpm.model.internal.Task;
+import org.jboss.bpm.ri.model.ActivityBuilder;
+import org.jboss.bpm.ri.model.Task;
//$Id$
Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model (from rev 1925, jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal)
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Activity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Activity.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ActivityBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ActivityBuilder.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.ProcessBuilder;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Artifact.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Artifact.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ArtifactInput.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ArtifactInput.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ArtifactOutput.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ArtifactOutput.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Assignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Assignment.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/BPMNElement.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/BPMNElement.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/CancelEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/CancelEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/CompensateEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/CompensateEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ComplexGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ComplexGateway.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
// $Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Condition.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Condition.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ConditionalEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ConditionalEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ConnectingObject.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ConnectingObject.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/DataObject.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/DataObject.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/EndEvent.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/EndEvent.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Entity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Entity.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ErrorEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ErrorEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Event.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Event.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/EventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/EventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Constants.EventDetailType;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGateway.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayDataBased.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayDataBased.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayEventBased.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ExclusiveGatewayEventBased.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Expression.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Expression.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/FlowObject.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/FlowObject.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Gate.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Gate.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Gateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Gateway.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/GraphicalElement.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/GraphicalElement.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/InclusiveGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/InclusiveGateway.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/InputSet.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/InputSet.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,14 +19,14 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
import java.util.List;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.runtime.internal.MutablePropertySupport;
+import org.jboss.bpm.ri.runtime.MutablePropertySupport;
/**
* An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/IntermediateEvent.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/IntermediateEvent.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Process;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/LinkEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/LinkEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ManualTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ManualTask.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MessageEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MessageEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Message;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MessageFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MessageFlow.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Message;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MultipleInFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MultipleInFlowSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MultipleOutFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/MultipleOutFlowSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/OutputSet.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/OutputSet.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,14 +19,14 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
import java.util.List;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.runtime.internal.MutablePropertySupport;
+import org.jboss.bpm.ri.runtime.MutablePropertySupport;
/**
* An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ParallelGateway.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ParallelGateway.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Participant.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Participant.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Message;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ProcessModel.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessModel.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ProcessModel.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertyBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertyBuilder.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Property;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertyBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertyBuilderFactory.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertySupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/PropertySupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ReceiveTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ReceiveTask.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Message.Implementation;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ReferenceTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ReferenceTask.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Role.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Role.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ScriptTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ScriptTask.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SendTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SendTask.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Message.Implementation;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SequenceFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SequenceFlow.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ServiceTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/ServiceTask.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Message.Implementation;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SignalEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SignalEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Signal;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SingleInFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SingleInFlowSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SingleOutFlowSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SingleOutFlowSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/StartEvent.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/StartEvent.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import java.util.List;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SubProcess.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SubProcess.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SupportingElement.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/SupportingElement.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Task.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/Task.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Constants;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TerminateEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TerminateEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TimeDateExpression.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TimeDateExpression.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TimerEventDetail.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/TimerEventDetail.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/UserTask.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/model/UserTask.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Message.Implementation;
Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime (from rev 1925, jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal)
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/Handler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/Handler.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,11 +19,11 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
import java.io.Serializable;
-import org.jboss.bpm.model.internal.FlowObject;
+import org.jboss.bpm.ri.model.FlowObject;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/HandlerSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/HandlerSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/MutablePropertySupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/MutablePropertySupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,10 +19,10 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.PropertySupport;
+import org.jboss.bpm.ri.model.PropertySupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
//$Id$
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -24,8 +24,8 @@
//$Id$
import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.runtime.internal.Handler;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.runtime.Handler;
/**
* The {@link ProcessEngine} invokes the ExecutionHandler on a
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -24,9 +24,9 @@
//$Id$
import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.runtime.internal.Handler;
-import org.jboss.bpm.runtime.internal.HandlerSupport;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.runtime.Handler;
+import org.jboss.bpm.ri.runtime.HandlerSupport;
/**
* The {@link ProcessEngine} invokes the FlowHandler on an {@link HandlerSupport}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -25,9 +25,9 @@
import org.jboss.bpm.client.ProcessEngine;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.runtime.internal.Handler;
-import org.jboss.bpm.runtime.internal.HandlerSupport;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.runtime.Handler;
+import org.jboss.bpm.ri.runtime.HandlerSupport;
/**
* The {@link ProcessEngine} invokes the SignalHandler on an {@link HandlerSupport}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -23,10 +23,10 @@
//$Id$
-import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.SequenceFlow;
/**
* A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime.
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -25,7 +25,7 @@
import java.util.Set;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.SequenceFlow;
/**
* The {@link FlowHandler} invokes the TokenExecutor to move {@link Token}s
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -52,7 +52,7 @@
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.internal.BPMNElement;
+import org.jboss.bpm.ri.model.BPMNElement;
public abstract class AbstractAPITestCase extends TestCase
{
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -62,37 +62,37 @@
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.internal.Assignment;
-import org.jboss.bpm.model.internal.ComplexGateway;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.EndEvent;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.EventDetail;
-import org.jboss.bpm.model.internal.ExclusiveGateway;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.Gateway;
-import org.jboss.bpm.model.internal.InclusiveGateway;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.IntermediateEvent;
-import org.jboss.bpm.model.internal.MessageEventDetail;
-import org.jboss.bpm.model.internal.MessageFlow;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.ParallelGateway;
-import org.jboss.bpm.model.internal.Participant;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.ReceiveTask;
-import org.jboss.bpm.model.internal.SendTask;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SignalEventDetail;
-import org.jboss.bpm.model.internal.StartEvent;
-import org.jboss.bpm.model.internal.Task;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.model.Assignment;
+import org.jboss.bpm.ri.model.ComplexGateway;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.EndEvent;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.EventDetail;
+import org.jboss.bpm.ri.model.ExclusiveGateway;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.Gateway;
+import org.jboss.bpm.ri.model.InclusiveGateway;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.IntermediateEvent;
+import org.jboss.bpm.ri.model.MessageEventDetail;
+import org.jboss.bpm.ri.model.MessageFlow;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.ParallelGateway;
+import org.jboss.bpm.ri.model.Participant;
+import org.jboss.bpm.ri.model.ReceiveTask;
+import org.jboss.bpm.ri.model.SendTask;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SignalEventDetail;
+import org.jboss.bpm.ri.model.StartEvent;
+import org.jboss.bpm.ri.model.Task;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.runtime.HandlerSupport;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.SignalHandler;
-import org.jboss.bpm.runtime.internal.HandlerSupport;
/**
* A JAXB marshaller for a Process
@@ -104,7 +104,7 @@
{
public void marshallProcess(Process proc, Writer out) throws JAXBException, IOException
{
- JAXBProcess jaxbProc = adaptProcess((org.jboss.bpm.model.internal.ProcessModel)proc);
+ JAXBProcess jaxbProc = adaptProcess((org.jboss.bpm.ri.model.ProcessModel)proc);
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
@@ -113,7 +113,7 @@
marshaller.marshal(jaxbProc, out);
}
- private JAXBProcess adaptProcess(org.jboss.bpm.model.internal.ProcessModel proc)
+ private JAXBProcess adaptProcess(org.jboss.bpm.ri.model.ProcessModel proc)
{
JAXBProcess jaxbProc = new JAXBProcess();
jaxbProc.setName(proc.getName());
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -82,8 +82,8 @@
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
-import org.jboss.bpm.runtime.internal.Handler;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.runtime.Handler;
/**
* A JAXB unmarshaller for a Process
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -29,10 +29,10 @@
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.Gateway;
+import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.Gateway;
/**
* An Assignment, which is used in the definition of attributes for {@link Process},
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
/**
* A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process.
Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client (from rev 1925, jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.client.internal;
+package org.jboss.bpm.ri.client;
// $Id$
@@ -34,22 +34,22 @@
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.AssignTime;
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.model.internal.Assignment;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.ExpressionEvaluator;
-import org.jboss.bpm.model.internal.ProcessImpl;
-import org.jboss.bpm.model.internal.RuntimeProcessImpl;
-import org.jboss.bpm.model.internal.SequenceFlowImpl;
-import org.jboss.bpm.model.internal.StartEvent;
-import org.jboss.bpm.model.internal.TokenExecutorImpl;
+import org.jboss.bpm.ri.model.Assignment;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.StartEvent;
+import org.jboss.bpm.ri.model.impl.ExpressionEvaluator;
+import org.jboss.bpm.ri.model.impl.ProcessImpl;
+import org.jboss.bpm.ri.model.impl.RuntimeProcessImpl;
+import org.jboss.bpm.ri.model.impl.SequenceFlowImpl;
+import org.jboss.bpm.ri.model.impl.TokenExecutorImpl;
+import org.jboss.bpm.ri.runtime.DelegatingToken;
+import org.jboss.bpm.ri.runtime.MutableToken;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.TokenImpl;
import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
-import org.jboss.bpm.runtime.internal.DelegatingToken;
-import org.jboss.bpm.runtime.internal.MutableToken;
-import org.jboss.bpm.runtime.internal.RuntimeProcess;
-import org.jboss.bpm.runtime.internal.TokenImpl;
/**
* The process manager is the entry point to create, find and otherwise manage processes.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/MessageManagerImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/MessageManagerImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.client.internal;
+package org.jboss.bpm.ri.client;
// $Id$
@@ -32,10 +32,10 @@
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.ProcessImpl;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.Task;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.Task;
+import org.jboss.bpm.ri.model.impl.ProcessImpl;
/**
* The ProcessEngine sends mesages through the MessageManager.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessEngineImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.client.internal;
+package org.jboss.bpm.ri.client;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.client.internal;
+package org.jboss.bpm.ri.client;
// $Id$
@@ -27,6 +27,7 @@
import org.jboss.bpm.client.DialectHandler;
import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.client.internal.DialectRegistry;
/**
* The process manager is the entry point to create, find and otherwise manage processes.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,25 +19,25 @@
* 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.client.internal;
+package org.jboss.bpm.ri.client;
// $Id$
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Constants;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.FlowObjectImpl;
-import org.jboss.bpm.model.internal.ProcessImpl;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.impl.FlowObjectImpl;
+import org.jboss.bpm.ri.model.impl.ProcessImpl;
+import org.jboss.bpm.ri.runtime.DelegatingToken;
+import org.jboss.bpm.ri.runtime.HandlerSupport;
+import org.jboss.bpm.ri.runtime.MutableToken;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
import org.jboss.bpm.runtime.Token.TokenStatus;
-import org.jboss.bpm.runtime.internal.DelegatingToken;
-import org.jboss.bpm.runtime.internal.HandlerSupport;
-import org.jboss.bpm.runtime.internal.MutableToken;
-import org.jboss.bpm.runtime.internal.RuntimeProcess;
/**
* The RunnableToken implements the logic to move the token from one FlowObject to the next.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/SignalManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/SignalManagerImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/SignalManagerImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.client.internal;
+package org.jboss.bpm.ri.client;
// $Id$
Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl (from rev 1925, jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityBuilderImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,14 +19,14 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.ActivityBuilder;
+import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.ri.model.ActivityBuilder;
/**
* The ActivityBuilder can be used to build an {@link Activity} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -30,11 +30,18 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Property;
+import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.runtime.MutablePropertySupport;
+import org.jboss.bpm.ri.runtime.MutableToken;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
-import org.jboss.bpm.runtime.internal.MutablePropertySupport;
-import org.jboss.bpm.runtime.internal.MutableToken;
/**
* An activity is a generic term for work that a company or organization performs via business processes. An activity
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AssignmentImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,14 +19,14 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.internal.Assignment;
-import org.jboss.bpm.model.internal.Expression;
+import org.jboss.bpm.ri.model.Assignment;
+import org.jboss.bpm.ri.model.Expression;
/**
* An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/BPMNElementImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,19 +19,19 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import javax.management.ObjectName;
import org.jboss.bpm.client.ObjectNameFactory;
-import org.jboss.bpm.model.internal.ProcessModel;
-import org.jboss.bpm.model.internal.BPMNElement;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.Gateway;
-import org.jboss.bpm.model.internal.Task;
+import org.jboss.bpm.ri.model.BPMNElement;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.Gateway;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.Task;
import org.jboss.util.id.UID;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ComplexGatewayImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,14 +19,14 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.internal.ComplexGateway;
-import org.jboss.bpm.model.internal.Expression;
+import org.jboss.bpm.ri.model.ComplexGateway;
+import org.jboss.bpm.ri.model.Expression;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -32,6 +32,11 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.EventDetailType;
+import org.jboss.bpm.ri.model.EndEvent;
+import org.jboss.bpm.ri.model.EventDetail;
+import org.jboss.bpm.ri.model.MessageEventDetail;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,9 +19,9 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.Entity;
+import org.jboss.bpm.ri.model.Entity;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -28,11 +28,11 @@
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.EventDetailType;
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.model.internal.EndEvent;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.EventDetail;
-import org.jboss.bpm.model.internal.IntermediateEvent;
-import org.jboss.bpm.model.internal.StartEvent;
+import org.jboss.bpm.ri.model.EndEvent;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.EventDetail;
+import org.jboss.bpm.ri.model.IntermediateEvent;
+import org.jboss.bpm.ri.model.StartEvent;
/**
* The EventBuilder can be used to build an {@link Event} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventDetailImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.EventDetail;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.EventDetail;
/**
* The base of all supported event details.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,9 +19,9 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.Event;
+import org.jboss.bpm.ri.model.Event;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayDataBasedImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayDataBasedImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,11 +19,11 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
-import org.jboss.bpm.model.internal.ExclusiveGatewayDataBased;
+import org.jboss.bpm.ri.model.ExclusiveGatewayDataBased;
/**
* A point in the workflow process where, based on a decision or workflow control data, one of several branches is chosen.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExclusiveGatewayImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -29,13 +29,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.ExclusiveGateway;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.ExclusiveGateway;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionEvaluator.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -27,7 +27,7 @@
import java.util.Map;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.internal.Expression;
+import org.jboss.bpm.ri.model.Expression;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.Attachments.Key;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ExpressionImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.internal.Expression;
+import org.jboss.bpm.ri.model.Expression;
/**
* An Expression, which is used in the definition of attributes for @{link StartEvent},
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.FlowObject;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.FlowObject;
/**
* A Flow is a graphical line connecting two objects in a BPD. There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
import java.util.ArrayList;
import java.util.Collections;
@@ -28,6 +28,17 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NameNotUniqueException;
import org.jboss.bpm.model.Constants.AssignTime;
+import org.jboss.bpm.ri.model.Assignment;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.Gateway;
+import org.jboss.bpm.ri.model.MultipleInFlowSupport;
+import org.jboss.bpm.ri.model.MultipleOutFlowSupport;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.SingleInFlowSupport;
+import org.jboss.bpm.ri.model.SingleOutFlowSupport;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GateImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GateImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,19 +19,19 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import java.util.List;
import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.model.internal.Assignment;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.Gateway;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.model.Assignment;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.Gateway;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
/**
* A {@link Gate} associated with a {@link Gateway}.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayBuilderImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,15 +19,15 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.GatewayBuilder;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.Gateway;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.Gateway;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
/**
* The GatewayBuilder can be used to build a {@link Gateway} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -31,11 +31,11 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.Gateway;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.Gateway;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,11 +19,11 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
-import org.jboss.bpm.model.internal.GraphicalElement;
+import org.jboss.bpm.ri.model.GraphicalElement;
/**
*
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.runtime.internal.Handler;
+import org.jboss.bpm.ri.runtime.Handler;
/**
* Base implementation of all handlers
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/HandlerSetterSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
+import org.jboss.bpm.ri.runtime.HandlerSupport;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.SignalHandler;
-import org.jboss.bpm.runtime.internal.HandlerSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -32,12 +32,12 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Constants.ExpressionLanguage;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.GraphicalElement;
-import org.jboss.bpm.model.internal.InclusiveGateway;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SequenceFlow.ConditionType;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.GraphicalElement;
+import org.jboss.bpm.ri.model.InclusiveGateway;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -30,9 +30,9 @@
import java.util.Map;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.ArtifactInput;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.runtime.internal.MutablePropertySupport;
+import org.jboss.bpm.ri.model.ArtifactInput;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.runtime.MutablePropertySupport;
/**
* An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -29,10 +29,10 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.EventDetail;
-import org.jboss.bpm.model.internal.IntermediateEvent;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.EventDetail;
+import org.jboss.bpm.ri.model.IntermediateEvent;
+import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderFactoryImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageBuilderFactoryImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderFactoryImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageBuilderImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageEventDetailImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,14 +19,14 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Constants.EventDetailType;
-import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.MessageEventDetail;
+import org.jboss.bpm.ri.model.Event;
+import org.jboss.bpm.ri.model.MessageEventDetail;
/**
* The message event detail
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageFlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageFlowImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,13 +19,13 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.internal.MessageFlow;
+import org.jboss.bpm.ri.model.MessageFlow;
/**
* A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to send and receive them.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,9 +29,9 @@
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.Participant;
-import org.jboss.bpm.runtime.internal.MutablePropertySupport;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.Participant;
+import org.jboss.bpm.ri.runtime.MutablePropertySupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -31,9 +31,9 @@
import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.MessageBuilderFactory;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.Entity;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.Participant;
+import org.jboss.bpm.ri.model.Entity;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.Participant;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,11 +19,11 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.MultipleInFlowSupport;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.MultipleInFlowSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,11 +19,11 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.MultipleOutFlowSupport;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.MultipleOutFlowSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
import org.jboss.bpm.model.Constants.TaskType;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -30,9 +30,9 @@
import java.util.Map;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.ArtifactOutput;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.runtime.internal.MutablePropertySupport;
+import org.jboss.bpm.ri.model.ArtifactOutput;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.runtime.MutablePropertySupport;
/**
* An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParallelGatewayImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -29,13 +29,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Constants.GatewayType;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.ParallelGateway;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.Gate;
+import org.jboss.bpm.ri.model.ParallelGateway;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.runtime.TokenImpl;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
-import org.jboss.bpm.runtime.internal.TokenImpl;
/**
* Parallel Gateway is required when two or more Activities need to be executed in parallel.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,11 +19,11 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.Entity;
-import org.jboss.bpm.model.internal.Participant;
-import org.jboss.bpm.model.internal.Role;
+import org.jboss.bpm.ri.model.Entity;
+import org.jboss.bpm.ri.model.Participant;
+import org.jboss.bpm.ri.model.Role;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderFactoryImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderFactoryImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderFactoryImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -36,8 +36,8 @@
import org.jboss.bpm.model.Constants.ExpressionLanguage;
import org.jboss.bpm.model.Constants.GatewayType;
import org.jboss.bpm.model.Constants.TaskType;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.Gateway;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.Gateway;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.SignalHandler;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -40,13 +40,20 @@
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.ProcessTimeoutException;
import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.client.internal.ProcessManagerImpl;
import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
+import org.jboss.bpm.ri.client.ProcessManagerImpl;
+import org.jboss.bpm.ri.model.Assignment;
+import org.jboss.bpm.ri.model.EndEvent;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.StartEvent;
+import org.jboss.bpm.ri.runtime.MutablePropertySupport;
import org.jboss.bpm.runtime.Attachments;
-import org.jboss.bpm.runtime.internal.MutablePropertySupport;
/**
* A Process is any Activity performed within a company or organization.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderFactoryImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
-import org.jboss.bpm.model.internal.PropertyBuilder;
-import org.jboss.bpm.model.internal.PropertyBuilderFactory;
+import org.jboss.bpm.ri.model.PropertyBuilder;
+import org.jboss.bpm.ri.model.PropertyBuilderFactory;
/**
* A Factory for the {@link PropertyBuilder}.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyBuilderImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.PropertyBuilder;
+import org.jboss.bpm.ri.model.PropertyBuilder;
/**
* A PropertyBuilder can be used to build a {@link Property} dynamically.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.Expression;
+import org.jboss.bpm.ri.model.Expression;
/**
* A Property, which is used in the definition of attributes for a Process and common activity attributes
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
import java.util.ArrayList;
import java.util.List;
@@ -33,6 +33,8 @@
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.ReceiveTask;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,9 +19,9 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.Role;
+import org.jboss.bpm.ri.model.Role;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RuntimeProcessImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,13 +19,13 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.TokenExecutor;
-import org.jboss.bpm.runtime.internal.RuntimeProcess;
/**
* A RuntimeProcess add runtime behaviour to the {@link Process}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -28,6 +28,8 @@
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.SendTask;
import org.jboss.bpm.runtime.Token;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,13 +19,13 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.Expression;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.SequenceFlow;
/**
* A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SignalEventDetailImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,13 +19,13 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.EventDetailType;
-import org.jboss.bpm.model.internal.SignalEventDetail;
+import org.jboss.bpm.ri.model.SignalEventDetail;
/**
* The Signal event detail
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleInFlowSetterSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SingleInFlowSupport;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SingleInFlowSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleOutFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SingleOutFlowSetterSupport.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SingleOutFlowSupport;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SingleOutFlowSupport;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -34,11 +34,16 @@
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.ri.model.EventDetail;
+import org.jboss.bpm.ri.model.ProcessModel;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.model.SignalEventDetail;
+import org.jboss.bpm.ri.model.StartEvent;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
+import org.jboss.bpm.ri.runtime.TokenImpl;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
-import org.jboss.bpm.runtime.internal.RuntimeProcess;
-import org.jboss.bpm.runtime.internal.TokenImpl;
/**
* A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts the
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,13 +19,13 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.internal.SubProcess;
+import org.jboss.bpm.ri.model.SubProcess;
import org.jboss.bpm.runtime.SignalHandler;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,11 +19,11 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
-import org.jboss.bpm.model.internal.SupportingElement;
+import org.jboss.bpm.ri.model.SupportingElement;
/**
*
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskBuilderImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.model.internal.Task;
+import org.jboss.bpm.ri.model.Task;
/**
* The TaskBuilder can be used to dynamically build {@link Task}.
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,12 +19,12 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.TaskType;
-import org.jboss.bpm.model.internal.Task;
+import org.jboss.bpm.ri.model.Task;
import org.jboss.bpm.runtime.SignalHandler;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.internal;
+package org.jboss.bpm.ri.model.impl;
//$Id$
@@ -33,15 +33,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.client.internal.RunnableToken;
import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.ri.client.RunnableToken;
+import org.jboss.bpm.ri.model.ConnectingObject;
+import org.jboss.bpm.ri.model.SequenceFlow;
+import org.jboss.bpm.ri.runtime.MutableToken;
+import org.jboss.bpm.ri.runtime.RuntimeProcess;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
import org.jboss.bpm.runtime.Token.TokenStatus;
-import org.jboss.bpm.runtime.internal.MutableToken;
-import org.jboss.bpm.runtime.internal.RuntimeProcess;
/**
* The {@link FlowHandler} invokes the TokenExecutor to schedule
Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime (from rev 1925, jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/BasicExecutionContext.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/BasicExecutionContext.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/BasicExecutionContext.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
//$Id$
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,7 +19,7 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
//$Id$
@@ -29,9 +29,9 @@
import java.util.Map;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.ProcessModel;
+import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.ProcessModel;
import org.jboss.bpm.runtime.ExecutionContext;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,15 +19,15 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
//$Id$
-import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.Activity;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MutableToken.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,13 +19,13 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
//$Id$
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.runtime.Token;
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -19,14 +19,14 @@
* 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.runtime.internal;
+package org.jboss.bpm.ri.runtime;
//$Id$
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.SequenceFlow;
+import org.jboss.bpm.ri.model.FlowObject;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.SequenceFlow;
import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -23,10 +23,10 @@
// $Id$
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.PropertyBuilder;
-import org.jboss.bpm.model.internal.PropertyBuilderFactory;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.PropertyBuilder;
+import org.jboss.bpm.ri.model.PropertyBuilderFactory;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.Token;
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-19 01:23:34 UTC (rev 1925)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-19 07:49:22 UTC (rev 1926)
@@ -23,10 +23,10 @@
// $Id$
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.PropertyBuilder;
-import org.jboss.bpm.model.internal.PropertyBuilderFactory;
+import org.jboss.bpm.ri.model.InputSet;
+import org.jboss.bpm.ri.model.OutputSet;
+import org.jboss.bpm.ri.model.PropertyBuilder;
+import org.jboss.bpm.ri.model.PropertyBuilderFactory;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.Token;
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1925 - in jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm: scheduler/ejbtimer and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-08-18 21:23:34 -0400 (Mon, 18 Aug 2008)
New Revision: 1925
Modified:
jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java
jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerService.java
jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerServiceFactory.java
jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java
Log:
restored the ability to override the jndi names used by the enterprise service factories in jbpm.cfg.xml: JBPM-960
Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
+++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java 2008-08-19 01:23:34 UTC (rev 1925)
@@ -30,8 +30,6 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmException;
import org.jbpm.ejb.impl.JobListenerBean;
import org.jbpm.svc.Service;
@@ -55,11 +53,11 @@
* Refer to the jBPM manual for details.
*
* @author Tom Baeyens
+ * @author Alejandro Guizar
*/
public class JmsMessageServiceFactoryImpl implements ServiceFactory {
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(JmsMessageServiceFactoryImpl.class);
String connectionFactoryJndiName = "java:comp/env/jms/JbpmConnectionFactory";
String destinationJndiName = "java:comp/env/jms/JobQueue";
@@ -68,37 +66,55 @@
private ConnectionFactory connectionFactory;
private Destination destination;
- public JmsMessageServiceFactoryImpl() {
+ public ConnectionFactory getConnectionFactory() {
+ if (connectionFactory == null) {
+ try {
+ connectionFactory = (ConnectionFactory) lookup(connectionFactoryJndiName);
+ }
+ catch (NamingException e) {
+ throw new JbpmException("could not retrieve message connection factory", e);
+ }
+ }
+ return connectionFactory;
+ }
+
+ public Destination getDestination() {
+ if (destination == null) {
+ try {
+ destination = (Destination) lookup(destinationJndiName);
+ }
+ catch (NamingException e) {
+ throw new JbpmException("could not retrieve message destination", e);
+ }
+ }
+ return destination;
+ }
+
+ private static Object lookup(String name) throws NamingException {
+ Context initial = new InitialContext();
try {
- Context initial = new InitialContext();
- connectionFactory = (ConnectionFactory) initial.lookup(connectionFactoryJndiName);
- destination = (Destination) initial.lookup(destinationJndiName);
+ return initial.lookup(name);
+ }
+ finally {
initial.close();
}
- catch (NamingException e) {
- log.error("jms object lookup problem", e);
- throw new JbpmException("jms object lookup problem", e);
- }
}
public Service openService() {
- Connection connection = null;
- Session session = null;
-
try {
- connection = connectionFactory.createConnection();
-
+ Connection connection = getConnectionFactory().createConnection();
+
// If you use an XA connection factory in JBoss, the parameters will be ignored. It will always take part in the global JTA transaction.
- // If you use a non XQ connection factory, the first parameter specifies whether you want to have all message productions and
+ // If you use a non XA connection factory, the first parameter specifies whether you want to have all message productions and
// consumptions as part of one transaction (TRUE) or whether you want all productions and consumptions to be instantanious (FALSE)
// Of course, we never want messages to be received before the current jbpm transaction commits so we just set it to true.
- session = connection.createSession(true, Session.SESSION_TRANSACTED);
-
- } catch (JMSException e) {
- throw new JbpmException("couldn't open jms message session", e);
- }
-
- return new JmsMessageServiceImpl(connection, session, destination, isCommitEnabled);
+ Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
+
+ return new JmsMessageServiceImpl(connection, session, getDestination(), isCommitEnabled);
+ }
+ catch (JMSException e) {
+ throw new JbpmException("couldn't open message session", e);
+ }
}
public void close() {
Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerService.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerService.java 2008-08-18 13:58:26 UTC (rev 1924)
+++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerService.java 2008-08-19 01:23:34 UTC (rev 1925)
@@ -14,6 +14,10 @@
import org.jbpm.job.Timer;
import org.jbpm.scheduler.SchedulerService;
+/**
+ * @author Tom Baeyens
+ * @deprecated replaced by {@link EntitySchedulerService}
+ */
public class EjbSchedulerService implements SchedulerService {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerServiceFactory.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerServiceFactory.java 2008-08-18 13:58:26 UTC (rev 1924)
+++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerServiceFactory.java 2008-08-19 01:23:34 UTC (rev 1925)
@@ -4,34 +4,45 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmException;
import org.jbpm.svc.Service;
import org.jbpm.svc.ServiceFactory;
+/**
+ * @author Tom Baeyens
+ * @deprecated replaced by {@link EntitySchedulerServiceFactory}
+ */
public class EjbSchedulerServiceFactory implements ServiceFactory {
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(EjbSchedulerServiceFactory.class);
-
String timerServiceHomeJndiName = "java:comp/env/ejb/LocalTimerServiceBean";
private LocalTimerServiceHome timerServiceHome;
- public EjbSchedulerServiceFactory() {
+ public LocalTimerServiceHome getTimerServiceHome() {
+ if (timerServiceHome == null) {
+ try {
+ timerServiceHome = (LocalTimerServiceHome) lookup(timerServiceHomeJndiName);
+ } catch (NamingException e) {
+ throw new JbpmException("ejb timer service lookup problem", e);
+ }
+ }
+ return timerServiceHome;
+ }
+
+ private static Object lookup(String name) throws NamingException {
+ Context initial = new InitialContext();
try {
- Context initial = new InitialContext();
- timerServiceHome = (LocalTimerServiceHome) initial.lookup(timerServiceHomeJndiName);
- } catch (NamingException e) {
- log.error("ejb timer service lookup problem", e);
- throw new JbpmException("ejb timer service lookup problem", e);
+ return initial.lookup(name);
}
+ finally {
+ initial.close();
+ }
}
public Service openService() {
- return new EjbSchedulerService(timerServiceHome);
+ return new EjbSchedulerService(getTimerServiceHome());
}
public void close() {
Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java 2008-08-18 13:58:26 UTC (rev 1924)
+++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java 2008-08-19 01:23:34 UTC (rev 1925)
@@ -4,8 +4,6 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmException;
import org.jbpm.ejb.LocalTimerEntityHome;
import org.jbpm.job.Timer;
@@ -28,30 +26,40 @@
* Refer to the jBPM manual for details.
*
* @author Tom Baeyens
+ * @author Alejandro Guizar
* @author Fady Matar
*/
public class EntitySchedulerServiceFactory implements ServiceFactory {
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(EntitySchedulerServiceFactory.class);
-
String timerEntityHomeJndiName = "java:comp/env/ejb/LocalTimerEntityBean";
private LocalTimerEntityHome timerEntityHome;
- public EntitySchedulerServiceFactory() {
+ public LocalTimerEntityHome getTimerEntityHome() {
+ if (timerEntityHome == null) {
+ try {
+ timerEntityHome = (LocalTimerEntityHome) lookup(timerEntityHomeJndiName);
+ } catch (NamingException e) {
+ throw new JbpmException("ejb timer entity lookup problem", e);
+ }
+ }
+ return timerEntityHome;
+ }
+
+ private static Object lookup(String name) throws NamingException {
+ Context initial = new InitialContext();
try {
- Context initial = new InitialContext();
- timerEntityHome = (LocalTimerEntityHome) initial.lookup(timerEntityHomeJndiName);
- } catch (NamingException e) {
- log.error("ejb timer entity lookup problem", e);
- throw new JbpmException("ejb timer entity lookup problem", e);
+ return initial.lookup(name);
}
+ finally {
+ initial.close();
+ }
}
public Service openService() {
- return new EntitySchedulerService(timerEntityHome);
+ return new EntitySchedulerService(getTimerEntityHome());
}
public void close() {
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1924 - in jbossbpm/spec/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-08-18 09:58:26 -0400 (Mon, 18 Aug 2008)
New Revision: 1924
Added:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessModel.java
Removed:
jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/MessageManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java
Log:
Split Process into Process + ProcessModel
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -31,9 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.internal.Event;
-import org.jboss.bpm.model.internal.FlowObject;
import org.jboss.bpm.model.internal.Participant;
import org.jboss.bpm.model.internal.Task;
@@ -44,7 +42,7 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public class MessageManager
+public abstract class MessageManager
{
// provide logging
private static final Log log = LogFactory.getLog(MessageManager.class);
@@ -103,24 +101,8 @@
/**
* Send a message to a given {@link Task} or {@link Event}
*/
- public void sendMessage(ObjectName procID, String targetName, Message msg)
- {
- ProcessManager pm = ProcessManager.locateProcessManager();
- Process proc = pm.getProcessByID(procID);
- if (proc == null)
- throw new IllegalStateException("Cannot obtain registered process: " + procID);
+ public abstract void sendMessage(ObjectName procID, String targetName, Message msg);
- FlowObject target = proc.getFlowObject(targetName);
- if (target == null)
- throw new IllegalArgumentException("Cannot find message target: " + targetName);
- if (target instanceof MessageListener == false)
- throw new IllegalArgumentException("Message target is not a valid message receiver: " + targetName);
-
- log.debug("sendMessage to " + target + " => " + msg);
- MessageListener msgListener = (MessageListener)target;
- msgListener.catchMessage(msg);
- }
-
/**
* Send a message to a given {@link MessageListener}
*/
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -41,6 +41,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.EngineShutdownException;
import org.jboss.bpm.client.internal.DialectRegistry;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.runtime.Attachments;
import org.w3c.dom.Document;
@@ -114,7 +115,7 @@
* @param status The optional process status
* @return An empty set if the process cannot be found
*/
- public Set<Process> getProcesses(String name, Process.ProcessStatus status)
+ public Set<Process> getProcesses(String name, Constants.ProcessStatus status)
{
Set<Process> procSet = new HashSet<Process>();
for (Process aux : procs.values())
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -70,4 +70,20 @@
{
Service, Receive, Send, User, Script, Manual, Reference, None
}
+
+ /**
+ * Defines the type of a {@link Process}
+ */
+ public enum ProcessType
+ {
+ None, Private, Abstract, Collaboration
+ }
+
+ /**
+ * Defines the status a {@link Process} can be in
+ */
+ public enum ProcessStatus
+ {
+ None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
+ }
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -21,19 +21,12 @@
*/
package org.jboss.bpm.model;
-//$Id$
+//$Id: Process.java 1919 2008-08-18 10:40:03Z thomas.diesler(a)jboss.com $
-import java.util.List;
-
import javax.management.ObjectName;
+import org.jboss.bpm.model.Constants.ProcessStatus;
import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.Assignment;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.PropertySupport;
-import org.jboss.bpm.model.internal.SupportingElement;
import org.jboss.bpm.runtime.Attachments;
/**
@@ -42,103 +35,24 @@
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
*/
-public interface Process extends SupportingElement, PropertySupport
+public interface Process
{
/**
- * Defines the type of a {@link Process}
+ * Get the ID of this element
*/
- public enum ProcessType
- {
- None, Private, Abstract, Collaboration
- };
-
+ ObjectName getID();
+
/**
- * Defines the status a {@link Process} can be in
- */
- public enum ProcessStatus
- {
- None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
- };
-
- /**
* Get the unique name.
*/
String getName();
/**
- * Get the process type
- */
- ProcessType getProcessType();
-
- /**
* Get the process state
*/
ProcessStatus getProcessStatus();
-
- /**
- * Get the list of flow objects
- */
- List<FlowObject> getFlowObjects();
-
- /**
- * Get a list of flow objects of a given type.
- */
- <T extends FlowObject> List<T> getFlowObjects(Class<T> clazz);
-
- /**
- * Get a flow object by name.
- * @return null if not found
- */
- FlowObject getFlowObject(String name);
/**
- * 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<Assignment> getAssignments();
-
- /**
- * 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 OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be
- * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the
- * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate
- * a relationship between an OutputSet and an InputSet that started the Process.
- */
- List<OutputSet> getOutputSets();
-
- /**
- * Get the list of associated {@link Message} objects.
- * @return An empty list if there are none
- */
- List<Message> getMessages();
-
- /**
- * Get an associated {@link Message} by name.
- * @return null if not found
- */
- Message getMessage(String msgName);
-
- // Not Part of BPMN ========================================================================
-
- /**
- * Make a deep copy of the process
- */
- Process copyProcess();
-
- /**
* Start the process
*/
ObjectName startProcess();
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -23,8 +23,6 @@
import java.util.List;
-import org.jboss.bpm.model.Process;
-
//$Id$
/**
@@ -43,7 +41,7 @@
/**
* Get the associated Process
*/
- Process getProcess();
+ ProcessModel getProcess();
/**
* One or more assignment expressions MAY be made for the object. For activities (Task, Sub-Process, and Process), the
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessModel.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessModel.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessModel.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -0,0 +1,110 @@
+/*
+ * 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.internal;
+
+//$Id$
+
+import java.util.List;
+
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Constants.ProcessStatus;
+import org.jboss.bpm.model.Constants.ProcessType;
+
+/**
+ * A Process is any {@link Activity} performed within a company or organization.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ProcessModel extends SupportingElement, PropertySupport
+{
+ /**
+ * Get the unique name.
+ */
+ String getName();
+
+ /**
+ * Get the process type
+ */
+ ProcessType getProcessType();
+
+ /**
+ * Get the process state
+ */
+ ProcessStatus getProcessStatus();
+
+ /**
+ * Get the list of flow objects
+ */
+ List<FlowObject> getFlowObjects();
+
+ /**
+ * Get a list of flow objects of a given type.
+ */
+ <T extends FlowObject> List<T> getFlowObjects(Class<T> clazz);
+
+ /**
+ * Get a flow object by name.
+ * @return null if not found
+ */
+ FlowObject getFlowObject(String name);
+
+ /**
+ * 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<Assignment> getAssignments();
+
+ /**
+ * 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 OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be
+ * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the
+ * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate
+ * a relationship between an OutputSet and an InputSet that started the Process.
+ */
+ List<OutputSet> getOutputSets();
+
+ /**
+ * Get the list of associated {@link Message} objects.
+ * @return An empty list if there are none
+ */
+ List<Message> getMessages();
+
+ /**
+ * Get an associated {@link Message} by name.
+ * @return null if not found
+ */
+ Message getMessage(String msgName);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessModel.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -60,7 +60,6 @@
import org.jboss.bpm.dialect.api10.model.ObjectFactory;
import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.internal.Assignment;
@@ -82,6 +81,7 @@
import org.jboss.bpm.model.internal.OutputSet;
import org.jboss.bpm.model.internal.ParallelGateway;
import org.jboss.bpm.model.internal.Participant;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.internal.ReceiveTask;
import org.jboss.bpm.model.internal.SendTask;
import org.jboss.bpm.model.internal.SequenceFlow;
@@ -104,7 +104,7 @@
{
public void marshallProcess(Process proc, Writer out) throws JAXBException, IOException
{
- JAXBProcess jaxbProc = adaptProcess(proc);
+ JAXBProcess jaxbProc = adaptProcess((org.jboss.bpm.model.internal.ProcessModel)proc);
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
@@ -113,7 +113,7 @@
marshaller.marshal(jaxbProc, out);
}
- private JAXBProcess adaptProcess(Process proc)
+ private JAXBProcess adaptProcess(org.jboss.bpm.model.internal.ProcessModel proc)
{
JAXBProcess jaxbProc = new JAXBProcess();
jaxbProc.setName(proc.getName());
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -23,10 +23,9 @@
// $Id$
+import org.jboss.bpm.ProcessTimeoutException;
import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.ReceiveTask;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -37,15 +36,21 @@
*/
public class ProcessIncludeTest extends DefaultEngineTestCase
{
-
+
public void testInclude() throws Exception
{
ProcessManager pm = ProcessManager.locateProcessManager();
Process proc = pm.createProcess(getResourceURL("include/proc-api10.xml"));
-
- ReceiveTask recTask = (ReceiveTask)proc.getFlowObject("A");
- Message msg = recTask.getMessageRef();
- assertEquals("FooMsg", msg.getName());
- assertEquals("bar", msg.getPropertyValue("foo"));
+
+ proc.startProcess();
+ try
+ {
+ proc.waitForEnd(500);
+ fail("ProcessTimeoutException expected");
+ }
+ catch (ProcessTimeoutException ex)
+ {
+ // expected
+ }
}
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -29,10 +29,10 @@
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.Process.ProcessStatus;
import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.model.internal.Assignment;
import org.jboss.bpm.model.internal.Expression;
@@ -66,7 +66,7 @@
public void startProcess(final Process proc, final Attachments att)
{
final ProcessImpl procImpl = (ProcessImpl)proc;
- procImpl.setProcessStatus(ProcessStatus.Active);
+ procImpl.setProcessStatus(Constants.ProcessStatus.Active);
SignalManager signalManager = SignalManager.locateSignalManager();
signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_PROCESS_ENTER));
@@ -77,7 +77,7 @@
{
public void start(Token token)
{
- processStartTimeAssignments(proc, token);
+ processStartTimeAssignments(procImpl, token);
Thread executorThread = new Thread(runnableProcess);
procImpl.setExecutorThread(executorThread);
@@ -88,7 +88,7 @@
rtProc.setTokenExecutor(tokenExecutor);
addRuntimeProcess(rtProc);
- StartEvent start = getStartEvent(proc);
+ StartEvent start = getStartEvent(procImpl);
if (start != null)
{
TokenImpl token = new TokenImpl(att);
@@ -97,7 +97,7 @@
}
}
- private StartEvent getStartEvent(Process proc)
+ private StartEvent getStartEvent(ProcessImpl proc)
{
StartEvent start = null;
for (StartEvent aux : proc.getFlowObjects(StartEvent.class))
@@ -113,7 +113,7 @@
}
// Evaluate the Start time assignments
- private void processStartTimeAssignments(Process proc, Token token)
+ private void processStartTimeAssignments(ProcessImpl proc, Token token)
{
DelegatingToken delegatingToken = new DelegatingToken((MutableToken)token);
ExecutionContext exContext = token.getExecutionContext();
@@ -157,16 +157,16 @@
public void run()
{
TokenExecutor tokenExecutor = rtProc.getTokenExecutor();
- Process proc = rtProc.getProcess();
+ ProcessImpl proc = (ProcessImpl)rtProc.getProcess();
String procName = proc.getName();
- ProcessStatus procStatus = proc.getProcessStatus();
+ Constants.ProcessStatus procStatus = proc.getProcessStatus();
boolean hasActiveTokens = tokenExecutor.hasRunnableTokens();
try
{
synchronized (proc)
{
- while (procStatus == ProcessStatus.Active && hasActiveTokens)
+ while (procStatus == Constants.ProcessStatus.Active && hasActiveTokens)
{
try
{
@@ -187,10 +187,10 @@
SignalManager signalManager = SignalManager.locateSignalManager();
signalManager.throwSignal(procName, new Signal(procName, Signal.SignalType.SYSTEM_PROCESS_EXIT));
- if (procStatus == ProcessStatus.Active)
+ if (procStatus == Constants.ProcessStatus.Active)
{
ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
- procImpl.setProcessStatus(ProcessStatus.Completed);
+ procImpl.setProcessStatus(Constants.ProcessStatus.Completed);
}
ProcessManager procManager = ProcessManager.locateProcessManager();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/MessageManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/MessageManagerImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/MessageManagerImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -23,7 +23,19 @@
// $Id$
+import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.client.MessageListener;
import org.jboss.bpm.client.MessageManager;
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.internal.ProcessImpl;
+import org.jboss.bpm.model.internal.Event;
+import org.jboss.bpm.model.internal.FlowObject;
+import org.jboss.bpm.model.internal.Task;
/**
* The ProcessEngine sends mesages through the MessageManager.
@@ -33,4 +45,28 @@
*/
public class MessageManagerImpl extends MessageManager
{
+ // provide logging
+ private static final Log log = LogFactory.getLog(MessageManagerImpl.class);
+
+ /**
+ * Send a message to a given {@link Task} or {@link Event}
+ */
+ public void sendMessage(ObjectName procID, String targetName, Message msg)
+ {
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.getProcessByID(procID);
+ if (proc == null)
+ throw new IllegalStateException("Cannot obtain registered process: " + procID);
+
+ ProcessImpl procImpl = (ProcessImpl)proc;
+ FlowObject target = procImpl.getFlowObject(targetName);
+ if (target == null)
+ throw new IllegalArgumentException("Cannot find message target: " + targetName);
+ if (target instanceof MessageListener == false)
+ throw new IllegalArgumentException("Message target is not a valid message receiver: " + targetName);
+
+ log.debug("sendMessage to " + target + " => " + msg);
+ MessageListener msgListener = (MessageListener)target;
+ msgListener.catchMessage(msg);
+ }
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.model.Process.ProcessStatus;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.internal.ConnectingObject;
import org.jboss.bpm.model.internal.FlowObject;
import org.jboss.bpm.model.internal.FlowObjectImpl;
@@ -75,8 +75,8 @@
throw new IllegalStateException("Cannot obtain initial flow");
TokenStatus tokStatus = token.getTokenStatus();
- ProcessStatus procStatus = procImpl.getProcessStatus();
- while (procStatus == ProcessStatus.Active && tokStatus == TokenStatus.Started)
+ Constants.ProcessStatus procStatus = procImpl.getProcessStatus();
+ while (procStatus == Constants.ProcessStatus.Active && tokStatus == TokenStatus.Started)
{
flow = token.getFlow();
@@ -120,7 +120,7 @@
catch (RuntimeException rte)
{
log.error("Process aborted: " + procImpl, rte);
- procImpl.setProcessStatus(ProcessStatus.Aborted);
+ procImpl.setProcessStatus(Constants.ProcessStatus.Aborted);
procImpl.setRuntimeException(rte);
}
finally
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -29,14 +29,7 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.Activity;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.SequenceFlow;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -294,7 +287,7 @@
}
@Override
- protected void initialize(Process proc)
+ protected void initialize(ProcessModel proc)
{
super.initialize(proc);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -26,7 +26,7 @@
import javax.management.ObjectName;
import org.jboss.bpm.client.ObjectNameFactory;
-import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.internal.ProcessModel;
import org.jboss.bpm.model.internal.BPMNElement;
import org.jboss.bpm.model.internal.ConnectingObject;
import org.jboss.bpm.model.internal.Event;
@@ -52,7 +52,7 @@
/**
* Initialize the flow object
*/
- protected void initialize(Process proc)
+ protected void initialize(ProcessModel proc)
{
assignElementID();
}
@@ -65,9 +65,9 @@
Event event = (Event)this;
str.append("type=Event,name=" + event.getName());
}
- else if (this instanceof Process)
+ else if (this instanceof ProcessModel)
{
- Process proc = (Process)this;
+ ProcessModel proc = (ProcessModel)this;
str.append("type=Process,name=" + proc.getName());
}
else if (this instanceof Task)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -30,13 +30,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Constants.EventDetailType;
-import org.jboss.bpm.model.internal.EndEvent;
-import org.jboss.bpm.model.internal.EventDetail;
-import org.jboss.bpm.model.internal.MessageEventDetail;
-import org.jboss.bpm.model.internal.SequenceFlow;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -135,7 +130,7 @@
}
@Override
- protected void initialize(Process proc)
+ protected void initialize(ProcessModel proc)
{
super.initialize(proc);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -27,18 +27,7 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NameNotUniqueException;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Constants.AssignTime;
-import org.jboss.bpm.model.internal.Assignment;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.Expression;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.Gate;
-import org.jboss.bpm.model.internal.Gateway;
-import org.jboss.bpm.model.internal.MultipleInFlowSupport;
-import org.jboss.bpm.model.internal.MultipleOutFlowSupport;
-import org.jboss.bpm.model.internal.SingleInFlowSupport;
-import org.jboss.bpm.model.internal.SingleOutFlowSupport;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
@@ -58,7 +47,7 @@
public abstract class FlowObjectImpl extends GraphicalElementImpl implements FlowObject, HandlerSetterSupport
{
private String name;
- private Process proc;
+ private ProcessModel proc;
private FlowHandler flowHandler;
private SignalHandler signalHandler;
private ExecutionHandler executionHandler;
@@ -69,7 +58,7 @@
this.name = name;
}
- public Process getProcess()
+ public ProcessModel getProcess()
{
return proc;
}
@@ -204,7 +193,7 @@
}
@Override
- protected void initialize(Process proc)
+ protected void initialize(ProcessModel proc)
{
super.initialize(proc);
this.proc = proc;
@@ -267,7 +256,7 @@
throw new InvalidProcessException("Unconnected flow object: " + this);
}
- private void initFlow(Process proc, SequenceFlowImpl flow)
+ private void initFlow(ProcessModel proc, SequenceFlowImpl flow)
{
if (flow != null)
{
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -71,11 +71,12 @@
public ProcessBuilder addProcessElements(Process addProc)
{
- for(Message msg : addProc.getMessages())
+ ProcessImpl procImpl = (ProcessImpl)addProc;
+ for(Message msg : procImpl.getMessages())
{
getProcessInternal().addMessage(msg);
}
- for(FlowObject fo : addProc.getFlowObjects())
+ for(FlowObject fo : procImpl.getFlowObjects())
{
getProcessInternal().addFlowObject(fo);
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -41,15 +41,10 @@
import org.jboss.bpm.ProcessTimeoutException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.internal.ProcessManagerImpl;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.internal.Assignment;
-import org.jboss.bpm.model.internal.EndEvent;
-import org.jboss.bpm.model.internal.FlowObject;
-import org.jboss.bpm.model.internal.InputSet;
-import org.jboss.bpm.model.internal.OutputSet;
-import org.jboss.bpm.model.internal.StartEvent;
import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.runtime.internal.MutablePropertySupport;
@@ -60,7 +55,7 @@
* @since 08-Jul-2008
*/
@SuppressWarnings("serial")
-public class ProcessImpl extends SupportingElementImpl implements Process, MutablePropertySupport
+public class ProcessImpl extends SupportingElementImpl implements ProcessModel, Process, MutablePropertySupport
{
// provide logging
private static final Log log = LogFactory.getLog(ProcessImpl.class);
@@ -76,7 +71,7 @@
// The process assignments
private List<Assignment> assignments = new ArrayList<Assignment>();
// the status of the process
- private ProcessStatus status = ProcessStatus.None;
+ private Constants.ProcessStatus status = Constants.ProcessStatus.None;
// The possible exception that caused the process to abort
private RuntimeException runtimeException;
// The thread of the executor
@@ -117,7 +112,7 @@
throw new NotImplementedException("JBPM-1646", "Process Performers");
}
- public ProcessType getProcessType()
+ public Constants.ProcessType getProcessType()
{
throw new NotImplementedException("JBPM-1647", "Process Type");
}
@@ -176,7 +171,7 @@
public List<FlowObject> getFlowObjects()
{
- if (status == ProcessStatus.None)
+ if (status == Constants.ProcessStatus.None)
return flowObjects;
return Collections.unmodifiableList(flowObjects);
@@ -185,7 +180,7 @@
/**
* A naive copy implementation that relies on serialization
*/
- public Process copyProcess()
+ public ProcessModel copyProcess()
{
try
{
@@ -213,10 +208,10 @@
{
ProcessManager pm = ProcessManager.locateProcessManager();
- if (status == ProcessStatus.Aborted || status == ProcessStatus.Completed)
+ if (status == Constants.ProcessStatus.Aborted || status == Constants.ProcessStatus.Completed)
resetProcess();
- if (status != ProcessStatus.Ready)
+ if (status != Constants.ProcessStatus.Ready)
throw new IllegalStateException("Cannot start process in state: " + status);
// Register the process if needed
@@ -238,7 +233,7 @@
FlowObjectImpl foImpl = (FlowObjectImpl)fo;
foImpl.reset();
}
- status = ProcessStatus.Ready;
+ status = Constants.ProcessStatus.Ready;
runtimeException = null;
}
@@ -259,7 +254,7 @@
*/
private void waitForEndInternal(long timeout)
{
- if (status == ProcessStatus.None || status == ProcessStatus.Ready)
+ if (status == Constants.ProcessStatus.None || status == Constants.ProcessStatus.Ready)
throw new IllegalStateException("Cannot wait for process in state: " + status);
if (executorThread == null)
@@ -313,7 +308,7 @@
private boolean isProcessTerminated()
{
- return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted;
+ return status == Constants.ProcessStatus.Cancelled || status == Constants.ProcessStatus.Completed || status == Constants.ProcessStatus.Aborted;
}
public FlowObject getFlowObject(String name)
@@ -345,12 +340,12 @@
return retFlowObjects;
}
- public ProcessStatus getProcessStatus()
+ public Constants.ProcessStatus getProcessStatus()
{
return status;
}
- public void setProcessStatus(ProcessStatus status)
+ public void setProcessStatus(Constants.ProcessStatus status)
{
this.status = status;
}
@@ -390,7 +385,7 @@
public void initialize()
{
- if (status != ProcessStatus.None)
+ if (status != Constants.ProcessStatus.None)
throw new IllegalStateException("Cannot initialize process in state: " + status);
// Initialize the Element
@@ -416,7 +411,7 @@
foImpl.initialize(this);
}
- status = ProcessStatus.Ready;
+ status = Constants.ProcessStatus.Ready;
}
protected void initializeMessageRef(Message msgRef)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -30,11 +30,9 @@
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.client.MessageListener;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
-import org.jboss.bpm.model.internal.ReceiveTask;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -162,7 +160,7 @@
}
@Override
- protected void initialize(Process proc)
+ protected void initialize(ProcessModel proc)
{
super.initialize(proc);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -26,10 +26,8 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Constants.TaskType;
import org.jboss.bpm.model.Message.Implementation;
-import org.jboss.bpm.model.internal.SendTask;
import org.jboss.bpm.runtime.Token;
/**
@@ -81,7 +79,7 @@
}
@Override
- protected void initialize(Process proc)
+ protected void initialize(ProcessModel proc)
{
super.initialize(proc);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -32,13 +32,8 @@
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.Process.ProcessStatus;
-import org.jboss.bpm.model.internal.EventDetail;
-import org.jboss.bpm.model.internal.SequenceFlow;
-import org.jboss.bpm.model.internal.SignalEventDetail;
-import org.jboss.bpm.model.internal.StartEvent;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -118,7 +113,7 @@
}
@Override
- protected void initialize(final Process proc)
+ protected void initialize(final ProcessModel proc)
{
super.initialize(proc);
@@ -140,7 +135,7 @@
if (startSignal.getSignalType() == signal.getSignalType() && startSignal.getMessage().equals(signal.getMessage()))
{
log.debug("catchSignal: " + signal);
- if (proc.getProcessStatus() == ProcessStatus.Active)
+ if (proc.getProcessStatus() == Constants.ProcessStatus.Active)
{
log.debug("Start process from signal: " + signal);
ExecutionManager exManager = ExecutionManager.locateExecutionManager();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -34,10 +34,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.client.internal.RunnableToken;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.Process.ProcessStatus;
-import org.jboss.bpm.model.internal.ConnectingObject;
-import org.jboss.bpm.model.internal.SequenceFlow;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -98,7 +96,7 @@
public void start(Token token)
{
Process proc = rtProc.getProcess();
- if (proc.getProcessStatus() != ProcessStatus.Active)
+ if (proc.getProcessStatus() != Constants.ProcessStatus.Active)
throw new IllegalStateException("Cannot start token to process in state: " + proc.getProcessStatus());
log.debug("Start Token: " + token);
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java 2008-08-18 12:44:46 UTC (rev 1923)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java 2008-08-18 13:58:26 UTC (rev 1924)
@@ -28,14 +28,14 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.internal.Activity;
import org.jboss.bpm.model.internal.FlowObject;
+import org.jboss.bpm.model.internal.ProcessModel;
import org.jboss.bpm.runtime.ExecutionContext;
/**
- * An ExecutionContext that delegates to the current {@link Activity} or {@link Process} for property rerieval.
+ * An ExecutionContext that delegates to the current {@link Activity} or {@link ProcessModel} for property rerieval.
*
* @author Thomas.Diesler(a)jboss.com
* @since 15-Aug-2008
@@ -46,7 +46,7 @@
private ExecutionContext delegate;
private String activityPrefix;
private String procPrefix;
- private Process proc;
+ private ProcessModel proc;
DelegatingExecutionContext(FlowObject flowObject, ExecutionContext delegate)
{
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1923 - jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor.
by do-not-reply＠jboss.org
Author: porcherg
Date: 2008-08-18 08:44:46 -0400 (Mon, 18 Aug 2008)
New Revision: 1923
Added:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java
Modified:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
Log:
generate an error message with a deterministic length instead of a stacktrace.
Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java (from rev 1921, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java)
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java 2008-08-18 12:44:46 UTC (rev 1923)
@@ -0,0 +1,67 @@
+/*
+ * 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.jbpm.pvm.internal.jobexecutor;
+
+import org.jbpm.pvm.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.job.CommandMessage;
+import org.jbpm.pvm.internal.log.Log;
+import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+
+
+/**
+ * @author Tom Baeyens
+ * @author Guillaume Porcher
+ *
+ * Simple command that will create an exception during execution.
+ * The exception will generate a stacktrace with variable length
+ * (controlled by the length parameter).
+ *
+ * This class is to test the persistence of exception stacktrace in jobs.
+ */
+public class GenerateExceptionTestCommand implements Command<Object> {
+
+ private static final long serialVersionUID = 1L;
+
+ int length;
+
+ public GenerateExceptionTestCommand() {
+ }
+
+ public static CommandMessage createMessage(int recursionInitialDepth) {
+ CommandMessage commandMessage = new CommandMessage();
+ ObjectDescriptor commandDescriptor = new ObjectDescriptor(GenerateExceptionTestCommand.class);
+ commandDescriptor.addInjection("length", new IntegerDescriptor(recursionInitialDepth));
+ commandMessage.setCommandDescriptor(commandDescriptor);
+ return commandMessage;
+ }
+
+ public Object execute(Environment environment) throws Exception {
+ StringBuilder stringBuilder = new StringBuilder();
+ while (stringBuilder.length() < length) {
+ stringBuilder.append("This is a test message. ");
+ }
+ throw new RuntimeException(stringBuilder.toString());
+ }
+
+}
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:mergeinfo
+
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-08-18 12:19:12 UTC (rev 1922)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-08-18 12:44:46 UTC (rev 1923)
@@ -209,13 +209,13 @@
jobExecutor.start();
try {
commandService.execute(new Command<Object>() {
- // size of the recursion (to create a long stacktrace)
- // 10 creates an exception if there is a limit of 4000 characters
- int recursiveDepth = 10;
+ // size of the error message to generate
+ // (currently there is a limit of 4000 characters)
+ int msgLength = 4100;
public Object execute(Environment environment) throws Exception {
MessageSession messageSession = environment.get(MessageSession.class);
- CommandMessage commandMessage = FailRecursivelyTestCommand.createMessage(recursiveDepth);
+ CommandMessage commandMessage = GenerateExceptionTestCommand.createMessage(msgLength);
messageSession.send(commandMessage);
return null;
}
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1922 - in jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl: xml and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-08-18 08:19:12 -0400 (Mon, 18 Aug 2008)
New Revision: 1922
Modified:
jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java
jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java
jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/DecisionBinding.java
Log:
decision condition refactoring
Modified: jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java
===================================================================
--- jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java 2008-08-18 11:50:23 UTC (rev 1921)
+++ jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java 2008-08-18 12:19:12 UTC (rev 1922)
@@ -49,7 +49,7 @@
Node node = execution.getNode();
List<Transition> outgoingTransitions = node.getOutgoingTransitions();
for (Transition transition : outgoingTransitions) {
- Condition condition = transition.getGuardCondition();
+ Condition condition = transition.getCondition();
if ( (condition==null)
|| (condition.evaluate(execution))
) {
Modified: jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java
===================================================================
--- jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java 2008-08-18 11:50:23 UTC (rev 1921)
+++ jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java 2008-08-18 12:19:12 UTC (rev 1922)
@@ -72,4 +72,10 @@
execution.take(transition);
}
+ public void setDecisionHandlerName(String decisionHandlerName) {
+ this.decisionHandlerName = decisionHandlerName;
+ }
+ public void setDecisionHandlerDescriptor(Descriptor decisionHandlerDescriptor) {
+ this.decisionHandlerDescriptor = decisionHandlerDescriptor;
+ }
}
Modified: jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/DecisionBinding.java
===================================================================
--- jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/DecisionBinding.java 2008-08-18 11:50:23 UTC (rev 1921)
+++ jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/DecisionBinding.java 2008-08-18 12:19:12 UTC (rev 1922)
@@ -21,7 +21,17 @@
*/
package org.jbpm.jpdl.xml;
+import java.util.List;
+
import org.jbpm.jpdl.activity.DecisionExpressionActivity;
+import org.jbpm.jpdl.activity.DecisionHandlerActivity;
+import org.jbpm.pvm.internal.model.NodeImpl;
+import org.jbpm.pvm.internal.model.TransitionImpl;
+import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.binding.ObjectBinding;
+import org.jbpm.pvm.internal.wire.descriptor.ExpressionDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ReferenceDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
import org.w3c.dom.Element;
@@ -32,6 +42,8 @@
*/
public class DecisionBinding extends JpdlActivityBinding {
+ static ObjectBinding objectBinding = new ObjectBinding();
+
public DecisionBinding() {
super("decision");
}
@@ -40,11 +52,63 @@
if (element.hasAttribute("expr")) {
DecisionExpressionActivity decisionExpressionActivity = new DecisionExpressionActivity();
String expr = element.getAttribute("expr");
- decisionExpressionActivity.setExpr(expr );
+ decisionExpressionActivity.setExpr(expr);
return decisionExpressionActivity;
}
+ if (element.hasAttribute("handler-ref")) {
+ String decisionHandlerName = element.getAttribute("handler-ref");
+ DecisionHandlerActivity decisionHandlerActivity = new DecisionHandlerActivity();
+ decisionHandlerActivity.setDecisionHandlerName(decisionHandlerName);
+ return decisionHandlerActivity;
+ }
+
+ Element handlerElement = XmlUtil.element(element, "handler");
+ if (handlerElement!=null) {
+ DecisionHandlerActivity decisionHandlerActivity = new DecisionHandlerActivity();
+ ObjectDescriptor decisionHandlerDescriptor = (ObjectDescriptor)
+ objectBinding.parse(handlerElement, parse, parser);
+ decisionHandlerActivity.setDecisionHandlerDescriptor(decisionHandlerDescriptor);
+ return decisionHandlerActivity;
+ }
+
+ boolean hasConditions = false;
+ List<Element> transitionElements = XmlUtil.elements(element, "transition");
+ if (transitionElements!=null) {
+ NodeImpl node = parse.findObject(NodeImpl.class);
+ List<TransitionImpl> transitions = (List) node.getOutgoingTransitions();
+
+ for (int i=0; i<transitionElements.size(); i++) {
+ TransitionImpl transition = transitions.get(i);
+ Element transitionElement = transitionElements.get(i);
+
+ Element conditionElement = XmlUtil.element(transitionElement, "condition");
+ if (conditionElement!=null) {
+ hasConditions = true;
+ }
+
+ if (conditionElement.hasAttribute("expr")) {
+ String expr = conditionElement.getAttribute("expr");
+ ExpressionDescriptor expressionDescriptor = new ExpressionDescriptor(expr);
+ transition.setConditionDescriptor(expressionDescriptor);
+
+ } else if (conditionElement.hasAttribute("ref")) {
+ String expr = conditionElement.getAttribute("ref");
+ ReferenceDescriptor refDescriptor = new ReferenceDescriptor(expr);
+ transition.setConditionDescriptor(refDescriptor);
+
+ } else if (ObjectBinding.isObjectDescriptor(conditionElement)) {
+ ObjectDescriptor conditionDescriptor = (ObjectDescriptor) objectBinding.parse(conditionElement, parse, parser);
+ transition.setConditionDescriptor(conditionDescriptor);
+
+ } else {
+ parse.addProblem("decision must have one of {expr attribute, handler-ref attribute, handler element or transition conditions}: "+XmlUtil.toString(element));
+ }
+ }
+ }
+
+ parse.addProblem("decision '"+element.getAttribute("name")+"' must have one of: expr attribute, handler attribute, handler element or condition expressions");
+
return null;
}
-
}
17 years, 8 months
- 1
- 0