[jbpm-commits] JBoss JBPM SVN: r1962 - in jbossbpm/spec/branches/tdiesler: modules/api/src/main/java/org/jboss/bpm/client and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-08-21 11:57:22 -0400 (Thu, 21 Aug 2008) New Revision: 1962 Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.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/startevent/StartEventSignalTest.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 jbossbpm/spec/branches/tdiesler/pom.xml 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:56:41 UTC (rev 1961) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-21 15:57:22 UTC (rev 1962) @@ -104,17 +104,50 @@ /** * Throw a signal to all registered listeners + * @param procName An optional process name */ - public void throwSignal(String procName, Signal signal) + 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); + } + + private void throwSignalInternal (String procName, Signal signal) + { log.debug("throwSignal: " + procName + "=" + signal); // Throw Signal to listeners associated with the process - Set<SignalListener> procListeners = getListenerSet(procName); - for (SignalListener listener : procListeners) + if (procName != null) { - failsafeThrow(listener, signal); + Set<SignalListener> procListeners = getListenerSet(procName); + for (SignalListener listener : procListeners) + { + 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); 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:56:41 UTC (rev 1961) +++ 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) @@ -60,10 +60,10 @@ // 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(getName(), new MergeListener(startTrigger)); // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -82,10 +82,10 @@ // 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(getName(), new MergeListener(startTrigger)); // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B")); // Wait for the process to end proc.waitForEnd(); @@ -104,10 +104,10 @@ // 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(getName(), new MergeListener(startTrigger)); // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); try { @@ -124,10 +124,10 @@ // 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(getName(), new MergeListener(startTrigger)); // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -161,12 +161,10 @@ class MergeListener implements SignalListener { - private String fromRef; private Signal nextSignal; - public MergeListener(String fromRef, Signal nextSignal) + public MergeListener(Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } @@ -177,7 +175,7 @@ if (nextSignal != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); + signalManager.throwSignal(nextSignal); nextSignal = null; } } 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:56:41 UTC (rev 1961) +++ 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) @@ -56,10 +56,10 @@ // 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(getName(), new MergeListener(startTrigger)); // Send start trigger signals - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -83,12 +83,10 @@ class MergeListener implements SignalListener { - private String fromRef; private Signal nextSignal; - public MergeListener(String fromRef, Signal nextSignal) + public MergeListener(Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } @@ -99,7 +97,7 @@ if (nextSignal != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); + signalManager.throwSignal( nextSignal); nextSignal = null; } } 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:56:41 UTC (rev 1961) +++ 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) @@ -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(proc.getName(), new MergeListener(proc.getName(), startTrigger)); + signalManager.addSignalListener(proc.getName(), new MergeListener(startTrigger)); // Start the process and send start trigger signal proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), 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(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end try @@ -102,11 +102,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(proc.getName(), new MergeListener(proc.getName(), startTrigger)); + signalManager.addSignalListener(proc.getName(), new MergeListener(startTrigger)); // Start the process and send start trigger signal proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); try { @@ -120,11 +120,11 @@ // 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)); + signalManager.addSignalListener(proc.getName(), new MergeListener(startTrigger)); // Start the process and send start trigger signal proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -158,12 +158,10 @@ public static class MergeListener implements SignalListener { - private String fromRef; private Signal nextSignal; - public MergeListener(String fromRef, Signal nextSignal) + public MergeListener(Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } @@ -174,7 +172,7 @@ if (nextSignal != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); + signalManager.throwSignal(nextSignal); nextSignal = null; } } 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:56:41 UTC (rev 1961) +++ 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) @@ -57,7 +57,7 @@ // 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")); + signalManager.throwSignal(new Signal(getName(), 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(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(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")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -100,11 +100,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(proc.getName(), new TaskListener(proc.getName(), startTrigger)); + signalManager.addSignalListener(proc.getName(), new TaskListener(startTrigger)); // Start the process and send start trigger signal proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -134,12 +134,10 @@ public static class TaskListener implements SignalListener { - private String fromRef; private Signal nextSignal; - public TaskListener(String fromRef, Signal nextSignal) + public TaskListener(Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } @@ -150,7 +148,7 @@ if (nextSignal != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); + signalManager.throwSignal(nextSignal); nextSignal = null; } } 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:56:41 UTC (rev 1961) +++ 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) @@ -59,7 +59,7 @@ signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger)); // Send start trigger signals - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -83,12 +83,10 @@ class MergeListener implements SignalListener { - private String fromRef; private Signal nextSignal; public MergeListener(String fromRef, Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } @@ -99,7 +97,7 @@ if (nextSignal != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); + signalManager.throwSignal(nextSignal); nextSignal = null; } } 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:56:41 UTC (rev 1961) +++ 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) @@ -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(proc.getName(), new MergeListener(proc.getName(), startTrigger)); + signalManager.addSignalListener(proc.getName(), new MergeListener(startTrigger)); // Start the process and send start trigger signal proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), 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(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end try @@ -102,11 +102,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(proc.getName(), new MergeListener(proc.getName(), startTrigger)); + signalManager.addSignalListener(proc.getName(), new MergeListener(startTrigger)); // Start the process and send start trigger signal proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); try { @@ -120,11 +120,11 @@ // 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)); + signalManager.addSignalListener(proc.getName(), new MergeListener(startTrigger)); // Start the process and send start trigger signal proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -158,12 +158,10 @@ public static class MergeListener implements SignalListener { - private String fromRef; private Signal nextSignal; - public MergeListener(String fromRef, Signal nextSignal) + public MergeListener(Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } @@ -174,7 +172,7 @@ if (nextSignal != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); + signalManager.throwSignal(nextSignal); nextSignal = null; } } Modified: jbossbpm/spec/branches/tdiesler/pom.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/pom.xml 2008-08-21 15:56:41 UTC (rev 1961) +++ jbossbpm/spec/branches/tdiesler/pom.xml 2008-08-21 15:57:22 UTC (rev 1962) @@ -173,8 +173,15 @@ <!-- DistributionManagement --> <distributionManagement> <!-- - Add this to your ~/.m2/settings.xml <servers> <server> <id>jbpm.dyndns.org</id> <username>yourname</username> - <privateKey>/home/yourname/.ssh/id_rsa</privateKey> <passphrase>yourpass</passphrase> </server> </servers> + Add this to your ~/.m2/settings.xml + <servers> + <server> + <id>jbpm.dyndns.org</id> + <username>yourname</username> + <privateKey>/home/yourname/.ssh/id_rsa</privateKey> + <passphrase>yourpass</passphrase> + </server> + </servers> --> <site> <id>jbpm.dyndns.org</id> @@ -182,6 +189,14 @@ </site> </distributionManagement> + <!-- Repositories --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + <!-- Profiles --> <profiles> <!--