JBoss JBPM SVN: r1941 - 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-20 10:07:10 -0400 (Wed, 20 Aug 2008)
New Revision: 1941
Added:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.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/model/AbstractElement.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.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/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/model/impl/AbstractElementImpl.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/EndEventImpl.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/FlowObjectImpl.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/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/SendTaskImpl.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/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/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java
Log:
More Synchronization tests
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -23,7 +23,11 @@
// $Id: $
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.runtime.Attachments;
/**
@@ -34,6 +38,9 @@
*/
public abstract class ExecutionManager
{
+ private int maxProcessThreads = 10;
+ private ExecutorService procExecutor = Executors.newFixedThreadPool(maxProcessThreads);
+
// Hide public constructor
protected ExecutionManager()
{
@@ -49,10 +56,26 @@
}
/**
- * Start the Process and return a Future
+ * Get the process executor service
+ */
+ public ExecutorService getProcessExecutor()
+ {
+ return procExecutor;
+ }
+
+ /**
+ * Start the Process
*
* @param proc The Process to start
* @param att The Attachments in the ExecutionContext
*/
public abstract void startProcess(Process proc, Attachments att);
+
+ /**
+ * Start the Process from a given start event
+ *
+ * @param start The StartEvent that triggers the process
+ * @param att The Attachments in the ExecutionContext
+ */
+ public abstract void startProcess(StartEvent start, Attachments att);
}
Modified: 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 2008-08-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -28,7 +28,7 @@
import javax.management.ObjectName;
/**
- * The parrent of all BPMN elements
+ * The parrent of all Elements
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -142,7 +142,7 @@
* <p/>
* This method until the process ends without timeout.
*/
- void waitForEnd();
+ ProcessStatus waitForEnd();
/**
* All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event.
@@ -150,5 +150,5 @@
* <p/>
* This method until the process ends with a given timeout.
*/
- void waitForEnd(long timeout);
+ ProcessStatus waitForEnd(long timeout);
}
\ No newline at end of file
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ExecutorService;
import javax.management.ObjectName;
@@ -40,12 +41,14 @@
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Process.ProcessStatus;
import org.jboss.bpm.model.Signal.SignalType;
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.model.impl.TokenExecutorImpl.StartCallback;
import org.jboss.bpm.ri.runtime.DelegatingToken;
import org.jboss.bpm.ri.runtime.MutableToken;
import org.jboss.bpm.ri.runtime.RuntimeProcess;
@@ -64,48 +67,77 @@
public class ExecutionManagerImpl extends ExecutionManager
{
// provide logging
- private static final Log log = LogFactory.getLog(ExecutionManager.class);
+ private static final Log log = LogFactory.getLog(ExecutionManagerImpl.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)
{
- final ProcessImpl procImpl = (ProcessImpl)proc;
- procImpl.setProcessStatus(Process.ProcessStatus.Active);
-
- SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_PROCESS_ENTER));
-
+ // Setup the StartCallback that will be called from the Token Executor
final RuntimeProcessImpl rtProc = new RuntimeProcessImpl(proc);
- final RunnableProcess runnableProcess = new RunnableProcess(rtProc, att);
- TokenExecutorImpl.StartCallback callback = new TokenExecutorImpl.StartCallback()
+ final RunnableProcess runnableProcess = new RunnableProcess(rtProc);
+ runtimeProcesses.put(proc.getID(), rtProc);
+
+ StartCallback startCallback = new StartCallback()
{
public void start(Token token)
{
- processStartTimeAssignments(procImpl, token);
-
- Thread executorThread = new Thread(runnableProcess);
- procImpl.setExecutorThread(executorThread);
- executorThread.start();
+ // Process start time assignments
+ startTimeAssignments(proc, token);
+
+ // Execute the Process through the ExecutorService
+ ExecutorService processExecutor = getProcessExecutor();
+ log.debug("Execute runnableProcess");
+ processExecutor.execute(runnableProcess);
+ //new Thread(runnableProcess).start();
+
+ synchronized (proc)
+ {
+ // Wait for the process to become active
+ while (proc.getProcessStatus() == ProcessStatus.Ready)
+ {
+ try
+ {
+ log.debug("Wait for process to become active");
+ proc.wait();
+ log.debug("Notified: " + proc);
+ }
+ catch (InterruptedException ex)
+ {
+ log.error(ex);
+ }
+ }
+ }
}
};
- TokenExecutor tokenExecutor = new TokenExecutorImpl(rtProc, callback);
- rtProc.setTokenExecutor(tokenExecutor);
- addRuntimeProcess(rtProc);
+ rtProc.setTokenExecutor(new TokenExecutorImpl(rtProc, startCallback));
- StartEvent start = getStartEvent(procImpl);
+ // Get the None Start Event if there is one and start the initial flow
+ StartEvent start = getNoneStartEvent(proc);
if (start != null)
- {
- TokenImpl token = new TokenImpl(att);
- tokenExecutor.create(token, new InitialFlow(start));
- tokenExecutor.start(token);
- }
+ startProcessInternal(start, att);
}
- private StartEvent getStartEvent(ProcessImpl proc)
+ @Override
+ public void startProcess(StartEvent start, Attachments att)
{
+ startProcessInternal(start, att);
+ }
+
+ private synchronized void startProcessInternal(StartEvent start, Attachments att)
+ {
+ ObjectName procID = start.getProcess().getID();
+ RuntimeProcess rtProc = runtimeProcesses.get(procID);
+ TokenExecutor tokenExecutor = rtProc.getTokenExecutor();
+ TokenImpl token = new TokenImpl(att);
+ tokenExecutor.create(token, new InitialFlow(start));
+ tokenExecutor.start(token);
+ }
+
+ private StartEvent getNoneStartEvent(Process proc)
+ {
StartEvent start = null;
for (StartEvent aux : proc.getFlowObjects(StartEvent.class))
{
@@ -118,9 +150,9 @@
}
return start;
}
-
+
// Evaluate the Start time assignments
- private void processStartTimeAssignments(ProcessImpl proc, Token token)
+ private void startTimeAssignments(Process proc, Token token)
{
DelegatingToken delegatingToken = new DelegatingToken((MutableToken)token);
ExecutionContext exContext = token.getExecutionContext();
@@ -151,78 +183,73 @@
}
/**
- * Get a {@link RuntimeProcess} for a given processID
- * @return null if there is no such process
+ * The runnable 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;
- Attachments att;
+ private RuntimeProcess rtProc;
- public RunnableProcess(RuntimeProcess rtProc, Attachments att)
+ public RunnableProcess(RuntimeProcess rtProc)
{
this.rtProc = rtProc;
- this.att = att;
}
public void run()
{
+ log.debug("RunnableProcess started");
+
TokenExecutor tokenExecutor = rtProc.getTokenExecutor();
- ProcessImpl proc = (ProcessImpl)rtProc.getProcess();
-
+ ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
+ Process proc = rtProc.getProcess();
+
+ SignalManager signalManager = SignalManager.locateSignalManager();
+
+ ObjectName procID = proc.getID();
String procName = proc.getName();
- Process.ProcessStatus procStatus = proc.getProcessStatus();
- boolean hasActiveTokens = tokenExecutor.hasRunnableTokens();
try
{
synchronized (proc)
{
- while (procStatus == Process.ProcessStatus.Active && hasActiveTokens)
+ procImpl.setProcessStatus(ProcessStatus.Active);
+ signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_PROCESS_ENTER));
+
+ // Notify that the Process is Active
+ proc.notifyAll();
+
+ // Wait until there are no more runnable tokens
+ while (tokenExecutor.hasRunnableTokens())
{
try
{
+ log.debug("Start Waiting");
proc.wait();
+ log.debug("Stop Waiting");
}
catch (InterruptedException ex)
{
log.error("Executor thread interrupted");
}
- procStatus = proc.getProcessStatus();
- hasActiveTokens = tokenExecutor.hasRunnableTokens();
}
- log.debug("End execution thread [status=" + procStatus + ",tokens=" + tokenExecutor.getRunnableTokens() + "]");
+ log.debug("End execution thread [proc=" + procName + ",status=" + proc.getProcessStatus() + "]");
}
}
finally
{
- SignalManager signalManager = SignalManager.locateSignalManager();
signalManager.throwSignal(procName, new Signal(procName, Signal.SignalType.SYSTEM_PROCESS_EXIT));
- if (procStatus == Process.ProcessStatus.Active)
+ synchronized (proc)
{
- ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
- procImpl.setProcessStatus(Process.ProcessStatus.Completed);
+ if (proc.getProcessStatus() == ProcessStatus.Active)
+ procImpl.setProcessStatus(ProcessStatus.Completed);
+
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ procManager.unregisterProcess(proc);
+ runtimeProcesses.remove(procID);
+
+ // Notify the Process
+ log.debug("Notify Process");
+ proc.notifyAll();
}
-
- ProcessManager procManager = ProcessManager.locateProcessManager();
- procManager.unregisterProcess(rtProc.getProcess());
- removeRuntimeProcess(rtProc);
}
}
}
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/ri/client/ProcessManagerImpl.java 2008-08-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -28,7 +28,8 @@
import org.jboss.bpm.client.DialectHandler;
import org.jboss.bpm.client.DialectRegistry;
import org.jboss.bpm.client.ProcessManager;
-
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.ri.model.impl.ProcessImpl;
/**
* The process manager is the entry point to create, find and otherwise manage processes.
*
@@ -46,4 +47,20 @@
{
this.dialectRegistry = dialectRegistry;
}
+
+ @Override
+ public void registerProcess(Process proc)
+ {
+ super.registerProcess(proc);
+ ProcessImpl procImpl = (ProcessImpl)proc;
+ procImpl.registerElement(proc);
+ }
+
+ @Override
+ public void unregisterProcess(Process proc)
+ {
+ ProcessImpl procImpl = (ProcessImpl)proc;
+ procImpl.unregisterElement(proc);
+ super.unregisterProcess(proc);
+ }
}
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/RunnableToken.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -28,6 +28,7 @@
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Process.ProcessStatus;
import org.jboss.bpm.ri.model.impl.FlowObjectImpl;
import org.jboss.bpm.ri.model.impl.ProcessImpl;
import org.jboss.bpm.ri.runtime.DelegatingToken;
@@ -67,7 +68,7 @@
public void run()
{
TokenExecutor tokenExecutor = rtProc.getTokenExecutor();
- ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
+ Process proc = rtProc.getProcess();
try
{
ConnectingObject flow = token.getFlow();
@@ -75,8 +76,8 @@
throw new IllegalStateException("Cannot obtain initial flow");
TokenStatus tokStatus = token.getTokenStatus();
- Process.ProcessStatus procStatus = procImpl.getProcessStatus();
- while (procStatus == Process.ProcessStatus.Active && tokStatus == TokenStatus.Started)
+ ProcessStatus procStatus = proc.getProcessStatus();
+ while (procStatus == ProcessStatus.Active && tokStatus == TokenStatus.Started)
{
flow = token.getFlow();
@@ -85,7 +86,7 @@
SignalHandler sigHandler = getSignalHandler(targetFlowObject);
// Synchronize execution on the target FlowObject
- synchronized (procImpl)
+ synchronized (targetFlowObject)
{
try
{
@@ -111,28 +112,22 @@
{
sigHandler.throwExitSignal();
}
+
+ tokStatus = token.getTokenStatus();
+ procStatus = proc.getProcessStatus();
}
-
- tokStatus = token.getTokenStatus();
- procStatus = procImpl.getProcessStatus();
}
}
catch (RuntimeException rte)
{
- log.error("Process aborted: " + procImpl, rte);
- procImpl.setProcessStatus(Process.ProcessStatus.Aborted);
- procImpl.setRuntimeException(rte);
+ log.error("Process aborted: " + proc, rte);
+ ((ProcessImpl)proc).setRuntimeException(rte);
+ tokenExecutor.destroy(token);
}
finally
{
if (token.getTokenStatus() != TokenStatus.Suspended)
- token.setTokenStatus(TokenStatus.Destroyed);
-
- synchronized (procImpl)
- {
- // Notify the ExecutionManager when a token terminates
- procImpl.notifyAll();
- }
+ tokenExecutor.destroy(token);
}
}
Modified: 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/model/impl/AbstractElementImpl.java 2008-08-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -26,16 +26,13 @@
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;
/**
+ * The parrent of all Elements
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
@@ -43,53 +40,51 @@
@SuppressWarnings("serial")
public class AbstractElementImpl implements AbstractElement
{
- private ObjectName id;
+ protected ObjectName id;
+ /**
+ * Get the ID of this element
+ */
public ObjectName getID()
{
+ if (id == null)
+ {
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+ str.append("type=Other,id=" + new UID());
+ id = ObjectNameFactory.create(str.toString());
+ }
return id;
}
/**
- * Initialize the flow object
+ * Called when the process is created
*/
- protected void initialize(ProcessImpl proc)
+ protected void createElement(Process proc)
{
- assignElementID();
+ // nothing to do
}
- protected void assignElementID()
+ /**
+ * Called when the process is registered
+ */
+ protected void registerElement(Process proc)
{
- 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());
+ // nothing to do
}
+
+ /**
+ * Called when the process is unregistered
+ */
+ protected void unregisterElement(Process proc)
+ {
+ // nothing to do
+ }
+
+ /**
+ * Called when the process is destroyed
+ */
+ protected void destroyElement(Process proc)
+ {
+ // nothing to do
+ }
}
\ No newline at end of file
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -35,6 +35,7 @@
import org.jboss.bpm.model.InputSet;
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.SequenceFlow;
import org.jboss.bpm.ri.runtime.MutableToken;
@@ -299,9 +300,9 @@
}
@Override
- protected void initialize(ProcessImpl proc)
+ protected void createElement(Process proc)
{
- super.initialize(proc);
+ super.createElement(proc);
// Validate InputSets
for (InputSet inSet : inputSets)
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -33,6 +33,7 @@
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.MessageEventDetail;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.EventDetail.EventDetailType;
@@ -134,9 +135,9 @@
}
@Override
- protected void initialize(ProcessImpl proc)
+ protected void createElement(Process proc)
{
- super.initialize(proc);
+ super.createElement(proc);
// Initialize Results
for (EventDetail result : getResult())
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -21,14 +21,18 @@
*/
package org.jboss.bpm.ri.model.impl;
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.ObjectNameFactory;
+import org.jboss.util.id.UID;
//$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.
+ * 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
@@ -40,4 +44,16 @@
{
super(name);
}
+
+ @Override
+ public ObjectName getID()
+ {
+ if (id == null)
+ {
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+ str.append("type=Event,name=" + getName() + ",id=" + new UID());
+ id = ObjectNameFactory.create(str.toString());
+ }
+ return id;
+ }
}
\ No newline at end of file
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -56,7 +56,7 @@
public abstract class FlowObjectImpl extends GraphicalElementImpl implements FlowObject, HandlerSetterSupport
{
private String name;
- private ProcessImpl proc;
+ private Process proc;
private FlowHandler flowHandler;
private SignalHandler signalHandler;
private ExecutionHandler executionHandler;
@@ -212,9 +212,9 @@
}
@Override
- protected void initialize(ProcessImpl proc)
+ protected void createElement(Process proc)
{
- super.initialize(proc);
+ super.createElement(proc);
this.proc = proc;
// Check required name
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -29,16 +29,21 @@
import java.util.List;
import java.util.Map;
+import javax.management.ObjectName;
+
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.ConnectingObject;
+import org.jboss.bpm.model.Constants;
import org.jboss.bpm.model.Gate;
import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
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;
+import org.jboss.util.id.UID;
/**
* Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge
@@ -64,6 +69,18 @@
super(name);
}
+ @Override
+ public ObjectName getID()
+ {
+ if (id == null)
+ {
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+ str.append("type=Gateway,name=" + getName() + ",id=" + new UID());
+ id = ObjectNameFactory.create(str.toString());
+ }
+ return id;
+ }
+
public List<Gate> getGates()
{
return Collections.unmodifiableList(new ArrayList<Gate>(gates.values()));
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -85,16 +85,13 @@
public Process getProcess()
{
- if (getProcessInternal() == null)
- throw new IllegalStateException("No process has been added");
- getProcessInternal().initialize();
- return getProcessInternal();
+ ProcessImpl internalProc = getProcessInternal();
+ internalProc.createElement(internalProc);
+ return internalProc;
}
public Process getProcessForInclude()
{
- if (getProcessInternal() == null)
- throw new IllegalStateException("No process has been added");
return getProcessInternal();
}
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -23,10 +23,6 @@
//$Id$
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -41,17 +37,20 @@
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.ObjectNameFactory;
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.runtime.Attachments;
+import org.jboss.util.id.UID;
/**
* A Process is any Activity performed within a company or organization.
@@ -76,12 +75,22 @@
// The process assignments
private List<Assignment> assignments = new ArrayList<Assignment>();
// the status of the process
- private Process.ProcessStatus status = Process.ProcessStatus.None;
+ private ProcessStatus status = ProcessStatus.None;
// The possible exception that caused the process to abort
private RuntimeException runtimeException;
- // The thread of the executor
- private Thread executorThread;
+ @Override
+ public ObjectName getID()
+ {
+ if (id == null)
+ {
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+ str.append("type=Process,name=" + getName() + ",id=" + new UID());
+ id = ObjectNameFactory.create(str.toString());
+ }
+ return id;
+ }
+
public ProcessImpl(String name)
{
this.name = name;
@@ -143,7 +152,7 @@
Property prop = getProperty(name);
return prop != null ? prop.getValue(clazz) : null;
}
-
+
public List<Property> getProperties()
{
return Collections.unmodifiableList(props);
@@ -177,39 +186,17 @@
public void setRuntimeException(RuntimeException rte)
{
this.runtimeException = rte;
+ setProcessStatus(ProcessStatus.Aborted);
}
public List<FlowObject> getFlowObjects()
{
-
- if (status == Process.ProcessStatus.None)
+ if (status == ProcessStatus.None)
return flowObjects;
return Collections.unmodifiableList(flowObjects);
}
- /**
- * A naive copy implementation that relies on serialization
- */
- public Process copyProcess()
- {
- try
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(this);
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- ProcessImpl proc = (ProcessImpl)ois.readObject();
- proc.assignElementID();
- return proc;
- }
- catch (Exception ex)
- {
- throw new InvalidProcessException("Cannot create a copy of: " + this, ex);
- }
- }
-
public ObjectName startProcess()
{
return startProcess(null);
@@ -219,10 +206,10 @@
{
ProcessManager pm = ProcessManager.locateProcessManager();
- if (status == Process.ProcessStatus.Aborted || status == Process.ProcessStatus.Completed)
+ if (status == ProcessStatus.Aborted || status == ProcessStatus.Completed)
resetProcess();
- if (status != Process.ProcessStatus.Ready)
+ if (status != ProcessStatus.Ready)
throw new IllegalStateException("Cannot start process in state: " + status);
// Register the process if needed
@@ -244,18 +231,18 @@
FlowObjectImpl foImpl = (FlowObjectImpl)fo;
foImpl.reset();
}
- status = Process.ProcessStatus.Ready;
+ status = ProcessStatus.Ready;
runtimeException = null;
}
- public void waitForEnd()
+ public ProcessStatus waitForEnd()
{
- waitForEndInternal(0);
+ return waitForEndInternal(0);
}
- public void waitForEnd(long timeout)
+ public ProcessStatus waitForEnd(long timeout)
{
- waitForEndInternal(timeout);
+ return waitForEndInternal(timeout);
}
/**
@@ -263,14 +250,11 @@
* arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was
* aborted this method throws the causing RuntimeException if avaialable.
*/
- private void waitForEndInternal(long timeout)
+ private ProcessStatus waitForEndInternal(long timeout)
{
- if (status == Process.ProcessStatus.None || status == Process.ProcessStatus.Ready)
+ if (status != ProcessStatus.Ready && status != ProcessStatus.Active)
throw new IllegalStateException("Cannot wait for process in state: " + status);
- if (executorThread == null)
- throw new IllegalStateException("No start signal, cannot obtain excutor thread");
-
// Wait a little for the process to end
boolean forever = (timeout < 1);
long now = System.currentTimeMillis();
@@ -279,28 +263,35 @@
{
while (forever || now < until)
{
- if (isProcessTerminated())
+ synchronized (this)
{
- if (getRuntimeException() != null)
- throw new BPMException("Process aborted", getRuntimeException());
-
- break;
+ if (isProcessTerminated())
+ {
+ if (runtimeException != null)
+ {
+ throw new BPMException("Process aborted", runtimeException);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ // Start waiting to get notified
+ long waitTimeout = forever ? 0 : until - now;
+ log.debug("Start Waiting: " + waitTimeout + "ms");
+ wait(waitTimeout);
+ log.debug("Stop Waiting");
}
-
- // Join the executor thread
- getExecutorThread().join(timeout);
now = System.currentTimeMillis();
}
-
+
// Throw timeout exception if it took too long
if (isProcessTerminated() == false)
{
RuntimeException rte = new ProcessTimeoutException("Process timeout after " + timeout + "ms for: " + getID());
+ setRuntimeException(rte);
log.error(rte);
-
- log.error("Interrupt executor thread");
- getExecutorThread().interrupt();
-
throw rte;
}
}
@@ -315,11 +306,13 @@
if (procManager.getProcessByID(getID()) != null)
procManager.unregisterProcess(this);
}
+
+ return status;
}
- private boolean isProcessTerminated()
+ private synchronized boolean isProcessTerminated()
{
- return status == Process.ProcessStatus.Cancelled || status == Process.ProcessStatus.Completed || status == Process.ProcessStatus.Aborted;
+ return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted;
}
public FlowObject getFlowObject(String name)
@@ -351,26 +344,16 @@
return retFlowObjects;
}
- public Process.ProcessStatus getProcessStatus()
+ public synchronized ProcessStatus getProcessStatus()
{
return status;
}
- public void setProcessStatus(Process.ProcessStatus status)
+ public synchronized void setProcessStatus(ProcessStatus status)
{
this.status = status;
}
- public Thread getExecutorThread()
- {
- return executorThread;
- }
-
- public void setExecutorThread(Thread executorThread)
- {
- this.executorThread = executorThread;
- }
-
public List<Message> getMessages()
{
return Collections.unmodifiableList(messages);
@@ -394,13 +377,14 @@
return null;
}
- public void initialize()
+ @Override
+ public void createElement(Process proc)
{
- if (status != Process.ProcessStatus.None)
+ if (status != ProcessStatus.None)
throw new IllegalStateException("Cannot initialize process in state: " + status);
// Initialize the Element
- super.initialize(this);
+ super.createElement(this);
// Set the anonymous default name
if (getName() == null)
@@ -419,12 +403,45 @@
for (FlowObject fo : flowObjects)
{
FlowObjectImpl foImpl = (FlowObjectImpl)fo;
- foImpl.initialize(this);
+ foImpl.createElement(this);
}
- status = Process.ProcessStatus.Ready;
+ status = ProcessStatus.Ready;
}
+ @Override
+ public void registerElement(Process proc)
+ {
+ super.registerElement(proc);
+ for (FlowObject fo : flowObjects)
+ {
+ FlowObjectImpl foImpl = (FlowObjectImpl)fo;
+ foImpl.registerElement(this);
+ }
+ }
+
+ @Override
+ public void unregisterElement(Process proc)
+ {
+ for (FlowObject fo : flowObjects)
+ {
+ FlowObjectImpl foImpl = (FlowObjectImpl)fo;
+ foImpl.unregisterElement(this);
+ }
+ super.unregisterElement(proc);
+ }
+
+ @Override
+ public void destroyElement(Process proc)
+ {
+ for (FlowObject fo : flowObjects)
+ {
+ FlowObjectImpl foImpl = (FlowObjectImpl)fo;
+ foImpl.destroyElement(this);
+ }
+ super.destroyElement(proc);
+ }
+
protected void initializeMessageRef(Message msgRef)
{
String msgName = msgRef.getName();
@@ -444,6 +461,6 @@
public String toString()
{
- return "Process[" + getName() + "]";
+ return "Process[" + getName() + ",status=" + status + "]";
}
}
\ No newline at end of file
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -30,6 +30,7 @@
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.ReceiveTask;
import org.jboss.bpm.model.Message.Implementation;
@@ -169,13 +170,14 @@
}
@Override
- protected void initialize(ProcessImpl proc)
+ protected void createElement(Process proc)
{
- super.initialize(proc);
+ super.createElement(proc);
if (messageRef == null)
throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered");
- proc.initializeMessageRef(messageRef);
+ ProcessImpl procImpl = (ProcessImpl)proc;
+ procImpl.initializeMessageRef(messageRef);
}
}
\ No newline at end of file
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -26,6 +26,7 @@
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SendTask;
import org.jboss.bpm.model.Message.Implementation;
import org.jboss.bpm.runtime.Token;
@@ -79,14 +80,15 @@
}
@Override
- protected void initialize(ProcessImpl proc)
+ protected void createElement(Process proc)
{
- super.initialize(proc);
+ super.createElement(proc);
if (messageRef == null)
throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered");
- proc.initializeMessageRef(messageRef);
+ ProcessImpl procImpl = (ProcessImpl)proc;
+ procImpl.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/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -38,9 +38,7 @@
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.model.Process.ProcessStatus;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.runtime.TokenExecutor;
@@ -61,6 +59,7 @@
private SequenceFlow outFlow;
private List<EventDetail> triggers = new ArrayList<EventDetail>();
+ private SignalListener startListener;
public StartEventImpl(String name)
{
@@ -118,9 +117,9 @@
}
@Override
- protected void initialize(final ProcessImpl proc)
+ protected void registerElement(final Process proc)
{
- super.initialize(proc);
+ super.registerElement(proc);
for (EventDetail eventDetail : getTrigger())
{
@@ -130,45 +129,57 @@
// Register the start signal listener
if (eventDetail instanceof SignalEventDetail)
{
- SignalEventDetail signalEventDetail = (SignalEventDetail)eventDetail;
- final Signal startSignal = signalEventDetail.getSignalRef();
- final StartEvent start = this;
- SignalListener listener = new SignalListener()
+ if (startListener == null)
{
- public void catchSignal(Signal signal)
+ SignalEventDetail signalEventDetail = (SignalEventDetail)eventDetail;
+ final Signal startSignal = signalEventDetail.getSignalRef();
+ final StartEvent start = this;
+ startListener = new SignalListener()
{
- if (startSignal.getSignalType() == signal.getSignalType() && startSignal.getMessage().equals(signal.getMessage()))
+ public void catchSignal(Signal signal)
{
- log.debug("catchSignal: " + signal);
- if (proc.getProcessStatus() == Process.ProcessStatus.Active)
+ if (startSignal.getSignalType() == signal.getSignalType() && startSignal.getMessage().equals(signal.getMessage()))
{
- log.debug("Start process from signal: " + signal);
- ExecutionManagerImpl exManager = (ExecutionManagerImpl)ExecutionManager.locateExecutionManager();
- RuntimeProcess rtProc = exManager.getRuntimeProcess(start.getProcess().getID());
- TokenExecutor tokenExecutor = rtProc.getTokenExecutor();
- TokenImpl token = new TokenImpl(null);
- tokenExecutor.create(token, getOutFlow());
- tokenExecutor.start(token);
+ log.debug("catchSignal: " + signal);
+ ProcessStatus procStatus = proc.getProcessStatus();
+ if (procStatus == ProcessStatus.Ready || procStatus == ProcessStatus.Active)
+ {
+ log.debug("Start process from signal: " + signal);
+ ExecutionManager exManager = ExecutionManager.locateExecutionManager();
+ exManager.startProcess(start, null);
+ }
+ else
+ {
+ log.debug("Ignore start signal for process: " + proc);
+ }
}
- else
- {
- log.debug("Ignore start signal for process: " + proc);
- }
}
- }
-
- public String toString()
- {
- return start + "." + startSignal;
- }
- };
- SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.addSignalListener(getProcess().getName(), listener);
+
+ public String toString()
+ {
+ return start + "." + startSignal;
+ }
+ };
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ signalManager.addSignalListener(getProcess().getName(), startListener);
+ }
}
}
}
+
+ @Override
+ protected void unregisterElement(final Process proc)
+ {
+ // Unregister the start signal listener
+ if (startListener != null)
+ {
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ signalManager.removeSignalListener(getProcess().getName(), startListener);
+ startListener = null;
+ }
+ super.unregisterElement(proc);
+ }
-
public String toString()
{
return "StartEvent[" + getName() + "]";
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -21,10 +21,15 @@
*/
package org.jboss.bpm.ri.model.impl;
+import javax.management.ObjectName;
+
import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.Constants;
+import org.jboss.bpm.model.ObjectNameFactory;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.Task;
import org.jboss.bpm.runtime.SignalHandler;
+import org.jboss.util.id.UID;
//$Id$
@@ -52,6 +57,18 @@
public abstract TaskType getTaskType();
+ @Override
+ public ObjectName getID()
+ {
+ if (id == null)
+ {
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+ str.append("type=Task,name=" + getName() + ",id=" + new UID());
+ id = ObjectNameFactory.create(str.toString());
+ }
+ return id;
+ }
+
public SignalHandler getSignalHandler()
{
SignalHandler handler = super.getSignalHandler();
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -36,6 +36,7 @@
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.SequenceFlow;
+import org.jboss.bpm.model.Process.ProcessStatus;
import org.jboss.bpm.ri.client.RunnableToken;
import org.jboss.bpm.ri.runtime.MutableToken;
import org.jboss.bpm.ri.runtime.RuntimeProcess;
@@ -45,8 +46,8 @@
import org.jboss.bpm.runtime.Token.TokenStatus;
/**
- * The {@link FlowHandler} invokes the TokenExecutor to schedule
- * {@link ConnectingObject} objects together with their associated {@link Token}.
+ * The {@link FlowHandler} invokes the TokenExecutor to schedule {@link ConnectingObject} objects together with their
+ * associated {@link Token}.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
@@ -55,7 +56,7 @@
{
// provide logging
private static final Log log = LogFactory.getLog(TokenExecutorImpl.class);
-
+
public interface StartCallback
{
void start(Token token);
@@ -77,7 +78,7 @@
Set<Token> tokenSet = new HashSet<Token>();
for (RunnableToken rt : runnableTokens.values())
tokenSet.add(rt.getToken());
-
+
return Collections.unmodifiableSet(tokenSet);
}
@@ -85,7 +86,7 @@
{
return runnableTokens.size() > 0;
}
-
+
public void create(Token token, SequenceFlow initialFlow)
{
MutableToken mutableToken = (MutableToken)token;
@@ -93,23 +94,25 @@
RunnableToken rtToken = new RunnableToken(rtProc, mutableToken);
runnableTokens.put(token.getTokenID(), rtToken);
}
-
+
public void start(Token token)
{
Process proc = rtProc.getProcess();
- if (proc.getProcessStatus() != Process.ProcessStatus.Active)
- throw new IllegalStateException("Cannot start token to process in state: " + proc.getProcessStatus());
-
+ ProcessStatus procStatus = proc.getProcessStatus();
+ if (procStatus != ProcessStatus.Ready && procStatus != ProcessStatus.Active)
+ throw new IllegalStateException("Cannot start token to process in state: " + procStatus);
+
log.debug("Start Token: " + token);
MutableToken mutableToken = (MutableToken)token;
mutableToken.setTokenStatus(TokenStatus.Started);
-
+
if (startCallback != null)
{
+ log.debug("Call start callback: " + token);
startCallback.start(token);
startCallback = null;
}
-
+
RunnableToken rtToken = runnableTokens.get(token.getTokenID());
executor.submit(rtToken);
}
@@ -118,7 +121,7 @@
{
if (flow == null)
throw new IllegalArgumentException("Flow cannot be null");
-
+
MutableToken mutableToken = (MutableToken)token;
mutableToken.setFlow(flow);
}
@@ -151,15 +154,15 @@
RunnableToken rtToken = runnableTokens.get(tokenID);
if (rtToken == null)
throw new IllegalStateException("Not a runnable token: " + tokenID);
-
+
Token token = rtToken.getToken();
if (token.getTokenStatus() != TokenStatus.Suspended)
throw new IllegalStateException("Activate token in state: " + token.getTokenStatus());
-
+
log.debug("Activate Token: " + token);
MutableToken mutableToken = (MutableToken)token;
mutableToken.setTokenStatus(TokenStatus.Started);
-
+
executor.submit(rtToken);
return token;
}
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingExecutionContext.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -53,7 +53,7 @@
this.flowObject = flowObject;
this.delegate = delegate;
- proc = (Process)flowObject.getProcess();
+ proc = flowObject.getProcess();
procPrefix = proc.getName() + ".";
activityPrefix = procPrefix + flowObject.getName() + ".";
}
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -55,14 +55,14 @@
public void testParallelMerge() throws Exception
{
Process proc = getProcess();
- proc.startProcess();
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
@@ -77,11 +77,11 @@
public void testMergeTimeout() throws Exception
{
Process proc = getProcess();
- proc.startProcess();
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
try
@@ -98,14 +98,14 @@
public void testInvalidToken() throws Exception
{
Process proc = getProcess();
- proc.startProcess();
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A");
signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
try
@@ -118,14 +118,12 @@
// expected
}
- // Restart the process
- proc.startProcess();
-
// Add a signal listener that sends the other start trigger signal
startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.cts.startevent;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.bpm.client.SignalListener;
+import org.jboss.bpm.client.SignalManager;
+import org.jboss.bpm.model.EventBuilder;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.model.Signal.SignalType;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Test start event with signal trigger
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class StartEventSignalTest extends DefaultEngineTestCase
+{
+ public void testStart() throws Exception
+ {
+ Process proc = getProcess();
+
+ // Start the process and send start trigger signal
+ proc.startProcess();
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+
+ // Wait for the process to end
+ proc.waitForEnd();
+
+ // Verify the result
+ Message endMessage = getMessages().get(0);
+ assertEquals("TaskA", endMessage.getPropertyValue("taskValue"));
+ }
+
+ public void testRestart() throws Exception
+ {
+ Process proc = getProcess();
+
+ // Start the process and send start trigger signal
+ proc.startProcess();
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+
+ // Wait for the process to end
+ proc.waitForEnd();
+
+ // Start the process and send start trigger signal
+ proc.startProcess();
+ signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+
+ // Wait for the process to end
+ proc.waitForEnd();
+
+ // Verify the result
+ List<Message> messages = getMessages();
+ assertEquals(2, messages.size());
+ assertEquals("TaskA", messages.get(0).getPropertyValue("taskValue"));
+ assertEquals("TaskA", messages.get(1).getPropertyValue("taskValue"));
+ }
+
+ public void testRestartBeforeEnd() throws Exception
+ {
+ Process proc = getProcess();
+
+ // Add a signal listener that sends the other start trigger signal
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A");
+ signalManager.addSignalListener(proc.getName(), new TaskListener(proc.getName(), startTrigger));
+
+ // Start the process and send start trigger signal
+ proc.startProcess();
+ signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+
+ // Wait for the process to end
+ proc.waitForEnd();
+
+ // Verify the result
+ List<Message> messages = getMessages();
+ assertEquals(2, messages.size());
+ assertEquals("TaskA", messages.get(0).getPropertyValue("taskValue"));
+ assertEquals("TaskA", messages.get(1).getPropertyValue("taskValue"));
+ }
+
+ public Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
+ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A")
+ .addSequenceFlow("TaskA");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValue");
+ taskBuilder.addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("taskValue", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+
+ public static class TaskListener implements SignalListener
+ {
+ private String fromRef;
+ private Signal nextSignal;
+
+ public TaskListener(String fromRef, Signal nextSignal)
+ {
+ this.fromRef = fromRef;
+ this.nextSignal = nextSignal;
+ }
+
+ public void catchSignal(Signal signal)
+ {
+ if (signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER)
+ {
+ if (nextSignal != null)
+ {
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ signalManager.throwSignal(fromRef, nextSignal);
+ nextSignal = null;
+ }
+ }
+ }
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-20 13:09:23 UTC (rev 1940)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-20 14:07:10 UTC (rev 1941)
@@ -55,14 +55,14 @@
public void testParallelMerge() throws Exception
{
Process proc = getProcess();
- proc.startProcess();
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
@@ -77,9 +77,9 @@
public void testMergeTimeout() throws Exception
{
Process proc = getProcess();
- proc.startProcess();
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
SignalManager signalManager = SignalManager.locateSignalManager();
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
@@ -98,14 +98,14 @@
public void testInvalidToken() throws Exception
{
Process proc = getProcess();
- proc.startProcess();
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A");
signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
try
@@ -118,14 +118,12 @@
// expected
}
- // Restart the process
- proc.startProcess();
-
// Add a signal listener that sends the other start trigger signal
startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
- // Send start trigger signal
+ // Start the process and send start trigger signal
+ proc.startProcess();
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1940 - in jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client: metric and 3 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-08-20 09:09:23 -0400 (Wed, 20 Aug 2008)
New Revision: 1940
Added:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/MainMenuPanel.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/TeaserPanel.java
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/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/model/HelpDAO.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.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/ProcessInstanceList.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/BarChart.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java
Log:
Begin metrics and stats views
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-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -30,6 +30,7 @@
import com.gwtext.client.widgets.layout.BorderLayout;
import com.gwtext.client.widgets.layout.BorderLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
+import org.jboss.bpm.console.client.metric.MetricOverviewEditor;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
import org.jboss.bpm.console.client.widgets.EditorView;
import org.jboss.bpm.console.client.widgets.UIConstants;
@@ -81,6 +82,7 @@
// ------------------------------------------
editorPanel.addEditor( new ProcessDefinitionListEditor(this), false );
+ editorPanel.addEditor( new MetricOverviewEditor(this), false);
// ------------------------------------------
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-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -69,11 +69,13 @@
public boolean hasEditor(String id)
{
boolean b = false;
+ final String tabId = id +".tab";
+
Component[] tabs = this.getItems();
for(int i=0; i<tabs.length; i++)
{
Component tab = tabs[i];
- if(tab.getId().equals(id))
+ if(tab.getId().equals(tabId))
{
b=true;
break;
@@ -85,7 +87,8 @@
public void showTab(String id)
{
- this.setActiveTab(id);
+ final String tabId = id+".tab";
+ this.setActiveTab(tabId);
}
class WrapperPanel extends Panel
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-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/MainMenu.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -21,10 +21,16 @@
*/
package org.jboss.bpm.console.client;
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.data.Node;
import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.layout.AccordionLayout;
+import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.tree.TreePanel;
-import com.gwtext.client.widgets.tree.TreeNode;
-import com.gwtext.client.widgets.layout.AccordionLayout;
+import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
+import org.jboss.bpm.console.client.metric.MetricOverviewEditor;
+import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
+import org.jboss.bpm.console.client.widgets.MainMenuPanel;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -45,33 +51,14 @@
this.setWidth(200);
this.setLayout(accordion);
- Panel navPanel = new Panel();
- navPanel.setTitle("Process Management");
- navPanel.setBorder(false);
- navPanel.setHideBorders(true);
- navPanel.setIconCls("bpm-process-icon");
- navPanel.add(new ProcessTree());
+ Panel navPanel = new MainMenuPanel("Process Management", "bpm-process-icon", new ProcessTree());
+ Panel taskPanel = new MainMenuPanel("Task Management", "bpm-task-icon", null);
+ Panel metricPanel = new MainMenuPanel("Metrics and Stats", "bpm-metric-icon", new MetricTree());
+ Panel settingsPanel = new MainMenuPanel("Settings", "bpm-settings-icon", null);
+
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>Settings</p>");
- settingsPanel.setTitle("Settings");
- settingsPanel.setBorder(false);
- settingsPanel.setIconCls("bpm-settings-icon");
this.add(settingsPanel);
}
@@ -82,19 +69,71 @@
TreeNode root = new TreeNode("Process Definitions");
- TreeNode view = new TreeNode("View definitions");
- view.setExpanded(true);
+ TreeNode definitions = new TreeNode("View definitions");
+ definitions.setExpanded(true);
+ definitions.addListener(
+ new TreeNodeListenerAdapter()
+ {
+ public void onClick(Node node, EventObject eventObject)
+ {
+ if(view.hasEditorView(ProcessDefinitionListEditor.ID))
+ {
+ view.showEditor(ProcessDefinitionListEditor.ID);
+ }
+ else
+ {
+ view.addEditorView( new ProcessDefinitionListEditor(view) );
+ }
+
+ }
+ }
+ );
TreeNode upload = new TreeNode("Upload new definitions");
upload.setExpanded(true);
- root.appendChild(view);
+ root.appendChild(definitions);
root.appendChild(upload);
+ setRootVisible(true);
+ setRootNode(root);
+ root.setExpanded(true);
+ }
+ }
+
+ class MetricTree extends TreePanel
+ {
+
+ public MetricTree() {
+
+ TreeNode root = new TreeNode("Process Metrics");
+
+ TreeNode overview = new TreeNode("Process workload");
+ overview.setExpanded(true);
+ overview.addListener(
+ new TreeNodeListenerAdapter()
+ {
+ public void onClick(Node node, EventObject eventObject)
+ {
+ if(view.hasEditorView(MetricOverviewEditor.ID))
+ {
+ view.showEditor(MetricOverviewEditor.ID);
+ }
+ else
+ {
+ view.addEditorView( new MetricOverviewEditor(view) );
+ }
+
+ }
+ }
+ );
+
+ TreeNode export = new TreeNode("Export stats");
+ export.setExpanded(true);
+
+ root.appendChild(overview);
+ root.appendChild(export);
+
setRootVisible(true);
-
- /*setTitle("Company");
- setWidth(200);
- setHeight(400);*/
setRootNode(root);
root.setExpanded(true);
}
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -0,0 +1,63 @@
+/*
+ * 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.metric;
+
+import org.jboss.bpm.console.client.widgets.EditorView;
+import org.jboss.bpm.console.client.model.ProcessDefinition;
+import org.jboss.bpm.console.client.ConsoleView;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DefinitionMetricEditor extends EditorView
+{
+
+ private ProcessDefinition parent;
+ private ConsoleView view;
+
+
+ public DefinitionMetricEditor(ConsoleView view, ProcessDefinition processDefinition)
+ {
+ super();
+ this.view = view;
+ this.parent = processDefinition;
+
+ this.setId(MetricOverviewEditor.ID+"."+processDefinition.getName());
+
+ // -----------------------------------------------
+ }
+
+ public String getEditorId()
+ {
+ return getId();
+ }
+
+ public String getTitle()
+ {
+ return parent.getName() + " metrics";
+ }
+
+ public String getIconCSS()
+ {
+ return "bpm-metric-icon";
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.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/metric/DefinitionMetricView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -0,0 +1,48 @@
+/*
+ * 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.metric;
+
+import com.gwtext.client.widgets.Panel;
+import org.jboss.bpm.console.client.model.ProcessDefinition;
+import org.jboss.bpm.console.client.ConsoleView;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DefinitionMetricView extends Panel
+{
+ private ProcessDefinition parent;
+
+ private ConsoleView view;
+
+ public DefinitionMetricView(ConsoleView view, ProcessDefinition parent)
+ {
+ super();
+ this.view = view;
+ this.parent = parent;
+
+ this.setHeader(false);
+ this.setBorder(false);
+
+
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.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/metric/InstanceMetricView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -0,0 +1,29 @@
+/*
+ * 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.metric;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class InstanceMetricView
+{
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.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/metric/MetricOverview.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -0,0 +1,199 @@
+/*
+ * 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.metric;
+
+import com.gwtext.client.data.Record;
+import com.gwtext.client.data.SimpleStore;
+import com.gwtext.client.data.Store;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.MessageBox;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.form.*;
+import com.gwtext.client.widgets.form.event.ComboBoxListenerAdapter;
+import com.gwtext.client.core.EventObject;
+import org.jboss.bpm.console.client.model.DAOFactory;
+import org.jboss.bpm.console.client.model.ProcessDefinition;
+import org.jboss.bpm.console.client.model.ProcessDefinitionDAO;
+import org.jboss.bpm.console.client.widgets.BarChart;
+import org.jboss.bpm.console.client.widgets.UIConstants;
+import org.jboss.bpm.console.client.ConsoleView;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MetricOverview extends Panel
+{
+
+ private Map row2ProcessMap = new HashMap();
+ private final ConsoleView view;
+ private int currentSelection=-1;
+
+ public MetricOverview(final ConsoleView view)
+ {
+ super();
+ this.setHeader(false);
+ this.setBorder(false);
+
+ this.view = view;
+ // ----------------------------------
+
+ // 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(360,250, "Most used processes", "Process Name", barValues );
+ chart.setLegendVisible(false);
+ chart.setFontFamily("sans-serif");
+
+ Panel chartPanel = new Panel("Most active process definitions");
+ chartPanel.setPaddings(15);
+ chartPanel.setHeader(false);
+ chartPanel.setBorder(false);
+ chartPanel.setWidth(UIConstants.EDITOR_PANE_WIDTH);
+ chartPanel.add( chart );
+
+ // -------------------------------
+
+ Panel panel = new Panel();
+ panel.setBorder(false);
+ panel.setPaddings(15);
+
+ final FormPanel formPanel = new FormPanel();
+ formPanel.setFrame(true);
+ formPanel.setTitle("Simple Form");
+
+ formPanel.setWidth(450);
+ formPanel.setLabelWidth(75);
+ //formPanel.setUrl("save-form.php");
+
+ //create a Store using local array data
+ final Store store = new SimpleStore(
+ new String[]{"procId", "name", "version"}, getData()
+ );
+ store.load();
+
+ final ComboBox cb = new ComboBox();
+ cb.setForceSelection(true);
+ cb.setMinChars(1);
+ cb.setFieldLabel("Process");
+ cb.setStore(store);
+ cb.setDisplayField("name");
+ cb.setMode(ComboBox.LOCAL);
+ cb.setTriggerAction(ComboBox.ALL);
+ cb.setEmptyText("Enter name");
+ cb.setLoadingText("Searching...");
+ cb.setTypeAhead(true);
+ cb.setSelectOnFocus(true);
+ cb.setWidth(200);
+
+ cb.setHideTrigger(false);
+
+ cb.addListener(
+ new ComboBoxListenerAdapter()
+ {
+
+ public void onSelect(ComboBox comboBox, Record record, int i)
+ {
+ currentSelection = i;
+ }
+ }
+ );
+
+ // -------------------------------
+
+ ButtonListenerAdapter listener = new ButtonListenerAdapter()
+ {
+ public void onClick(Button button, EventObject e)
+ {
+ if(currentSelection!=-1)
+ {
+ ProcessDefinition def = (ProcessDefinition)row2ProcessMap.get(new Integer(currentSelection));
+
+ String editorId = MetricOverviewEditor.ID+"."+def.getName();
+ if(view.hasEditorView(editorId))
+ {
+ view.showEditor(editorId);
+ }
+ else
+ {
+ view.addEditorView(new DefinitionMetricEditor(view, def));
+ }
+ }
+ else
+ {
+ MessageBox.alert("Please select a process.");
+ }
+ }
+ };
+ Button button = new Button("View details", listener);
+
+ formPanel.add(cb);
+ formPanel.add(button);
+
+ panel.add(formPanel);
+
+ this.add(chartPanel);
+ this.add(panel);
+
+ // -------------------------------
+
+ // required after ext init
+ chart.update();
+ }
+
+ protected Object[][] getData()
+ {
+ ProcessDefinitionDAO dao = DAOFactory.createProcessDefinitionDAO();
+ List processDefs = dao.getAllProcessDefinitions();
+
+ Object[][] records = new Object[processDefs.size()][];
+
+ Iterator it = processDefs.iterator();
+ int row = 0;
+ while(it.hasNext())
+ {
+ ProcessDefinition pd = (ProcessDefinition)it.next();
+ records[row] = new Object[3];
+ records[row][0] = new Long(pd.getId());
+ records[row][1] = pd.getName();
+ records[row][2] = pd.getVersion();
+
+ row2ProcessMap.put(new Integer(row), pd);
+
+ row++;
+ }
+
+ return records;
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.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/metric/MetricOverviewEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -0,0 +1,92 @@
+/*
+ * 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.metric;
+
+import org.jboss.bpm.console.client.widgets.EditorView;
+import org.jboss.bpm.console.client.widgets.UIConstants;
+import org.jboss.bpm.console.client.widgets.HelpPanel;
+import org.jboss.bpm.console.client.widgets.TeaserPanel;
+import org.jboss.bpm.console.client.ConsoleView;
+import org.jboss.bpm.console.client.model.DAOFactory;
+import org.jboss.bpm.console.client.model.HelpDAO;
+import com.gwtext.client.widgets.layout.ColumnLayout;
+import com.gwtext.client.widgets.layout.ColumnLayoutData;
+import com.gwtext.client.widgets.Panel;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MetricOverviewEditor extends EditorView
+{
+
+ private ConsoleView view;
+ private Panel teaserPanel;
+
+ public final static String ID = "org.jboss.bpm.metric.ProcessMetric";
+
+ public MetricOverviewEditor(ConsoleView view)
+ {
+ super();
+ this.view = view;
+ this.setId(ID);
+
+ // -------------------------------------
+
+ this.setLayout( new ColumnLayout() );
+ this.setWidth(UIConstants.EDITOR_PANE_WIDTH);
+
+ // -------------------------------------
+
+ HelpPanel help = new HelpPanel(200, 180, "Process workload explained");
+ help.setContent( DAOFactory.getHelpDAO().getHelpByReference(HelpDAO.REF_PROCESS_METRIC));
+
+ // -------------------------------------
+
+ teaserPanel = new TeaserPanel();
+ teaserPanel.add(help);
+
+ // -------------------------------------
+
+ MetricOverview usageView = new MetricOverview(view);
+
+ // -------------------------------------
+
+ this.add(usageView, new ColumnLayoutData(0.7) );
+ this.add(teaserPanel , new ColumnLayoutData(0.3) );
+
+ }
+
+ public String getEditorId()
+ {
+ return ID;
+ }
+
+ public String getTitle()
+ {
+ return "Metrics and Stats";
+ }
+
+ public String getIconCSS()
+ {
+ return "bpm-metric-icon";
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.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/model/HelpDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java 2008-08-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -27,6 +27,7 @@
public interface HelpDAO
{
public final static int REF_PROCESS_DEFINITIONS = 100;
+ public final static int REF_PROCESS_METRIC = 200;
String getHelpByReference(int ref);
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.java 2008-08-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -38,6 +38,12 @@
"Process definitions are the base classs for any process instance. " +
"They act as an execution template for BPM engine"
);
+
+ ref2text.put(
+ new Integer(HelpDAO.REF_PROCESS_METRIC),
+ "The chart on the left displays the most used process definitions. " +
+ "Usage is defined by the number of instances that have been created for a particular definition."
+ );
}
public String getHelpByReference(int ref)
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-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -86,7 +86,7 @@
protected void onExamine(final Integer row)
{
ProcessDefinition proc = (ProcessDefinition)row2ProcessMap.get(row);
- String editorId = ProcessInstanceEditor.ID+"."+proc.getName()+".tab";
+ String editorId = ProcessInstanceEditor.ID+"."+proc.getName();
if(view.hasEditorView(editorId))
view.showEditor(editorId);
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-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -30,11 +30,10 @@
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.metric.MetricOverviewEditor;
import org.jboss.bpm.console.client.model.DAOFactory;
import org.jboss.bpm.console.client.model.HelpDAO;
-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 org.jboss.bpm.console.client.widgets.*;
import java.util.Map;
import java.util.HashMap;
@@ -50,7 +49,9 @@
private ConsoleView view;
- public ProcessDefinitionListEditor(ConsoleView view)
+ private Panel teaserPanel;
+
+ public ProcessDefinitionListEditor(final ConsoleView view)
{
super();
this.setId(ID);
@@ -58,35 +59,14 @@
this.view = view;
this.setLayout( new ColumnLayout() );
- this.setWidth(680);
+ this.setWidth(UIConstants.EDITOR_PANE_WIDTH);
// ----------------------------------
- // 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);
// ----------------------------------
+
// TODO: introduce abstractions and integrate with DAO
Map chartValues = new HashMap();
chartValues.put("1", new Double(0.65));
@@ -124,7 +104,14 @@
new ToolbarButton("More metrics", new ButtonListenerAdapter() {
public void onClick(Button button, EventObject e)
{
- // TODO: display metric tab
+ if(view.hasEditorView(MetricOverviewEditor.ID))
+ {
+ view.showEditor(MetricOverviewEditor.ID);
+ }
+ else
+ {
+ view.addEditorView( new MetricOverviewEditor(view) );
+ }
}
})
);
@@ -136,19 +123,16 @@
HelpPanel help = new HelpPanel(200, 180, "About process definitions");
help.setContent( DAOFactory.getHelpDAO().getHelpByReference(HelpDAO.REF_PROCESS_DEFINITIONS));
+ // ----------------------------------
- Panel leftPanel = new Panel();
- leftPanel.setPaddings(10,0,0,5);
- leftPanel.setLayout(new VerticalLayout(10));
- leftPanel.setHideBorders(true);
- leftPanel.setFrame(false);
- leftPanel.setBorder(false);
+ teaserPanel = new TeaserPanel();
+ teaserPanel.add(help);
+ teaserPanel.add(metricPanel);
+
+ // ----------------------------------
- leftPanel.add(help);
- leftPanel.add(metricPanel);
-
this.add(processDefinitions, new ColumnLayoutData(0.7) );
- this.add(leftPanel , new ColumnLayoutData(0.3) );
+ this.add(teaserPanel , new ColumnLayoutData(0.3) );
// init gchart
pieChart.update();
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-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -24,7 +24,6 @@
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;
@@ -134,7 +133,7 @@
protected void onExamine(final Integer row)
{
ProcessInstance instance = (ProcessInstance)row2InstanceMap.get(row);
- String id = ProcessInstanceEditor.ID+"."+instance.getId()+".tab";
+ String id = ProcessInstanceEditor.ID+"."+instance.getId();
if(view.hasEditorView(id))
view.showEditor(id);
else
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-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -33,8 +33,6 @@
public class ProcessInstanceListEditor extends EditorView
{
- public final static String ID = "org.jboss.bpm.process.ProcessInstanceList";
-
private ProcessDefinition parent;
public ProcessInstanceListEditor(ProcessDefinition proc, ConsoleView view)
@@ -52,7 +50,7 @@
public String getEditorId()
{
- return ID;
+ return getId();
}
public String getTitle()
Modified: 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 2008-08-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -32,7 +32,7 @@
{
String[] groupLabels;
- final static String BAR_COLOR = "blue";
+ final static String BAR_COLOR = "#66CC66";
final int MAX_REVENUE = 1000;
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/MainMenuPanel.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/MainMenuPanel.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/MainMenuPanel.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -0,0 +1,45 @@
+/*
+ * 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.Component;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MainMenuPanel extends Panel
+{
+
+ public MainMenuPanel(String title, String iconClass, Component tree)
+ {
+ super();
+
+ setTitle(title);
+ setBorder(false);
+ setHideBorders(true);
+ setIconCls(iconClass);
+
+ if(tree!=null)
+ add(tree);
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/MainMenuPanel.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/TeaserPanel.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/TeaserPanel.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/TeaserPanel.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -0,0 +1,43 @@
+/*
+ * 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.VerticalLayout;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class TeaserPanel extends Panel
+{
+
+ public TeaserPanel()
+ {
+ super();
+
+ setPaddings(10,0,0,5);
+ setLayout(new VerticalLayout(10));
+ setHideBorders(true);
+ setFrame(false);
+ setBorder(false);
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/TeaserPanel.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/widgets/UIConstants.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java 2008-08-20 11:48:55 UTC (rev 1939)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/UIConstants.java 2008-08-20 13:09:23 UTC (rev 1940)
@@ -29,4 +29,5 @@
final static int EDITOR_PANEL_WIDTH = 450;
public static final int MAIN_MENU_MIN = 175;
public static final int MAIN_MENU_MAX = 400;
+ public static final int EDITOR_PANE_WIDTH = 680;
}
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1939 - jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor.
by do-not-reply＠jboss.org
Author: porcherg
Date: 2008-08-20 07:48:55 -0400 (Wed, 20 Aug 2008)
New Revision: 1939
Removed:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java
Log:
remove unused class
Deleted: 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/FailRecursivelyTestCommand.java 2008-08-20 11:24:43 UTC (rev 1938)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java 2008-08-20 11:48:55 UTC (rev 1939)
@@ -1,76 +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.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 recursionInitialDepth parameter).
- *
- * This class is to test the persistence of exception stacktrace in jobs.
- */
-public class FailRecursivelyTestCommand implements Command<Object> {
-
- private static final long serialVersionUID = 1L;
- private static final Log log = Log.getLog(FailRecursivelyTestCommand.class.getName());
-
- int recursionInitialDepth;
-
- public FailRecursivelyTestCommand() {
- }
-
- private void recursiveException(int val) {
- if (val <= 0) {
- throw new RuntimeException("val <= 0");
- }
- try {
- recursiveException(val-1);
- } catch (Exception e) {
- throw new RuntimeException("Error in reccursive call", e);
- }
- }
-
- public static CommandMessage createMessage(int recursionInitialDepth) {
- CommandMessage commandMessage = new CommandMessage();
- ObjectDescriptor commandDescriptor = new ObjectDescriptor(FailRecursivelyTestCommand.class);
- commandDescriptor.addInjection("recursionInitialDepth", new IntegerDescriptor(recursionInitialDepth));
- commandMessage.setCommandDescriptor(commandDescriptor);
- return commandMessage;
- }
-
- public Object execute(Environment environment) throws Exception {
- recursiveException(recursionInitialDepth);
- return null;
- }
-
-}
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1938 - in jbpm3/trunk/modules/jpdl/core/src: main/java/org/jbpm/graph/def and 7 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-08-20 07:24:43 -0400 (Wed, 20 Aug 2008)
New Revision: 1938
Modified:
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/JobSession.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/Event.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/GraphElement.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/job/Timer.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
jbpm3/trunk/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java
jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java
jbpm3/trunk/modules/jpdl/core/src/test/resources/org/jbpm/job/executor/timerOnTimer.jpdl.xml
Log:
eliminated stale state exception by excluding locked jobs from query "JobSession.getTimersByName": JBPM-1135
rewrote timer test in terms of monitors instead of thread sleeps
improved toString() for Timer, TaskInstance and ProcessInstance
extracted "timer" event type constant from CreateTimerAction to Event
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/JobSession.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/JobSession.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -165,14 +165,14 @@
Iterator iter = results.iterator();
while (iter.hasNext()) {
Timer timer = (Timer) iter.next();
- log.debug("deleting timer "+timer+" by name "+name);
+ log.debug("deleting "+timer+" for '"+token+"'");
session.delete(timer);
}
}
} catch (Exception e) {
log.error(e);
- throw new JbpmException("couldn't cancel timers '"+name+"' for '"+token+"'", e);
+ throw new JbpmException("couldn't cancel timers by name '"+name+"' for '"+token+"'", e);
}
}
@@ -189,22 +189,22 @@
public void save(ProcessInstance processInstance, JbpmContext jbpmContext) {
// avoid deleting jobs for process instances that did not request job deletion
if (!targetProcessInstance.equals(processInstance)) {
- log.debug("forgiving " + processInstance + ", it isn't the target of this operation");
+ log.debug("forgiving " + processInstance + ", it is not the target of this operation");
return;
}
- log.debug("deleting timers for process instance "+processInstance);
+ log.debug("deleting timers for "+processInstance);
Session session = jbpmContext.getSession();
Query query = session.getNamedQuery("JobSession.deleteTimersForProcessInstance");
query.setParameter("processInstance", processInstance);
int entityCount = query.executeUpdate();
- log.debug(entityCount+" remaining timers for '"+processInstance+"' were deleted");
+ log.debug(entityCount+" remaining timers for "+processInstance+" were deleted");
- log.debug("deleting execute-node-jobs for process instance "+processInstance);
+ log.debug("deleting execute-node-jobs for "+processInstance);
query = session.getNamedQuery("JobSession.deleteExecuteNodeJobsForProcessInstance");
query.setParameter("processInstance", processInstance);
entityCount = query.executeUpdate();
- log.debug(entityCount+" remaining execute-node-jobs for '"+processInstance+"' are deleted");
+ log.debug(entityCount+" remaining execute-node-jobs for "+processInstance+" were deleted");
}
}
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/Event.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/Event.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/Event.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -46,6 +46,7 @@
public static final String EVENTTYPE_TASK_ASSIGN = "task-assign";
public static final String EVENTTYPE_TASK_START = "task-start";
public static final String EVENTTYPE_TASK_END = "task-end";
+ public static final String EVENTTYPE_TIMER_CREATE = "timer-create";
public static final String EVENTTYPE_TIMER = "timer";
long id = 0;
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/GraphElement.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -160,10 +160,7 @@
// event handling ///////////////////////////////////////////////////////////
public void fireEvent(String eventType, ExecutionContext executionContext) {
- Token token = executionContext.getToken();
-
- log.debug( "event '"+eventType+"' on '"+this+"' for '"+token+"'" );
-
+ log.debug( "event '"+eventType+"' on '"+this+"' for '"+executionContext.getToken()+"'" );
try {
executionContext.setEventSource(this);
fireAndPropagateEvent(eventType, executionContext);
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -448,6 +448,10 @@
return EqualsUtil.equals(this, o);
}
+ public String toString() {
+ return "ProcessInstance" + (key != null ? '(' + key + ')' : "@" + Integer.toHexString(hashCode()));
+ }
+
// getters and setters //////////////////////////////////////////////////////
public long getId() {
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/job/Timer.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/job/Timer.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/job/Timer.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -120,11 +120,11 @@
buffer.append(formatDueDate(dueDate)).append(",");
}
if (taskInstance!=null)
- buffer.append("TaskInstance: ").append(taskInstance.getId()).append(",");
+ buffer.append(taskInstance).append(",");
if (token!=null)
- buffer.append("Token: ").append(token.getId());
+ buffer.append(token);
else if (processInstance!=null)
- buffer.append("ProcessInstance: ").append(processInstance.getId());
+ buffer.append(processInstance);
buffer.append(")");
}
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -29,6 +29,7 @@
import org.jbpm.calendar.BusinessCalendar;
import org.jbpm.calendar.Duration;
import org.jbpm.graph.def.Action;
+import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.GraphElement;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.job.Timer;
@@ -133,7 +134,7 @@
try {
executionContext.setTimer(timer);
// fire the create timer event on the same graph element
- graphElement.fireEvent("timer-create", executionContext);
+ graphElement.fireEvent(Event.EVENTTYPE_TIMER_CREATE, executionContext);
} finally {
executionContext.setTimer(null);
}
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -41,7 +41,6 @@
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.node.TaskNode;
import org.jbpm.security.SecurityHelper;
import org.jbpm.taskmgmt.def.Swimlane;
import org.jbpm.taskmgmt.def.Task;
@@ -555,7 +554,7 @@
}
public String toString() {
- return "TaskInstance"+(name!=null ? "["+name+"]" : Integer.toHexString(System.identityHashCode(this)));
+ return "TaskInstance"+(name!=null ? "("+name+")" : "@"+Integer.toHexString(hashCode()));
}
// private //////////////////////////////////////////////////////////////////
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-08-20 11:24:43 UTC (rev 1938)
@@ -311,6 +311,7 @@
from org.jbpm.job.Timer timer
where timer.token = :token
and timer.name = :name
+ and timer.lockOwner is null
]]>
</query>
Modified: jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -37,24 +37,24 @@
private JbpmContext jbpmContext;
private static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
- "<jbpm-configuration>" +
- " <null name='jbpm.job.executor' />" +
- "</jbpm-configuration>");
+ "<jbpm-configuration>" +
+ " <null name='jbpm.job.executor' />" +
+ "</jbpm-configuration>");
public void setUp() throws Exception {
- jbpmContext = jbpmConfiguration.createJbpmContext();
+ jbpmContext = jbpmConfiguration.createJbpmContext();
}
public void tearDown() throws Exception {
- jbpmContext.close();
+ jbpmContext.close();
}
public void testJobExecutorDoesNotExist() {
- // check the job executor is properly nullified
+ // check the job executor is properly nullified
assertNull(jbpmContext.getObjectFactory().createObject("jbpm.job.executor"));
// start and end a process instance, confirm no exception gets thrown
- jbpmContext.deployProcessDefinition(new ProcessDefinition("Audit"));
- ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("Audit");
- processInstance.end();
+ jbpmContext.deployProcessDefinition(new ProcessDefinition("Audit"));
+ ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("Audit");
+ processInstance.end();
}
}
Modified: jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java 2008-08-20 11:24:43 UTC (rev 1938)
@@ -23,9 +23,8 @@
import java.io.Serializable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -35,71 +34,99 @@
*/
public class TimerOnTimerDbTest extends AbstractDbTestCase {
- private static final Log log = LogFactory.getLog(TimerOnTimerDbTest.class);
-
public void testTimerOnTimer() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/job/executor/timerOnTimer.jpdl.xml");
jbpmContext.deployProcessDefinition(processDefinition);
ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("timerTest");
- processInstance.getContextInstance().setVariable("timerTestWorkflow", new WorkflowLogger());
+ processInstance.getContextInstance().setVariable("testCallback", new TestCallback());
processInstance.signal();
+ long tokenId = processInstance.getRootToken().getId();
commitAndCloseSession();
- long tokenId = processInstance.getRootToken().getId();
startJobExecutor();
try {
- sleep(500);
+ TestCallback.waitForEvent(Event.EVENTTYPE_NODE_ENTER);
beginSessionTransaction();
- assertEquals("timerTest", jbpmContext.loadToken(tokenId).getNode().getName());
+ assertEquals("firstNode", jbpmContext.loadToken(tokenId).getNode().getName());
commitAndCloseSession();
- sleep(1000);
+ TestCallback.waitForEvent(Event.EVENTTYPE_NODE_ENTER);
beginSessionTransaction();
- assertEquals("secondTimerTest", jbpmContext.loadToken(tokenId).getNode().getName());
+ assertEquals("secondNode", jbpmContext.loadToken(tokenId).getNode().getName());
commitAndCloseSession();
- sleep(1000);
+ TestCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
beginSessionTransaction();
- assertTrue(jbpmContext.loadToken(tokenId).getProcessInstance().hasEnded());
+ assertTrue(jbpmContext.loadToken(tokenId).hasEnded());
}
finally {
stopJobExecutor();
}
}
- private void sleep(long millis) {
- try {
- Thread.sleep(millis);
- }
- catch (InterruptedException e) {
- // reassert interruption
- Thread.currentThread().interrupt();
- }
- }
+ public static class TestCallback implements Serializable {
- public static final class WorkflowLogger implements Serializable {
-
private static final long serialVersionUID = 1L;
-
- public void logNodeEnter() {
- log.info("entered node");
+
+ public void processStart() {
+ synchronized (Event.EVENTTYPE_PROCESS_START) {
+ Event.EVENTTYPE_PROCESS_START.notify();
+ }
}
-
- public void logNodeLeave() {
- log.info("left node");
+
+ public void processEnd() {
+ synchronized (Event.EVENTTYPE_PROCESS_END) {
+ Event.EVENTTYPE_PROCESS_END.notify();
+ }
}
-
- public void logTaskCreate() {
- log.info("created task");
+
+ public void nodeEnter() {
+ synchronized (Event.EVENTTYPE_NODE_ENTER) {
+ Event.EVENTTYPE_NODE_ENTER.notify();
+ }
}
-
- public void logTimerCreate() {
- log.info("created timer");
+
+ public void nodeLeave() {
+ synchronized (Event.EVENTTYPE_NODE_LEAVE) {
+ Event.EVENTTYPE_NODE_LEAVE.notify();
+ }
}
-
- public void logTimerFired() {
- log.info("fired timer");
+
+ public void taskCreate() {
+ synchronized (Event.EVENTTYPE_TASK_CREATE) {
+ Event.EVENTTYPE_TASK_CREATE.notify();
+ }
}
+
+ public void taskEnd() {
+ synchronized (Event.EVENTTYPE_TASK_END) {
+ Event.EVENTTYPE_TASK_END.notify();
+ }
+ }
+
+ public void timerCreate() {
+ synchronized (Event.EVENTTYPE_TIMER_CREATE) {
+ Event.EVENTTYPE_TIMER_CREATE.notify();
+ }
+ }
+
+ public void timer() {
+ synchronized (Event.EVENTTYPE_TIMER) {
+ Event.EVENTTYPE_TIMER.notify();
+ }
+ }
+
+ public static void waitForEvent(String event) {
+ synchronized (event) {
+ try {
+ event.wait(60000);
+ }
+ catch (InterruptedException e) {
+ // reassert interruption
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
}
}
Modified: jbpm3/trunk/modules/jpdl/core/src/test/resources/org/jbpm/job/executor/timerOnTimer.jpdl.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/org/jbpm/job/executor/timerOnTimer.jpdl.xml 2008-08-20 00:20:43 UTC (rev 1937)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/org/jbpm/job/executor/timerOnTimer.jpdl.xml 2008-08-20 11:24:43 UTC (rev 1938)
@@ -3,44 +3,47 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
+ <event type="process-start">
+ <action expression="#{testCallback.processStart}"/>
+ </event>
+ <event type="process-end">
+ <action expression="#{testCallback.processEnd}"/>
+ </event>
+ <event type="node-enter">
+ <action expression="#{testCallback.nodeEnter}" />
+ </event>
+ <event type="node-leave">
+ <action expression="#{testCallback.nodeLeave}" />
+ </event>
+ <event type="task-create">
+ <action expression="#{testCallback.taskCreate}" />
+ </event>
+ <event type="task-end">
+ <action expression="#{testCallback.taskEnd}" />
+ </event>
+ <event type="timer-create">
+ <action expression="#{testCallback.timerCreate}" />
+ </event>
+ <event type="timer">
+ <action expression="#{testCallback.timer}"/>
+ </event>
+
<start-state name="start">
- <transition name="" to="timerTest" />
+ <transition name="doneStart" to="firstNode" />
</start-state>
- <task-node name="timerTest" end-tasks="true">
- <event type="node-enter">
- <action expression="#{timerTestWorkflow.logNodeEnter}" />
- </event>
- <event type="node-leave">
- <action expression="#{timerTestWorkflow.logNodeLeave}" />
- </event>
- <transition name="doneFirst" to="secondTimerTest" />
- <task name="timerTestTask" description="TimerTestTask">
+ <task-node name="firstNode" end-tasks="yes">
+ <task name="firstTask">
<assignment actor-id="admin" />
- <event type="task-create">
- <action expression="#{timerTestWorkflow.logTaskCreate}" />
- </event>
- <event type="timer-create">
- <action expression="#{timerTestWorkflow.logTimerCreate}" />
- </event>
- <timer duedate="1 second" transition="doneFirst">
- <action expression="#{timerTestWorkflow.logTimerFired}" />
- </timer>
+ <timer duedate="1 second" transition="doneFirst" />
</task>
+ <transition name="doneFirst" to="secondNode" />
</task-node>
- <task-node name="secondTimerTest">
- <task name="secondTimerTestTask" description="SecondTimerTestTask">
+ <task-node name="secondNode" end-tasks="yes">
+ <task name="secondTask">
<assignment actor-id="admin" />
- <event type="task-create">
- <action expression="#{timerTestWorkflow.logTaskCreate}" />
- </event>
- <event type="timer-create">
- <action expression="#{timerTestWorkflow.logTimerCreate}" />
- </event>
- <timer duedate="1 second" transition="doneSecond">
- <action expression="#{timerTestWorkflow.logTimerFired}" />
- </timer>
+ <timer duedate="1 second" transition="doneSecond" />
</task>
<transition name="doneSecond" to="end" />
</task-node>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1937 - in jbpm3/trunk/modules/jpdl/core/src: main/java/org/jbpm/svc and 1 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-08-19 20:20:43 -0400 (Tue, 19 Aug 2008)
New Revision: 1937
Modified:
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/svc/Services.java
jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSession.java
jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java
jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
Log:
removed bogus NPE trace caused by redundant rollback() call when a flush exception occurs: JBPM-1465
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2008-08-19 23:22:38 UTC (rev 1936)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2008-08-20 00:20:43 UTC (rev 1937)
@@ -235,7 +235,10 @@
Exception flushException = flushSession();
if (flushException!=null) {
- rollback();
+ // JBPM-1465 transaction has been either committed or rolled back at this point
+ // on the other hand, it is possible that no transaction is underway
+ // rolling back here is redundant and possibly dangerous
+ // rollback();
closeSession();
closeConnection();
throw new JbpmPersistenceException("hibernate flush failed", flushException);
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/svc/Services.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/svc/Services.java 2008-08-19 23:22:38 UTC (rev 1936)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/svc/Services.java 2008-08-20 00:20:43 UTC (rev 1937)
@@ -257,9 +257,8 @@
if (firstException != null) {
if (firstException instanceof JbpmException) {
throw (JbpmException) firstException;
- } else {
- throw new JbpmException("problem closing services", firstException);
}
+ throw new JbpmException("problem closing services", firstException);
}
}
}
Modified: jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSession.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSession.java 2008-08-19 23:22:38 UTC (rev 1936)
+++ jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSession.java 2008-08-20 00:20:43 UTC (rev 1937)
@@ -18,6 +18,7 @@
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
+import org.hibernate.StaleStateException;
import org.hibernate.Transaction;
import org.hibernate.stat.SessionStatistics;
import org.hibernate.type.Type;
@@ -31,6 +32,9 @@
boolean isFlushed = false;
boolean isClosed = false;
+ boolean failOnFlush;
+ boolean failOnClose;
+
public MockSession() {
}
@@ -38,6 +42,14 @@
this.connection = connection;
}
+ public void setFailOnFlush(boolean fail) {
+ failOnFlush = fail;
+ }
+
+ public void setFailOnClose(boolean fail) {
+ failOnClose = fail;
+ }
+
public Transaction beginTransaction() throws HibernateException {
transaction = new MockTransaction();
return transaction;
@@ -52,11 +64,17 @@
}
public Connection close() throws HibernateException {
+ if (failOnClose)
+ throw new HibernateException("simulated close exception");
+
isClosed = true;
return connection;
}
public void flush() throws HibernateException {
+ if (failOnFlush)
+ throw new HibernateException("simulated flush exception");
+
isFlushed = true;
}
@@ -64,8 +82,6 @@
return ! isClosed;
}
-
-
public EntityMode getEntityMode() {
throw new UnsupportedOperationException();
}
Modified: jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java 2008-08-19 23:22:38 UTC (rev 1936)
+++ jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java 2008-08-20 00:20:43 UTC (rev 1937)
@@ -20,14 +20,31 @@
public class MockSessionFactory implements SessionFactory {
+ private boolean failOnFlush;
+ private boolean failOnClose;
+
private static final long serialVersionUID = 1L;
-
+
+ public void setFailOnFlush(boolean fail) {
+ failOnFlush = fail;
+ }
+
+ public void setFailOnClose(boolean fail) {
+ failOnClose = fail;
+ }
+
public Session openSession(Connection connection) {
- return new MockSession(connection);
+ MockSession session = new MockSession(connection);
+ session.setFailOnFlush(failOnFlush);
+ session.setFailOnClose(failOnClose);
+ return session;
}
public Session openSession() throws HibernateException {
- return new MockSession();
+ MockSession session = new MockSession();
+ session.setFailOnFlush(failOnFlush);
+ session.setFailOnClose(failOnClose);
+ return session;
}
public Session getCurrentSession() throws HibernateException {
Modified: jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java 2008-08-19 23:22:38 UTC (rev 1936)
+++ jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java 2008-08-20 00:20:43 UTC (rev 1937)
@@ -7,6 +7,7 @@
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
+import org.jbpm.persistence.JbpmPersistenceException;
public class PersistenceDbServiceNoTxTest extends TestCase {
@@ -14,7 +15,7 @@
JbpmContext jbpmContext = null;
MockSessionFactory mockSessionFactory = null;
- public void setUp() {
+ protected void setUp() {
// for all of these tests, the default configuration is used
jbpmConfiguration = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
@@ -38,8 +39,8 @@
mockSessionFactory = new MockSessionFactory();
jbpmContext.setSessionFactory(mockSessionFactory);
}
-
- public void tearDown() {
+
+ protected void tearDown() {
jbpmConfiguration = null;
jbpmContext = null;
mockSessionFactory = null;
@@ -170,4 +171,28 @@
// OK
}
}
+
+ public void testFlushException() {
+ mockSessionFactory.setFailOnFlush(true);
+ MockSession mockSession = (MockSession) jbpmContext.getSession();
+ try {
+ jbpmContext.close();
+ fail("expected exception");
+ } catch (JbpmPersistenceException e) {
+ assertFalse(mockSession.isFlushed);
+ assertTrue(mockSession.isClosed);
+ }
+ }
+
+ public void testCloseException() {
+ mockSessionFactory.setFailOnClose(true);
+ MockSession mockSession = (MockSession) jbpmContext.getSession();
+ try {
+ jbpmContext.close();
+ fail("expected exception");
+ } catch (JbpmPersistenceException e) {
+ assertTrue(mockSession.isFlushed);
+ assertFalse(mockSession.isClosed);
+ }
+ }
}
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1936 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 8 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 19:22:38 -0400 (Tue, 19 Aug 2008)
New Revision: 1936
Added:
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketMarshallerTest.java
Removed:
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/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java
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/Property.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.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/FlowObjectImpl.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/MessageImpl.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/ProcessImpl.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/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java
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/client/ConfirmMessage.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/GwtMessage.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/OfferMessage.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/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-api10.xml
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-stp-api10.xml
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn
jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java
Log:
Use Assignments in Airticket sample
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -23,7 +23,7 @@
-//$Id$
+//$Id: Expression.java 1930 2008-08-19 11:04:43Z thomas.diesler(a)jboss.com $
/**
* An Expression, which is used in the definition of attributes for StartEvent,
@@ -55,6 +55,6 @@
* The value of the ExpressionLanguage should follow the naming conventions for the
* version of the specified language.
*/
- Expression.ExpressionLanguage getExpressionLanguage();
+ ExpressionLanguage getExpressionLanguage();
}
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -60,7 +60,7 @@
/**
* Get the body of the expression value.
*/
- String getValue();
+ Object getValue();
/**
* Get the body of the expression value.
Modified: 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 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -21,12 +21,10 @@
*/
package org.jboss.bpm.model;
-//$Id$
+//$Id: PropertySupport.java 1928 2008-08-19 10:45:22Z thomas.diesler(a)jboss.com $
import java.util.List;
-
-
/**
* Property support
*
@@ -43,9 +41,14 @@
/**
* Get a Property value with a given name.
*/
- String getPropertyValue(String name);
+ Object getPropertyValue(String name);
/**
+ * Get a Property value with a given name.
+ */
+ <T> T getPropertyValue(Class<T> clazz, String name);
+
+ /**
* Multiple Properties MAY entered for the Message.
*/
List<Property> getProperties();
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -455,7 +455,7 @@
{
JAXBProperty jaxbProp = new JAXBProperty();
jaxbProp.setName(prop.getName());
- jaxbProp.setValue(prop.getValue());
+ jaxbProp.setValue((String)prop.getValue());
if (prop.isCorrelation())
jaxbProp.setCorrelation(prop.isCorrelation());
return jaxbProp;
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -126,12 +126,18 @@
return null;
}
- public String getPropertyValue(String name)
+ public Object getPropertyValue(String name)
{
Property prop = getProperty(name);
return prop != null ? prop.getValue() : null;
}
+ public <T> T getPropertyValue(Class<T> clazz, String name)
+ {
+ Property prop = getProperty(name);
+ return prop != null ? prop.getValue(clazz) : null;
+ }
+
public List<Property> getProperties()
{
return Collections.unmodifiableList(props);
@@ -267,7 +273,7 @@
+ getName());
String name = outProp.getName();
- String value = outProp.getValue();
+ Object value = outProp.getValue();
exContext.addAttachment(name, value);
}
}
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -127,12 +127,8 @@
*/
public void execute(Token token)
{
- // Start Time Assignments
- for (Assignment ass : getAssignments())
- {
- if (ass.getAssignTime() == AssignTime.Start)
- processAssignment(ass, token);
- }
+ // Process the start time assignments
+ startTimeAssignments(token);
// Call the ExecutionHandler
ExecutionHandler exHandler = getExecutionHandler();
@@ -145,16 +141,30 @@
defaultExecution(token);
}
- // End Time Assignments
+ // Process the end time assignments
+ endTimeAssignments(token);
+ }
+
+ protected void startTimeAssignments(Token token)
+ {
for (Assignment ass : getAssignments())
{
- if (ass.getAssignTime() == AssignTime.End)
+ if (ass.getAssignTime() == AssignTime.Start)
processAssignment(ass, token);
}
}
- private void processAssignment(Assignment ass, Token token)
+ protected void endTimeAssignments(Token token)
{
+ for (Assignment ass : getAssignments())
+ {
+ if (ass.getAssignTime() == AssignTime.End)
+ processAssignment(ass, token);
+ }
+ }
+
+ protected void processAssignment(Assignment ass, Token token)
+ {
Expression expr = ass.getFrom();
ExpressionEvaluator exprEvaluator = new ExpressionEvaluator(expr);
Object result = exprEvaluator.evaluateExpression(token);
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InputSetImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -61,12 +61,18 @@
return props.get(name);
}
- public String getPropertyValue(String name)
+ public Object getPropertyValue(String name)
{
Property prop = getProperty(name);
return prop != null ? prop.getValue() : null;
}
+ public <T> T getPropertyValue(Class<T> clazz, String name)
+ {
+ Property prop = getProperty(name);
+ return prop != null ? prop.getValue(clazz) : null;
+ }
+
public List<Property> getProperties()
{
return Collections.unmodifiableList(new ArrayList<Property>(props.values()));
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -102,12 +102,18 @@
return null;
}
- public String getPropertyValue(String name)
+ public Object getPropertyValue(String name)
{
Property prop = getProperty(name);
return prop != null ? prop.getValue() : null;
}
+ public <T> T getPropertyValue(Class<T> clazz, String name)
+ {
+ Property prop = getProperty(name);
+ return prop != null ? prop.getValue(clazz) : null;
+ }
+
public List<Property> getProperties()
{
return Collections.unmodifiableList(props);
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/OutputSetImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -61,12 +61,18 @@
return props.get(name);
}
- public String getPropertyValue(String name)
+ public Object getPropertyValue(String name)
{
Property prop = getProperty(name);
return prop != null ? prop.getValue() : null;
}
+ public <T> T getPropertyValue(Class<T> clazz, String name)
+ {
+ Property prop = getProperty(name);
+ return prop != null ? prop.getValue(clazz) : null;
+ }
+
public List<Property> getProperties()
{
return Collections.unmodifiableList(new ArrayList<Property>(props.values()));
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -132,12 +132,18 @@
return null;
}
- public String getPropertyValue(String name)
+ public Object getPropertyValue(String name)
{
Property prop = getProperty(name);
return prop != null ? prop.getValue() : null;
}
+ public <T> T getPropertyValue(Class<T> clazz, String name)
+ {
+ Property prop = getProperty(name);
+ return prop != null ? prop.getValue(clazz) : null;
+ }
+
public List<Property> getProperties()
{
return Collections.unmodifiableList(props);
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/PropertyImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -87,9 +87,9 @@
this.isCorrelation = isCorrelation;
}
- public String getValue()
+ public Object getValue()
{
- return (expression != null ? expression.getExpressionBody() : null);
+ return (expression != null ? expression.getExpressionValue() : null);
}
@SuppressWarnings("unchecked")
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -133,7 +133,7 @@
for (Property prop : messageRef.getProperties())
{
String key = prop.getName();
- String value = msg.getPropertyValue(key);
+ Object value = msg.getPropertyValue(key);
exContext.addAttachment(key, value);
}
@@ -143,6 +143,15 @@
}
@Override
+ protected void endTimeAssignments(Token token)
+ {
+ if (receivedMessages.size() > 0)
+ {
+ super.endTimeAssignments(token);
+ }
+ }
+
+ @Override
protected synchronized void defaultFlowHandler(TokenExecutor tokenExecutor, Token token)
{
if (receivedMessages.size() > 0)
Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -88,7 +88,7 @@
gwtMsg.from = "MUC";
gwtMsg.to = "NYC";
gwtMsg.date = "30-Oct-2008";
- gwtMsg.seats = "2";
+ gwtMsg.seats = new Integer(2);
return gwtMsg;
}
@@ -117,7 +117,7 @@
textFrom.setText(gwtMsg.from);
textTo.setText(gwtMsg.to);
textDate.setText(gwtMsg.date);
- textSeats.setText(gwtMsg.seats);
+ textSeats.setText(gwtMsg.seats != null ? gwtMsg.seats.toString() : "0");
}
private Panel getOfferPanel()
@@ -153,8 +153,8 @@
labelFromRO.setText(gwtMsg.from);
labelToRO.setText(gwtMsg.to);
labelDateRO.setText(gwtMsg.date);
- labelSeatsRO.setText(gwtMsg.seats);
- labelPriceRO.setText(gwtMsg.price);
+ labelSeatsRO.setText(gwtMsg.seats != null ? gwtMsg.seats.toString() : "0");
+ labelPriceRO.setText(gwtMsg.price != null ? gwtMsg.price.toString() : "0");
textCreditCard.setText("1234-1234-1234-1234");
textExpire.setText("30-Jul-2012");
@@ -188,8 +188,8 @@
labelFromRO.setText(gwtMsg.from);
labelToRO.setText(gwtMsg.to);
labelDateRO.setText(gwtMsg.date);
- labelSeatsRO.setText(gwtMsg.seats);
- labelPriceRO.setText(gwtMsg.price);
+ labelSeatsRO.setText(gwtMsg.seats != null ? gwtMsg.seats.toString() : "0");
+ labelPriceRO.setText(gwtMsg.price != null ? gwtMsg.price.toString() : "0");
}
private void setVisiblePanel(Panel panel)
@@ -209,7 +209,7 @@
gwtMsg.from = textFrom.getText();
gwtMsg.to = textTo.getText();
gwtMsg.date = textDate.getText();
- gwtMsg.seats = textSeats.getText();
+ gwtMsg.seats = new Integer(textSeats.getText());
sendGwtMessage(gwtMsg);
}
if (sender == buttonSubmitOrder)
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -33,6 +33,8 @@
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Task;
import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
/**
* Test the Airticket sample application
@@ -103,37 +105,18 @@
// Build the ReceiveReqTask
TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Task.TaskType.Receive);
taskBuilder.addMessageRef(MESSAGE_REQ_DATA).
- addSequenceFlow(TASK_VALIDATE);
-
- // Build the ValidateTask
- taskBuilder = procBuilder.addTask(TASK_VALIDATE);
- taskBuilder.addExecutionHandler(ValidationHandler.class).
- addInputSet().
- addPropertyInput(PROPERTY_NAME, null).
- addPropertyInput(PROPERTY_FROM, null).
- addPropertyInput(PROPERTY_TO, null).
- addPropertyInput(PROPERTY_DATE, null).
- addPropertyInput(PROPERTY_SEATS, null).
- addOutputSet().
- addPropertyOutput(PROPERTY_IS_VALID_REQUEST, null).
+ addAssignment(AssignTime.End, ExpressionLanguage.MVEL, getValidationExpression(), PROPERTY_IS_VALID_REQUEST).
addSequenceFlow(GATEWAY_IS_VALID);
// Build the ValidateGateway
GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Gateway.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Expression.ExpressionLanguage.MVEL, "isReqDataValid == true").
+ gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Expression.ExpressionLanguage.MVEL, PROPERTY_IS_VALID_REQUEST + " == true").
addDefaultGate(TASK_SEND_INVALID);
// Build the CheckAvailabilityTask
taskBuilder = procBuilder.addTask(TASK_CHECK_AVAILABLE);
- taskBuilder.addExecutionHandler(AvailabilityHandler.class).
- addInputSet().
- addPropertyInput(PROPERTY_FROM, null).
- addPropertyInput(PROPERTY_TO, null).
- addPropertyInput(PROPERTY_DATE, null).
- addPropertyInput(PROPERTY_SEATS, null).
- addOutputSet().
- addPropertyOutput(PROPERTY_IS_AVAILABLE, null).
- addPropertyOutput(PROPERTY_PRICE, null).
+ taskBuilder.addAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " < 10", PROPERTY_IS_AVAILABLE).
+ addAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " * 111", PROPERTY_PRICE).
addSequenceFlow(GATEWAY_IS_AVAILABLE);
// Build the SendInvalidTask
@@ -143,7 +126,7 @@
// Build the AvailabilityGateway
gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Gateway.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Expression.ExpressionLanguage.MVEL, "isAvailable == true").
+ gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Expression.ExpressionLanguage.MVEL, PROPERTY_IS_AVAILABLE + " == true").
addDefaultGate(TASK_SEND_NOT_AVAILABLE);
// Build the SendOfferTask
@@ -163,7 +146,7 @@
// Build the AcceptOfferGateway
gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Gateway.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Expression.ExpressionLanguage.MVEL, "isOfferAccepted == true").
+ gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Expression.ExpressionLanguage.MVEL, PROPERTY_IS_OFFER_ACCEPTED + " == true").
addDefaultGate(TASK_RECEIVE_REQUEST);
// Build the AcceptOfferGateway
@@ -257,4 +240,14 @@
Process proc = procBuilder.getProcess();
return proc;
}
+
+ private String getValidationExpression()
+ {
+ StringBuilder str = new StringBuilder(PROPERTY_NAME + " != null && ");
+ str.append(PROPERTY_FROM + " != null && ");
+ str.append(PROPERTY_TO + " != null && ");
+ str.append(PROPERTY_DATE + " != null && ");
+ str.append(PROPERTY_SEATS + " > 0");
+ return str.toString();
+ }
}
\ No newline at end of file
Deleted: 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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.samples.airticket;
-
-// $Id$
-
-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;
-
-/**
- * An ExecutionHandler that adds the required outputSet properties
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 04-Jul-2008
- */
-@SuppressWarnings("serial")
-public class AvailabilityHandler implements ExecutionHandler
-{
- public void execute(Token token)
- {
- InputSet inputSet = token.getInputSet();
- OutputSet outputSet = token.getOutputSet();
- PropertyBuilder builder = PropertyBuilderFactory.newInstance().newPropertyBuilder();
- Integer seats = Integer.valueOf(inputSet.getPropertyValue(AirticketProcessBuilder.PROPERTY_SEATS));
- outputSet.addProperty(builder.newProperty(AirticketProcessBuilder.PROPERTY_IS_AVAILABLE, new Boolean(seats < 10).toString()));
- outputSet.addProperty(builder.newProperty(AirticketProcessBuilder.PROPERTY_PRICE, new Integer(seats * 111).toString()));
- }
-}
Deleted: 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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -1,61 +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.samples.airticket;
-
-// $Id$
-
-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;
-
-/**
- * An ExecutionHandler that adds the required outputSet properties
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 04-Jul-2008
- */
-@SuppressWarnings("serial")
-public class ValidationHandler implements ExecutionHandler
-{
- public void execute(Token token)
- {
- InputSet inputSet = token.getInputSet();
- OutputSet outputSet = token.getOutputSet();
- String name = inputSet.getPropertyValue(AirticketProcessBuilder.PROPERTY_NAME);
- String from = inputSet.getPropertyValue(AirticketProcessBuilder.PROPERTY_FROM);
- String to = inputSet.getPropertyValue(AirticketProcessBuilder.PROPERTY_TO);
- String date = inputSet.getPropertyValue(AirticketProcessBuilder.PROPERTY_DATE);
- String seats = inputSet.getPropertyValue(AirticketProcessBuilder.PROPERTY_SEATS);
-
- boolean isValid = name != null && name.length() > 0;
- isValid &= from != null && from.length() > 0;
- isValid &= to != null && to.length() > 0;
- isValid &= date != null && date.length() > 0;
- isValid &= seats != null && seats.length() > 0 && 0 < Integer.valueOf(seats);
-
- PropertyBuilder builder = PropertyBuilderFactory.newInstance().newPropertyBuilder();
- outputSet.addProperty(builder.newProperty(AirticketProcessBuilder.PROPERTY_IS_VALID_REQUEST, "" + isValid));
- }
-}
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/ConfirmMessage.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/ConfirmMessage.java 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/ConfirmMessage.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -27,5 +27,5 @@
{
private static final long serialVersionUID = 1L;
- public String price;
+ public Integer price;
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/GwtMessage.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/GwtMessage.java 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/GwtMessage.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -33,5 +33,5 @@
public String from;
public String to;
public String date;
- public String seats;
+ public Integer seats;
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/OfferMessage.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/OfferMessage.java 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/OfferMessage.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -27,5 +27,5 @@
{
private static final long serialVersionUID = 1L;
- public String price;
+ public Integer price;
}
\ No newline at end of file
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -98,43 +98,43 @@
if (msgName.equals(AirticketProcessBuilder.MESSAGE_OFFER))
{
OfferMessage gwtMsg = new OfferMessage();
- gwtMsg.name = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_NAME);
- gwtMsg.from = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_FROM);
- gwtMsg.to = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_TO);
- gwtMsg.date = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_DATE);
- gwtMsg.seats = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_SEATS);
- gwtMsg.price = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_PRICE);
+ gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
+ gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
+ gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
+ gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
+ gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
+ gwtMsg.price = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
returnMsg = gwtMsg;
}
else if (msgName.equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA))
{
InvalidDataMessage gwtMsg = new InvalidDataMessage();
- gwtMsg.name = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_NAME);
- gwtMsg.from = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_FROM);
- gwtMsg.to = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_TO);
- gwtMsg.date = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_DATE);
- gwtMsg.seats = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_SEATS);
+ gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
+ gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
+ gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
+ gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
+ gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
returnMsg = gwtMsg;
}
else if (msgName.equals(AirticketProcessBuilder.MESSAGE_NOT_AVAILABLE))
{
NotAvailableMessage gwtMsg = new NotAvailableMessage();
- gwtMsg.name = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_NAME);
- gwtMsg.from = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_FROM);
- gwtMsg.to = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_TO);
- gwtMsg.date = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_DATE);
- gwtMsg.seats = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_SEATS);
+ gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
+ gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
+ gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
+ gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
+ gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
returnMsg = gwtMsg;
}
else if (msgName.equals(AirticketProcessBuilder.MESSAGE_CONFIRM))
{
ConfirmMessage gwtMsg = new ConfirmMessage();
- gwtMsg.name = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_NAME);
- gwtMsg.from = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_FROM);
- gwtMsg.to = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_TO);
- gwtMsg.date = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_DATE);
- gwtMsg.seats = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_SEATS);
- gwtMsg.price = bpmMsg.getPropertyValue(AirticketProcessBuilder.PROPERTY_PRICE);
+ gwtMsg.name = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_NAME);
+ gwtMsg.from = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_FROM);
+ gwtMsg.to = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_TO);
+ gwtMsg.date = bpmMsg.getPropertyValue(String.class, AirticketProcessBuilder.PROPERTY_DATE);
+ gwtMsg.seats = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_SEATS);
+ gwtMsg.price = bpmMsg.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
returnMsg = gwtMsg;
}
else
Copied: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketMarshallerTest.java (from rev 1935, 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/AirticketMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketMarshallerTest.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -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.samples.airticket;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Test the Airticket process marshaller
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class AirticketMarshallerTest extends AirticketTest
+{
+ @Override
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
\ No newline at end of file
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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -57,8 +57,8 @@
Message confirmMessage = msgListener.getConfirmMessage();
assertNotNull("Expected confirm message", confirmMessage);
- String price = confirmMessage.getPropertyValue(AirticketProcessBuilder.PROPERTY_PRICE);
- assertEquals("222", price);
+ Integer price = confirmMessage.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
+ assertEquals(new Integer(222), price);
}
public void testInvalidData() throws Exception
@@ -71,8 +71,8 @@
Message confirmMessage = msgListener.getConfirmMessage();
assertNotNull("Expected confirm message", confirmMessage);
- String price = confirmMessage.getPropertyValue(AirticketProcessBuilder.PROPERTY_PRICE);
- assertEquals("222", price);
+ Integer price = confirmMessage.getPropertyValue(Integer.class, AirticketProcessBuilder.PROPERTY_PRICE);
+ assertEquals(new Integer(222), price);
}
@Override
Deleted: 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 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -1,110 +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.samples.airticket;
-
-// $Id$
-
-import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
-import java.net.URL;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.client.DialectHandler;
-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;
-import org.jboss.util.xml.DOMWriter;
-import org.w3c.dom.Element;
-
-/**
- * Test the Airticket process marshaller
- *
- * @author thomas.diesler(a)jboss.com
- * @since 03-Jul-2008
- */
-public class ProcessMarshallerTest extends DefaultEngineTestCase
-{
- @Override
- public ObjectName getMessageListenerID()
- {
- return ObjectNameFactory.create("jboss.bpm:client=AirticketTest");
- }
-
- /**
- * Build the process through a ProcessBuilder.
- * Marshall it through the DialectHandler.
- * Compare the output with expected file content.
- */
- public void testProcessMarshaller() throws Exception
- {
- AirticketProcessBuilder builder = new AirticketProcessBuilder(getMessageListenerID());
- Process proc = builder.buildProcess();
-
- ProcessManager pm = ProcessManager.locateProcessManager();
- DialectHandler dh = pm.getDialectHandler("urn:bpm.jboss:pdl-0.1");
-
- StringWriter strwr = new StringWriter();
- dh.marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
- Element wasEl = DOMUtils.parse(new ByteArrayInputStream(procXML.getBytes()));
- String wasStr = DOMWriter.printNode(wasEl, true);
-
- URL expURL = getResourceURL("samples/airticket/airticket-api10.xml");
- Element expEl = DOMUtils.parse(expURL.openStream());
- String expStr = DOMWriter.printNode(expEl, true);
-
- //System.out.println(expStr);
- //System.out.println(wasStr);
- assertEquals(expStr, wasStr);
- }
-
- /**
- * Build the process through the ProcessManager.
- * Marshall it through the DialectHandler.
- * Compare the output with expected file content.
- */
- public void testProcessUnMarshaller() throws Exception
- {
- URL expURL = getResourceURL("samples/airticket/airticket-api10.xml");
- ProcessManager pm = ProcessManager.locateProcessManager();
- Process proc = pm.createProcess(expURL);
-
- StringWriter strwr = new StringWriter();
- DialectHandler dh = pm.getDialectHandler("urn:bpm.jboss:pdl-0.1");
- dh.marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
- Element wasEl = DOMUtils.parse(new ByteArrayInputStream(procXML.getBytes()));
- String wasStr = DOMWriter.printNode(wasEl, true);
-
- Element expEl = DOMUtils.parse(expURL.openStream());
- String expStr = DOMWriter.printNode(expEl, true);
-
- //System.out.println(expStr);
- //System.out.println(wasStr);
- assertEquals(expStr, wasStr);
- }
-}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-api10.xml 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-api10.xml 2008-08-19 23:22:38 UTC (rev 1936)
@@ -1,247 +1,210 @@
-<ns2:process name='Airticket' xmlns:ns2='urn:bpm.jboss:pdl-0.1'>
- <start name='Start'>
- <seqflow to='ReceiveReq'/>
- </start>
- <task name='ReceiveReq' taskType='Receive'>
- <seqflow to='Validate'/>
- <msgref nameRef='ReqDataMsg'/>
- </task>
- <task name='Validate' taskType='None'>
- <seqflow to='IsValid'/>
- <execution-handler class='org.jboss.bpm.samples.airticket.ValidationHandler'/>
- <input-set>
- <property>
- <name>Name</name>
- </property>
- <property>
- <name>From</name>
- </property>
- <property>
- <name>To</name>
- </property>
- <property>
- <name>Date</name>
- </property>
- <property>
- <name>Seats</name>
- </property>
- </input-set>
- <output-set>
- <property>
- <name>isReqDataValid</name>
- </property>
- </output-set>
- </task>
- <exclusive-gateway name='IsValid'>
- <seqflow conditionType='Expression' to='CheckAvailable'>
- <condition lang='MVEL'>isReqDataValid == true</condition>
- </seqflow>
- <seqflow conditionType='Default' to='SendInvalid'/>
- </exclusive-gateway>
- <task name='CheckAvailable' taskType='None'>
- <seqflow to='IsAvailable'/>
- <execution-handler class='org.jboss.bpm.samples.airticket.AvailabilityHandler'/>
- <input-set>
- <property>
- <name>From</name>
- </property>
- <property>
- <name>To</name>
- </property>
- <property>
- <name>Date</name>
- </property>
- <property>
- <name>Seats</name>
- </property>
- </input-set>
- <output-set>
- <property>
- <name>isAvailable</name>
- </property>
- <property>
- <name>Price</name>
- </property>
- </output-set>
- </task>
- <task name='SendInvalid' taskType='Send'>
- <seqflow to='ReceiveReq'/>
- <msgref nameRef='InvalidDataMsg'/>
- </task>
- <exclusive-gateway name='IsAvailable'>
- <seqflow conditionType='Expression' to='SendOffer'>
- <condition lang='MVEL'>isAvailable == true</condition>
- </seqflow>
- <seqflow conditionType='Default' to='SendNotAvailable'/>
- </exclusive-gateway>
- <task name='SendOffer' taskType='Send'>
- <seqflow to='ReceiveOrder'/>
- <msgref nameRef='OfferMsg'/>
- </task>
- <task name='SendNotAvailable' taskType='Send'>
- <seqflow to='ReceiveReq'/>
- <msgref nameRef='NotAvailableMsg'/>
- </task>
- <task name='ReceiveOrder' taskType='Receive'>
- <seqflow to='IsAccepted'/>
- <msgref nameRef='AcceptOfferMsg'/>
- </task>
- <exclusive-gateway name='IsAccepted'>
- <seqflow conditionType='Expression' to='Split'>
- <condition lang='MVEL'>isOfferAccepted == true</condition>
- </seqflow>
- <seqflow conditionType='Default' to='ReceiveReq'/>
- </exclusive-gateway>
- <parallel-gateway name='Split'>
- <seqflow to='CreditCard'/>
- <seqflow to='Booking'/>
- </parallel-gateway>
- <task name='CreditCard' taskType='None'>
- <seqflow to='SyncJoin'/>
- <input-set>
- <property>
- <name>CreditCard</name>
- </property>
- <property>
- <name>Expire</name>
- </property>
- <property>
- <name>Price</name>
- </property>
- </input-set>
- </task>
- <task name='Booking' taskType='None'>
- <seqflow to='SyncJoin'/>
- <input-set>
- <property>
- <name>Name</name>
- </property>
- <property>
- <name>From</name>
- </property>
- <property>
- <name>To</name>
- </property>
- <property>
- <name>Date</name>
- </property>
- <property>
- <name>Seats</name>
- </property>
- </input-set>
- </task>
- <parallel-gateway name='SyncJoin'>
- <seqflow to='SendConfirm'/>
- </parallel-gateway>
- <task name='SendConfirm' taskType='Send'>
- <seqflow to='End'/>
- <msgref nameRef='ConfirmMsg'/>
- </task>
- <end name='End'/>
- <message name='ReqDataMsg'>
- <property correlation='true'>
- <name>Name</name>
- </property>
- <property correlation='true'>
- <name>From</name>
- </property>
- <property correlation='true'>
- <name>To</name>
- </property>
- <property correlation='true'>
- <name>Date</name>
- </property>
- <property correlation='true'>
- <name>Seats</name>
- </property>
- </message>
- <message name='InvalidDataMsg'>
- <to>jboss.bpm:client=AirticketTest</to>
- <property correlation='true'>
- <name>Name</name>
- </property>
- <property correlation='true'>
- <name>From</name>
- </property>
- <property correlation='true'>
- <name>To</name>
- </property>
- <property correlation='true'>
- <name>Date</name>
- </property>
- <property correlation='true'>
- <name>Seats</name>
- </property>
- </message>
- <message name='NotAvailableMsg'>
- <to>jboss.bpm:client=AirticketTest</to>
- <property correlation='true'>
- <name>Name</name>
- </property>
- <property correlation='true'>
- <name>From</name>
- </property>
- <property correlation='true'>
- <name>To</name>
- </property>
- <property correlation='true'>
- <name>Date</name>
- </property>
- <property correlation='true'>
- <name>Seats</name>
- </property>
- </message>
- <message name='OfferMsg'>
- <to>jboss.bpm:client=AirticketTest</to>
- <property correlation='true'>
- <name>Name</name>
- </property>
- <property correlation='true'>
- <name>From</name>
- </property>
- <property correlation='true'>
- <name>To</name>
- </property>
- <property correlation='true'>
- <name>Date</name>
- </property>
- <property correlation='true'>
- <name>Seats</name>
- </property>
- <property correlation='true'>
- <name>Price</name>
- </property>
- </message>
- <message name='AcceptOfferMsg'>
- <property correlation='true'>
- <name>CreditCard</name>
- </property>
- <property correlation='true'>
- <name>Expire</name>
- </property>
- <property correlation='true'>
- <name>isOfferAccepted</name>
- </property>
- </message>
- <message name='ConfirmMsg'>
- <to>jboss.bpm:client=AirticketTest</to>
- <property correlation='true'>
- <name>Name</name>
- </property>
- <property correlation='true'>
- <name>From</name>
- </property>
- <property correlation='true'>
- <name>To</name>
- </property>
- <property correlation='true'>
- <name>Date</name>
- </property>
- <property correlation='true'>
- <name>Seats</name>
- </property>
- <property correlation='true'>
- <name>Price</name>
- </property>
- </message>
+<ns2:process name="Airticket" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+ <start name="Start">
+ <seqflow to="ReceiveReq" />
+ </start>
+ <task taskType="Receive" name="ReceiveReq">
+ <assignment time="End">
+ <from lang="MVEL"><![CDATA[Name != null && From != null && To != null && Date != null && Seats > 0]]></from>
+ <to>isReqDataValid</to>
+ </assignment>
+ <seqflow to="IsValid" />
+ <msgref nameRef="ReqDataMsg" />
+ </task>
+ <exclusive-gateway name="IsValid">
+ <seqflow conditionType="Expression" to="CheckAvailable">
+ <condition lang="MVEL">isReqDataValid == true</condition>
+ </seqflow>
+ <seqflow conditionType="Default" to="SendInvalid" />
+ </exclusive-gateway>
+ <task taskType="None" name="CheckAvailable">
+ <assignment time="End">
+ <from lang="MVEL"><![CDATA[Seats < 10]]></from>
+ <to>isAvailable</to>
+ </assignment>
+ <assignment time="End">
+ <from lang="MVEL">Seats * 111</from>
+ <to>Price</to>
+ </assignment>
+ <seqflow to="IsAvailable" />
+ </task>
+ <task taskType="Send" name="SendInvalid">
+ <seqflow to="ReceiveReq" />
+ <msgref nameRef="InvalidDataMsg" />
+ </task>
+ <exclusive-gateway name="IsAvailable">
+ <seqflow conditionType="Expression" to="SendOffer">
+ <condition lang="MVEL">isAvailable == true</condition>
+ </seqflow>
+ <seqflow conditionType="Default" to="SendNotAvailable" />
+ </exclusive-gateway>
+ <task taskType="Send" name="SendOffer">
+ <seqflow to="ReceiveOrder" />
+ <msgref nameRef="OfferMsg" />
+ </task>
+ <task taskType="Send" name="SendNotAvailable">
+ <seqflow to="ReceiveReq" />
+ <msgref nameRef="NotAvailableMsg" />
+ </task>
+ <task taskType="Receive" name="ReceiveOrder">
+ <seqflow to="IsAccepted" />
+ <msgref nameRef="AcceptOfferMsg" />
+ </task>
+ <exclusive-gateway name="IsAccepted">
+ <seqflow conditionType="Expression" to="Split">
+ <condition lang="MVEL">isOfferAccepted == true</condition>
+ </seqflow>
+ <seqflow conditionType="Default" to="ReceiveReq" />
+ </exclusive-gateway>
+ <parallel-gateway name="Split">
+ <seqflow to="CreditCard" />
+ <seqflow to="Booking" />
+ </parallel-gateway>
+ <task taskType="None" name="CreditCard">
+ <seqflow to="SyncJoin" />
+ <input-set>
+ <property>
+ <name>CreditCard</name>
+ </property>
+ <property>
+ <name>Expire</name>
+ </property>
+ <property>
+ <name>Price</name>
+ </property>
+ </input-set>
+ </task>
+ <task taskType="None" name="Booking">
+ <seqflow to="SyncJoin" />
+ <input-set>
+ <property>
+ <name>Name</name>
+ </property>
+ <property>
+ <name>From</name>
+ </property>
+ <property>
+ <name>To</name>
+ </property>
+ <property>
+ <name>Date</name>
+ </property>
+ <property>
+ <name>Seats</name>
+ </property>
+ </input-set>
+ </task>
+ <parallel-gateway name="SyncJoin">
+ <seqflow to="SendConfirm" />
+ </parallel-gateway>
+ <task taskType="Send" name="SendConfirm">
+ <seqflow to="End" />
+ <msgref nameRef="ConfirmMsg" />
+ </task>
+ <end name="End" />
+ <message name="ReqDataMsg">
+ <property correlation="true">
+ <name>Name</name>
+ </property>
+ <property correlation="true">
+ <name>From</name>
+ </property>
+ <property correlation="true">
+ <name>To</name>
+ </property>
+ <property correlation="true">
+ <name>Date</name>
+ </property>
+ <property correlation="true">
+ <name>Seats</name>
+ </property>
+ </message>
+ <message name="InvalidDataMsg">
+ <to>jboss.bpm:client=AirticketTest</to>
+ <property correlation="true">
+ <name>Name</name>
+ </property>
+ <property correlation="true">
+ <name>From</name>
+ </property>
+ <property correlation="true">
+ <name>To</name>
+ </property>
+ <property correlation="true">
+ <name>Date</name>
+ </property>
+ <property correlation="true">
+ <name>Seats</name>
+ </property>
+ </message>
+ <message name="NotAvailableMsg">
+ <to>jboss.bpm:client=AirticketTest</to>
+ <property correlation="true">
+ <name>Name</name>
+ </property>
+ <property correlation="true">
+ <name>From</name>
+ </property>
+ <property correlation="true">
+ <name>To</name>
+ </property>
+ <property correlation="true">
+ <name>Date</name>
+ </property>
+ <property correlation="true">
+ <name>Seats</name>
+ </property>
+ </message>
+ <message name="OfferMsg">
+ <to>jboss.bpm:client=AirticketTest</to>
+ <property correlation="true">
+ <name>Name</name>
+ </property>
+ <property correlation="true">
+ <name>From</name>
+ </property>
+ <property correlation="true">
+ <name>To</name>
+ </property>
+ <property correlation="true">
+ <name>Date</name>
+ </property>
+ <property correlation="true">
+ <name>Seats</name>
+ </property>
+ <property correlation="true">
+ <name>Price</name>
+ </property>
+ </message>
+ <message name="AcceptOfferMsg">
+ <property correlation="true">
+ <name>CreditCard</name>
+ </property>
+ <property correlation="true">
+ <name>Expire</name>
+ </property>
+ <property correlation="true">
+ <name>isOfferAccepted</name>
+ </property>
+ </message>
+ <message name="ConfirmMsg">
+ <to>jboss.bpm:client=AirticketTest</to>
+ <property correlation="true">
+ <name>Name</name>
+ </property>
+ <property correlation="true">
+ <name>From</name>
+ </property>
+ <property correlation="true">
+ <name>To</name>
+ </property>
+ <property correlation="true">
+ <name>Date</name>
+ </property>
+ <property correlation="true">
+ <name>Seats</name>
+ </property>
+ <property correlation="true">
+ <name>Price</name>
+ </property>
+ </message>
</ns2:process>
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-stp-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-stp-api10.xml 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket-stp-api10.xml 2008-08-19 23:22:38 UTC (rev 1936)
@@ -4,35 +4,12 @@
<seqflow to='ReceiveReq' />
</start-->
<task name='ReceiveReq' taskType='Receive'>
- <!-- seqflow to='Validate' /-->
+ <assignment time="End">
+ <from lang="MVEL"><![CDATA[Name != null && From != null && To != null && Date != null && Seats > 0]]></from>
+ <to>isReqDataValid</to>
+ </assignment>
<msgref nameRef='ReqDataMsg' />
</task>
- <task name='Validate' taskType='None'>
- <!-- seqflow to='IsValid' /-->
- <execution-handler class='org.jboss.bpm.samples.airticket.ValidationHandler' />
- <input-set>
- <property>
- <name>Name</name>
- </property>
- <property>
- <name>From</name>
- </property>
- <property>
- <name>To</name>
- </property>
- <property>
- <name>Date</name>
- </property>
- <property>
- <name>Seats</name>
- </property>
- </input-set>
- <output-set>
- <property>
- <name>isReqDataValid</name>
- </property>
- </output-set>
- </task>
<exclusive-gateway name='IsValid'>
<seqflow conditionType='Expression' to='CheckAvailable'>
<condition lang='MVEL'>isReqDataValid == true</condition>
@@ -40,30 +17,14 @@
<seqflow conditionType='Default' to='SendInvalid' />
</exclusive-gateway>
<task name='CheckAvailable' taskType='None'>
- <!-- seqflow to='IsAvailable' /-->
- <execution-handler class='org.jboss.bpm.samples.airticket.AvailabilityHandler' />
- <input-set>
- <property>
- <name>From</name>
- </property>
- <property>
- <name>To</name>
- </property>
- <property>
- <name>Date</name>
- </property>
- <property>
- <name>Seats</name>
- </property>
- </input-set>
- <output-set>
- <property>
- <name>isAvailable</name>
- </property>
- <property>
- <name>Price</name>
- </property>
- </output-set>
+ <assignment time="End">
+ <from lang="MVEL"><![CDATA[Seats < 10]]></from>
+ <to>isAvailable</to>
+ </assignment>
+ <assignment time="End">
+ <from lang="MVEL">Seats * 111</from>
+ <to>Price</to>
+ </assignment>
</task>
<task name='SendInvalid' taskType='Send'>
<!-- seqflow to='ReceiveReq' /-->
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn 2008-08-19 23:22:38 UTC (rev 1936)
@@ -2,8 +2,8 @@
<bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_iYxIQFhrEd2aHsyOaYt_3g" iD="_iYwhMFhrEd2aHsyOaYt_3g">
<pools xmi:type="bpmn:Pool" xmi:id="_dhOfoVhtEd2aHsyOaYt_3g" iD="_dhOfoFhtEd2aHsyOaYt_3g" name="Pool">
<vertices xmi:type="bpmn:Activity" xmi:id="_huULIVhtEd2aHsyOaYt_3g" iD="_huULIFhtEd2aHsyOaYt_3g" outgoingEdges="_iyzG8VhtEd2aHsyOaYt_3g" activityType="EventStartEmpty"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_lMlo0VhtEd2aHsyOaYt_3g" iD="_lMlo0FhtEd2aHsyOaYt_3g" outgoingEdges="_7grf0WDaEd2jINLjV_7TQw" incomingEdges="_efVRMVhuEd2aHsyOaYt_3g _r-90MVhwEd2aHsyOaYt_3g _1UWrsVhvEd2aHsyOaYt_3g _iyzG8VhtEd2aHsyOaYt_3g" name="ReceiveReq" activityType="Task"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_rsQa8VhtEd2aHsyOaYt_3g" iD="_rsQa8FhtEd2aHsyOaYt_3g" outgoingEdges="_zUIyUFhtEd2aHsyOaYt_3g _ApdYMVhvEd2aHsyOaYt_3g" incomingEdges="_8u-e8WDaEd2jINLjV_7TQw" name="IsValid" activityType="GatewayDataBasedExclusive"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_lMlo0VhtEd2aHsyOaYt_3g" iD="_lMlo0FhtEd2aHsyOaYt_3g" outgoingEdges="_nZeo4W4_Ed2iTb26rib3kA" incomingEdges="_efVRMVhuEd2aHsyOaYt_3g _r-90MVhwEd2aHsyOaYt_3g _1UWrsVhvEd2aHsyOaYt_3g _iyzG8VhtEd2aHsyOaYt_3g" name="ReceiveReq" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_rsQa8VhtEd2aHsyOaYt_3g" iD="_rsQa8FhtEd2aHsyOaYt_3g" outgoingEdges="_zUIyUFhtEd2aHsyOaYt_3g _ApdYMVhvEd2aHsyOaYt_3g" incomingEdges="_nZeo4W4_Ed2iTb26rib3kA" name="IsValid" activityType="GatewayDataBasedExclusive"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_zUDSwVhtEd2aHsyOaYt_3g" iD="_zUDSwFhtEd2aHsyOaYt_3g" outgoingEdges="_9Q4IQVhtEd2aHsyOaYt_3g" incomingEdges="_zUIyUFhtEd2aHsyOaYt_3g" name="CheckAvailable" activityType="Task"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_9Q1sAFhtEd2aHsyOaYt_3g" iD="_9Q1E8FhtEd2aHsyOaYt_3g" outgoingEdges="_BdGREVhuEd2aHsyOaYt_3g _fHP64VhwEd2aHsyOaYt_3g" incomingEdges="_9Q4IQVhtEd2aHsyOaYt_3g" name="IsAvailable" activityType="GatewayDataBasedExclusive"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_BdDNwVhuEd2aHsyOaYt_3g" iD="_BdDNwFhuEd2aHsyOaYt_3g" outgoingEdges="_tT3_YVh1Ed2aHsyOaYt_3g" incomingEdges="_BdGREVhuEd2aHsyOaYt_3g" name="SendOffer" activityType="Task"/>
@@ -17,7 +17,6 @@
<vertices xmi:type="bpmn:Activity" xmi:id="_QQMAAVhwEd2aHsyOaYt_3g" iD="_QQMAAFhwEd2aHsyOaYt_3g" incomingEdges="_QQQ4gVhwEd2aHsyOaYt_3g" name="End" activityType="EventEndEmpty"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_fHKbUVhwEd2aHsyOaYt_3g" iD="_fHKbUFhwEd2aHsyOaYt_3g" outgoingEdges="_r-90MVhwEd2aHsyOaYt_3g" incomingEdges="_fHP64VhwEd2aHsyOaYt_3g" name="SendNotAvailable" activityType="Task"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_tTzG4Fh1Ed2aHsyOaYt_3g" iD="_tTyf0Fh1Ed2aHsyOaYt_3g" outgoingEdges="_waDtMVh1Ed2aHsyOaYt_3g" incomingEdges="_tT3_YVh1Ed2aHsyOaYt_3g" name="ReceiveOrder" activityType="Task"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_4Ph4IWDaEd2jINLjV_7TQw" iD="_4Ph4IGDaEd2jINLjV_7TQw" outgoingEdges="_8u-e8WDaEd2jINLjV_7TQw" incomingEdges="_7grf0WDaEd2jINLjV_7TQw" name="Validate"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_iyzG8VhtEd2aHsyOaYt_3g" iD="_iyzG8FhtEd2aHsyOaYt_3g" source="_huULIVhtEd2aHsyOaYt_3g" target="_lMlo0VhtEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_zUIyUFhtEd2aHsyOaYt_3g" iD="_zUILQFhtEd2aHsyOaYt_3g" source="_rsQa8VhtEd2aHsyOaYt_3g" target="_zUDSwVhtEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_9Q4IQVhtEd2aHsyOaYt_3g" iD="_9Q4IQFhtEd2aHsyOaYt_3g" source="_zUDSwVhtEd2aHsyOaYt_3g" target="_9Q1sAFhtEd2aHsyOaYt_3g"/>
@@ -36,7 +35,6 @@
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_r-90MVhwEd2aHsyOaYt_3g" iD="_r-90MFhwEd2aHsyOaYt_3g" source="_fHKbUVhwEd2aHsyOaYt_3g" target="_lMlo0VhtEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_tT3_YVh1Ed2aHsyOaYt_3g" iD="_tT3_YFh1Ed2aHsyOaYt_3g" source="_BdDNwVhuEd2aHsyOaYt_3g" target="_tTzG4Fh1Ed2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_waDtMVh1Ed2aHsyOaYt_3g" iD="_waDtMFh1Ed2aHsyOaYt_3g" source="_tTzG4Fh1Ed2aHsyOaYt_3g" target="_D-IqcVhuEd2aHsyOaYt_3g"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_7grf0WDaEd2jINLjV_7TQw" iD="_7grf0GDaEd2jINLjV_7TQw" source="_lMlo0VhtEd2aHsyOaYt_3g" target="_4Ph4IWDaEd2jINLjV_7TQw"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_8u-e8WDaEd2jINLjV_7TQw" iD="_8u-e8GDaEd2jINLjV_7TQw" source="_4Ph4IWDaEd2jINLjV_7TQw" target="_rsQa8VhtEd2aHsyOaYt_3g"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_nZeo4W4_Ed2iTb26rib3kA" iD="_nZeo4G4_Ed2iTb26rib3kA" source="_lMlo0VhtEd2aHsyOaYt_3g" target="_rsQa8VhtEd2aHsyOaYt_3g"/>
</pools>
</bpmn:BpmnDiagram>
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram 2008-08-19 23:22:38 UTC (rev 1936)
@@ -31,7 +31,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_rsRCA1htEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_rsRCBFhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_rsQa8VhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rsRCBVhtEd2aHsyOaYt_3g" x="384" y="60"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rsRCBVhtEd2aHsyOaYt_3g" x="264" y="60"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zUEg4FhtEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_zUEg5lhtEd2aHsyOaYt_3g" type="4001"/>
@@ -40,7 +40,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_zUEg41htEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_zUEg5FhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_zUDSwVhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUEg5VhtEd2aHsyOaYt_3g" x="456"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUEg5VhtEd2aHsyOaYt_3g" x="336"/>
</children>
<children xmi:type="notation:Node" xmi:id="_9Q1sAVhtEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_9Q2TEFhtEd2aHsyOaYt_3g" type="4001"/>
@@ -49,7 +49,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_9Q1sBFhtEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_9Q1sBVhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_9Q1sAFhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q1sBlhtEd2aHsyOaYt_3g" x="600" y="72"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q1sBlhtEd2aHsyOaYt_3g" x="480" y="72"/>
</children>
<children xmi:type="notation:Node" xmi:id="_BdD00FhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_BdD01lhuEd2aHsyOaYt_3g" type="4001"/>
@@ -58,7 +58,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_BdD001huEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_BdD01FhuEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_BdDNwVhuEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BdD01VhuEd2aHsyOaYt_3g" x="672"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BdD01VhuEd2aHsyOaYt_3g" x="552"/>
</children>
<children xmi:type="notation:Node" xmi:id="_D-J4kFhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_D-KfoFhuEd2aHsyOaYt_3g" type="4001"/>
@@ -67,7 +67,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_D-J4k1huEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_D-J4lFhuEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_D-IqcVhuEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-J4lVhuEd2aHsyOaYt_3g" x="840" y="132"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-J4lVhuEd2aHsyOaYt_3g" x="838" y="132"/>
</children>
<children xmi:type="notation:Node" xmi:id="_T7jwcFhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_T7kXgFhuEd2aHsyOaYt_3g" type="4001"/>
@@ -76,7 +76,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_T7jwc1huEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_T7jwdFhuEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_T7iiUVhuEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7jwdVhuEd2aHsyOaYt_3g" x="456" y="120"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7jwdVhuEd2aHsyOaYt_3g" x="336" y="120"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lVLHolhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_lVLuslhuEd2aHsyOaYt_3g" type="4001"/>
@@ -139,7 +139,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_fHLpc1hwEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_fHLpdFhwEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_fHKbUVhwEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHLpdVhwEd2aHsyOaYt_3g" x="672" y="120"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHLpdVhwEd2aHsyOaYt_3g" x="552" y="120"/>
</children>
<children xmi:type="notation:Node" xmi:id="_tTzt8Fh1Ed2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_tT0VAFh1Ed2aHsyOaYt_3g" type="4001"/>
@@ -148,17 +148,8 @@
<styles xmi:type="notation:FillStyle" xmi:id="_tTzt81h1Ed2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_tTzt9Fh1Ed2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_tTzG4Fh1Ed2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTzt9Vh1Ed2aHsyOaYt_3g" x="828"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTzt9Vh1Ed2aHsyOaYt_3g" x="708"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_4PmwoGDaEd2jINLjV_7TQw" type="2001">
- <children xmi:type="notation:Node" xmi:id="_4PrpIGDaEd2jINLjV_7TQw" type="4001"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_4PmwoWDaEd2jINLjV_7TQw" fontName="Arial"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_4PmwomDaEd2jINLjV_7TQw"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_4Pmwo2DaEd2jINLjV_7TQw"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_4PmwpGDaEd2jINLjV_7TQw" lineColor="0"/>
- <element xmi:type="bpmn:Activity" href="airticket.bpmn#_4Ph4IWDaEd2jINLjV_7TQw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4PmwpWDaEd2jINLjV_7TQw" x="240" y="60"/>
- </children>
<styles xmi:type="notation:DrawerStyle" xmi:id="_dhSKAVhtEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_dhSKAlhtEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dhSKA1htEd2aHsyOaYt_3g"/>
@@ -168,7 +159,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_dhRi8VhtEd2aHsyOaYt_3g" fillColor="16771304"/>
<styles xmi:type="notation:LineStyle" xmi:id="_dhRi8lhtEd2aHsyOaYt_3g" lineColor="11119017"/>
<element xmi:type="bpmn:Pool" href="airticket.bpmn#_dhOfoVhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dhRi81htEd2aHsyOaYt_3g" x="16" y="24" width="1017" height="565"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dhRi81htEd2aHsyOaYt_3g" x="16" y="24" width="1271" height="565"/>
</children>
<styles xmi:type="notation:PageStyle" xmi:id="_iZDcIVhrEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:GuideStyle" xmi:id="_iZDcIlhrEd2aHsyOaYt_3g"/>
@@ -390,28 +381,16 @@
<element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_waDtMVh1Ed2aHsyOaYt_3g"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_waE7VFh1Ed2aHsyOaYt_3g" points="[-8, 29, 8, -100]$[-40, 128, -24, -1]"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_7gt8EGDaEd2jINLjV_7TQw" type="3001" source="_lMmP4FhtEd2aHsyOaYt_3g" target="_4PmwoGDaEd2jINLjV_7TQw">
- <children xmi:type="notation:Node" xmi:id="_7gvxQGDaEd2jINLjV_7TQw" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_7gvxQWDaEd2jINLjV_7TQw" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_7gvxQmDaEd2jINLjV_7TQw" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_7gvxQ2DaEd2jINLjV_7TQw" y="-10"/>
+ <edges xmi:type="notation:Edge" xmi:id="_nZiTQG4_Ed2iTb26rib3kA" type="3001" source="_lMmP4FhtEd2aHsyOaYt_3g" target="_rsRCAFhtEd2aHsyOaYt_3g">
+ <children xmi:type="notation:Node" xmi:id="_nZlWkG4_Ed2iTb26rib3kA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_nZlWkW4_Ed2iTb26rib3kA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_nZlWkm4_Ed2iTb26rib3kA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_nZlWk24_Ed2iTb26rib3kA" y="-10"/>
</children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_7gt8EWDaEd2jINLjV_7TQw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_7gt8EmDaEd2jINLjV_7TQw" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_7gt8E2DaEd2jINLjV_7TQw" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_7grf0WDaEd2jINLjV_7TQw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7gt8FGDaEd2jINLjV_7TQw" points="[54, -3, -102, -3]$[103, -11, -53, -11]"/>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_nZiTQW4_Ed2iTb26rib3kA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_nZiTQm4_Ed2iTb26rib3kA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_nZiTQ24_Ed2iTb26rib3kA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_nZeo4W4_Ed2iTb26rib3kA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nZiTRG4_Ed2iTb26rib3kA" points="[54, 0, -206, 3]$[245, 7, -15, 10]"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_8vAUIGDaEd2jINLjV_7TQw" type="3001" source="_4PmwoGDaEd2jINLjV_7TQw" target="_rsRCAFhtEd2aHsyOaYt_3g">
- <children xmi:type="notation:Node" xmi:id="_8vAUJWDaEd2jINLjV_7TQw" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_8vA7MGDaEd2jINLjV_7TQw" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_8vA7MWDaEd2jINLjV_7TQw" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8vA7MmDaEd2jINLjV_7TQw" y="-10"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_8vAUIWDaEd2jINLjV_7TQw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_8vAUImDaEd2jINLjV_7TQw" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_8vAUI2DaEd2jINLjV_7TQw" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_8u-e8WDaEd2jINLjV_7TQw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8vAUJGDaEd2jINLjV_7TQw" points="[54, -13, -50, 2]$[96, -33, -8, -18]"/>
- </edges>
</notation:Diagram>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-19 19:15:14 UTC (rev 1935)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-19 23:22:38 UTC (rev 1936)
@@ -37,17 +37,15 @@
*/
public class ActivityPropertyMarshallerTest extends ActivityPropertyTest
{
+ @Override
protected Process getProcess() throws IOException
{
- Process proc = super.getProcess();
-
// Marshall the process to a string
+ Process proc = super.getProcess();
String procXML = marshallProcess(proc);
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1935 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model and 13 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 15:15:14 -0400 (Tue, 19 Aug 2008)
New Revision: 1935
Added:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java
Removed:
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/
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/ProcessUnmarshaller.java
jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.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/parallel/ParallelGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java
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/data/casedata/CaseDataAPITest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataAPITest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-case-data-api10.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-task-data-api10.xml
Log:
Use Assignment instead of ExecutionHandler
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -474,7 +474,7 @@
JAXBAssignment jaxbAss = new JAXBAssignment();
jaxbAss.setAssignTime(ass.getAssignTime());
jaxbAss.setFrom(getJAXBExpression(ass.getFrom()));
- jaxbAss.setTo(getJaxbProperty(ass.getTo()));
+ jaxbAss.setTo(ass.getTo().getName());
return jaxbAss;
}
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -129,8 +129,8 @@
for (JAXBAssignment jaxbAss : jaxbProc.getAssignments())
{
JAXBExpression jaxbFrom = jaxbAss.getFrom();
- JAXBProperty jaxbTo = jaxbAss.getTo();
- procBuilder.addAssignment(jaxbAss.getAssignTime(), jaxbFrom.getLang(), jaxbFrom.getBody(), jaxbTo.getName());
+ String jaxbTo = jaxbAss.getTo();
+ procBuilder.addAssignment(jaxbAss.getAssignTime(), jaxbFrom.getLang(), jaxbFrom.getBody(), jaxbTo);
}
// Process FlowObjects
@@ -157,8 +157,8 @@
for (JAXBAssignment jaxbAss : jaxbFlowObject.getAssignments())
{
JAXBExpression jaxbFrom = jaxbAss.getFrom();
- JAXBProperty jaxbTo = jaxbAss.getTo();
- procBuilder.addAssignment(jaxbAss.getAssignTime(), jaxbFrom.getLang(), jaxbFrom.getBody(), jaxbTo.getName());
+ String jaxbTo = jaxbAss.getTo();
+ procBuilder.addAssignment(jaxbAss.getAssignTime(), jaxbFrom.getLang(), jaxbFrom.getBody(), jaxbTo);
}
}
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -40,17 +40,17 @@
@XmlType(name = "Assignment")
public class JAXBAssignment
{
- JAXBProperty to;
+ String to;
JAXBExpression from;
AssignTime assignTime;
- public JAXBProperty getTo()
+ public String getTo()
{
return to;
}
@XmlElement
- public void setTo(JAXBProperty to)
+ public void setTo(String to)
{
this.to = to;
}
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -24,7 +24,6 @@
// $Id$
import java.io.IOException;
-import java.util.Collection;
import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Message;
@@ -32,12 +31,9 @@
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Property;
import org.jboss.bpm.model.TaskBuilder;
-import org.jboss.bpm.runtime.ExecutionContext;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.Token;
-import org.jboss.bpm.runtime.Attachments.Key;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -52,7 +48,6 @@
*/
public class ActivityPropertyTest extends DefaultEngineTestCase
{
- @SuppressWarnings("unchecked")
public void testActivityPropertyRead() throws Exception
{
Process proc = getProcess();
@@ -62,37 +57,19 @@
Message endMessage = getMessages().get(0);
assertNotNull("EndMessage expected", endMessage);
assertEquals("bar", endMessage.getPropertyValue("foo"));
-
- Property prop = endMessage.getProperty("attKeys");
- Collection<Key> attKeys = prop.getValue(Collection.class);
- assertEquals(1, attKeys.size());
- Key key = attKeys.iterator().next();
- assertEquals("ActivityProperties.TaskA.foo", key.getNamePart());
}
protected Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA");
- MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
- msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true).addProperty("attKeys", null, true);
- TaskBuilder taskBuilder = procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class);
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "foo");
procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true);
Process proc = procBuilder.getProcess();
return proc;
}
-
- @SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
- {
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- Object attValue = exContext.getAttachment("ActivityProperties.TaskA.foo");
- Collection<Key> attKeys = exContext.getAttachmentKeys();
- exContext.addAttachment("foo", attValue);
- exContext.addAttachment("attKeys", attKeys);
- }
- }
}
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -30,14 +30,16 @@
import org.jboss.bpm.model.EventBuilder;
import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.runtime.ExecutionContext;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -67,7 +69,9 @@
proc.waitForEnd();
// Verify the result
- assertEquals("TaskA", TaskC.taskValue);
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("TaskA", endMessage.getPropertyValue("taskValue"));
}
public void testGateB() throws Exception
@@ -87,7 +91,9 @@
proc.waitForEnd();
// Verify the result
- assertEquals("TaskB", TaskC.taskValue);
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("TaskB", endMessage.getPropertyValue("taskValue"));
}
public void testInvalidToken() throws Exception
@@ -127,7 +133,9 @@
proc.waitForEnd();
// Verify the result
- assertEquals("TaskA", TaskC.taskValue);
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("TaskA", endMessage.getPropertyValue("taskValue"));
}
public Process getProcess() throws IOException
@@ -135,13 +143,18 @@
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValue");
+ taskBuilder.addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
- procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Gateway.GatewayType.Exclusive).addSequenceFlow("TaskC");
- procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
- procBuilder.addEndEvent("End");
+ taskBuilder = procBuilder.addTask("TaskB");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValue");
+ taskBuilder.addSequenceFlow("Merge");
+ procBuilder.addGateway("Merge", Gateway.GatewayType.Exclusive).addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("taskValue", null, true);
Process proc = procBuilder.getProcess();
return proc;
}
@@ -170,36 +183,4 @@
}
}
}
-
- @SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
- {
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- exContext.addAttachment("taskValue", "TaskA");
- }
- }
-
- @SuppressWarnings("serial")
- public static class TaskB implements ExecutionHandler
- {
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- exContext.addAttachment("taskValue", "TaskB");
- }
- }
-
- @SuppressWarnings("serial")
- public static class TaskC implements ExecutionHandler
- {
- public static Object taskValue;
-
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- taskValue = exContext.getAttachment("taskValue");
- }
- }
}
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -30,14 +30,16 @@
import org.jboss.bpm.model.EventBuilder;
import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.runtime.ExecutionContext;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -58,7 +60,7 @@
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
- signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger));
+ signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
// Send start trigger signal
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
@@ -67,7 +69,9 @@
proc.waitForEnd();
// Verify the result
- assertEquals("TaskA:TaskB", TaskC.taskValue);
+ Message endMessage = getMessages().get(0);
+ assertEquals("TaskA", endMessage.getPropertyValue("taskValueA"));
+ assertEquals("TaskB", endMessage.getPropertyValue("taskValueB"));
}
public void testMergeTimeout() throws Exception
@@ -77,7 +81,7 @@
// Send start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
try
@@ -99,7 +103,7 @@
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A");
- signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger));
+ signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
// Send start trigger signal
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
@@ -119,7 +123,7 @@
// Add a signal listener that sends the other start trigger signal
startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
- signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger));
+ signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
// Send start trigger signal
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
@@ -128,7 +132,9 @@
proc.waitForEnd();
// Verify the result
- assertEquals("TaskA:TaskB", TaskC.taskValue);
+ Message endMessage = getMessages().get(0);
+ assertEquals("TaskA", endMessage.getPropertyValue("taskValueA"));
+ assertEquals("TaskB", endMessage.getPropertyValue("taskValueB"));
}
public Process getProcess() throws IOException
@@ -136,13 +142,18 @@
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA");
+ taskBuilder.addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
- procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("TaskC");
- procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
- procBuilder.addEndEvent("End");
+ taskBuilder = procBuilder.addTask("TaskB");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB");
+ taskBuilder.addSequenceFlow("Merge");
+ procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true);
Process proc = procBuilder.getProcess();
return proc;
}
@@ -171,36 +182,4 @@
}
}
}
-
- @SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
- {
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- exContext.addAttachment("taskA", "TaskA");
- }
- }
-
- @SuppressWarnings("serial")
- public static class TaskB implements ExecutionHandler
- {
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- exContext.addAttachment("taskB", "TaskB");
- }
- }
-
- @SuppressWarnings("serial")
- public static class TaskC implements ExecutionHandler
- {
- public static Object taskValue;
-
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- taskValue = exContext.getAttachment("taskA") + ":" + exContext.getAttachment("taskB");
- }
- }
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-19 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -24,15 +24,15 @@
// $Id$
import java.io.IOException;
-import java.util.Collection;
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.runtime.ExecutionContext;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.Token;
-import org.jboss.bpm.runtime.Attachments.Key;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -55,34 +55,21 @@
proc.startProcess();
proc.waitForEnd();
- assertEquals("bar", TaskA.attValue);
-
- assertEquals(1, TaskA.attKeys.size());
- Key key = TaskA.attKeys.iterator().next();
- assertEquals("ProcessProperties.foo", key.getNamePart());
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getPropertyValue("foo"));
}
protected Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addProperty("foo", "bar").addTask("TaskA").addExecutionHandler(TaskA.class);
- procBuilder.addSequenceFlow("End").addEndEvent("End");
+ procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "foo");
+ procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true);
Process proc = procBuilder.getProcess();
return proc;
}
-
- @SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
- {
- static Object attValue;
- static Collection<Key> attKeys;
-
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- attValue = exContext.getAttachment("ProcessProperties.foo");
- attKeys = exContext.getAttachmentKeys();
- }
- }
}
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -50,10 +50,10 @@
proc.startProcess();
proc.waitForEnd();
- assertEquals(TaskA.procProp, "kermit");
- assertEquals(TaskA.taskProp, "piggy");
- assertEquals(TaskA.procAssign, Boolean.TRUE);
- assertEquals(TaskA.taskAssign, Boolean.TRUE);
+ assertEquals(TaskExecutionHandler.procProp, "kermit");
+ assertEquals(TaskExecutionHandler.taskProp, "piggy");
+ assertEquals(TaskExecutionHandler.procAssign, Boolean.TRUE);
+ assertEquals(TaskExecutionHandler.taskAssign, Boolean.TRUE);
}
protected Process getProcess() throws IOException
@@ -63,14 +63,14 @@
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.addProperty("taskProp", "piggy").addExecutionHandler(TaskExecutionHandler.class).addSequenceFlow("End");
taskBuilder.addAssignment(Assignment.AssignTime.Start, Expression.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign");
procBuilder.addEndEvent("End");
return procBuilder.getProcess();
}
@SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
+ public static class TaskExecutionHandler implements ExecutionHandler
{
static String procProp;
static String taskProp;
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 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -30,14 +30,16 @@
import org.jboss.bpm.model.EventBuilder;
import org.jboss.bpm.model.EventDetail;
import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.model.Signal;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.model.Signal.SignalType;
-import org.jboss.bpm.runtime.ExecutionContext;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.Token;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -50,7 +52,7 @@
*/
public class SynchronizationTest extends DefaultEngineTestCase
{
- public void testSynchronization() throws Exception
+ public void testParallelMerge() throws Exception
{
Process proc = getProcess();
proc.startProcess();
@@ -58,7 +60,7 @@
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
- signalManager.addSignalListener(null, new MergeListener(proc.getName(), startTrigger));
+ signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
// Send start trigger signal
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
@@ -67,10 +69,12 @@
proc.waitForEnd();
// Verify the result
- assertEquals("TaskA:TaskB", TaskC.taskValue);
+ Message endMessage = getMessages().get(0);
+ assertEquals("TaskA", endMessage.getPropertyValue("taskValueA"));
+ assertEquals("TaskB", endMessage.getPropertyValue("taskValueB"));
}
- public void testSynchronizationTimeout() throws Exception
+ public void testMergeTimeout() throws Exception
{
Process proc = getProcess();
proc.startProcess();
@@ -91,7 +95,7 @@
}
}
- public void testSynchronizationInvalidToken() throws Exception
+ public void testInvalidToken() throws Exception
{
Process proc = getProcess();
proc.startProcess();
@@ -99,7 +103,7 @@
// Add a signal listener that sends the other start trigger signal
SignalManager signalManager = SignalManager.locateSignalManager();
Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A");
- signalManager.addSignalListener(null, new MergeListener(proc.getName(), startTrigger));
+ signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
// Send start trigger signal
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
@@ -119,7 +123,7 @@
// Add a signal listener that sends the other start trigger signal
startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B");
- signalManager.addSignalListener(null, new MergeListener(proc.getName(), startTrigger));
+ signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger));
// Send start trigger signal
signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
@@ -128,21 +132,28 @@
proc.waitForEnd();
// Verify the result
- assertEquals("TaskA:TaskB", TaskC.taskValue);
+ Message endMessage = getMessages().get(0);
+ assertEquals("TaskA", endMessage.getPropertyValue("taskValueA"));
+ assertEquals("TaskB", endMessage.getPropertyValue("taskValueB"));
}
public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
- EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
+ EventBuilder eventBuilder = procBuilder.addProcess("Synchronization").addStartEvent("StartA");
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA");
- procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA");
+ taskBuilder.addSequenceFlow("Merge");
eventBuilder = procBuilder.addStartEvent("StartB");
eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB");
- procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("TaskC");
- procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End");
- procBuilder.addEndEvent("End");
+ taskBuilder = procBuilder.addTask("TaskB");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB");
+ taskBuilder.addSequenceFlow("Merge");
+ procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true);
Process proc = procBuilder.getProcess();
return proc;
}
@@ -171,36 +182,4 @@
}
}
}
-
- @SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
- {
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- exContext.addAttachment("taskA", "TaskA");
- }
- }
-
- @SuppressWarnings("serial")
- public static class TaskB implements ExecutionHandler
- {
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- exContext.addAttachment("taskB", "TaskB");
- }
- }
-
- @SuppressWarnings("serial")
- public static class TaskC implements ExecutionHandler
- {
- public static Object taskValue;
-
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- taskValue = exContext.getAttachment("taskA") + ":" + exContext.getAttachment("taskB");
- }
- }
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataAPITest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataAPITest.java 2008-08-19 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataAPITest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -25,15 +25,9 @@
import java.io.IOException;
import java.net.URL;
-import java.util.Collection;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.runtime.ExecutionContext;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.Token;
-import org.jboss.bpm.runtime.Attachments.Key;
-import org.jboss.bpm.test.DefaultEngineTestCase;
/**
* Data elements are supported which are specific to a process instance or case. They can be accessed by all components
@@ -44,21 +38,8 @@
* @author thomas.diesler(a)jboss.com
* @since 15-Aug-2008
*/
-public class CaseDataAPITest extends DefaultEngineTestCase
+public class CaseDataAPITest extends CaseDataTest
{
- public void testCaseProperties() throws Exception
- {
- Process proc = getProcess();
- proc.startProcess();
- proc.waitForEnd();
-
- assertEquals("bar", TaskA.attValue);
-
- assertEquals(1, TaskA.attKeys.size());
- Key key = TaskA.attKeys.iterator().next();
- assertEquals("ProcessProperties.foo", key.getNamePart());
- }
-
protected Process getProcess() throws IOException
{
URL jpdlURL = getResourceURL("pattern/data/casedata/pattern-data-case-data-api10.xml");
@@ -66,18 +47,4 @@
Process proc = pm.createProcess(jpdlURL);
return proc;
}
-
- @SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
- {
- static Object attValue;
- static Collection<Key> attKeys;
-
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- attValue = exContext.getAttachment("ProcessProperties.foo");
- attKeys = exContext.getAttachmentKeys();
- }
- }
}
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.pattern.data.casedata;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Data elements are supported which are specific to a process instance or case. They can be accessed by all components
+ * of the process during the execution of the case.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1519
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class CaseDataMarshallerTest extends CaseDataTest
+{
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -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.pattern.data.casedata;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Data elements are supported which are specific to a process instance or case. They can be accessed by all components
+ * of the process during the execution of the case.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1519
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class CaseDataTest extends DefaultEngineTestCase
+{
+ public void testCaseProperties() throws Exception
+ {
+ Process proc = getProcess();
+ proc.startProcess();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getPropertyValue("foo"));
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("CaseData").addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "foo");
+ procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataAPITest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataAPITest.java 2008-08-19 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataAPITest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -25,15 +25,9 @@
import java.io.IOException;
import java.net.URL;
-import java.util.Collection;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.runtime.ExecutionContext;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.Token;
-import org.jboss.bpm.runtime.Attachments.Key;
-import org.jboss.bpm.test.DefaultEngineTestCase;
/**
* Data elements can be defined by tasks which are accessible only within the context of individual execution instances
@@ -44,21 +38,8 @@
* @author thomas.diesler(a)jboss.com
* @since 15-Aug-2008
*/
-public class TaskDataAPITest extends DefaultEngineTestCase
+public class TaskDataAPITest extends TaskDataTest
{
- public void testTaskProperties() throws Exception
- {
- Process proc = getProcess();
- proc.startProcess();
- proc.waitForEnd();
-
- assertEquals("bar", TaskA.attValue);
-
- assertEquals(1, TaskA.attKeys.size());
- Key key = TaskA.attKeys.iterator().next();
- assertEquals("ActivityProperties.TaskA.foo", key.getNamePart());
- }
-
protected Process getProcess() throws IOException
{
URL jpdlURL = getResourceURL("pattern/data/taskdata/pattern-data-task-data-api10.xml");
@@ -66,18 +47,4 @@
Process proc = pm.createProcess(jpdlURL);
return proc;
}
-
- @SuppressWarnings("serial")
- public static class TaskA implements ExecutionHandler
- {
- static Object attValue;
- static Collection<Key> attKeys;
-
- public void execute(Token token)
- {
- ExecutionContext exContext = token.getExecutionContext();
- attValue = exContext.getAttachment("ActivityProperties.TaskA.foo");
- attKeys = exContext.getAttachmentKeys();
- }
- }
-}
+}
\ No newline at end of file
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataMarshallerTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataMarshallerTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.pattern.data.taskdata;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+
+/**
+ * Data elements can be defined by tasks which are accessible only within the context of individual execution instances
+ * of that task.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1515
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class TaskDataMarshallerTest extends TaskDataTest
+{
+ protected Process getProcess() throws IOException
+ {
+ // Marshall the process to a string
+ Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
+
+ // Recreate the process from the marshalled process
+ ProcessManager procManager = ProcessManager.locateProcessManager();
+ return procManager.createProcess(procXML);
+ }
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java (rev 0)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java 2008-08-19 19:15:14 UTC (rev 1935)
@@ -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.pattern.data.taskdata;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.model.EventDetail;
+import org.jboss.bpm.model.Message;
+import org.jboss.bpm.model.MessageBuilder;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+import org.jboss.bpm.model.TaskBuilder;
+import org.jboss.bpm.model.Assignment.AssignTime;
+import org.jboss.bpm.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+
+/**
+ * Data elements can be defined by tasks which are accessible only within the context of individual execution instances
+ * of that task.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1515
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class TaskDataTest extends DefaultEngineTestCase
+{
+ public void testTaskDataRead() throws Exception
+ {
+ Process proc = getProcess();
+ proc.startProcess();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getPropertyValue("foo"));
+ }
+
+ protected Process getProcess() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("TaskData").addStartEvent("Start").addSequenceFlow("TaskA");
+ TaskBuilder taskBuilder = procBuilder.addTask("TaskA");
+ taskBuilder.addProperty("foo", "bar").addSequenceFlow("End");
+ taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskData_TaskA_foo", "foo");
+ procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
+ msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true);
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-19 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-19 19:15:14 UTC (rev 1935)
@@ -1,4 +1,4 @@
-<ns2:process name="pattern-control-synchronization" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+<ns2:process name="Synchronization" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start name="StartA">
<seqflow to="TaskA" />
<signal-trigger>
@@ -8,8 +8,11 @@
</signal-trigger>
</start>
<task taskType="None" name="TaskA">
+ <assignment time="Start">
+ <from lang="MVEL">'TaskA'</from>
+ <to>taskValueA</to>
+ </assignment>
<seqflow to="Merge" />
- <execution-handler class="org.jboss.bpm.pattern.control.synchronization.SynchronizationTest$TaskA" />
</task>
<start name="StartB">
<seqflow to="TaskB" />
@@ -20,15 +23,27 @@
</signal-trigger>
</start>
<task taskType="None" name="TaskB">
+ <assignment time="Start">
+ <from lang="MVEL">'TaskB'</from>
+ <to>taskValueB</to>
+ </assignment>
<seqflow to="Merge" />
- <execution-handler class="org.jboss.bpm.pattern.control.synchronization.SynchronizationTest$TaskB" />
</task>
<parallel-gateway name="Merge">
- <seqflow to="TaskC" />
+ <seqflow to="End" />
</parallel-gateway>
- <task taskType="None" name="TaskC">
- <seqflow to="End" />
- <execution-handler class="org.jboss.bpm.pattern.control.synchronization.SynchronizationTest$TaskC" />
- </task>
- <end name="End" />
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:msgListener=SynchronizationAPITest</to>
+ <property correlation="true">
+ <name>taskValueA</name>
+ </property>
+ <property correlation="true">
+ <name>taskValueB</name>
+ </property>
+ </message>
</ns2:process>
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-case-data-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-case-data-api10.xml 2008-08-19 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-case-data-api10.xml 2008-08-19 19:15:14 UTC (rev 1935)
@@ -1,12 +1,25 @@
-<ns2:process name="ProcessProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+<ns2:process name="CaseData" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start name="Start">
+ <assignment time="Start">
+ <from lang="MVEL">CaseData_foo</from>
+ <to>foo</to>
+ </assignment>
<seqflow to="TaskA" />
</start>
<task taskType="None" name="TaskA">
<seqflow to="End" />
- <execution-handler class="org.jboss.bpm.pattern.data.casedata.CaseDataAPITest$TaskA" />
</task>
- <end name="End" />
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:msgListener=CaseDataAPITest</to>
+ <property correlation="true">
+ <name>foo</name>
+ </property>
+ </message>
<property>
<name>foo</name>
<value>bar</value>
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-task-data-api10.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-task-data-api10.xml 2008-08-19 15:56:55 UTC (rev 1934)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-task-data-api10.xml 2008-08-19 19:15:14 UTC (rev 1935)
@@ -1,14 +1,27 @@
-<ns2:process name="ActivityProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+<ns2:process name="TaskData" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
<start name="Start">
<seqflow to="TaskA" />
</start>
<task taskType="None" name="TaskA">
+ <assignment time="Start">
+ <from lang="MVEL">TaskData_TaskA_foo</from>
+ <to>foo</to>
+ </assignment>
<property>
<name>foo</name>
<value>bar</value>
</property>
<seqflow to="End" />
- <execution-handler class="org.jboss.bpm.pattern.data.taskdata.TaskDataAPITest$TaskA" />
</task>
- <end name="End" />
+ <end name="End">
+ <message-result>
+ <messageRef nameRef="EndMessage" />
+ </message-result>
+ </end>
+ <message name="EndMessage">
+ <to>jboss.bpm:msgListener=TaskDataAPITest</to>
+ <property correlation="true">
+ <name>foo</name>
+ </property>
+ </message>
</ns2:process>
\ No newline at end of file
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1934 - in jbpm3/trunk/modules/gwt-console/war/src/main: java/org/jboss/bpm/console/client/model and 4 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-08-19 11:56:55 -0400 (Tue, 19 Aug 2008)
New Revision: 1934
Added:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.java
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/Jbpm_logo.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/Jbpm_logo_small.png
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/13.png
Modified:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.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/resources/org/jboss/bpm/console/public/console.css
Log:
Added Help system callback. Some more eyecandy
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java 2008-08-19 15:25:17 UTC (rev 1933)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java 2008-08-19 15:56:55 UTC (rev 1934)
@@ -21,9 +21,12 @@
*/
package org.jboss.bpm.console.client;
-import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Image;
import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.layout.*;
+import com.gwtext.client.widgets.form.TextField;
+import com.gwtext.client.widgets.form.FormPanel;
+import com.gwtext.client.core.Position;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -41,14 +44,54 @@
this.setId(ID);
- VerticalLayout verticalLayout = new VerticalLayout();
- this.setLayout(verticalLayout);
+ HorizontalLayout layout = new HorizontalLayout(20);
+ this.setLayout(layout);
this.setHeight(50);
- this.setBodyStyle("background-color:FFFFFF");
+ this.setBaseCls("bpm-header");
- this.add( new Label("GWT Console"));
- //this.add(new MainMenu(view));
+ // --
+ /* FormPanel formPanel = new FormPanel();
+ formPanel.setUrl("");
+ formPanel.setLabelAlign(Position.TOP);
+ formPanel.setWidth(100);
+
+ // ---
+
+ Panel topPanel = new Panel();
+ topPanel.setLayout(new ColumnLayout());
+
+ Panel columnOnePanel = new Panel();
+ columnOnePanel.setLayout(new FormLayout());
+
+ TextField name = new TextField("Username", "username", 230);
+ name.setAllowBlank(false);
+
+ columnOnePanel.add(name, new AnchorLayoutData("95%"));
+
+ // ---
+
+ Panel columnTwoPanel = new Panel();
+ columnTwoPanel.setLayout(new FormLayout());
+
+ TextField pass = new TextField("Password", "password", 230);
+ pass.setAllowBlank(false);
+ pass.setPassword(true);
+
+ columnTwoPanel.add(pass, new AnchorLayoutData("95%"));
+
+ // ---
+
+ topPanel.add(name, new ColumnLayoutData(.5));
+ topPanel.add(pass, new ColumnLayoutData(.5));
+
+ formPanel.add(topPanel);
+
+ // ---
+
+ final Image image = new Image("images/Jbpm_logo_small.png");
+ this.add(formPanel); */
+
}
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java 2008-08-19 15:25:17 UTC (rev 1933)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java 2008-08-19 15:56:55 UTC (rev 1934)
@@ -35,4 +35,9 @@
{
return new MockProcessInstanceDAO();
}
+
+ public static HelpDAO getHelpDAO()
+ {
+ return new MockHelpDAO();
+ }
}
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java 2008-08-19 15:56:55 UTC (rev 1934)
@@ -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.model;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface HelpDAO
+{
+ public final static int REF_PROCESS_DEFINITIONS = 100;
+
+ String getHelpByReference(int ref);
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.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/model/MockHelpDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.java 2008-08-19 15:56:55 UTC (rev 1934)
@@ -0,0 +1,51 @@
+/*
+ * 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.model;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MockHelpDAO implements HelpDAO
+{
+
+ private static Map ref2text = new HashMap();
+
+ static {
+ ref2text.put(
+ new Integer(HelpDAO.REF_PROCESS_DEFINITIONS),
+ "Process definitions are the base classs for any process instance. " +
+ "They act as an execution template for BPM engine"
+ );
+ }
+
+ public String getHelpByReference(int ref)
+ {
+ String text = (String)ref2text.get(new Integer(ref));
+ if(text!=null)
+ return text;
+ else
+ return "No help entry for ref: " + ref;
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockHelpDAO.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/ProcessDefinitionListEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-19 15:25:17 UTC (rev 1933)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-19 15:56:55 UTC (rev 1934)
@@ -30,6 +30,8 @@
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.model.DAOFactory;
+import org.jboss.bpm.console.client.model.HelpDAO;
import org.jboss.bpm.console.client.widgets.EditorView;
import org.jboss.bpm.console.client.widgets.PieChart;
import org.jboss.bpm.console.client.widgets.HelpPanel;
@@ -118,7 +120,7 @@
Toolbar bottomToolbar = new Toolbar();
bottomToolbar.addFill();
- bottomToolbar.addButton(
+ bottomToolbar.addButton(
new ToolbarButton("More metrics", new ButtonListenerAdapter() {
public void onClick(Button button, EventObject e)
{
@@ -132,8 +134,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");
+ help.setContent( DAOFactory.getHelpDAO().getHelpByReference(HelpDAO.REF_PROCESS_DEFINITIONS));
Panel leftPanel = new Panel();
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 15:25:17 UTC (rev 1933)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-08-19 15:56:55 UTC (rev 1934)
@@ -6,7 +6,9 @@
.bpm-header {
height: 50px;
width: 100%;
- border: 1px solid;
+ background-color:#ffffff;
+ background-image: url( images/Jbpm_logo_small.png);
+ background-repeat:no-repeat;
}
.bpm-menu {
@@ -81,3 +83,7 @@
background-image: url( images/icons/36.png)
}
+.bpm-switch-context-icon {
+ background-image: url( images/icons/13.png)
+}
+
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/Jbpm_logo.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/Jbpm_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/Jbpm_logo_small.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/Jbpm_logo_small.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/13.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/icons/13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1933 - in jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model: spec and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 11:25:17 -0400 (Tue, 19 Aug 2008)
New Revision: 1933
Added:
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSupport.java
Removed:
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
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/MultipleInFlowSetterSupport.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java
Log:
Restructure API packages
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 15:23:12 UTC (rev 1932)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-19 15:25:17 UTC (rev 1933)
@@ -37,8 +37,6 @@
import org.jboss.bpm.model.SingleInFlowSupport;
import org.jboss.bpm.model.SingleOutFlowSupport;
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;
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/MultipleInFlowSetterSupport.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java 2008-08-19 15:23:12 UTC (rev 1932)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSetterSupport.java 2008-08-19 15:25:17 UTC (rev 1933)
@@ -23,7 +23,6 @@
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.FlowObject;
-import org.jboss.bpm.ri.model.spec.MultipleInFlowSupport;
//$Id$
Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSupport.java (from rev 1931, 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/impl/MultipleInFlowSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleInFlowSupport.java 2008-08-19 15:25:17 UTC (rev 1933)
@@ -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.impl;
+
+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();
+}
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 15:23:12 UTC (rev 1932)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSetterSupport.java 2008-08-19 15:25:17 UTC (rev 1933)
@@ -23,7 +23,6 @@
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.FlowObject;
-import org.jboss.bpm.ri.model.spec.MultipleOutFlowSupport;
//$Id$
Copied: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSupport.java (from rev 1931, 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/impl/MultipleOutFlowSupport.java (rev 0)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MultipleOutFlowSupport.java 2008-08-19 15:25:17 UTC (rev 1933)
@@ -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.impl;
+
+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();
+}
Deleted: 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 2008-08-19 15:23:12 UTC (rev 1932)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleInFlowSupport.java 2008-08-19 15:25:17 UTC (rev 1933)
@@ -1,43 +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.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();
-}
Deleted: 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 2008-08-19 15:23:12 UTC (rev 1932)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/MultipleOutFlowSupport.java 2008-08-19 15:25:17 UTC (rev 1933)
@@ -1,43 +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.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();
-}
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r1932 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/client/internal and 7 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-19 11:23:12 -0400 (Tue, 19 Aug 2008)
New Revision: 1932
Added:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java
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/Constants.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/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/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/GatewayBuilder.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/Message.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.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/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/ProcessBuilderFactory.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/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/Signal.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/model/TaskBuilder.java
Removed:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java
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/Constants.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/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/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/GatewayBuilder.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/Message.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.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/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/ProcessBuilderFactory.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/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/Signal.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/model/TaskBuilder.java
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectHandler.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/runtime/Attachments.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.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/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/ProcessManagerImpl.java
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
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/DialectHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectHandler.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectHandler.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -30,7 +30,7 @@
import org.jboss.bpm.model.Process;
/**
- * The DialectHandler converts a supported dialect to the internal Process model.
+ * The DialectHandler converts a supported dialect to the Process model.
*
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java (from rev 1930, jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java)
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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.client;
+
+//$Id$
+
+import java.util.Map;
+
+/**
+ * A registry that Maps namespaceURI to dialect Id
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jul-2008
+ */
+public class DialectRegistry
+{
+ public static final Object BEAN_NAME = "jBPMDialectRegistry";
+
+ // Maps namespaceURI to dialect Id
+ private Map<String,String> registry;
+
+ public void setRegistry(Map<String, String> registry)
+ {
+ this.registry = registry;
+ }
+
+ public String getDialect(String nsURI)
+ {
+ return registry.get(nsURI);
+ }
+}
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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -40,7 +40,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.EngineShutdownException;
-import org.jboss.bpm.client.internal.DialectRegistry;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.runtime.Attachments;
import org.w3c.dom.Document;
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client.internal;
-
-//$Id$
-
-import java.util.Map;
-
-/**
- * A registry that Maps namespaceURI to dialect Id
- *
- * @author thomas.diesler(a)jboss.com
- * @since 18-Jul-2008
- */
-public class DialectRegistry
-{
- public static final Object BEAN_NAME = "jBPMDialectRegistry";
-
- // Maps namespaceURI to dialect Id
- private Map<String,String> registry;
-
- public void setRegistry(Map<String, String> registry)
- {
- this.registry = registry;
- }
-
- public String getDialect(String nsURI)
- {
- return registry.get(nsURI);
- }
-}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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
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 15:23:12 UTC (rev 1932)
@@ -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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,113 @@
+/*
+ * 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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * 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, Expression.ExpressionLanguage lang);
-
- /**
- * Add an activity property
- */
- ActivityBuilder addProperty(String name, String value);
-}
\ No newline at end of file
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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, Expression.ExpressionLanguage lang);
+
+ /**
+ * Add an activity property
+ */
+ ActivityBuilder addProperty(String name, String value);
+}
\ No newline at end of file
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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();
-}
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 15:23:12 UTC (rev 1932)
@@ -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();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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();
-
-}
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.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();
+
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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();
-
-}
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.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();
+
+}
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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
-{
- public enum AssignTime
- {
- Start, End
- }
-
- /**
- * 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.
- */
- Assignment.AssignTime getAssignTime();
-}
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 15:23:12 UTC (rev 1932)
@@ -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.jboss.bpm.model;
+
+
+
+//$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
+{
+ public enum AssignTime
+ {
+ Start, End
+ }
+
+ /**
+ * 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.
+ */
+ Assignment.AssignTime getAssignTime();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * 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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,60 @@
+/*
+ * 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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id: $
-
-
-/**
- * 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";
-}
\ No newline at end of file
Added: 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 (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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$
+
+
+/**
+ * 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";
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.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
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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();
-}
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-
-//$Id$
-
-/**
- * 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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+
+
+//$Id$
+
+/**
+ * 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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import org.jboss.bpm.model.Signal.SignalType;
-
-/**
- * The EventBuilder can be used to build an Event dynamically.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface EventBuilder extends ProcessBuilder
-{
- /**
- * Add an event detail to the last added Event
- */
- EventBuilder addEventDetail(EventDetail.EventDetailType detailType);
-
- /**
- * Add a signal ref to the last added EventDetail
- */
- EventBuilder addSignalRef(SignalType signalType, String signalMessage);
-
- /**
- * 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/EventBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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 org.jboss.bpm.model.Signal.SignalType;
+
+/**
+ * The EventBuilder can be used to build an Event dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface EventBuilder extends ProcessBuilder
+{
+ /**
+ * Add an event detail to the last added Event
+ */
+ EventBuilder addEventDetail(EventDetail.EventDetailType detailType);
+
+ /**
+ * Add a signal ref to the last added EventDetail
+ */
+ EventBuilder addSignalRef(SignalType signalType, String signalMessage);
+
+ /**
+ * Add a message ref to the last added EventDetail
+ */
+ EventBuilder addMessageRef(String msgName);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * The base of all supported event details.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-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.
- */
- EventDetail.EventDetailType getEventDetailType();
-}
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+//$Id$
+
+/**
+ * The base of all supported event details.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+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.
+ */
+ EventDetail.EventDetailType getEventDetailType();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-
-//$Id$
-
-/**
- * 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
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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
-{
- 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.
- */
- 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.
- */
- Expression.ExpressionLanguage getExpressionLanguage();
-
-}
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+
+//$Id$
+
+/**
+ * An Expression, which is used in the definition of attributes for StartEvent,
+ * IntermediateEvent, Activity, ComplexGateway, and SequenceFlow
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+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.
+ */
+ 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.
+ */
+ Expression.ExpressionLanguage getExpressionLanguage();
+
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.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();
-}
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+//$Id$
+
+import java.util.List;
+
+/**
+ * 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();
+}
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import java.util.List;
-
-
-//$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
-{
- /**
- * 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
- */
- 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
- * 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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,84 @@
+/*
+ * 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$
+
+/**
+ * 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
+{
+ /**
+ * 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
+ */
+ 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
+ * 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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id:$
-
-/**
- * The GatewayBuilder can be used to build a Gateway dynamically.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface GatewayBuilder extends ProcessBuilder
-{
- GatewayBuilder addDefaultGate(String targetName);
-
- GatewayBuilder addConditionalGate(String targetName, Expression.ExpressionLanguage exprLang, String exprBody);
-
- GatewayBuilder addGate(String targetName);
-}
\ No newline at end of file
Added: 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 (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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 GatewayBuilder can be used to build a Gateway dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface GatewayBuilder extends ProcessBuilder
+{
+ GatewayBuilder addDefaultGate(String targetName);
+
+ GatewayBuilder addConditionalGate(String targetName, Expression.ExpressionLanguage exprLang, String exprBody);
+
+ GatewayBuilder addGate(String targetName);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * A graphical BPMN element
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface GraphicalElement extends AbstractElement
-{
-}
\ No newline at end of file
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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.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
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import 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();
-}
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 15:23:12 UTC (rev 1932)
@@ -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;
+
+
+/**
+ * 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();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id: $
-
-/**
- * A 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 PropertySupport
-{
- /**
- * Specifies the technology that will be used to send or receive the
- * message.
- */
- public enum Implementation
- {
- WebService, Other, Unspecified
- }
-
- /**
- * Name is an attribute that is text description of the Message.
- */
- String getName();
-
- /**
- * This defines the source of the Message.
- */
- Participant getFromRef();
-
- /**
- * Get the source of the source {@link FlowObject} for this message
- */
- FlowObject getFrom();
-
- /**
- * This defines the target of the Message.
- */
- Participant getToRef();
-}
Added: 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 (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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 PropertySupport
+{
+ /**
+ * Specifies the technology that will be used to send or receive the
+ * message.
+ */
+ public enum Implementation
+ {
+ WebService, Other, Unspecified
+ }
+
+ /**
+ * Name is an attribute that is text description of the Message.
+ */
+ String getName();
+
+ /**
+ * This defines the source of the Message.
+ */
+ Participant getFromRef();
+
+ /**
+ * Get the source of the source {@link FlowObject} for this message
+ */
+ FlowObject getFrom();
+
+ /**
+ * This defines the target of the Message.
+ */
+ Participant getToRef();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import javax.management.ObjectName;
-
-
-
-//$Id$
-
-/**
- * A MessageBuilder can be used to build a {@link Message} dynamically.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface MessageBuilder
-{
- /**
- * Create a {@link Message} with a given name
- */
- MessageBuilder newMessage(String msgName);
-
- /**
- * Add a message destination
- */
- MessageBuilder addToRef(ObjectName toRef);
-
- /**
- * Add a message source
- */
- MessageBuilder addFromRef(ObjectName fromRef);
-
- /**
- * Add a message property
- */
- MessageBuilder addProperty(String name, Object value);
-
- /**
- * Add a message property
- */
- MessageBuilder addProperty(String name, Object value, boolean isCorrelation);
-
- /**
- * Get the Message
- */
- Message getMessage();
-}
\ No newline at end of file
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+//$Id$
+
+import javax.management.ObjectName;
+
+
+/**
+ * A MessageBuilder can be used to build a {@link Message} dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface MessageBuilder
+{
+ /**
+ * Create a {@link Message} with a given name
+ */
+ MessageBuilder newMessage(String msgName);
+
+ /**
+ * Add a message destination
+ */
+ MessageBuilder addToRef(ObjectName toRef);
+
+ /**
+ * Add a message source
+ */
+ MessageBuilder addFromRef(ObjectName fromRef);
+
+ /**
+ * Add a message property
+ */
+ MessageBuilder addProperty(String name, Object value);
+
+ /**
+ * Add a message property
+ */
+ MessageBuilder addProperty(String name, Object value, boolean isCorrelation);
+
+ /**
+ * Get the Message
+ */
+ Message getMessage();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.util.KernelLocator;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-
-/**
- * A Factory for the {@link MessageBuilder}.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public abstract class MessageBuilderFactory
-{
- /** The bean name - jBPMMessageBuilderFactory */
- public static final String BEAN_NAME = "jBPMMessageBuilderFactory";
-
- // Hide the constructor
- protected MessageBuilderFactory()
- {
- }
-
- /**
- * Get a MessageBuilderFactory instance.
- */
- @SuppressWarnings("deprecation")
- public static MessageBuilderFactory newInstance()
- {
- // Make sure the engine is bootstrapped
- ProcessEngine.locateProcessEngine();
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
- return (MessageBuilderFactory)entry.getTarget();
- }
-
- /**
- * Get a {@link MessageBuilder}.
- */
- public abstract MessageBuilder newMessageBuilder();
-}
\ No newline at end of file
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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 MessageBuilder}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public abstract class MessageBuilderFactory
+{
+ /** The bean name - jBPMMessageBuilderFactory */
+ public static final String BEAN_NAME = "jBPMMessageBuilderFactory";
+
+ // Hide the constructor
+ protected MessageBuilderFactory()
+ {
+ }
+
+ /**
+ * Get a MessageBuilderFactory instance.
+ */
+ @SuppressWarnings("deprecation")
+ public static MessageBuilderFactory newInstance()
+ {
+ // Make sure the engine is bootstrapped
+ ProcessEngine.locateProcessEngine();
+ Kernel kernel = KernelLocator.getKernel();
+ KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
+ return (MessageBuilderFactory)entry.getTarget();
+ }
+
+ /**
+ * Get a {@link MessageBuilder}.
+ */
+ public abstract MessageBuilder newMessageBuilder();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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();
-}
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+
+//$Id$
+
+/**
+ * The 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();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * A 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
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MutablePropertySupport.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
Deleted: 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/ObjectNameFactory.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ObjectNameFactory.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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.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/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 15:23:12 UTC (rev 1932)
@@ -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);
+ }
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ObjectNameFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import 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();
-}
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 15:23:12 UTC (rev 1932)
@@ -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;
+
+
+/**
+ * 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();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+
+//$Id$
+
+/**
+ * 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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-
-//$Id$
-
-/**
- * A 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
-{
- public enum ParticipantType
- {
- Role, Entity
- }
-
- /**
- * Get the type of this participant
- */
- 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();
-}
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
+{
+ public enum ParticipantType
+ {
+ Role, Entity
+ }
+
+ /**
+ * Get the type of this participant
+ */
+ 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();
+}
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,154 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id: 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.runtime.Attachments;
-
-/**
- * A Process is any Activity performed within a company or organization.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-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();
-
- /**
- * Get the process state
- */
- Process.ProcessStatus getProcessStatus();
-
- /**
- * Get the process type
- */
- Process.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();
-
- /**
- * Start the process, with a given execution context
- */
- ObjectName startProcess(Attachments att);
-
- /**
- * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event.
- * The Process will be in a running state until all Tokens are consumed.
- * <p/>
- * This method until the process ends without timeout.
- */
- void waitForEnd();
-
- /**
- * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event.
- * The Process will be in a running state until all Tokens are consumed.
- * <p/>
- * This method until the process ends with a given timeout.
- */
- void waitForEnd(long timeout);
-}
\ No newline at end of file
Added: 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 (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -0,0 +1,154 @@
+/*
+ * 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;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.runtime.Attachments;
+
+/**
+ * A Process is any Activity performed within a company or organization.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+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();
+
+ /**
+ * Get the process state
+ */
+ Process.ProcessStatus getProcessStatus();
+
+ /**
+ * Get the process type
+ */
+ Process.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();
+
+ /**
+ * Start the process, with a given execution context
+ */
+ ObjectName startProcess(Attachments att);
+
+ /**
+ * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event.
+ * The Process will be in a running state until all Tokens are consumed.
+ * <p/>
+ * This method until the process ends without timeout.
+ */
+ void waitForEnd();
+
+ /**
+ * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event.
+ * The Process will be in a running state until all Tokens are consumed.
+ * <p/>
+ * This method until the process ends with a given timeout.
+ */
+ void waitForEnd(long timeout);
+}
\ No newline at end of file
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import org.jboss.bpm.client.DialectHandler;
-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;
-
-
-//$Id$
-
-/**
- * The ProcessBuilder can be used to build a {@link Process} dynamically.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface ProcessBuilder
-{
- /**
- * Add a {@link Process} with a given name
- */
- ProcessBuilder addProcess(String name);
-
- /**
- * Add all elements from another {@link Process}.
- * This is typically used by a {@link DialectHandler} when processing an include.
- */
- ProcessBuilder addProcessElements(Process proc);
-
- /**
- * Get the {@link Process}.
- * <p/>
- * This is the final call to the ProcessBuilder after all elements have been added.
- * The {@link Process} is initialized and put in state READY
- */
- Process getProcess();
-
- /**
- * Get the {@link Process} for inclusion in another.
- * <p/>
- * This is the final call to the ProcessBuilder after all elements have been added.
- * The {@link Process} is not initialized and put in state READY
- */
- Process getProcessForInclude();
-
- /**
- * Add a SequenceFlow with a given name
- */
- ProcessBuilder addSequenceFlow(String targetName);
-
- /**
- * Add a MessageFlow with a given name
- */
- ProcessBuilder addMessageFlow(String targetName);
-
- /**
- * Add a SartEvent with a given name
- */
- EventBuilder addStartEvent(String name);
-
- /**
- * Add an IntermediateEvent with a given name
- */
- EventBuilder addEvent(String name);
-
- /**
- * Add an EndEvent with a given name
- */
- EventBuilder addEndEvent(String 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, Task.TaskType type);
-
- /**
- * Add a Gateway with a given name
- */
- GatewayBuilder addGateway(String name, Gateway.GatewayType type);
-
- /**
- * Add a {@link Message} with a given name.
- */
- MessageBuilder addMessage(String name);
-
- /**
- * Add a process property
- */
- ProcessBuilder addProperty(String name, String value);
-
- /**
- * Add an Assignment to the Process or the current FlowObject.
- */
- ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp);
-
- /**
- * Add an {@link ExecutionHandler} with a given Class
- */
- ProcessBuilder addExecutionHandler(Class<?> clazz);
-
- /**
- * Add an {@link FlowHandler} with a given Class
- */
- ProcessBuilder addFlowHandler(Class<?> clazz);
-
- /**
- * Add an {@link SignalHandler} with a given Class
- */
- ProcessBuilder addSignalHandler(Class<?> clazz);
-}
\ No newline at end of file
Added: 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 (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -0,0 +1,138 @@
+/*
+ * 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.client.DialectHandler;
+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;
+
+
+// $Id$
+
+/**
+ * The ProcessBuilder can be used to build a {@link Process} dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ProcessBuilder
+{
+ /**
+ * Add a {@link Process} with a given name
+ */
+ ProcessBuilder addProcess(String name);
+
+ /**
+ * Add all elements from another {@link Process}.
+ * This is typically used by a {@link DialectHandler} when processing an include.
+ */
+ ProcessBuilder addProcessElements(Process proc);
+
+ /**
+ * Get the {@link Process}.
+ * <p/>
+ * This is the final call to the ProcessBuilder after all elements have been added.
+ * The {@link Process} is initialized and put in state READY
+ */
+ Process getProcess();
+
+ /**
+ * Get the {@link Process} for inclusion in another.
+ * <p/>
+ * This is the final call to the ProcessBuilder after all elements have been added.
+ * The {@link Process} is not initialized and put in state READY
+ */
+ Process getProcessForInclude();
+
+ /**
+ * Add a SequenceFlow with a given name
+ */
+ ProcessBuilder addSequenceFlow(String targetName);
+
+ /**
+ * Add a MessageFlow with a given name
+ */
+ ProcessBuilder addMessageFlow(String targetName);
+
+ /**
+ * Add a SartEvent with a given name
+ */
+ EventBuilder addStartEvent(String name);
+
+ /**
+ * Add an IntermediateEvent with a given name
+ */
+ EventBuilder addEvent(String name);
+
+ /**
+ * Add an EndEvent with a given name
+ */
+ EventBuilder addEndEvent(String 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, Task.TaskType type);
+
+ /**
+ * Add a Gateway with a given name
+ */
+ GatewayBuilder addGateway(String name, Gateway.GatewayType type);
+
+ /**
+ * Add a {@link Message} with a given name.
+ */
+ MessageBuilder addMessage(String name);
+
+ /**
+ * Add a process property
+ */
+ ProcessBuilder addProperty(String name, String value);
+
+ /**
+ * Add an Assignment to the Process or the current FlowObject.
+ */
+ ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp);
+
+ /**
+ * Add an {@link ExecutionHandler} with a given Class
+ */
+ ProcessBuilder addExecutionHandler(Class<?> clazz);
+
+ /**
+ * Add an {@link FlowHandler} with a given Class
+ */
+ ProcessBuilder addFlowHandler(Class<?> clazz);
+
+ /**
+ * Add an {@link SignalHandler} with a given Class
+ */
+ ProcessBuilder addSignalHandler(Class<?> clazz);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.util.KernelLocator;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-
-/**
- * A Factory for the {@link ProcessBuilder}.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public abstract class ProcessBuilderFactory
-{
- /** The bean name - jBPMProcessBuilderFactory */
- public static final String BEAN_NAME = "jBPMProcessBuilderFactory";
-
- // Hide the constructor
- protected ProcessBuilderFactory()
- {
- }
-
- /**
- * Get a ProcessBuilderFactory instance.
- */
- @SuppressWarnings("deprecation")
- public static ProcessBuilderFactory newInstance()
- {
- // Make sure the engine is bootstrapped
- ProcessEngine.locateProcessEngine();
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
- return (ProcessBuilderFactory)entry.getTarget();
- }
-
- /**
- * Get a {@link ProcessBuilder}.
- */
- public abstract ProcessBuilder newProcessBuilder();
-}
\ No newline at end of file
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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 ProcessBuilder}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public abstract class ProcessBuilderFactory
+{
+ /** The bean name - jBPMProcessBuilderFactory */
+ public static final String BEAN_NAME = "jBPMProcessBuilderFactory";
+
+ // Hide the constructor
+ protected ProcessBuilderFactory()
+ {
+ }
+
+ /**
+ * Get a ProcessBuilderFactory instance.
+ */
+ @SuppressWarnings("deprecation")
+ public static ProcessBuilderFactory newInstance()
+ {
+ // Make sure the engine is bootstrapped
+ ProcessEngine.locateProcessEngine();
+ Kernel kernel = KernelLocator.getKernel();
+ KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
+ return (ProcessBuilderFactory)entry.getTarget();
+ }
+
+ /**
+ * Get a {@link ProcessBuilder}.
+ */
+ public abstract ProcessBuilder newProcessBuilder();
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -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.model;
-
-
-//$Id$
-
-/**
- * A Property, which is used in the definition of attributes for a Process and common activity attributes
- *
- * @author thomas.diesler(a)jboss.com
- * @since 21-Jul-2008
- */
-public interface Property
-{
- /**
- * Supported property types
- */
- public enum PropertyType
- {
- String, Object
- }
-
- /**
- * Each Property has a Name (e.g., name=”Customer Name”).
- */
- String getName();
-
- /**
- * Each Property has a Type (e.g., type=”String”). Properties may be defined
- * hierarchically.
- */
- PropertyType getPropertyType();
-
- /**
- * Each Property MAY have a value expression specified.
- */
- Expression getExpression();
-
- /**
- * Get the body of the expression value.
- */
- String getValue();
-
- /**
- * Get the body of the expression value.
- */
- <T> T getValue(Class<T> T);
-
- /**
- * If the Correlation attribute is set to True, then the Property is marked to be used for
- * correlation (e.g., for incoming Messages).
- */
- boolean isCorrelation();
-}
Added: 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 (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+
+// $Id$
+
+/**
+ * A Property, which is used in the definition of attributes for a Process and common activity attributes
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Jul-2008
+ */
+public interface Property
+{
+ /**
+ * Supported property types
+ */
+ public enum PropertyType
+ {
+ String, Object
+ }
+
+ /**
+ * Each Property has a Name (e.g., name=”Customer Name”).
+ */
+ String getName();
+
+ /**
+ * Each Property has a Type (e.g., type=”String”). Properties may be defined
+ * hierarchically.
+ */
+ PropertyType getPropertyType();
+
+ /**
+ * Each Property MAY have a value expression specified.
+ */
+ Expression getExpression();
+
+ /**
+ * Get the body of the expression value.
+ */
+ String getValue();
+
+ /**
+ * Get the body of the expression value.
+ */
+ <T> T getValue(Class<T> T);
+
+ /**
+ * If the Correlation attribute is set to True, then the Property is marked to be used for
+ * correlation (e.g., for incoming Messages).
+ */
+ boolean isCorrelation();
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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
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 15:23:12 UTC (rev 1932)
@@ -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 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
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.util.KernelLocator;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-
-/**
- * A Factory for the {@link PropertyBuilder}.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public abstract class PropertyBuilderFactory
-{
- /** 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
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 15:23:12 UTC (rev 1932)
@@ -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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import java.util.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
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 15:23:12 UTC (rev 1932)
@@ -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.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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,60 @@
+/*
+ * 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
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * A 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();
-
-}
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 15:23:12 UTC (rev 1932)
@@ -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.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();
+
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+//$Id$
+
+import org.jboss.bpm.model.Message.Implementation;
+
+/**
+ * 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
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * A 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
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 15:23:12 UTC (rev 1932)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.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
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import java.io.Serializable;
-
-//$Id$
-
-/**
- * A Signal thrown by the ProcessEngine
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public class Signal implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Defines the types of supported Signals
- */
- public enum SignalType
- {
- SYSTEM_START_EVENT_ENTER, SYSTEM_START_EVENT_EXIT, SYSTEM_START_TRIGGER,
- SYSTEM_EVENT_ENTER, SYSTEM_EVENT_EXIT, SYSTEM_EVENT_TRIGGER,
- SYSTEM_END_EVENT_ENTER, SYSTEM_END_EVENT_EXIT, SYSTEM_END_TRIGGER,
- SYSTEM_GATEWAY_ENTER, SYSTEM_GATEWAY_EXIT,
- SYSTEM_PROCESS_ENTER, SYSTEM_PROCESS_EXIT,
- SYSTEM_SUB_PROCESS_ENTER, SYSTEM_SUB_PROCESS_EXIT,
- SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER,
- USER_SIGNAL
- }
-
- private SignalType type;
- private String message;
- private String fromRef;
-
- /** Create the signal for a given process */
- public Signal(String fromRef, SignalType type)
- {
- this.fromRef = fromRef;
- this.type = type;
- if (fromRef == null)
- throw new IllegalArgumentException("Signal fromRef cannot be null");
- if (type == null)
- throw new IllegalArgumentException("SignalType cannot be null");
- }
-
- /** Create the signal for a given process */
- public Signal(String fromRef, SignalType type, String message)
- {
- this(fromRef, type);
- this.message = message;
- }
-
- public String getFromRef()
- {
- return fromRef;
- }
-
- public SignalType getSignalType()
- {
- return type;
- }
-
- public String getMessage()
- {
- return message;
- }
-
- public String toString()
- {
- StringBuilder string = new StringBuilder(type + "[" + fromRef);
- if (message != null)
- {
- string.append(":" + message);
- }
- string.append("]");
- return string.toString();
- }
-}
\ No newline at end of file
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -0,0 +1,100 @@
+/*
+ * 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.io.Serializable;
+
+// $Id$
+
+/**
+ * A Signal thrown by the ProcessEngine
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public class Signal implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Defines the types of supported Signals
+ */
+ public enum SignalType
+ {
+ SYSTEM_START_EVENT_ENTER, SYSTEM_START_EVENT_EXIT, SYSTEM_START_TRIGGER,
+ SYSTEM_EVENT_ENTER, SYSTEM_EVENT_EXIT, SYSTEM_EVENT_TRIGGER,
+ SYSTEM_END_EVENT_ENTER, SYSTEM_END_EVENT_EXIT, SYSTEM_END_TRIGGER,
+ SYSTEM_GATEWAY_ENTER, SYSTEM_GATEWAY_EXIT,
+ SYSTEM_PROCESS_ENTER, SYSTEM_PROCESS_EXIT,
+ SYSTEM_SUB_PROCESS_ENTER, SYSTEM_SUB_PROCESS_EXIT,
+ SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER,
+ USER_SIGNAL
+ }
+
+ private SignalType type;
+ private String message;
+ private String fromRef;
+
+ /** Create the signal for a given process */
+ public Signal(String fromRef, SignalType type)
+ {
+ this.fromRef = fromRef;
+ this.type = type;
+ if (fromRef == null)
+ throw new IllegalArgumentException("Signal fromRef cannot be null");
+ if (type == null)
+ throw new IllegalArgumentException("SignalType cannot be null");
+ }
+
+ /** Create the signal for a given process */
+ public Signal(String fromRef, SignalType type, String message)
+ {
+ this(fromRef, type);
+ this.message = message;
+ }
+
+ public String getFromRef()
+ {
+ return fromRef;
+ }
+
+ public SignalType getSignalType()
+ {
+ return type;
+ }
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public String toString()
+ {
+ StringBuilder string = new StringBuilder(type + "[" + fromRef);
+ if (message != null)
+ {
+ string.append(":" + message);
+ }
+ string.append("]");
+ return string.toString();
+ }
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * 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();
-
-}
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 15:23:12 UTC (rev 1932)
@@ -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.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();
+
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * Implementing {@link 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();
-}
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 15:23:12 UTC (rev 1932)
@@ -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} 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();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-
-//$Id$
-
-/**
- * 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();
-}
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 15:23:12 UTC (rev 1932)
@@ -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.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();
+}
Deleted: 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 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-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
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 15:23:12 UTC (rev 1932)
@@ -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.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
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-
-
-//$Id$
-
-/**
- * A 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
-{
- /**
- * 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
- * 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.
- */
- Task.TaskType getTaskType();
-}
\ No newline at end of file
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 15:23:12 UTC (rev 1932)
@@ -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$
+
+/**
+ * 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
+{
+ /**
+ * 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
+ * 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.
+ */
+ Task.TaskType getTaskType();
+}
\ No newline at end of file
Deleted: 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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id: $
-
-/**
- * The TaskBuilder can be used to build a Task dynamically.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Jul-2008
- */
-public interface TaskBuilder extends ActivityBuilder
-{
- TaskBuilder addMessageRef(String msgName);
-
- TaskBuilder addExecutionHandler(Class<?> clazz);
-}
\ No newline at end of file
Added: 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 (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model;
+
+
+//$Id$
+
+/**
+ * The TaskBuilder can be used to build a Task dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface TaskBuilder extends ActivityBuilder
+{
+ TaskBuilder addMessageRef(String msgName);
+
+ TaskBuilder addExecutionHandler(Class<?> clazz);
+}
\ No newline at end of file
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.runtime;
-//$Id$
+// $Id: $
import java.util.Collection;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.runtime;
-//$Id$
+// $Id: $
import java.util.Collection;
import java.util.HashMap;
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -22,7 +22,7 @@
package org.jboss.bpm.runtime;
-//$Id$
+// $Id: $
/**
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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.runtime;
-//$Id$
+// $Id: $
import org.jboss.bpm.client.ProcessEngine;
import org.jboss.bpm.model.FlowObject;
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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.runtime;
-//$Id$
+// $Id: $
import org.jboss.bpm.client.ProcessEngine;
import org.jboss.bpm.model.FlowObject;
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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.runtime;
-//$Id$
+// $Id: $
import org.jboss.bpm.model.InputSet;
import org.jboss.bpm.model.OutputSet;
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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-19 15:23:12 UTC (rev 1932)
@@ -33,7 +33,7 @@
<bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/>
<!-- The DialectRegistry -->
- <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry">
+ <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-19 15:23:12 UTC (rev 1932)
@@ -33,7 +33,7 @@
<bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>
<!-- The DialectRegistry -->
- <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry">
+ <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
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/ri/client/ProcessManagerImpl.java 2008-08-19 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java 2008-08-19 15:23:12 UTC (rev 1932)
@@ -26,8 +26,8 @@
import java.util.Map;
import org.jboss.bpm.client.DialectHandler;
+import org.jboss.bpm.client.DialectRegistry;
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/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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-19 15:23:12 UTC (rev 1932)
@@ -35,7 +35,7 @@
<bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>
<!-- The DialectRegistry -->
- <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry">
+ <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
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 14:57:31 UTC (rev 1931)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-19 15:23:12 UTC (rev 1932)
@@ -39,7 +39,7 @@
<bean name="jBPMDialectHandlerXPDL21" class="org.jboss.bpm.dialect.xpdl21.DialectHandlerImpl"/>
<!-- The DialectRegistry -->
- <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry">
+ <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
17 years, 8 months
- 1
- 0