[jbpm-commits] JBoss JBPM SVN: r1963 - in jbossbpm/spec/branches/tdiesler/modules: api/src/main/java/org/jboss/bpm/model and 14 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 21 15:59:16 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-08-21 15:59:16 -0400 (Thu, 21 Aug 2008)
New Revision: 1963
Modified:
jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java
jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
jbossbpm/spec/branches/tdiesler/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java
jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java
Log:
WIP
Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -28,12 +28,16 @@
import java.util.Map;
import java.util.Set;
+import javax.management.ObjectName;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.model.Signal;
/**
- * The ProcessEngine sends signals through the SignalManager <p/> A {@link Signal} is like an undirected flare shot up
+ * The ProcessEngine sends signals through the SignalManager.
+ * <p/>
+ * A {@link Signal} is like an undirected flare shot up
* into the air. A component can register a {@link SignalListener} with the SignalManager.
*
* @author thomas.diesler at jboss.com
@@ -45,7 +49,7 @@
private static final Log log = LogFactory.getLog(SignalManager.class);
// The map of registered signal listeners
- private Map<String, Set<SignalListener>> listeners = new HashMap<String, Set<SignalListener>>();
+ private Map<ObjectName, Set<SignalListener>> listeners = new HashMap<ObjectName, Set<SignalListener>>();
/**
* Locate the SignalManager
@@ -57,32 +61,34 @@
}
/**
- * Add a SignalListener for a given process
+ * Add a SignalListener for a given source
+ *
+ * @param fromRef If null the listener catches all signals
*/
- public void addSignalListener(String procName, SignalListener listener)
+ public void addSignalListener(ObjectName fromRef, SignalListener listener)
{
synchronized (listeners)
{
- log.debug("addSignalListener: " + procName + "=" + listener);
- Set<SignalListener> set = listeners.get(procName);
+ log.debug("addSignalListener: " + fromRef + "=" + listener);
+ Set<SignalListener> set = listeners.get(fromRef);
if (set == null)
{
set = new HashSet<SignalListener>();
- listeners.put(procName, set);
+ listeners.put(fromRef, set);
}
set.add(listener);
}
}
/**
- * Remove an SignalListener for a given process
+ * Remove a SignalListener for a given source
*/
- public void removeSignalListener(String procName, SignalListener listener)
+ public void removeSignalListener(ObjectName fromRef, SignalListener listener)
{
synchronized (listeners)
{
- log.debug("removeSignalListener: " + procName + "=" + listener);
- Set<SignalListener> set = listeners.get(procName);
+ log.debug("removeSignalListener: " + fromRef + "=" + listener);
+ Set<SignalListener> set = listeners.get(fromRef);
if (set != null)
{
set.remove(listener);
@@ -91,78 +97,48 @@
}
/**
- * Remove all SignalListener for a given process
+ * Remove all SignalListener for a given source
*/
- public void removeSignalListeners(String procName)
+ public void removeSignalListeners(ObjectName fromRef)
{
synchronized (listeners)
{
- log.debug("removeSignalListeners: " + procName);
- listeners.remove(procName);
+ log.debug("removeSignalListeners: " + fromRef);
+ listeners.remove(fromRef);
}
}
/**
* Throw a signal to all registered listeners
+ *
* @param procName An optional process name
*/
public void throwSignal(Signal signal)
{
- throwSignalInternal(null, signal);
- }
-
- /**
- * Throw a signal to all registered listeners
- * @param procName An optional process name
- */
- public void throwSignal (String procName, Signal signal)
- {
- throwSignalInternal(procName, signal);
- }
+ log.debug("throwSignal: " + signal);
- private void throwSignalInternal (String procName, Signal signal)
- {
- log.debug("throwSignal: " + procName + "=" + signal);
-
- // Throw Signal to listeners associated with the process
- if (procName != null)
+ // Throw Signal to listeners associated with a given source
+ ObjectName fromRef = signal.getFromRef();
+ Set<SignalListener> fromRefListeners = getListeners(fromRef);
+ for (SignalListener listener : fromRefListeners)
{
- Set<SignalListener> procListeners = getListenerSet(procName);
- for (SignalListener listener : procListeners)
- {
- failsafeThrow(listener, signal);
- }
+ failsafeThrow(listener, signal);
}
-
- // Throw Signal to listeners associated with any process
- if (procName == null)
- {
- synchronized (listeners)
- {
- for (String auxName : listeners.keySet())
- {
- if (auxName != null)
- {
- throwSignalInternal(auxName, signal);
- }
- }
- }
- }
- // Throw Signal to listeners not associated with any process
- Set<SignalListener> allProcListeners = getListenerSet(null);
- for (SignalListener listener : allProcListeners)
+ // Throw Signal to listeners not associated with any source
+ Set<SignalListener> allListeners = getListeners(null);
+ for (SignalListener listener : allListeners)
{
failsafeThrow(listener, signal);
}
}
- private Set<SignalListener> getListenerSet(String procName)
+ private Set<SignalListener> getListeners(ObjectName fromRef)
{
synchronized (listeners)
{
HashSet<SignalListener> retSet = new HashSet<SignalListener>();
- Set<SignalListener> listenerSet = listeners.get(procName);
+ Set<SignalListener> listenerSet = listeners.get(fromRef);
if (listenerSet != null)
retSet.addAll(listenerSet);
return retSet;
Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -23,6 +23,8 @@
import java.io.Serializable;
+import javax.management.ObjectName;
+
// $Id$
/**
@@ -31,7 +33,7 @@
* @author Thomas.Diesler at jboss.com
* @since 08-Jul-2008
*/
-public class Signal implements Serializable
+public final class Signal implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -52,10 +54,12 @@
private SignalType type;
private String message;
- private String fromRef;
+ private ObjectName fromRef;
- /** Create the signal for a given process */
- public Signal(String fromRef, SignalType type)
+ /**
+ * Create the signal for a given source and type
+ */
+ public Signal(ObjectName fromRef, SignalType type)
{
this.fromRef = fromRef;
this.type = type;
@@ -65,14 +69,16 @@
throw new IllegalArgumentException("SignalType cannot be null");
}
- /** Create the signal for a given process */
- public Signal(String fromRef, SignalType type, String message)
+ /**
+ * Create the signal for a given source, type and message
+ */
+ public Signal(ObjectName fromRef, SignalType type, String message)
{
this(fromRef, type);
this.message = message;
}
- public String getFromRef()
+ public ObjectName getFromRef()
{
return fromRef;
}
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -335,7 +335,7 @@
synchronized (proc)
{
procImpl.setProcessStatus(ProcessStatus.Active);
- signalManager.throwSignal(proc.getName(), new Signal(proc.getName(), SignalType.SYSTEM_PROCESS_ENTER));
+ signalManager.throwSignal(new Signal(procID, SignalType.SYSTEM_PROCESS_ENTER));
// Notify that the process is now Active
log.debug("Notify: " + proc);
@@ -367,7 +367,7 @@
}
finally
{
- signalManager.throwSignal(procName, new Signal(procName, Signal.SignalType.SYSTEM_PROCESS_EXIT));
+ signalManager.throwSignal(new Signal(procID, Signal.SignalType.SYSTEM_PROCESS_EXIT));
synchronized (proc)
{
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -120,14 +120,14 @@
SignalManager signalManager = SignalManager.locateSignalManager();
public void throwEnterSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_END_EVENT_ENTER);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_END_EVENT_ENTER);
+ signalManager.throwSignal(signal);
}
public void throwExitSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_END_EVENT_EXIT);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ signalManager.throwSignal(signal);
}
};
}
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -93,7 +93,7 @@
if (eventDetail instanceof SignalEventDetailImpl)
{
SignalEventDetailImpl signalEventDetail = (SignalEventDetailImpl)eventDetail;
- signalEventDetail.setSignalRef(new Signal(flowObject.getName(), signalType, message));
+ signalEventDetail.setSignalRef(new Signal(flowObject.getID(), signalType, message));
}
else
{
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -168,14 +168,14 @@
SignalManager signalManager = SignalManager.locateSignalManager();
public void throwEnterSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_GATEWAY_ENTER);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_GATEWAY_ENTER);
+ signalManager.throwSignal(signal);
}
public void throwExitSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_GATEWAY_EXIT);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_GATEWAY_EXIT);
+ signalManager.throwSignal(signal);
}
};
}
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -103,14 +103,14 @@
SignalManager signalManager = SignalManager.locateSignalManager();
public void throwEnterSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_EVENT_ENTER);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_EVENT_ENTER);
+ signalManager.throwSignal(signal);
}
public void throwExitSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_EVENT_EXIT);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_EVENT_EXIT);
+ signalManager.throwSignal(signal);
}
};
}
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -102,14 +102,14 @@
SignalManager signalManager = SignalManager.locateSignalManager();
public void throwEnterSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_START_EVENT_ENTER);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_START_EVENT_ENTER);
+ signalManager.throwSignal(signal);
}
public void throwExitSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_START_EVENT_EXIT);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_START_EVENT_EXIT);
+ signalManager.throwSignal(signal);
}
};
}
@@ -161,7 +161,7 @@
}
};
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.addSignalListener(getProcess().getName(), startListener);
+ signalManager.addSignalListener(null, startListener);
}
}
}
@@ -174,7 +174,7 @@
if (startListener != null)
{
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.removeSignalListener(getProcess().getName(), startListener);
+ signalManager.removeSignalListener(null, startListener);
startListener = null;
}
super.unregisterElement(proc);
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -57,14 +57,14 @@
SignalManager signalManager = SignalManager.locateSignalManager();
public void throwEnterSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_SUB_PROCESS_ENTER);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_SUB_PROCESS_ENTER);
+ signalManager.throwSignal(signal);
}
public void throwExitSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_SUB_PROCESS_EXIT);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_SUB_PROCESS_EXIT);
+ signalManager.throwSignal(signal);
}
};
}
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -79,14 +79,14 @@
SignalManager signalManager = SignalManager.locateSignalManager();
public void throwEnterSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_TASK_ENTER);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_TASK_ENTER);
+ signalManager.throwSignal(signal);
}
public void throwExitSignal()
{
- Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_TASK_EXIT);
- signalManager.throwSignal(getProcess().getName(), signal);
+ Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_TASK_EXIT);
+ signalManager.throwSignal(signal);
}
};
}
Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -136,7 +136,7 @@
em.startProcess(proc, null);
SignalManager sm = SignalManager.locateSignalManager();
- sm.throwSignal(getName(), new Signal(getName(), SignalType.USER_SIGNAL, "A"));
+ sm.throwSignal(new Signal(getMessageListenerID(), SignalType.USER_SIGNAL, "A"));
ProcessStatus status = em.waitForEnd(proc);
assertEquals(ProcessStatus.Completed, status);
@@ -205,7 +205,7 @@
}
TestSignalListener sigListener = new TestSignalListener();
SignalManager sm = SignalManager.locateSignalManager();
- sm.addSignalListener(getName(), sigListener);
+ sm.addSignalListener(getMessageListenerID(), sigListener);
proc.startProcess();
proc.waitForEnd();
Modified: jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -32,7 +32,7 @@
@SuppressWarnings("serial")
public class AirticketServiceImpl extends RemoteServiceServlet implements AirticketService
{
- private ObjectName listenerID = ObjectNameFactory.create("mydomain:type=MessageListener");
+ private ObjectName sampleID = ObjectNameFactory.create("org.jboss.bpm:sample=AirticketService");
public void sendMessage(GwtMessage gwtMsg)
{
@@ -52,7 +52,7 @@
AirticketMessageListener msgListener = new AirticketMessageListener(messageQueue);
mm.addMessageListener(msgListener);
- sm.addSignalListener(AirticketProcessBuilder.PROCESS_NAME, new AirticketSignalListener());
+ sm.addSignalListener(sampleID, new AirticketSignalListener());
httpSession.setAttribute("messageQueue", messageQueue);
}
@@ -62,7 +62,7 @@
if (procID == null || pm.getProcessByID(procID) == null)
{
System.out.println("Create new Process");
- AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(listenerID);
+ AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID);
Process proc = procBuilder.buildProcess();
procID = proc.startProcess();
httpSession.setAttribute("procID", procID);
@@ -188,7 +188,7 @@
public ObjectName getID()
{
- return listenerID;
+ return sampleID;
}
}
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -59,11 +59,11 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Send start trigger signal
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
@@ -81,11 +81,11 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Send start trigger signal
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"));
// Wait for the process to end
proc.waitForEnd();
@@ -103,11 +103,11 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Send start trigger signal
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
try
{
@@ -123,11 +123,11 @@
proc.startProcess();
// 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(startTrigger));
+ startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Send start trigger signal
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -55,11 +55,11 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Send start trigger signals
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -58,12 +58,12 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Start the process and send start trigger signal
proc.startProcess();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
@@ -81,7 +81,7 @@
// Start the process and send start trigger signal
proc.startProcess();
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
try
@@ -101,12 +101,12 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Start the process and send start trigger signal
proc.startProcess();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
try
{
@@ -119,12 +119,12 @@
}
// 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(startTrigger));
+ startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Start the process and send start trigger signal
proc.startProcess();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -26,6 +26,8 @@
import java.io.IOException;
import java.util.List;
+import javax.management.ObjectName;
+
import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
@@ -52,7 +54,9 @@
// Validate received signals
List<Signal> signals = getSignals(SignalType.SYSTEM_END_EVENT_ENTER);
assertEquals(2, signals.size());
- String fromRefs = signals.get(0).getFromRef() + signals.get(1).getFromRef();
+ ObjectName fromRef0 = signals.get(0).getFromRef();
+ ObjectName fromRef1 = signals.get(1).getFromRef();
+ String fromRefs = fromRef0.getCanonicalName() + fromRef1.getCanonicalName();
assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndA"));
assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB"));
}
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -62,7 +62,7 @@
}
};
SignalManager sm = SignalManager.locateSignalManager();
- sm.addSignalListener(getName(), signalListener);
+ sm.addSignalListener(getMessageListenerID(), signalListener);
// Start the process, which automatically adds it to the registery
assertEquals(procID, proc.startProcess());
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -38,8 +38,8 @@
public class SignalManagerTest extends DefaultEngineTestCase
{
final SignalManager sigManager = SignalManager.locateSignalManager();
- final Signal sigA = new Signal(getShortName(), SignalType.USER_SIGNAL, "A");
- final Signal sigB = new Signal(getShortName(), SignalType.USER_SIGNAL, "B");
+ final Signal sigA = new Signal(getMessageListenerID(), SignalType.USER_SIGNAL, "A");
+ final Signal sigB = new Signal(getMessageListenerID(), SignalType.USER_SIGNAL, "B");
private Signal gotA;
private Signal gotB;
@@ -56,7 +56,7 @@
if ("A".equals(sigMsg))
{
gotA = signal;
- sigManager.throwSignal(getShortName(), sigB);
+ sigManager.throwSignal(sigB);
}
if ("B".equals(sigMsg))
{
@@ -65,9 +65,9 @@
}
}
};
- sigManager.addSignalListener(getShortName(), sigListener);
- sigManager.throwSignal(getShortName(), sigA);
- sigManager.removeSignalListeners(getShortName());
+ sigManager.addSignalListener(getMessageListenerID(), sigListener);
+ sigManager.throwSignal(sigA);
+ sigManager.removeSignalListeners(getMessageListenerID());
assertEquals(sigA, gotA);
assertEquals(sigB, gotB);
@@ -94,9 +94,9 @@
}
}
};
- sigManager.addSignalListener(getShortName(), sigListener);
+ sigManager.addSignalListener(getMessageListenerID(), sigListener);
sendThreadSignal(sigA);
- sigManager.removeSignalListeners(getShortName());
+ sigManager.removeSignalListeners(getMessageListenerID());
assertEquals(sigA, gotA);
assertEquals(sigB, gotB);
@@ -139,7 +139,7 @@
public void run()
{
hasStarted = true;
- sigManager.throwSignal(getShortName(), threadSig);
+ sigManager.throwSignal(threadSig);
}
}
}
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -57,7 +57,7 @@
// Start the process and send start trigger signal
proc.startProcess();
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
@@ -74,14 +74,14 @@
// Start the process and send start trigger signal
proc.startProcess();
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), 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(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
@@ -99,12 +99,12 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A");
+ signalManager.addSignalListener(getMessageListenerID(), new TaskListener(startTrigger));
// Start the process and send start trigger signal
proc.startProcess();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -120,7 +120,7 @@
}
};
SignalManager sigManager = SignalManager.locateSignalManager();
- sigManager.addSignalListener(proc.getName(), signalListener);
+ sigManager.addSignalListener(getMessageListenerID(), signalListener);
proc.startProcess();
proc.waitForEnd();
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -26,6 +26,8 @@
import java.io.IOException;
import java.util.List;
+import javax.management.ObjectName;
+
import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
@@ -52,7 +54,9 @@
// Validate received signals
List<Signal> signals = getSignals(SignalType.SYSTEM_END_EVENT_ENTER);
assertEquals(2, signals.size());
- String fromRefs = signals.get(0).getFromRef() + signals.get(1).getFromRef();
+ ObjectName fromRef0 = signals.get(0).getFromRef();
+ ObjectName fromRef1 = signals.get(1).getFromRef();
+ String fromRefs = fromRef0.getCanonicalName() + fromRef1.getCanonicalName();
assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndA"));
assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB"));
}
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -55,11 +55,11 @@
// 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));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(proc.getName(), startTrigger));
// Send start trigger signals
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java
===================================================================
--- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-21 15:57:22 UTC (rev 1962)
+++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-21 19:59:16 UTC (rev 1963)
@@ -58,12 +58,12 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Start the process and send start trigger signal
proc.startProcess();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
@@ -81,7 +81,7 @@
// Start the process and send start trigger signal
proc.startProcess();
SignalManager signalManager = SignalManager.locateSignalManager();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
try
@@ -101,12 +101,12 @@
// 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(startTrigger));
+ Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Start the process and send start trigger signal
proc.startProcess();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
try
{
@@ -119,12 +119,12 @@
}
// 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(startTrigger));
+ startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B");
+ signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger));
// Start the process and send start trigger signal
proc.startProcess();
- signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"));
+ signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Wait for the process to end
proc.waitForEnd();
More information about the jbpm-commits
mailing list