jbpm-commits August 2008

jbpm-commits@lists.jboss.org

1 participants
252 discussions

JBoss JBPM SVN: r1982 - in jbossbpm/spec/trunk: modules/api/src/main/java/org/jboss/bpm/client and 28 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-22 06:09:27 -0400 (Fri, 22 Aug 2008) New Revision: 1982 Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java Removed: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.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/FlowObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.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/runtime/SignalHandler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.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/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/EventBuilderImpl.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/GraphicalElementImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.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/SubProcessImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java jbossbpm/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.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/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java 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/task/ReceiveTaskTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 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/TaskDataTest.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-casedata-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml jbossbpm/spec/trunk/pom.xml Log: Refactor signal handling Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -23,8 +23,11 @@ //$Id$ +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; import javax.management.ObjectName; @@ -61,21 +64,39 @@ */ public void addMessageListener(MessageListener listener) { - if (hasMessageListener(listener.getID())) - throw new IllegalStateException("Listener already registered: " + listener.getID()); + synchronized (listeners) + { + if (hasMessageListener(listener.getID())) + throw new IllegalStateException("Listener already registered: " + listener.getID()); - log.debug("addMessageListener: " + listener.getID()); - listeners.put(listener.getID(), listener); + log.debug("addMessageListener: " + listener.getID()); + listeners.put(listener.getID(), listener); + } } /** + * Get the set of registered MessageListeners + */ + public Set<MessageListener> getMessageListeners() + { + synchronized (listeners) + { + HashSet<MessageListener> set = new HashSet<MessageListener>(listeners.values()); + return Collections.unmodifiableSet(set); + } + } + + /** * Get a MessageListener for a given ID * * @return null if there is none */ public MessageListener getMessageListener(ObjectName listenerID) { - return listeners.get(listenerID); + synchronized (listeners) + { + return listeners.get(listenerID); + } } /** @@ -91,8 +112,11 @@ */ public void removeMessageListener(ObjectName listenerID) { - log.debug("removeMessageListener: " + listenerID); - listeners.remove(listenerID); + synchronized (listeners) + { + log.debug("removeMessageListener: " + listenerID); + listeners.remove(listenerID); + } } /** @@ -105,7 +129,7 @@ */ public void sendMessage(ObjectName targetID, Message msg) { - MessageListener msgListener = listeners.get(targetID); + MessageListener msgListener = getMessageListener(targetID); if (msgListener == null) throw new IllegalStateException("No message listener registered for: " + targetID); Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -21,21 +21,25 @@ */ package org.jboss.bpm.client; -import org.jboss.bpm.model.Signal; - //$Id$ +import org.jboss.bpm.model.Signal; /** - * A signal listener that can be registered with the ProcessEngine + * A signal listener that can be registered with the {@link SignalManager} * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ public interface SignalListener { + /** + * Returns true if the listener accepts a given signal + */ + boolean acceptSignal(Signal signal); + /** - * Catch a signal from the process that this listener is registered with + * Catch a previously accepted signal */ void catchSignal(Signal signal); } \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -23,9 +23,8 @@ //$Id$ -import java.util.HashMap; +import java.util.Collections; import java.util.HashSet; -import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -33,7 +32,7 @@ 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(a)jboss.com @@ -45,7 +44,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 Set<SignalListener> listeners = new HashSet<SignalListener>(); /** * Locate the SignalManager @@ -57,83 +56,66 @@ } /** - * Add a SignalListener for a given process + * Add a SignalListener for a given source */ - public void addSignalListener(String procName, SignalListener listener) + public void addSignalListener(SignalListener listener) { synchronized (listeners) { - log.debug("addSignalListener: " + procName + "=" + listener); - Set<SignalListener> set = listeners.get(procName); - if (set == null) - { - set = new HashSet<SignalListener>(); - listeners.put(procName, set); - } - set.add(listener); + log.debug("addSignalListener: " + listener); + listeners.add(listener); } } /** - * Remove an SignalListener for a given process + * Get the set of registered SignalListeners */ - public void removeSignalListener(String procName, SignalListener listener) + public Set<SignalListener> getSignalListeners() { synchronized (listeners) { - log.debug("removeSignalListener: " + procName + "=" + listener); - Set<SignalListener> set = listeners.get(procName); - if (set != null) - { - set.remove(listener); - } + return Collections.unmodifiableSet(listeners); } } /** - * Remove all SignalListener for a given process + * Remove a SignalListener for a given source */ - public void removeSignalListeners(String procName) + public void removeSignalListener(SignalListener listener) { synchronized (listeners) { - log.debug("removeSignalListeners: " + procName); - listeners.remove(procName); + log.debug("removeSignalListener: " + listener); + listeners.remove(listener); } } /** * Throw a signal to all registered listeners */ - public void throwSignal(String procName, Signal signal) + public void throwSignal(Signal signal) { - log.debug("throwSignal: " + procName + "=" + signal); - - // Throw Signal to listeners associated with the process - Set<SignalListener> procListeners = getListenerSet(procName); - for (SignalListener listener : procListeners) + log.debug("throwSignal: " + signal); + Set<SignalListener> currentListeners = getSignalListeners(); + for (SignalListener listener : currentListeners) { - failsafeThrow(listener, signal); + if (failsafeAccept(listener, signal)) + failsafeThrow(listener, signal); } - - // Throw Signal to listeners not associated with any process - Set<SignalListener> allProcListeners = getListenerSet(null); - for (SignalListener listener : allProcListeners) - { - failsafeThrow(listener, signal); - } } - private Set<SignalListener> getListenerSet(String procName) + private boolean failsafeAccept(SignalListener listener, Signal signal) { - synchronized (listeners) + try { - HashSet<SignalListener> retSet = new HashSet<SignalListener>(); - Set<SignalListener> listenerSet = listeners.get(procName); - if (listenerSet != null) - retSet.addAll(listenerSet); - return retSet; + boolean accept = listener.acceptSignal(signal); + return accept; } + catch (RuntimeException rte) + { + log.error("Signal processing error", rte); + return false; + } } private void failsafeThrow(SignalListener listener, Signal signal) 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model; -//$Id$ +//$Id: $ import java.io.Serializable; Modified: 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -21,11 +21,9 @@ */ package org.jboss.bpm.model; +// $Id: $ import java.util.List; - -//$Id$ - /** * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway. * Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -52,7 +52,7 @@ * 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(); + GatewayType getGatewayType(); /** * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -21,12 +21,10 @@ */ package org.jboss.bpm.model; +// $Id: $ - -//$Id$ - /** - * A graphical BPMN element + * A graphical element * * @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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -35,7 +35,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface Process extends GraphicalElement, PropertySupport +public interface Process extends SupportingElement, PropertySupport { /** * Defines the type of a {@link Process} Modified: 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -23,6 +23,8 @@ import java.io.Serializable; +import javax.management.ObjectName; + // $Id$ /** @@ -31,7 +33,7 @@ * @author Thomas.Diesler(a)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; } Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java (from rev 1981, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.model; + + +//$Id$ + +/** + * A supporting element + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SupportingElement extends AbstractElement +{ +} \ No newline at end of file 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -39,10 +39,10 @@ /** * Get signal for enter */ - void throwEnterSignal(); + void throwEnterSignal(Token token); /** * Get signal for exit */ - void throwExitSignal(); + void throwExitSignal(Token token); } \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -82,18 +82,40 @@ deployer = new EmbeddedBeansDeployer(); // Setup the SignalListener - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(null, getSignalListener()); + clearAllSignalListeners(); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(getSignalListener()); synchronized (signals) { signals.clear(); } // Setup the MessageListener - MessageManager messageManager = MessageManager.locateMessageManager(); - messageManager.addMessageListener(getMessageListener()); + clearAllMessageListeners(); + MessageManager msgManager = MessageManager.locateMessageManager(); + msgManager.addMessageListener(getMessageListener()); } + private void clearAllSignalListeners() + { + SignalManager sigManager = SignalManager.locateSignalManager(); + Set<SignalListener> sigListeners = sigManager.getSignalListeners(); + for (SignalListener sigListener : sigListeners) + { + sigManager.removeSignalListener(sigListener); + } + } + + private void clearAllMessageListeners() + { + MessageManager msgManager = MessageManager.locateMessageManager(); + Set<MessageListener> msgListeners = msgManager.getMessageListeners(); + for (MessageListener msgListener : msgListeners) + { + msgManager.removeMessageListener(msgListener.getID()); + } + } + @Override protected void tearDown() throws Exception { @@ -101,11 +123,11 @@ // Tear down the SignalListener SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.removeSignalListeners(null); + signalManager.removeSignalListener(getSignalListener()); // Tear down the MessageListener MessageManager messageManager = MessageManager.locateMessageManager(); - messageManager.removeMessageListener(getMessageListenerID()); + messageManager.removeMessageListener(getTestID()); // Check that there are no registered processes left ProcessManager procManager = ProcessManager.locateProcessManager(); @@ -117,6 +139,24 @@ log.warn(logMsg); } + // Check that there are no registered signal listeners left + Set<SignalListener> sigListeners = signalManager.getSignalListeners(); + if (sigListeners.size() > 0) + { + String logMsg = "Registered signal listeners on tear down of " + getName() + ": " + sigListeners; + System.out.println(logMsg); + log.warn(logMsg); + } + + // Check that there are no registered signal listeners left + Set<MessageListener> msgListeners = messageManager.getMessageListeners(); + if (msgListeners.size() > 0) + { + String logMsg = "Registered message listeners on tear down of " + getName() + ": " + msgListeners; + System.out.println(logMsg); + log.warn(logMsg); + } + super.tearDown(); } @@ -160,6 +200,11 @@ { signalListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return true; + } + public void catchSignal(Signal signal) { synchronized (signals) @@ -207,7 +252,7 @@ { public ObjectName getID() { - return getMessageListenerID(); + return getTestID(); } public void catchMessage(Message message) @@ -223,9 +268,9 @@ return messageListener; } - public ObjectName getMessageListenerID() + public ObjectName getTestID() { - return ObjectNameFactory.create(Constants.ID_DOMAIN, "msgListener", getShortName()); + return ObjectNameFactory.create(Constants.ID_DOMAIN, "test", getShortName()); } public List<Message> getMessages() 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -134,9 +134,7 @@ { try { - log.debug("Wait to become Active " + proc); proc.wait(); - log.debug("Notified " + proc); } catch (InterruptedException ex) { @@ -217,9 +215,7 @@ // Start waiting to get notified long waitTimeout = forever ? 0 : until - now; - log.debug("Wait for " + waitTimeout + "ms on " + proc); proc.wait(waitTimeout); - log.debug("Notified " + proc); } now = System.currentTimeMillis(); } @@ -320,14 +316,12 @@ public void run() { - log.debug("RunnableProcess started"); - TokenExecutor tokenExecutor = rtProc.getTokenExecutor(); ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess(); Process proc = rtProc.getProcess(); SignalManager signalManager = SignalManager.locateSignalManager(); - + ObjectName procID = proc.getID(); String procName = proc.getName(); try @@ -335,10 +329,9 @@ 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); proc.notifyAll(); } @@ -349,9 +342,7 @@ { try { - log.debug("Wait: " + rtProc); rtProc.wait(); - log.debug("Notified: " + rtProc); } catch (InterruptedException ex) { @@ -367,7 +358,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) { @@ -376,7 +367,6 @@ runtimeProcesses.remove(procID); // Notify that the process has now ended - log.debug("Notify: " + proc); proc.notifyAll(); } } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -53,14 +53,14 @@ { super.registerProcess(proc); ProcessImpl procImpl = (ProcessImpl)proc; - procImpl.registerElement(proc); + procImpl.register(proc); } @Override public void unregisterProcess(Process proc) { ProcessImpl procImpl = (ProcessImpl)proc; - procImpl.unregisterElement(proc); + procImpl.unregister(proc); super.unregisterProcess(proc); } } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -26,10 +26,7 @@ import javax.management.ObjectName; import org.jboss.bpm.model.AbstractElement; -import org.jboss.bpm.model.Constants; -import org.jboss.bpm.model.ObjectNameFactory; import org.jboss.bpm.model.Process; -import org.jboss.util.id.UID; /** * The parrent of all Elements @@ -38,28 +35,20 @@ * @since 08-Jul-2008 */ @SuppressWarnings("serial") -public class AbstractElementImpl implements AbstractElement +public abstract class AbstractElementImpl implements AbstractElement { + // The cached 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; - } - + public abstract ObjectName getID(); + /** * Called when the process is created */ - protected void createElement(Process proc) + protected void create(Process proc) { // nothing to do } @@ -67,7 +56,7 @@ /** * Called when the process is registered */ - protected void registerElement(Process proc) + protected void register(Process proc) { // nothing to do } @@ -75,7 +64,7 @@ /** * Called when the process is unregistered */ - protected void unregisterElement(Process proc) + protected void unregister(Process proc) { // nothing to do } @@ -83,7 +72,7 @@ /** * Called when the process is destroyed */ - protected void destroyElement(Process proc) + protected void destroy(Process proc) { // nothing to do } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -300,9 +300,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -27,19 +27,25 @@ import java.util.Collections; import java.util.List; +import javax.management.ObjectName; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.MessageEventDetail; +import org.jboss.bpm.model.ObjectNameFactory; 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; +import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.util.id.UID; /** * As the name implies, the End Event indicates where a Process will end. @@ -64,6 +70,18 @@ super(name); } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=EndEvent,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public SequenceFlow getInFlow() { return inFlow; @@ -107,7 +125,8 @@ protected void defaultFlowHandler(TokenExecutor tokenExecutor, Token token) { log.debug("End reached in: " + getName()); - tokenExecutor.destroy(token); + ExecutionContext exContext = token.getExecutionContext(); + exContext.addAttachment(EndSignalCallback.class, new EndSignalCallback(tokenExecutor)); } public SignalHandler getSignalHandler() @@ -118,16 +137,21 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); - public void throwEnterSignal() + public void throwEnterSignal(Token token) { - 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() + public void throwExitSignal(Token token) { - 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); + + // Destroy the token + ExecutionContext exContext = token.getExecutionContext(); + EndSignalCallback callback = exContext.getAttachment(EndSignalCallback.class); + callback.destroyToken(token); } }; } @@ -135,9 +159,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); // Initialize Results for (EventDetail result : getResult()) @@ -151,4 +175,21 @@ { return "EndEvent[" + getName() + "]"; } + + /** + * The callback that destroys the token AFTER the SYSTEM_END_EVENT_EXIT signal + */ + static class EndSignalCallback + { + TokenExecutor tokenExecutor; + public EndSignalCallback(TokenExecutor tokenExecutor) + { + this.tokenExecutor = tokenExecutor; + } + + void destroyToken(Token token) + { + tokenExecutor.destroy(token); + } + } } \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventBuilderImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -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/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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -21,12 +21,7 @@ */ 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$ @@ -44,16 +39,4 @@ { 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -212,9 +212,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -75,7 +75,7 @@ if (id == null) { StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); - str.append("type=Gateway,name=" + getName() + ",id=" + new UID()); + str.append("type=" + getGatewayType() + "Gateway,name=" + getName() + ",id=" + new UID()); id = ObjectNameFactory.create(str.toString()); } return id; @@ -166,16 +166,16 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); - public void throwEnterSignal() + public void throwEnterSignal(Token token) { - 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() + public void throwExitSignal(Token token) { - 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/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -26,7 +26,8 @@ import org.jboss.bpm.model.GraphicalElement; /** - * + * A graphical element + * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/InclusiveGatewayImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -77,11 +77,6 @@ List<Gate> applicableGates = getApplicableGates(token); log.debug("applicableGates: " + applicableGates); - // Destroy the incomming token if there are - // more than one applicable gates - if (applicableGates.size() > 1) - tokenExecutor.destroy(token); - if (applicableGates.size() == 1) { SequenceFlow outFlow = applicableGates.get(0).getOutgoingSequenceFlow(); @@ -102,6 +97,11 @@ tokenExecutor.start(outToken); } } + + // Destroy the incomming token if there are + // more than one applicable gates + if (applicableGates.size() > 1) + tokenExecutor.destroy(token); } // Get applicable gates which' condition evaluates to TRUE Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -27,15 +27,20 @@ import java.util.Collections; import java.util.List; +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.EventDetail; import org.jboss.bpm.model.IntermediateEvent; +import org.jboss.bpm.model.ObjectNameFactory; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.util.id.UID; /** * An Intermediate Event is an Event that occurs after a Process has been started. It will affect the Flow of the Process, but will not start or (directly) terminate @@ -57,6 +62,18 @@ super(name); } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=IntermediateEvent,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public ConnectingObject getInFlow() { return inFlow; @@ -101,16 +118,16 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); - public void throwEnterSignal() + public void throwEnterSignal(Token token) { - 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() + public void throwExitSignal(Token token) { - 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/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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -86,7 +86,7 @@ public Process getProcess() { ProcessImpl internalProc = getProcessInternal(); - internalProc.createElement(internalProc); + internalProc.create(internalProc); return internalProc; } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -308,13 +308,13 @@ } @Override - public void createElement(Process proc) + public void create(Process proc) { if (status != ProcessStatus.None) throw new IllegalStateException("Cannot initialize process in state: " + status); // Initialize the Element - super.createElement(this); + super.create(this); // Set the anonymous default name if (getName() == null) @@ -333,43 +333,43 @@ for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.createElement(this); + foImpl.create(this); } status = ProcessStatus.Ready; } @Override - public void registerElement(Process proc) + public void register(Process proc) { - super.registerElement(proc); + super.register(proc); for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.registerElement(this); + foImpl.register(this); } } @Override - public void unregisterElement(Process proc) + public void unregister(Process proc) { for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.unregisterElement(this); + foImpl.unregister(this); } - super.unregisterElement(proc); + super.unregister(proc); } @Override - public void destroyElement(Process proc) + public void destroy(Process proc) { for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.destroyElement(this); + foImpl.destroy(this); } - super.destroyElement(proc); + super.destroy(proc); } protected void initializeMessageRef(Message msgRef) Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -170,9 +170,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); if (messageRef == null) throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered"); 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -80,9 +80,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); if (messageRef == null) throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered"); 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -27,21 +27,27 @@ import java.util.Collections; import java.util.List; +import javax.management.ObjectName; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.ExecutionManager; import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventDetail; +import org.jboss.bpm.model.ObjectNameFactory; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.SignalEventDetail; import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Process.ProcessStatus; +import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.util.id.UID; /** * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts the @@ -66,6 +72,18 @@ super(name == null ? "Start" : name); } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=StartEvent,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public List<EventDetail> getTrigger() { return Collections.unmodifiableList(triggers); @@ -100,16 +118,17 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); - public void throwEnterSignal() + + public void throwEnterSignal(Token token) { - 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() + public void throwExitSignal(Token token) { - 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); } }; } @@ -117,15 +136,15 @@ } @Override - protected void registerElement(final Process proc) + protected void register(final Process proc) { - super.registerElement(proc); - + super.register(proc); + for (EventDetail eventDetail : getTrigger()) { EventDetailImpl eventDetailImpl = (EventDetailImpl)eventDetail; eventDetailImpl.initialize(this); - + // Register the start signal listener if (eventDetail instanceof SignalEventDetail) { @@ -136,48 +155,60 @@ final StartEvent start = this; startListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + SignalType expType = startSignal.getSignalType(); + String expMsg = startSignal.getMessage(); + + String sigMsg = signal.getMessage(); + SignalType sigType = signal.getSignalType(); + + boolean accept = (expType == sigType); + if (accept && expMsg != null) + accept = accept && expMsg.equals(sigMsg); + + return accept; + } + public void catchSignal(Signal signal) { - if (startSignal.getSignalType() == signal.getSignalType() && startSignal.getMessage().equals(signal.getMessage())) + log.debug("catchSignal: " + signal); + ProcessStatus procStatus = proc.getProcessStatus(); + if (procStatus == ProcessStatus.Ready || procStatus == ProcessStatus.Active) { - 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); - } + log.debug("Start process from signal: " + signal); + ExecutionManager exManager = ExecutionManager.locateExecutionManager(); + exManager.startProcess(start, null); } + else + { + log.debug("Ignore start signal for process: " + proc); + } } - + public String toString() { return start + "." + startSignal; } }; SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getProcess().getName(), startListener); + signalManager.addSignalListener(startListener); } } } } - + @Override - protected void unregisterElement(final Process proc) + protected void unregister(final Process proc) { // Unregister the start signal listener if (startListener != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.removeSignalListener(getProcess().getName(), startListener); + signalManager.removeSignalListener(startListener); startListener = null; } - super.unregisterElement(proc); + super.unregister(proc); } public String toString() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -23,10 +23,16 @@ //$Id$ +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.ri.model.spec.SubProcess; import org.jboss.bpm.runtime.SignalHandler; +import org.jboss.bpm.runtime.Token; +import org.jboss.util.id.UID; /** * A Sub-Process is Process that is included within another Process. @@ -47,6 +53,18 @@ return ActivityType.SubProcess; } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=SubProcess,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public SignalHandler getSignalHandler() { SignalHandler handler = super.getSignalHandler(); @@ -55,16 +73,16 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); - public void throwEnterSignal() + public void throwEnterSignal(Token token) { - 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() + public void throwExitSignal(Token token) { - 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/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -23,14 +23,31 @@ //$Id$ -import org.jboss.bpm.ri.model.spec.SupportingElement; +import javax.management.ObjectName; +import org.jboss.bpm.model.Constants; +import org.jboss.bpm.model.ObjectNameFactory; +import org.jboss.bpm.model.SupportingElement; +import org.jboss.util.id.UID; + /** - * + * A supporting element + * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ @SuppressWarnings("serial") public abstract class SupportingElementImpl extends AbstractElementImpl implements SupportingElement { + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=SupportingElement,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/TaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -29,6 +29,7 @@ import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.Task; import org.jboss.bpm.runtime.SignalHandler; +import org.jboss.bpm.runtime.Token; import org.jboss.util.id.UID; //$Id$ @@ -63,7 +64,7 @@ if (id == null) { StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); - str.append("type=Task,name=" + getName() + ",id=" + new UID()); + str.append("type=" + getTaskType() + "Task,name=" + getName() + ",id=" + new UID()); id = ObjectNameFactory.create(str.toString()); } return id; @@ -77,16 +78,17 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); - public void throwEnterSignal() + + public void throwEnterSignal(Token token) { - 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() + public void throwExitSignal(Token token) { - 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/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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -233,20 +233,20 @@ // Synchronize execution on the target FlowObject synchronized (flowObject) { - // Throw the Enter Signal - sigHandler.throwEnterSignal(); - // Create a Token that includes properties from the current Activity - DelegatingToken delegatingToken = new DelegatingToken(token); + DelegatingToken tokCopy = new DelegatingToken(token); + // Throw the Enter Signal + sigHandler.throwEnterSignal(tokCopy); + // Execute the target FlowObject - flowObjectImpl.execute(delegatingToken); + flowObjectImpl.execute(tokCopy); // Transfer the token to the FlowHandler - flowObjectImpl.executeFlowHandler(tokenExecutor, delegatingToken); + flowObjectImpl.executeFlowHandler(tokenExecutor, tokCopy); // Throw the Exit Signal - sigHandler.throwExitSignal(); + sigHandler.throwExitSignal(tokCopy); tokStatus = token.getTokenStatus(); procStatus = proc.getProcessStatus(); @@ -289,7 +289,6 @@ // Notify the runtime process synchronized (rtProc) { - log.debug("Notify: " + rtProc); rtProc.notifyAll(); } } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -22,6 +22,7 @@ package org.jboss.bpm.ri.model.spec; import org.jboss.bpm.model.Expression; +import org.jboss.bpm.model.SupportingElement; //$Id$ Deleted: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -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.ri.model.spec; - -import org.jboss.bpm.model.AbstractElement; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SupportingElement extends AbstractElement -{ -} \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -61,7 +61,7 @@ ProcessStatus status = em.waitForEnd(proc); assertEquals(ProcessStatus.Completed, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -86,7 +86,7 @@ status = em.waitForEnd(proc); assertEquals(ProcessStatus.Completed, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -116,7 +116,7 @@ ProcessStatus status = proc.getProcessStatus(); assertEquals(ProcessStatus.Aborted, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -136,11 +136,11 @@ em.startProcess(proc, null); SignalManager sm = SignalManager.locateSignalManager(); - sm.throwSignal(getName(), new Signal(getName(), SignalType.USER_SIGNAL, "A")); + sm.throwSignal(new Signal(getTestID(), SignalType.USER_SIGNAL, "A")); ProcessStatus status = em.waitForEnd(proc); assertEquals(ProcessStatus.Completed, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -171,7 +171,7 @@ ProcessStatus status = proc.getProcessStatus(); assertEquals(ProcessStatus.Aborted, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -179,40 +179,49 @@ public void testStartTwice() throws Exception { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA"). - addTask("TaskA").addSequenceFlow("End").addEndEvent("End"); + procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA").addTask("TaskA").addSequenceFlow( + "End").addEndEvent("End"); final Process proc = procBuilder.getProcess(); - + class TestSignalListener implements SignalListener { RuntimeException signalException; + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER) + try { - try - { - proc.startProcess(); - fail("Cannot start process twice"); - } - catch (RuntimeException rte) - { - signalException = rte; - } + proc.startProcess(); + fail("Cannot start process twice"); } + catch (RuntimeException rte) + { + signalException = rte; + } } } TestSignalListener sigListener = new TestSignalListener(); - SignalManager sm = SignalManager.locateSignalManager(); - sm.addSignalListener(getName(), sigListener); - - proc.startProcess(); - proc.waitForEnd(); - + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); + + try + { + proc.startProcess(); + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + assertNotNull("Signal Exception expected", sigListener.signalException); } - + @SuppressWarnings("serial") public static class ThrowHandler implements ExecutionHandler { 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -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(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,12 +188,17 @@ public ObjectName getID() { - return listenerID; + return sampleID; } } class AirticketSignalListener implements SignalListener { + public boolean acceptSignal(Signal signal) + { + return true; + } + public void catchSignal(Signal signal) { System.out.println(signal); 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -76,7 +76,7 @@ } @Override - public ObjectName getMessageListenerID() + public ObjectName getTestID() { return ObjectNameFactory.create("jboss.bpm:client=AirticketTest"); } @@ -84,14 +84,14 @@ @Override public MessageListener getMessageListener() { - msgListener = new AirticketMessageListener(getMessageListenerID()); + msgListener = new AirticketMessageListener(getTestID()); return msgListener; } @Override protected void tearDown() throws Exception { - messageManager.removeMessageListener(getMessageListenerID()); + messageManager.removeMessageListener(getTestID()); super.tearDown(); } @@ -137,7 +137,7 @@ protected Process getProcess() throws IOException { - AirticketProcessBuilder builder = new AirticketProcessBuilder(getMessageListenerID()); + AirticketProcessBuilder builder = new AirticketProcessBuilder(getTestID()); return builder.buildProcess(); } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -68,7 +68,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -55,18 +55,25 @@ public void testGateA() 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(getName(), new MergeListener(getName(), startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -77,18 +84,25 @@ public void testGateB() 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(getName(), new MergeListener(getName(), startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B")); + try + { + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -99,38 +113,50 @@ 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(getName(), new MergeListener(getName(), startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); - try { - proc.waitForEnd(); - fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + + try + { + proc.waitForEnd(); + fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + } + catch (RuntimeException rte) + { + // expected + } } - catch (RuntimeException rte) + finally { - // expected + sigManager.removeSignalListener(sigListener); } - // 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(getName(), new MergeListener(getName(), startTrigger)); + sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -142,44 +168,46 @@ { 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"); + 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("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow( + "TaskB"); 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); + msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true); Process proc = procBuilder.getProcess(); return proc; } 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; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -56,7 +56,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndA", endSignals.get(0).getFromRef()); + assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testGateB() throws Exception @@ -70,7 +70,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testInvalidGate() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -39,9 +39,8 @@ import org.jboss.bpm.test.DefaultEngineTestCase; /** - * Inclusive gateway that has multiple incoming sequence flows. - * All tokens arriving from incoming sequence flows proceeds unconditionally along the outgoing sequence flow. - * The inclusive join is stateless. + * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows + * proceeds unconditionally along the outgoing sequence flow. The inclusive join is stateless. * * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 @@ -51,19 +50,26 @@ public void testGateA() 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(getName(), new MergeListener(getName(), startTrigger)); - - // Send start trigger signals - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Wait for the process to end - proc.waitForEnd(); + try + { + // Send start trigger signals + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(2, endSignals.size()); } @@ -72,10 +78,10 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge"); - eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + procBuilder.addSequenceFlow("Merge").addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess(); return proc; @@ -83,25 +89,25 @@ 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; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -69,7 +69,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public Process getProcess() throws IOException 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -57,16 +57,23 @@ 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, "B"); - signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -81,7 +88,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(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end try @@ -100,34 +107,48 @@ 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 MergeListener(proc.getName(), startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); - try { - proc.waitForEnd(); - fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + + try + { + proc.waitForEnd(); + fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + } + catch (RuntimeException rte) + { + // expected + } } - catch (RuntimeException rte) + finally { - // expected + sigManager.removeSignalListener(sigListener); } // 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)); + sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -139,44 +160,44 @@ { 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"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").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"); - taskBuilder = procBuilder.addTask("TaskB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + taskBuilder = procBuilder.addSequenceFlow("TaskB").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); + msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true); Process proc = procBuilder.getProcess(); return proc; } 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; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -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.getKeyProperty("name") + fromRef1.getKeyProperty("name"); assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndA")); assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB")); } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -68,7 +68,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -51,23 +51,32 @@ final ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("A process created through the builder is not registered automatically", pm.getProcessByID(procID)); - SignalListener signalListener = new SignalListener() + SignalListener sigListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER) - { - assertNotNull(pm.getProcessByID(procID)); - } + assertNotNull(pm.getProcessByID(procID)); } }; - SignalManager sm = SignalManager.locateSignalManager(); - sm.addSignalListener(getName(), signalListener); - - // Start the process, which automatically adds it to the registery - assertEquals(procID, proc.startProcess()); - proc.waitForEnd(); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); + try + { + // Start the process, which automatically adds it to the registery + assertEquals(procID, proc.startProcess()); + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + assertNull("A terminated process is removed from the registry", pm.getProcessByID(procID)); } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -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(getTestID(), SignalType.USER_SIGNAL, "A"); + final Signal sigB = new Signal(getTestID(), SignalType.USER_SIGNAL, "B"); private Signal gotA; private Signal gotB; @@ -48,26 +48,28 @@ { SignalListener sigListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.USER_SIGNAL; + } + public void catchSignal(Signal signal) { String sigMsg = signal.getMessage(); - if (signal.getSignalType() == SignalType.USER_SIGNAL) + if ("A".equals(sigMsg)) { - if ("A".equals(sigMsg)) - { - gotA = signal; - sigManager.throwSignal(getShortName(), sigB); - } - if ("B".equals(sigMsg)) - { - gotB = signal; - } + gotA = signal; + sigManager.throwSignal(sigB); } + if ("B".equals(sigMsg)) + { + gotB = signal; + } } }; - sigManager.addSignalListener(getShortName(), sigListener); - sigManager.throwSignal(getShortName(), sigA); - sigManager.removeSignalListeners(getShortName()); + sigManager.addSignalListener(sigListener); + sigManager.throwSignal(sigA); + sigManager.removeSignalListener(sigListener); assertEquals(sigA, gotA); assertEquals(sigB, gotB); @@ -77,26 +79,28 @@ { SignalListener sigListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.USER_SIGNAL; + } + public void catchSignal(Signal signal) { String sigMsg = signal.getMessage(); - if (signal.getSignalType() == SignalType.USER_SIGNAL) + if ("A".equals(sigMsg)) { - if ("A".equals(sigMsg)) - { - gotA = signal; - sendThreadSignal(sigB); - } - if ("B".equals(sigMsg)) - { - gotB = signal; - } + gotA = signal; + sendThreadSignal(sigB); } + if ("B".equals(sigMsg)) + { + gotB = signal; + } } }; - sigManager.addSignalListener(getShortName(), sigListener); + sigManager.addSignalListener(sigListener); sendThreadSignal(sigA); - sigManager.removeSignalListeners(getShortName()); + sigManager.removeSignalListener(sigListener); assertEquals(sigA, gotA); assertEquals(sigB, gotB); @@ -139,7 +143,7 @@ public void run() { hasStarted = true; - sigManager.throwSignal(getShortName(), threadSig); + sigManager.throwSignal(threadSig); } } } Modified: 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 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -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(getTestID(), 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(getTestID(), 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(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -98,16 +98,23 @@ 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)); + TaskListener sigListener = new TaskListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result List<Message> messages = getMessages(); @@ -127,32 +134,32 @@ taskBuilder.addSequenceFlow("End"); procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); - msgBuilder.addToRef(getMessageListenerID()).addProperty("taskValue", null, true); + msgBuilder.addToRef(getTestID()).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) + public TaskListener(Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -64,11 +64,11 @@ // expected } } - + public void testUnregisteredProcess() throws Exception { Process proc = getProcess(); - + MessageManager msgManager = MessageManager.locateMessageManager(); try { @@ -90,10 +90,10 @@ // Send the message before the process is started MessageManager msgManager = MessageManager.locateMessageManager(); msgManager.sendMessage(proc.getID(), "TaskA", getMessage()); - + proc.startProcess(); proc.waitForEnd(); - + Message endMsg = getMessages().get(0); assertNotNull("End message expected", endMsg); assertEquals("bar", endMsg.getPropertyValue("foo")); @@ -102,29 +102,39 @@ public void testSuspendedToken() throws Exception { final Process proc = getProcess(); - SignalListener signalListener = new SignalListener() + SignalListener sigListener = new SignalListener() { private boolean sendMessage = true; + + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_EXIT; + } + public void catchSignal(Signal signal) { // Send the message after the process reached the receive task - if (signal.getSignalType() == SignalType.SYSTEM_TASK_EXIT) + if (sendMessage == true) { - if (sendMessage == true) - { - sendMessage = false; - MessageManager msgManager = MessageManager.locateMessageManager(); - msgManager.sendMessage(proc.getID(), "TaskA", getMessage()); - } + sendMessage = false; + MessageManager msgManager = MessageManager.locateMessageManager(); + msgManager.sendMessage(proc.getID(), "TaskA", getMessage()); } } }; SignalManager sigManager = SignalManager.locateSignalManager(); - sigManager.addSignalListener(proc.getName(), signalListener); - - proc.startProcess(); - proc.waitForEnd(); - + sigManager.addSignalListener(sigListener); + + try + { + proc.startProcess(); + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + Message endMsg = getMessages().get(0); assertNotNull("End message expected", endMsg); assertEquals("bar", endMsg.getPropertyValue("foo")); @@ -136,14 +146,14 @@ Message msg = procBuilder.newMessage("ReceiveTaskMessage").addProperty("foo", "bar", true).getMessage(); return msg; } - + private Process getProcess() { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); MessageBuilder msgBuilder = procBuilder.addProcess("ReceiveTaskTest").addMessage("ReceiveTaskMessage"); msgBuilder.addProperty("foo", null, true); msgBuilder = procBuilder.addMessage("EndEventMessage"); - msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); procBuilder.addTask("TaskA", Task.TaskType.Receive).addMessageRef("ReceiveTaskMessage"); EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End"); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -56,7 +56,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndA", endSignals.get(0).getFromRef()); + assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testGateB() throws Exception @@ -70,7 +70,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testInvalidGate() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -69,7 +69,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public Process getProcess() throws IOException Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -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.getKeyProperty("name") + fromRef1.getKeyProperty("name"); assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndA")); assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB")); } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -39,9 +39,8 @@ import org.jboss.bpm.test.DefaultEngineTestCase; /** - * Inclusive gateway that has multiple incoming sequence flows. - * All tokens arriving from incoming sequence flows proceeds unconditionally along the outgoing sequence flow. - * The inclusive join is stateless. + * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows + * proceeds unconditionally along the outgoing sequence flow. The inclusive join is stateless. * * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 @@ -51,19 +50,26 @@ public void testSimpleMerge() 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 signals - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + MergeListener sigListener = new MergeListener(proc.getName(), new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Wait for the process to end - proc.waitForEnd(); + try + { + // Send start trigger signals + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(2, endSignals.size()); } @@ -83,25 +89,25 @@ class MergeListener implements SignalListener { - private String fromRef; private Signal nextSignal; public MergeListener(String fromRef, Signal nextSignal) { - this.fromRef = fromRef; this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -57,16 +57,23 @@ 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, "B"); - signalManager.addSignalListener(proc.getName(), new MergeListener(proc.getName(), startTrigger)); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -81,7 +88,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(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end try @@ -100,34 +107,50 @@ 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 MergeListener(proc.getName(), startTrigger)); + Signal startTrigger = new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A"); + MergeListener sigListener = new MergeListener(startTrigger); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); - try { - proc.waitForEnd(); - fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + + try + { + proc.waitForEnd(); + fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + } + catch (RuntimeException rte) + { + // expected + } } - catch (RuntimeException rte) + finally { - // expected + sigManager.removeSignalListener(sigListener); } // 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)); + startTrigger = new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B"); + sigListener = new MergeListener(startTrigger); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -139,44 +162,44 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess("Synchronization").addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").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"); - taskBuilder = procBuilder.addTask("TaskB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + taskBuilder = procBuilder.addSequenceFlow("TaskB").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); + msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true); Process proc = procBuilder.getProcess(); return proc; } 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; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: 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 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -65,7 +65,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } Modified: 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 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java 2008-08-22 10:09:27 UTC (rev 1982) @@ -67,7 +67,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } 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-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-22 10:09:27 UTC (rev 1982) @@ -38,7 +38,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:msgListener=SynchronizationDescriptorTest</to> + <to>jboss.bpm:test=SynchronizationDescriptorTest</to> <property correlation="true"> <name>taskValueA</name> </property> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 10:09:27 UTC (rev 1982) @@ -15,7 +15,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:msgListener=CaseDataDescriptorTest</to> + <to>jboss.bpm:test=CaseDataDescriptorTest</to> <property correlation="true"> <name>foo</name> </property> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 10:09:27 UTC (rev 1982) @@ -19,7 +19,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:msgListener=TaskDataDescriptorTest</to> + <to>jboss.bpm:test=TaskDataDescriptorTest</to> <property correlation="true"> <name>foo</name> </property> Modified: jbossbpm/spec/trunk/pom.xml =================================================================== --- jbossbpm/spec/trunk/pom.xml 2008-08-22 09:40:49 UTC (rev 1981) +++ jbossbpm/spec/trunk/pom.xml 2008-08-22 10:09:27 UTC (rev 1982) @@ -173,8 +173,15 @@  <distributionManagement>  <site> <id>jbpm.dyndns.org</id> @@ -182,6 +189,14 @@ </site> </distributionManagement> +  + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> +  <profiles> <!--

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1981 - in jbossbpm/spec/branches/tdiesler/modules: api/src/main/java/org/jboss/bpm/model and 26 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-22 05:40:49 -0400 (Fri, 22 Aug 2008) New Revision: 1981 Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java Removed: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java 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/AbstractElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.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/client/ProcessManagerImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.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/EventImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.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/GraphicalElementImpl.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/ProcessBuilderImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.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/SupportingElementImpl.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/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.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/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.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/exclusive/ExclusiveGatewaySplitTest.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/inclusive/InclusiveGatewaySplitTest.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/process/ProcessPropertyTest.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/exclusivechoice/ExclusiveChoiceTest.java jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.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 jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml Log: Refactor signal handling Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -23,8 +23,11 @@ //$Id$ +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; import javax.management.ObjectName; @@ -61,21 +64,39 @@ */ public void addMessageListener(MessageListener listener) { - if (hasMessageListener(listener.getID())) - throw new IllegalStateException("Listener already registered: " + listener.getID()); + synchronized (listeners) + { + if (hasMessageListener(listener.getID())) + throw new IllegalStateException("Listener already registered: " + listener.getID()); - log.debug("addMessageListener: " + listener.getID()); - listeners.put(listener.getID(), listener); + log.debug("addMessageListener: " + listener.getID()); + listeners.put(listener.getID(), listener); + } } /** + * Get the set of registered MessageListeners + */ + public Set<MessageListener> getMessageListeners() + { + synchronized (listeners) + { + HashSet<MessageListener> set = new HashSet<MessageListener>(listeners.values()); + return Collections.unmodifiableSet(set); + } + } + + /** * Get a MessageListener for a given ID * * @return null if there is none */ public MessageListener getMessageListener(ObjectName listenerID) { - return listeners.get(listenerID); + synchronized (listeners) + { + return listeners.get(listenerID); + } } /** @@ -91,8 +112,11 @@ */ public void removeMessageListener(ObjectName listenerID) { - log.debug("removeMessageListener: " + listenerID); - listeners.remove(listenerID); + synchronized (listeners) + { + log.debug("removeMessageListener: " + listenerID); + listeners.remove(listenerID); + } } /** @@ -105,7 +129,7 @@ */ public void sendMessage(ObjectName targetID, Message msg) { - MessageListener msgListener = listeners.get(targetID); + MessageListener msgListener = getMessageListener(targetID); if (msgListener == null) throw new IllegalStateException("No message listener registered for: " + targetID); Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -21,21 +21,25 @@ */ package org.jboss.bpm.client; -import org.jboss.bpm.model.Signal; - //$Id$ +import org.jboss.bpm.model.Signal; /** - * A signal listener that can be registered with the ProcessEngine + * A signal listener that can be registered with the {@link SignalManager} * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ public interface SignalListener { + /** + * Returns true if the listener accepts a given signal + */ + boolean acceptSignal(Signal signal); + /** - * Catch a signal from the process that this listener is registered with + * Catch a previously accepted signal */ void catchSignal(Signal signal); } \ No newline at end of file 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -23,21 +23,16 @@ //$Id$ -import java.util.HashMap; +import java.util.Collections; import java.util.HashSet; -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(a)jboss.com @@ -49,7 +44,7 @@ private static final Log log = LogFactory.getLog(SignalManager.class); // The map of registered signal listeners - private Map<ObjectName, Set<SignalListener>> listeners = new HashMap<ObjectName, Set<SignalListener>>(); + private Set<SignalListener> listeners = new HashSet<SignalListener>(); /** * Locate the SignalManager @@ -62,87 +57,65 @@ /** * Add a SignalListener for a given source - * - * @param fromRef If null the listener catches all signals */ - public void addSignalListener(ObjectName fromRef, SignalListener listener) + public void addSignalListener(SignalListener listener) { synchronized (listeners) { - log.debug("addSignalListener: " + fromRef + "=" + listener); - Set<SignalListener> set = listeners.get(fromRef); - if (set == null) - { - set = new HashSet<SignalListener>(); - listeners.put(fromRef, set); - } - set.add(listener); + log.debug("addSignalListener: " + listener); + listeners.add(listener); } } /** - * Remove a SignalListener for a given source + * Get the set of registered SignalListeners */ - public void removeSignalListener(ObjectName fromRef, SignalListener listener) + public Set<SignalListener> getSignalListeners() { synchronized (listeners) { - log.debug("removeSignalListener: " + fromRef + "=" + listener); - Set<SignalListener> set = listeners.get(fromRef); - if (set != null) - { - set.remove(listener); - } + return Collections.unmodifiableSet(listeners); } } /** - * Remove all SignalListener for a given source + * Remove a SignalListener for a given source */ - public void removeSignalListeners(ObjectName fromRef) + public void removeSignalListener(SignalListener listener) { synchronized (listeners) { - log.debug("removeSignalListeners: " + fromRef); - listeners.remove(fromRef); + log.debug("removeSignalListener: " + listener); + listeners.remove(listener); } } /** * Throw a signal to all registered listeners - * - * @param procName An optional process name */ public void throwSignal(Signal signal) { log.debug("throwSignal: " + signal); - - // Throw Signal to listeners associated with a given source - ObjectName fromRef = signal.getFromRef(); - Set<SignalListener> fromRefListeners = getListeners(fromRef); - for (SignalListener listener : fromRefListeners) + Set<SignalListener> currentListeners = getSignalListeners(); + for (SignalListener listener : currentListeners) { - failsafeThrow(listener, signal); + if (failsafeAccept(listener, signal)) + failsafeThrow(listener, signal); } - - // Throw Signal to listeners not associated with any source - Set<SignalListener> allListeners = getListeners(null); - for (SignalListener listener : allListeners) - { - failsafeThrow(listener, signal); - } } - private Set<SignalListener> getListeners(ObjectName fromRef) + private boolean failsafeAccept(SignalListener listener, Signal signal) { - synchronized (listeners) + try { - HashSet<SignalListener> retSet = new HashSet<SignalListener>(); - Set<SignalListener> listenerSet = listeners.get(fromRef); - if (listenerSet != null) - retSet.addAll(listenerSet); - return retSet; + boolean accept = listener.acceptSignal(signal); + return accept; } + catch (RuntimeException rte) + { + log.error("Signal processing error", rte); + return false; + } } private void failsafeThrow(SignalListener listener, Signal signal) Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/AbstractElement.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model; -//$Id$ +//$Id: $ import java.io.Serializable; Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -21,11 +21,9 @@ */ package org.jboss.bpm.model; +// $Id: $ import java.util.List; - -//$Id$ - /** * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway. * Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -52,7 +52,7 @@ * 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(); + GatewayType getGatewayType(); /** * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -21,12 +21,10 @@ */ package org.jboss.bpm.model; +// $Id: $ - -//$Id$ - /** - * A graphical BPMN element + * A graphical element * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -35,7 +35,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface Process extends GraphicalElement, PropertySupport +public interface Process extends SupportingElement, PropertySupport { /** * Defines the type of a {@link Process} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java (from rev 1979, jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.model; + + +//$Id$ + +/** + * A supporting element + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SupportingElement extends AbstractElement +{ +} \ No newline at end of file Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -82,18 +82,40 @@ deployer = new EmbeddedBeansDeployer(); // Setup the SignalListener - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(null, getSignalListener()); + clearAllSignalListeners(); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(getSignalListener()); synchronized (signals) { signals.clear(); } // Setup the MessageListener - MessageManager messageManager = MessageManager.locateMessageManager(); - messageManager.addMessageListener(getMessageListener()); + clearAllMessageListeners(); + MessageManager msgManager = MessageManager.locateMessageManager(); + msgManager.addMessageListener(getMessageListener()); } + private void clearAllSignalListeners() + { + SignalManager sigManager = SignalManager.locateSignalManager(); + Set<SignalListener> sigListeners = sigManager.getSignalListeners(); + for (SignalListener sigListener : sigListeners) + { + sigManager.removeSignalListener(sigListener); + } + } + + private void clearAllMessageListeners() + { + MessageManager msgManager = MessageManager.locateMessageManager(); + Set<MessageListener> msgListeners = msgManager.getMessageListeners(); + for (MessageListener msgListener : msgListeners) + { + msgManager.removeMessageListener(msgListener.getID()); + } + } + @Override protected void tearDown() throws Exception { @@ -101,11 +123,11 @@ // Tear down the SignalListener SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.removeSignalListeners(null); + signalManager.removeSignalListener(getSignalListener()); // Tear down the MessageListener MessageManager messageManager = MessageManager.locateMessageManager(); - messageManager.removeMessageListener(getMessageListenerID()); + messageManager.removeMessageListener(getTestID()); // Check that there are no registered processes left ProcessManager procManager = ProcessManager.locateProcessManager(); @@ -117,6 +139,24 @@ log.warn(logMsg); } + // Check that there are no registered signal listeners left + Set<SignalListener> sigListeners = signalManager.getSignalListeners(); + if (sigListeners.size() > 0) + { + String logMsg = "Registered signal listeners on tear down of " + getName() + ": " + sigListeners; + System.out.println(logMsg); + log.warn(logMsg); + } + + // Check that there are no registered signal listeners left + Set<MessageListener> msgListeners = messageManager.getMessageListeners(); + if (msgListeners.size() > 0) + { + String logMsg = "Registered message listeners on tear down of " + getName() + ": " + msgListeners; + System.out.println(logMsg); + log.warn(logMsg); + } + super.tearDown(); } @@ -160,6 +200,11 @@ { signalListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return true; + } + public void catchSignal(Signal signal) { synchronized (signals) @@ -207,7 +252,7 @@ { public ObjectName getID() { - return getMessageListenerID(); + return getTestID(); } public void catchMessage(Message message) @@ -223,9 +268,9 @@ return messageListener; } - public ObjectName getMessageListenerID() + public ObjectName getTestID() { - return ObjectNameFactory.create(Constants.ID_DOMAIN, "msgListener", getShortName()); + return ObjectNameFactory.create(Constants.ID_DOMAIN, "test", getShortName()); } public List<Message> getMessages() 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ExecutionManagerImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -134,9 +134,7 @@ { try { - log.debug("Wait to become Active " + proc); proc.wait(); - log.debug("Notified " + proc); } catch (InterruptedException ex) { @@ -217,9 +215,7 @@ // Start waiting to get notified long waitTimeout = forever ? 0 : until - now; - log.debug("Wait for " + waitTimeout + "ms on " + proc); proc.wait(waitTimeout); - log.debug("Notified " + proc); } now = System.currentTimeMillis(); } @@ -327,7 +323,7 @@ Process proc = rtProc.getProcess(); SignalManager signalManager = SignalManager.locateSignalManager(); - + ObjectName procID = proc.getID(); String procName = proc.getName(); try @@ -338,7 +334,6 @@ signalManager.throwSignal(new Signal(procID, SignalType.SYSTEM_PROCESS_ENTER)); // Notify that the process is now Active - log.debug("Notify: " + proc); proc.notifyAll(); } @@ -349,9 +344,7 @@ { try { - log.debug("Wait: " + rtProc); rtProc.wait(); - log.debug("Notified: " + rtProc); } catch (InterruptedException ex) { @@ -376,7 +369,6 @@ runtimeProcesses.remove(procID); // Notify that the process has now ended - log.debug("Notify: " + proc); proc.notifyAll(); } } Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessManagerImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -53,14 +53,14 @@ { super.registerProcess(proc); ProcessImpl procImpl = (ProcessImpl)proc; - procImpl.registerElement(proc); + procImpl.register(proc); } @Override public void unregisterProcess(Process proc) { ProcessImpl procImpl = (ProcessImpl)proc; - procImpl.unregisterElement(proc); + procImpl.unregister(proc); super.unregisterProcess(proc); } } Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -26,10 +26,7 @@ import javax.management.ObjectName; import org.jboss.bpm.model.AbstractElement; -import org.jboss.bpm.model.Constants; -import org.jboss.bpm.model.ObjectNameFactory; import org.jboss.bpm.model.Process; -import org.jboss.util.id.UID; /** * The parrent of all Elements @@ -38,28 +35,20 @@ * @since 08-Jul-2008 */ @SuppressWarnings("serial") -public class AbstractElementImpl implements AbstractElement +public abstract class AbstractElementImpl implements AbstractElement { + // The cached 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; - } - + public abstract ObjectName getID(); + /** * Called when the process is created */ - protected void createElement(Process proc) + protected void create(Process proc) { // nothing to do } @@ -67,7 +56,7 @@ /** * Called when the process is registered */ - protected void registerElement(Process proc) + protected void register(Process proc) { // nothing to do } @@ -75,7 +64,7 @@ /** * Called when the process is unregistered */ - protected void unregisterElement(Process proc) + protected void unregister(Process proc) { // nothing to do } @@ -83,7 +72,7 @@ /** * Called when the process is destroyed */ - protected void destroyElement(Process proc) + protected void destroy(Process proc) { // nothing to do } Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -300,9 +300,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); // Validate InputSets for (InputSet inSet : inputSets) 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -27,12 +27,16 @@ import java.util.Collections; import java.util.List; +import javax.management.ObjectName; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.MessageEventDetail; +import org.jboss.bpm.model.ObjectNameFactory; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; @@ -40,6 +44,7 @@ import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.util.id.UID; /** * As the name implies, the End Event indicates where a Process will end. @@ -64,6 +69,18 @@ super(name); } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=EndEvent,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public SequenceFlow getInFlow() { return inFlow; @@ -135,9 +152,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); // Initialize Results for (EventDetail result : getResult()) Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -21,12 +21,7 @@ */ 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$ @@ -44,16 +39,4 @@ { 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/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -212,9 +212,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); this.proc = proc; // Check required name 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GatewayImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -75,7 +75,7 @@ if (id == null) { StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); - str.append("type=Gateway,name=" + getName() + ",id=" + new UID()); + str.append("type=" + getGatewayType() + "Gateway,name=" + getName() + ",id=" + new UID()); id = ObjectNameFactory.create(str.toString()); } return id; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/GraphicalElementImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -26,7 +26,8 @@ import org.jboss.bpm.model.GraphicalElement; /** - * + * A graphical element + * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/IntermediateEventImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -27,15 +27,20 @@ import java.util.Collections; import java.util.List; +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.EventDetail; import org.jboss.bpm.model.IntermediateEvent; +import org.jboss.bpm.model.ObjectNameFactory; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.util.id.UID; /** * An Intermediate Event is an Event that occurs after a Process has been started. It will affect the Flow of the Process, but will not start or (directly) terminate @@ -57,6 +62,18 @@ super(name); } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=IntermediateEvent,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public ConnectingObject getInFlow() { return inFlow; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessBuilderImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -86,7 +86,7 @@ public Process getProcess() { ProcessImpl internalProc = getProcessInternal(); - internalProc.createElement(internalProc); + internalProc.create(internalProc); return internalProc; } Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -308,13 +308,13 @@ } @Override - public void createElement(Process proc) + public void create(Process proc) { if (status != ProcessStatus.None) throw new IllegalStateException("Cannot initialize process in state: " + status); // Initialize the Element - super.createElement(this); + super.create(this); // Set the anonymous default name if (getName() == null) @@ -333,43 +333,43 @@ for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.createElement(this); + foImpl.create(this); } status = ProcessStatus.Ready; } @Override - public void registerElement(Process proc) + public void register(Process proc) { - super.registerElement(proc); + super.register(proc); for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.registerElement(this); + foImpl.register(this); } } @Override - public void unregisterElement(Process proc) + public void unregister(Process proc) { for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.unregisterElement(this); + foImpl.unregister(this); } - super.unregisterElement(proc); + super.unregister(proc); } @Override - public void destroyElement(Process proc) + public void destroy(Process proc) { for (FlowObject fo : flowObjects) { FlowObjectImpl foImpl = (FlowObjectImpl)fo; - foImpl.destroyElement(this); + foImpl.destroy(this); } - super.destroyElement(proc); + super.destroy(proc); } protected void initializeMessageRef(Message msgRef) Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ReceiveTaskImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -170,9 +170,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); if (messageRef == null) throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered"); Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SendTaskImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -80,9 +80,9 @@ } @Override - protected void createElement(Process proc) + protected void create(Process proc) { - super.createElement(proc); + super.create(proc); if (messageRef == null) throw new InvalidProcessException("A Message for the MessageRef attribute MUST be entered"); 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -27,21 +27,27 @@ import java.util.Collections; import java.util.List; +import javax.management.ObjectName; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.ExecutionManager; import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventDetail; +import org.jboss.bpm.model.ObjectNameFactory; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.SignalEventDetail; import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Process.ProcessStatus; +import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.util.id.UID; /** * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts the @@ -66,6 +72,18 @@ super(name == null ? "Start" : name); } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=StartEvent,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public List<EventDetail> getTrigger() { return Collections.unmodifiableList(triggers); @@ -100,6 +118,7 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); + public void throwEnterSignal() { Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_START_EVENT_ENTER); @@ -117,15 +136,15 @@ } @Override - protected void registerElement(final Process proc) + protected void register(final Process proc) { - super.registerElement(proc); - + super.register(proc); + for (EventDetail eventDetail : getTrigger()) { EventDetailImpl eventDetailImpl = (EventDetailImpl)eventDetail; eventDetailImpl.initialize(this); - + // Register the start signal listener if (eventDetail instanceof SignalEventDetail) { @@ -136,48 +155,60 @@ final StartEvent start = this; startListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + SignalType expType = startSignal.getSignalType(); + String expMsg = startSignal.getMessage(); + + String sigMsg = signal.getMessage(); + SignalType sigType = signal.getSignalType(); + + boolean accept = (expType == sigType); + if (accept && expMsg != null) + accept = accept && expMsg.equals(sigMsg); + + return accept; + } + public void catchSignal(Signal signal) { - if (startSignal.getSignalType() == signal.getSignalType() && startSignal.getMessage().equals(signal.getMessage())) + log.debug("catchSignal: " + signal); + ProcessStatus procStatus = proc.getProcessStatus(); + if (procStatus == ProcessStatus.Ready || procStatus == ProcessStatus.Active) { - 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); - } + log.debug("Start process from signal: " + signal); + ExecutionManager exManager = ExecutionManager.locateExecutionManager(); + exManager.startProcess(start, null); } + else + { + log.debug("Ignore start signal for process: " + proc); + } } - + public String toString() { return start + "." + startSignal; } }; SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(null, startListener); + signalManager.addSignalListener(startListener); } } } } - + @Override - protected void unregisterElement(final Process proc) + protected void unregister(final Process proc) { // Unregister the start signal listener if (startListener != null) { SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.removeSignalListener(null, startListener); + signalManager.removeSignalListener(startListener); startListener = null; } - super.unregisterElement(proc); + super.unregister(proc); } public String toString() 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SubProcessImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -23,10 +23,15 @@ //$Id$ +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.ri.model.spec.SubProcess; import org.jboss.bpm.runtime.SignalHandler; +import org.jboss.util.id.UID; /** * A Sub-Process is Process that is included within another Process. @@ -47,6 +52,18 @@ return ActivityType.SubProcess; } + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=SubProcess,name=" + getName() + ",id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } + public SignalHandler getSignalHandler() { SignalHandler handler = super.getSignalHandler(); Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -23,14 +23,31 @@ //$Id$ -import org.jboss.bpm.ri.model.spec.SupportingElement; +import javax.management.ObjectName; +import org.jboss.bpm.model.Constants; +import org.jboss.bpm.model.ObjectNameFactory; +import org.jboss.bpm.model.SupportingElement; +import org.jboss.util.id.UID; + /** - * + * A supporting element + * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ @SuppressWarnings("serial") public abstract class SupportingElementImpl extends AbstractElementImpl implements SupportingElement { + @Override + public ObjectName getID() + { + if (id == null) + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=SupportingElement,id=" + new UID()); + id = ObjectNameFactory.create(str.toString()); + } + return id; + } } \ No newline at end of file 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -63,7 +63,7 @@ if (id == null) { StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); - str.append("type=Task,name=" + getName() + ",id=" + new UID()); + str.append("type=" + getTaskType() + "Task,name=" + getName() + ",id=" + new UID()); id = ObjectNameFactory.create(str.toString()); } return id; @@ -77,6 +77,7 @@ handler = new SignalHandler() { SignalManager signalManager = SignalManager.locateSignalManager(); + public void throwEnterSignal() { Signal signal = new Signal(getID(), Signal.SignalType.SYSTEM_TASK_ENTER); Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TokenExecutorImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -289,7 +289,6 @@ // Notify the runtime process synchronized (rtProc) { - log.debug("Notify: " + rtProc); rtProc.notifyAll(); } } Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/Condition.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -22,6 +22,7 @@ package org.jboss.bpm.ri.model.spec; import org.jboss.bpm.model.Expression; +import org.jboss.bpm.model.SupportingElement; //$Id$ Deleted: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/ri/model/spec/SupportingElement.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -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.ri.model.spec; - -import org.jboss.bpm.model.AbstractElement; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SupportingElement extends AbstractElement -{ -} \ No newline at end of file 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/test/java/org/jboss/bpm/runtime/ExecutionManagerTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -61,7 +61,7 @@ ProcessStatus status = em.waitForEnd(proc); assertEquals(ProcessStatus.Completed, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -86,7 +86,7 @@ status = em.waitForEnd(proc); assertEquals(ProcessStatus.Completed, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -116,7 +116,7 @@ ProcessStatus status = proc.getProcessStatus(); assertEquals(ProcessStatus.Aborted, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -136,11 +136,11 @@ em.startProcess(proc, null); SignalManager sm = SignalManager.locateSignalManager(); - sm.throwSignal(new Signal(getMessageListenerID(), SignalType.USER_SIGNAL, "A")); + sm.throwSignal(new Signal(getTestID(), SignalType.USER_SIGNAL, "A")); ProcessStatus status = em.waitForEnd(proc); assertEquals(ProcessStatus.Completed, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -171,7 +171,7 @@ ProcessStatus status = proc.getProcessStatus(); assertEquals(ProcessStatus.Aborted, status); - + ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("Process should be unregistered", pm.getProcessByID(proc.getID())); } @@ -179,40 +179,49 @@ public void testStartTwice() throws Exception { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA"). - addTask("TaskA").addSequenceFlow("End").addEndEvent("End"); + procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA").addTask("TaskA").addSequenceFlow( + "End").addEndEvent("End"); final Process proc = procBuilder.getProcess(); - + class TestSignalListener implements SignalListener { RuntimeException signalException; + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER) + try { - try - { - proc.startProcess(); - fail("Cannot start process twice"); - } - catch (RuntimeException rte) - { - signalException = rte; - } + proc.startProcess(); + fail("Cannot start process twice"); } + catch (RuntimeException rte) + { + signalException = rte; + } } } TestSignalListener sigListener = new TestSignalListener(); - SignalManager sm = SignalManager.locateSignalManager(); - sm.addSignalListener(getMessageListenerID(), sigListener); - - proc.startProcess(); - proc.waitForEnd(); - + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); + + try + { + proc.startProcess(); + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + assertNotNull("Signal Exception expected", sigListener.signalException); } - + @SuppressWarnings("serial") public static class ThrowHandler implements ExecutionHandler { 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -52,7 +52,7 @@ AirticketMessageListener msgListener = new AirticketMessageListener(messageQueue); mm.addMessageListener(msgListener); - sm.addSignalListener(sampleID, new AirticketSignalListener()); + sm.addSignalListener(new AirticketSignalListener()); httpSession.setAttribute("messageQueue", messageQueue); } @@ -194,6 +194,11 @@ class AirticketSignalListener implements SignalListener { + public boolean acceptSignal(Signal signal) + { + return true; + } + public void catchSignal(Signal signal) { System.out.println(signal); Modified: jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -76,7 +76,7 @@ } @Override - public ObjectName getMessageListenerID() + public ObjectName getTestID() { return ObjectNameFactory.create("jboss.bpm:client=AirticketTest"); } @@ -84,14 +84,14 @@ @Override public MessageListener getMessageListener() { - msgListener = new AirticketMessageListener(getMessageListenerID()); + msgListener = new AirticketMessageListener(getTestID()); return msgListener; } @Override protected void tearDown() throws Exception { - messageManager.removeMessageListener(getMessageListenerID()); + messageManager.removeMessageListener(getTestID()); super.tearDown(); } @@ -137,7 +137,7 @@ protected Process getProcess() throws IOException { - AirticketProcessBuilder builder = new AirticketProcessBuilder(getMessageListenerID()); + AirticketProcessBuilder builder = new AirticketProcessBuilder(getTestID()); return builder.buildProcess(); } Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -68,7 +68,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -55,18 +55,25 @@ public void testGateA() 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(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -77,18 +84,25 @@ public void testGateB() 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(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B")); + try + { + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -99,38 +113,50 @@ 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(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); - try { - proc.waitForEnd(); - fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + + try + { + proc.waitForEnd(); + fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + } + catch (RuntimeException rte) + { + // expected + } } - catch (RuntimeException rte) + finally { - // expected + sigManager.removeSignalListener(sigListener); } - // Restart the process - proc.startProcess(); - // Add a signal listener that sends the other start trigger signal - startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Send start trigger signal - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -142,19 +168,21 @@ { 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"); + 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("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow( + "TaskB"); 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); + msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true); Process proc = procBuilder.getProcess(); return proc; } @@ -168,16 +196,18 @@ this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -56,7 +56,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndA", endSignals.get(0).getFromRef()); + assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testGateB() throws Exception @@ -70,7 +70,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testInvalidGate() throws Exception 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -39,9 +39,8 @@ import org.jboss.bpm.test.DefaultEngineTestCase; /** - * Inclusive gateway that has multiple incoming sequence flows. - * All tokens arriving from incoming sequence flows proceeds unconditionally along the outgoing sequence flow. - * The inclusive join is stateless. + * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows + * proceeds unconditionally along the outgoing sequence flow. The inclusive join is stateless. * * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 @@ -51,19 +50,26 @@ public void testGateA() 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(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); - - // Send start trigger signals - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Wait for the process to end - proc.waitForEnd(); + try + { + // Send start trigger signals + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(2, endSignals.size()); } @@ -72,10 +78,10 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge"); - eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + procBuilder.addSequenceFlow("Merge").addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess(); return proc; @@ -90,16 +96,18 @@ this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal( nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -69,7 +69,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public Process getProcess() throws IOException 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -57,16 +57,23 @@ Process proc = getProcess(); // Add a signal listener that sends the other start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -81,7 +88,7 @@ // Start the process and send start trigger signal proc.startProcess(); SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end try @@ -100,34 +107,48 @@ Process proc = getProcess(); // Add a signal listener that sends the other start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + SignalManager sigManager = SignalManager.locateSignalManager(); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); - try { - proc.waitForEnd(); - fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + + try + { + proc.waitForEnd(); + fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + } + catch (RuntimeException rte) + { + // expected + } } - catch (RuntimeException rte) + finally { - // expected + sigManager.removeSignalListener(sigListener); } // Add a signal listener that sends the other start trigger signal - startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -139,19 +160,19 @@ { 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"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").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"); - taskBuilder = procBuilder.addTask("TaskB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + taskBuilder = procBuilder.addSequenceFlow("TaskB").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); + msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true); Process proc = procBuilder.getProcess(); return proc; } @@ -165,16 +186,18 @@ this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -56,7 +56,7 @@ assertEquals(2, signals.size()); ObjectName fromRef0 = signals.get(0).getFromRef(); ObjectName fromRef1 = signals.get(1).getFromRef(); - String fromRefs = fromRef0.getCanonicalName() + fromRef1.getCanonicalName(); + String fromRefs = fromRef0.getKeyProperty("name") + fromRef1.getKeyProperty("name"); 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/process/ProcessPropertyTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -68,7 +68,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/processmanager/ProcessManagerTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -51,23 +51,32 @@ final ProcessManager pm = ProcessManager.locateProcessManager(); assertNull("A process created through the builder is not registered automatically", pm.getProcessByID(procID)); - SignalListener signalListener = new SignalListener() + SignalListener sigListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER) - { - assertNotNull(pm.getProcessByID(procID)); - } + assertNotNull(pm.getProcessByID(procID)); } }; - SignalManager sm = SignalManager.locateSignalManager(); - sm.addSignalListener(getMessageListenerID(), signalListener); - - // Start the process, which automatically adds it to the registery - assertEquals(procID, proc.startProcess()); - proc.waitForEnd(); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); + try + { + // Start the process, which automatically adds it to the registery + assertEquals(procID, proc.startProcess()); + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + assertNull("A terminated process is removed from the registry", pm.getProcessByID(procID)); } 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -38,8 +38,8 @@ public class SignalManagerTest extends DefaultEngineTestCase { final SignalManager sigManager = SignalManager.locateSignalManager(); - final Signal sigA = new Signal(getMessageListenerID(), SignalType.USER_SIGNAL, "A"); - final Signal sigB = new Signal(getMessageListenerID(), SignalType.USER_SIGNAL, "B"); + final Signal sigA = new Signal(getTestID(), SignalType.USER_SIGNAL, "A"); + final Signal sigB = new Signal(getTestID(), SignalType.USER_SIGNAL, "B"); private Signal gotA; private Signal gotB; @@ -48,26 +48,28 @@ { SignalListener sigListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.USER_SIGNAL; + } + public void catchSignal(Signal signal) { String sigMsg = signal.getMessage(); - if (signal.getSignalType() == SignalType.USER_SIGNAL) + if ("A".equals(sigMsg)) { - if ("A".equals(sigMsg)) - { - gotA = signal; - sigManager.throwSignal(sigB); - } - if ("B".equals(sigMsg)) - { - gotB = signal; - } + gotA = signal; + sigManager.throwSignal(sigB); } + if ("B".equals(sigMsg)) + { + gotB = signal; + } } }; - sigManager.addSignalListener(getMessageListenerID(), sigListener); + sigManager.addSignalListener(sigListener); sigManager.throwSignal(sigA); - sigManager.removeSignalListeners(getMessageListenerID()); + sigManager.removeSignalListener(sigListener); assertEquals(sigA, gotA); assertEquals(sigB, gotB); @@ -77,26 +79,28 @@ { SignalListener sigListener = new SignalListener() { + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.USER_SIGNAL; + } + public void catchSignal(Signal signal) { String sigMsg = signal.getMessage(); - if (signal.getSignalType() == SignalType.USER_SIGNAL) + if ("A".equals(sigMsg)) { - if ("A".equals(sigMsg)) - { - gotA = signal; - sendThreadSignal(sigB); - } - if ("B".equals(sigMsg)) - { - gotB = signal; - } + gotA = signal; + sendThreadSignal(sigB); } + if ("B".equals(sigMsg)) + { + gotB = signal; + } } }; - sigManager.addSignalListener(getMessageListenerID(), sigListener); + sigManager.addSignalListener(sigListener); sendThreadSignal(sigA); - sigManager.removeSignalListeners(getMessageListenerID()); + sigManager.removeSignalListener(sigListener); assertEquals(sigA, gotA); assertEquals(sigB, gotB); 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -57,7 +57,7 @@ // Start the process and send start trigger signal proc.startProcess(); SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getTestID(), 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(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getTestID(), 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(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end proc.waitForEnd(); @@ -98,16 +98,23 @@ Process proc = getProcess(); // Add a signal listener that sends the other start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"); - signalManager.addSignalListener(getMessageListenerID(), new TaskListener(startTrigger)); + TaskListener sigListener = new TaskListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result List<Message> messages = getMessages(); @@ -127,7 +134,7 @@ taskBuilder.addSequenceFlow("End"); procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); - msgBuilder.addToRef(getMessageListenerID()).addProperty("taskValue", null, true); + msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true); Process proc = procBuilder.getProcess(); return proc; } @@ -141,16 +148,18 @@ this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_TASK_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -64,11 +64,11 @@ // expected } } - + public void testUnregisteredProcess() throws Exception { Process proc = getProcess(); - + MessageManager msgManager = MessageManager.locateMessageManager(); try { @@ -90,10 +90,10 @@ // Send the message before the process is started MessageManager msgManager = MessageManager.locateMessageManager(); msgManager.sendMessage(proc.getID(), "TaskA", getMessage()); - + proc.startProcess(); proc.waitForEnd(); - + Message endMsg = getMessages().get(0); assertNotNull("End message expected", endMsg); assertEquals("bar", endMsg.getPropertyValue("foo")); @@ -102,29 +102,39 @@ public void testSuspendedToken() throws Exception { final Process proc = getProcess(); - SignalListener signalListener = new SignalListener() + SignalListener sigListener = new SignalListener() { private boolean sendMessage = true; + + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_TASK_EXIT; + } + public void catchSignal(Signal signal) { // Send the message after the process reached the receive task - if (signal.getSignalType() == SignalType.SYSTEM_TASK_EXIT) + if (sendMessage == true) { - if (sendMessage == true) - { - sendMessage = false; - MessageManager msgManager = MessageManager.locateMessageManager(); - msgManager.sendMessage(proc.getID(), "TaskA", getMessage()); - } + sendMessage = false; + MessageManager msgManager = MessageManager.locateMessageManager(); + msgManager.sendMessage(proc.getID(), "TaskA", getMessage()); } } }; SignalManager sigManager = SignalManager.locateSignalManager(); - sigManager.addSignalListener(getMessageListenerID(), signalListener); - - proc.startProcess(); - proc.waitForEnd(); - + sigManager.addSignalListener(sigListener); + + try + { + proc.startProcess(); + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + Message endMsg = getMessages().get(0); assertNotNull("End message expected", endMsg); assertEquals("bar", endMsg.getPropertyValue("foo")); @@ -136,14 +146,14 @@ Message msg = procBuilder.newMessage("ReceiveTaskMessage").addProperty("foo", "bar", true).getMessage(); return msg; } - + private Process getProcess() { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); MessageBuilder msgBuilder = procBuilder.addProcess("ReceiveTaskTest").addMessage("ReceiveTaskMessage"); msgBuilder.addProperty("foo", null, true); msgBuilder = procBuilder.addMessage("EndEventMessage"); - msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); procBuilder.addTask("TaskA", Task.TaskType.Receive).addMessageRef("ReceiveTaskMessage"); EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End"); Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -56,7 +56,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndA", endSignals.get(0).getFromRef()); + assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testGateB() throws Exception @@ -70,7 +70,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public void testInvalidGate() throws Exception Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -69,7 +69,7 @@ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef()); + assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); } public Process getProcess() throws IOException 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -56,7 +56,7 @@ assertEquals(2, signals.size()); ObjectName fromRef0 = signals.get(0).getFromRef(); ObjectName fromRef1 = signals.get(1).getFromRef(); - String fromRefs = fromRef0.getCanonicalName() + fromRef1.getCanonicalName(); + String fromRefs = fromRef0.getKeyProperty("name") + fromRef1.getKeyProperty("name"); 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -39,9 +39,8 @@ import org.jboss.bpm.test.DefaultEngineTestCase; /** - * Inclusive gateway that has multiple incoming sequence flows. - * All tokens arriving from incoming sequence flows proceeds unconditionally along the outgoing sequence flow. - * The inclusive join is stateless. + * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows + * proceeds unconditionally along the outgoing sequence flow. The inclusive join is stateless. * * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 @@ -51,19 +50,26 @@ public void testSimpleMerge() 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(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(proc.getName(), startTrigger)); - - // Send start trigger signals - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + MergeListener sigListener = new MergeListener(proc.getName(), new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Wait for the process to end - proc.waitForEnd(); + try + { + // Send start trigger signals + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } + List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); assertEquals(2, endSignals.size()); } @@ -90,16 +96,18 @@ this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + 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-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -57,16 +57,23 @@ Process proc = getProcess(); // Add a signal listener that sends the other start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + MergeListener sigListener = new MergeListener(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B")); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -81,7 +88,7 @@ // Start the process and send start trigger signal proc.startProcess(); SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + signalManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); // Wait for the process to end try @@ -100,34 +107,50 @@ Process proc = getProcess(); // Add a signal listener that sends the other start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - Signal startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + Signal startTrigger = new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A"); + MergeListener sigListener = new MergeListener(startTrigger); + SignalManager sigManager = SignalManager.locateSignalManager(); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); - try { - proc.waitForEnd(); - fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); + + try + { + proc.waitForEnd(); + fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); + } + catch (RuntimeException rte) + { + // expected + } } - catch (RuntimeException rte) + finally { - // expected + sigManager.removeSignalListener(sigListener); } // Add a signal listener that sends the other start trigger signal - startTrigger = new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getMessageListenerID(), new MergeListener(startTrigger)); + startTrigger = new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "B"); + sigListener = new MergeListener(startTrigger); + sigManager.addSignalListener(sigListener); - // Start the process and send start trigger signal - proc.startProcess(); - signalManager.throwSignal(new Signal(getMessageListenerID(), SignalType.SYSTEM_START_TRIGGER, "A")); + try + { + // Start the process and send start trigger signal + proc.startProcess(); + sigManager.throwSignal(new Signal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A")); - // Wait for the process to end - proc.waitForEnd(); + // Wait for the process to end + proc.waitForEnd(); + } + finally + { + sigManager.removeSignalListener(sigListener); + } // Verify the result Message endMessage = getMessages().get(0); @@ -139,19 +162,19 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess("Synchronization").addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").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"); - taskBuilder = procBuilder.addTask("TaskB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + taskBuilder = procBuilder.addSequenceFlow("TaskB").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); + msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true); Process proc = procBuilder.getProcess(); return proc; } @@ -165,16 +188,18 @@ this.nextSignal = nextSignal; } + public boolean acceptSignal(Signal signal) + { + return signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER; + } + public void catchSignal(Signal signal) { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) + if (nextSignal != null) { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(nextSignal); - nextSignal = null; - } + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.throwSignal(nextSignal); + nextSignal = null; } } } Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -65,7 +65,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/taskdata/TaskDataTest.java 2008-08-22 09:40:49 UTC (rev 1981) @@ -67,7 +67,7 @@ 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); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); Process proc = procBuilder.getProcess(); return proc; } Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-22 09:40:49 UTC (rev 1981) @@ -38,7 +38,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:msgListener=SynchronizationDescriptorTest</to> + <to>jboss.bpm:test=SynchronizationDescriptorTest</to> <property correlation="true"> <name>taskValueA</name> </property> Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 09:40:49 UTC (rev 1981) @@ -15,7 +15,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:msgListener=CaseDataDescriptorTest</to> + <to>jboss.bpm:test=CaseDataDescriptorTest</to> <property correlation="true"> <name>foo</name> </property> Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 07:25:03 UTC (rev 1980) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 09:40:49 UTC (rev 1981) @@ -19,7 +19,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:msgListener=TaskDataDescriptorTest</to> + <to>jboss.bpm:test=TaskDataDescriptorTest</to> <property correlation="true"> <name>foo</name> </property>

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1980 - jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-22 03:25:03 -0400 (Fri, 22 Aug 2008) New Revision: 1980 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/build.xml Log: added junit dependency Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/build.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/build.xml 2008-08-22 05:17:36 UTC (rev 1979) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/build.xml 2008-08-22 07:25:03 UTC (rev 1980) @@ -34,6 +34,7 @@ <target name="compile.test.dependencies"> <path id="test.path"> <path refid="jboss.path" /> + <pathelement location="${lib.junit.local}" /> <pathelement location="${lib.jbpm.bpel.tools.jar.local}" /> <pathelement location="${output.classes.dir}" /> <pathelement location="../task/${output.classes.dir}" />

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1979 - in jbpm3/branches/jpdl-3.2.3.CP/bpel: examples/hello/src/test/java/org/jbpm/bpel/tutorial/hello and 51 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-22 01:17:36 -0400 (Fri, 22 Aug 2008) New Revision: 1979 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/hello/src/test/java/org/jbpm/bpel/tutorial/hello/HelloTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionary.java jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionaryFactory.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/AlarmAction.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/TimeDrivenActivity.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/DeploymentDescriptor.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/MyRoleDescriptor.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerLinkDescriptor.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerRoleDescriptor.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/ScopeDescriptor.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReference.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReferenceFactory.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/SoapEndpointReference.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaConstants.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReference.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceFactory.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReference.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReferenceFactory.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Assign.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Empty.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Exit.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Invoke.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Receive.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Reply.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Rethrow.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Throw.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Validate.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Wait.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromElement.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromExpression.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromPartnerLink.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromProperty.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToExpression.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToPartnerLink.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToProperty.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Activity.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/BpelProcessDefinition.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/CompositeActivity.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Import.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/ImportDefinition.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/LinkDefinition.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/EventInstance.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeInstance.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeState.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/ActiveState.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/CompensatingState.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/EndState.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/FaultingState.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/StateUtil.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/TerminatingState.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Catch.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Compensate.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Handler.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Scope.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Flow.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/If.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Pick.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Sequence.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/StructuredActivity.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/While.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/CompositeCatalog.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/ServiceCatalog.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/UrlCatalog.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/client/SoapCaller.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlation.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/CorrelationSetDefinition.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlations.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InboundMessageActivity.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/PartnerLinkDefinition.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/CorrelationSetInstance.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/PartnerLinkInstance.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationConstants.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/OutstandingRequest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntriesBuilder.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntry.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/RequestListener.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListenersBuilder.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapBindConstants.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapFormatter.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/BpelArchiveParser.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DefinitionDescriptor.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DescriptorArchiveParser.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/StringBufferReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/def/Snippet.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/exe/EvaluatorFactory.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusFunction.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariableDataFunction.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyFunction.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/TokenVariableContext.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathEvaluatorFactory.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathExpressionEvaluator.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathJoinConditionEvaluator.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathPropertyQueryEvaluator.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/ElementType.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/MessageType.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/SchemaType.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableDefinition.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableType.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PartnerLinkType.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/Property.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PropertyAlias.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/AbstractExtension.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/DefinitionImpl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/FaultImpl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/InputImpl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/NamedExtension.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OperationMember.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OutputImpl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PartnerLinkTypeImpl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PropertyAliasImpl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeSerializer.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertyAliasSerializer.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertySerializer.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlConstants.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlFactoryImpl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlUtil.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ActivityReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/AssignReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelConstants.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/CompensateReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DefinitionDescriptorReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DeploymentDescriptorReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/EmptyReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ExitReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/FlowReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/IfReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/InvokeReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/PickReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessArchiveWsdlLocator.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessWsdlLocator.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReceiveReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RepeatUntilReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReplyReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RethrowReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ScopeReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SequenceReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ServiceCatalogReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SwitchReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ThrowReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/UrlCatalogReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ValidateReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WaitReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WhileReader.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/DatatypeUtil.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/Duration.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/XmlUtil.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/AllDbTests.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/deploy/ScopeMatcherTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/AssignTests.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromExpressionTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromPropertyTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromVariableTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToPropertyTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToVariableTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/ActivityDefTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/GraphDefTests.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/AbstractExeTestCase.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ActivityExeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/FlowExeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/GraphExeTests.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/IfExeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/InitialActivitiesTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/LinkInstanceTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/PickExeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ScopeExeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/SequenceExeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/StructuredActivityTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/WhileExeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/AcyclicGraphTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE1Test.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE2Test.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/LinkScopingTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/IntegrationTests.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/ServerTests.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/catalog/UrlCatalogTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/exe/CorrelationSetTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/StartListenerTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/BpelArchiveParserTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/DescriptorArchiveParserTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/ProcessArchiveTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DeadlineExpressionTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DurationExpressionTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/GeneralExpressionTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/JoinConditionTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/VariableAccessTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariableDataTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/variable/exe/MessageValueTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyAliasTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AbstractReaderTestCase.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ActivityReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AssignReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelConverterTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/CompensateReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/DefinitionDescriptorReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/FlowReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/IfReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/PickReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReceiveReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/RepeatUntilReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReplyReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ScopeReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SequenceReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SwitchReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ThrowReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ValidateReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WaitReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WhileReaderTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WsdlConverterTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/XmlTests.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/util/DurationTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/tools/ jbpm3/branches/jpdl-3.2.3.CP/bpel/tools/src/main/java/org/jbpm/bpel/tools/WsdlServiceTool.java Log: fixed unmappable character warnings Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/console ___________________________________________________________________ Name: svn:ignore + target Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/hello/src/test/java/org/jbpm/bpel/tutorial/hello/HelloTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/hello/src/test/java/org/jbpm/bpel/tutorial/hello/HelloTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/hello/src/test/java/org/jbpm/bpel/tutorial/hello/HelloTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ import org.jbpm.bpel.tools.ModuleDeployTestSetup; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/06 22:06:25 $ */ public class HelloTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionary.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionary.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionary.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -10,7 +10,7 @@ import com.example.translator.spi.Dictionary; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/20 12:28:17 $ */ public class ResourceDictionary implements Dictionary { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionaryFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionaryFactory.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/translator/src/main/java/com/example/translator/resource/ResourceDictionaryFactory.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -11,7 +11,7 @@ import com.example.translator.spi.DictionaryFactory; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/10/29 06:27:49 $ */ public class ResourceDictionaryFactory extends DictionaryFactory { Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/library ___________________________________________________________________ Name: svn:ignore + target Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/AlarmAction.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/AlarmAction.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/AlarmAction.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ * Defines a notification to be delivered by the jBPM scheduler to a * {@linkplain TimeDrivenActivity time-driven activity} at a specific instant in the future, once or * repeteadly. - * @author Juan Cant� + * @author Juan Cantu * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/20 21:02:25 $ */ Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/TimeDrivenActivity.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/TimeDrivenActivity.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/alarm/TimeDrivenActivity.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ /** * Contract that activities must fulfill in order to receive {@linkplain AlarmAction alarm} * notifications from the jBPM scheduler service. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/08/28 05:41:58 $ */ public interface TimeDrivenActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/DeploymentDescriptor.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/DeploymentDescriptor.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/DeploymentDescriptor.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -29,7 +29,7 @@ /** * Binding of <tt>bpelApplication</tt> element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/02 16:46:17 $ */ public class DeploymentDescriptor extends ScopeDescriptor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/MyRoleDescriptor.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/MyRoleDescriptor.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/MyRoleDescriptor.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ /** * Binding of <tt>myRole</tt> element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class MyRoleDescriptor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerLinkDescriptor.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerLinkDescriptor.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerLinkDescriptor.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -16,7 +16,7 @@ /** * Binding of <tt>partnerLink</tt> element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class PartnerLinkDescriptor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerRoleDescriptor.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerRoleDescriptor.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/PartnerRoleDescriptor.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ /** * Binding of <tt>partnerRole</tt> element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class PartnerRoleDescriptor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/ScopeDescriptor.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/ScopeDescriptor.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/deploy/ScopeDescriptor.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ /** * Binding of <tt>scope</tt> element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class ScopeDescriptor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReference.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReference.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReference.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -31,7 +31,7 @@ /** * Endpoint references are the means for dynamic communication of port-specific data for services. * This class represents the least common denominator of data needed to identify a service endpoint. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/08/28 05:42:00 $ */ public abstract class EndpointReference { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReferenceFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReferenceFactory.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/EndpointReferenceFactory.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ /** * Manufactures the endpoint reference instance appropriate for a given value * element name and interpretation scheme combination. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/05/02 23:06:00 $ */ public abstract class EndpointReferenceFactory { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/SoapEndpointReference.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/SoapEndpointReference.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/SoapEndpointReference.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ /** * Captures enough detail to uniquely identify service endpoints bound to SOAP. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/08/28 05:42:00 $ */ public abstract class SoapEndpointReference extends EndpointReference { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaConstants.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaConstants.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaConstants.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -15,7 +15,7 @@ package org.jbpm.bpel.endpointref.wsa; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/22 17:27:03 $ */ public class WsaConstants { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReference.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReference.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReference.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/04 06:42:27 $ */ public class WsaEndpointReference extends SoapEndpointReference { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceFactory.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceFactory.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.endpointref.EndpointReferenceFactory; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/08/02 18:56:28 $ */ public class WsaEndpointReferenceFactory extends EndpointReferenceFactory { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReference.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReference.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReference.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/22 17:27:03 $ */ public class WsdlEndpointReference extends SoapEndpointReference { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReferenceFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReferenceFactory.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/endpointref/wsdl/WsdlEndpointReferenceFactory.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ import org.jbpm.bpel.endpointref.EndpointReferenceFactory; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/08/02 18:56:28 $ */ public class WsdlEndpointReferenceFactory extends EndpointReferenceFactory { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Assign.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Assign.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Assign.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ /** * Updates the values of variables with new data. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/22 05:54:37 $ */ public class Assign extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Empty.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Empty.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Empty.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ /** * A "no-op" in a business process. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public class Empty extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Exit.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Exit.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Exit.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ /** * Immediately ends a business process instance. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public class Exit extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Invoke.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Invoke.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Invoke.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ /** * Calls a one-way or request-response operation on an endpoint offered by a partner. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 07:18:22 $ */ public class Invoke extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Receive.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Receive.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Receive.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Blocks for a matching message to arrive. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/02 16:46:21 $ */ public class Receive extends Activity implements InboundMessageActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Reply.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Reply.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Reply.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ * Sends a response to a message that was received by an * {@linkplain InboundMessageActivity inbound message activity} (IMA). The combination of an IMA and * a <tt>reply</tt> forms a request-response operation. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/02 16:46:21 $ */ public class Reply extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Rethrow.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Rethrow.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Rethrow.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ * Raises again the fault that was originally caught by the immediately * enclosing fault handler. The <tt>rethrow</tt> activity is only used within * a fault handler. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public class Rethrow extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Throw.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Throw.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Throw.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -29,7 +29,7 @@ /** * Generates a fault from inside the business process. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/02/19 22:25:44 $ */ public class Throw extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Validate.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Validate.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Validate.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ /** * Validates the values of variables against their associated XML and WSDL data * definition. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public class Validate extends Activity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Wait.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Wait.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/Wait.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -29,7 +29,7 @@ /** * Suspends the process instance for a given time period or until a certain * point in time has been reached. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/02 23:55:04 $ */ public class Wait extends Activity implements TimeDrivenActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromElement.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromElement.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromElement.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ /** * <code><from></code> variant that allows an element literal to be given as the source * value to assign to a destination. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ public class FromElement extends From { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromExpression.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromExpression.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromExpression.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ /** * <code><from></code> variant that allows processes to perform simple computations on * properties and variables. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ public class FromExpression extends From { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromPartnerLink.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromPartnerLink.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromPartnerLink.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ public class FromPartnerLink extends From { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromProperty.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromProperty.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/FromProperty.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ /** * <code><from></code> variant that explicitly manipulates message properties occurring in * variables. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ public class FromProperty extends From { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToExpression.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToExpression.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToExpression.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ public class ToExpression extends To { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToPartnerLink.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToPartnerLink.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToPartnerLink.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ public class ToPartnerLink extends To { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToProperty.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToProperty.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/basic/assign/ToProperty.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ /** * <code><to></code> variant that explicitly manipulates message properties occurring in * variables. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ public class ToProperty extends To { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Activity.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Activity.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Activity.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -39,7 +39,7 @@ /** * Activities perform the process logic. They are divided into 2 classes: basic and structured. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public abstract class Activity extends Node { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/BpelProcessDefinition.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/BpelProcessDefinition.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/BpelProcessDefinition.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -39,7 +39,7 @@ /** * BPEL process definitions model the behavior of a participant in a business interaction. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/17 22:02:52 $ */ public class BpelProcessDefinition extends ProcessDefinition { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/CompositeActivity.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/CompositeActivity.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/CompositeActivity.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -32,7 +32,7 @@ * <li>{@linkplain Scope scopes}</li> * <li>fault, compensation and termination {@linkplain Handler handlers}</li> * </ul> - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public abstract class CompositeActivity extends Activity implements NodeCollection { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Import.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Import.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/Import.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ /** * Reference to a single imported document, either WSDL or XML Schema. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class Import implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/ImportDefinition.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/ImportDefinition.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/ImportDefinition.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -43,7 +43,7 @@ /** * Groups imported WSDL and XML Schema documents. Provides lookup facilites for the various elements * defined in those documents. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/17 22:02:52 $ */ public class ImportDefinition extends ModuleDefinition { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/LinkDefinition.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/LinkDefinition.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/def/LinkDefinition.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Establishes explicit control dependencies between nested child activities within a * {@link Flow flow}. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class LinkDefinition implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/EventInstance.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/EventInstance.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/EventInstance.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/04 14:35:47 $ */ class EventInstance extends ScopeInstance { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeInstance.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeInstance.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeInstance.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -49,7 +49,7 @@ import org.jbpm.scheduler.SchedulerService; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/06/11 19:58:04 $ */ public class ScopeInstance implements Serializable, Compensator { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeState.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeState.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/ScopeState.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.apache.commons.lang.enums.Enum; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:09 $ */ public abstract class ScopeState extends Enum implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/ActiveState.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/ActiveState.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/ActiveState.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ import org.jbpm.bpel.graph.exe.ScopeState; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public abstract class ActiveState extends ScopeState { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/CompensatingState.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/CompensatingState.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/CompensatingState.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.jbpm.bpel.graph.scope.Handler; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class CompensatingState extends ScopeState { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/EndState.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/EndState.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/EndState.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/04 14:35:49 $ */ public class EndState extends ScopeState { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/FaultingState.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/FaultingState.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/FaultingState.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.jbpm.bpel.graph.scope.Handler; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class FaultingState extends ScopeState { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/StateUtil.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/StateUtil.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/StateUtil.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ class StateUtil { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/TerminatingState.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/TerminatingState.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/exe/state/TerminatingState.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.jbpm.bpel.graph.scope.Handler; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class TerminatingState extends ScopeState { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Catch.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Catch.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Catch.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Fault handlers attached to a scope provide a way to define custom error * recovery activities. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/03/16 00:04:38 $ */ public class Catch extends Handler { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Compensate.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Compensate.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Compensate.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ * {@link CompensateScope compensateScope} must only be used within {@link Catch catch}, * {@link Handler catchAll}, {@link Handler compensationHandler} and * {@link Handler terminationHandler}. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/09/18 10:21:30 $ */ public class Compensate extends Activity implements Compensator { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Handler.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Handler.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Handler.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ import org.jbpm.graph.exe.ExecutionContext; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class Handler extends CompositeActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Scope.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Scope.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/scope/Scope.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -60,7 +60,7 @@ * {@linkplain CorrelationSetDefinition correlation sets}, {@linkplain Handler event handlers}, * {@linkplain Catch fault handlers}, a {@linkplain Handler compensation handler} and a * {@linkplain Handler termination handler}. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/04 14:35:49 $ */ public class Scope extends CompositeActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Flow.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Flow.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Flow.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ * Specifies one or more activities to be performed concurrently. {@link LinkDefinition links} can * be used within a <tt>flow</tt> to define explicit control dependencies between nested child * activities. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class Flow extends StructuredActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/If.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/If.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/If.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ /** * Selects exactly one activity for execution from a set of choices. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class If extends StructuredActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Pick.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Pick.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Pick.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -35,7 +35,7 @@ /** * Blocks for one of several possible messages to arrive or for a time-out to occur. When one of * these triggers occurs, the associated child activity is performed. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class Pick extends StructuredActivity implements InboundMessageActivity, TimeDrivenActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Sequence.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Sequence.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/Sequence.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ /** * Defines a collection of activities to be performed sequentially in lexical order. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class Sequence extends StructuredActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/StructuredActivity.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/StructuredActivity.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/StructuredActivity.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -31,7 +31,7 @@ /** * Common base of structured activities. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public abstract class StructuredActivity extends CompositeActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/While.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/While.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/graph/struct/While.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ /** * Defines that an activity is to be repeated as long as the specified * {@link #getCondition() condition} is true. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class While extends RepetitiveActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/CompositeCatalog.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/CompositeCatalog.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/CompositeCatalog.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ import javax.xml.namespace.QName; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:06:10 $ */ public class CompositeCatalog implements ServiceCatalog { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/ServiceCatalog.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/ServiceCatalog.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/ServiceCatalog.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import javax.xml.namespace.QName; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:06:10 $ */ public interface ServiceCatalog { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/UrlCatalog.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/UrlCatalog.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/catalog/UrlCatalog.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.wsdl.xml.WsdlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:29 $ */ public class UrlCatalog extends DecoratorCatalog { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/client/SoapCaller.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/client/SoapCaller.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/client/SoapCaller.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -47,7 +47,7 @@ /** * Provides support for the dynamic invocation of a service endpoint bound to SOAP. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/01/30 07:18:22 $ */ public class SoapCaller implements Caller { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlation.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlation.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlation.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ /** * Indicates a correlation set ocurring in the message being sent or received in * an activity. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/05/31 12:42:19 $ */ public class Correlation implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/CorrelationSetDefinition.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/CorrelationSetDefinition.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/CorrelationSetDefinition.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -28,7 +28,7 @@ /** * Each correlation set is a named group of properties used to identify an * application-level conversation within a process instance. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/03/22 13:32:55 $ */ public class CorrelationSetDefinition implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlations.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlations.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/Correlations.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Groups the correlations ocurring in the message being sent or received in an * activity. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/03/22 13:32:55 $ */ public class Correlations implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InboundMessageActivity.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InboundMessageActivity.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InboundMessageActivity.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ * Contract that inbound message activities must adhere for receiving * {@linkplain ReceiveAction reception} notifications from the jBPM BPEL partner * integration service. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/02 23:55:04 $ */ public interface InboundMessageActivity { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/PartnerLinkDefinition.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/PartnerLinkDefinition.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/PartnerLinkDefinition.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.wsdl.PartnerLinkType.Role; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/10 23:58:50 $ */ public class PartnerLinkDefinition implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/CorrelationSetInstance.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/CorrelationSetInstance.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/CorrelationSetInstance.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ import org.jbpm.bpel.xml.BpelConstants; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/09/27 03:53:01 $ */ public class CorrelationSetInstance { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/PartnerLinkInstance.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/PartnerLinkInstance.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/exe/PartnerLinkInstance.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ import org.jbpm.bpel.integration.def.PartnerLinkDefinition; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/10 23:58:50 $ */ public class PartnerLinkInstance { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationConstants.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationConstants.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationConstants.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.jbpm.bpel.endpointref.wsa.WsaConstants; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/25 13:07:15 $ */ public class IntegrationConstants { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/OutstandingRequest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/OutstandingRequest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/OutstandingRequest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/01/30 07:18:22 $ */ public class OutstandingRequest { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntriesBuilder.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntriesBuilder.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntriesBuilder.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -40,7 +40,7 @@ import org.jbpm.bpel.integration.def.PartnerLinkDefinition; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:30 $ */ class PartnerLinkEntriesBuilder extends AbstractBpelVisitor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntry.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntry.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/PartnerLinkEntry.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.endpointref.EndpointReference; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:30 $ */ public class PartnerLinkEntry { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/RequestListener.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/RequestListener.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/RequestListener.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -43,7 +43,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/06/12 08:18:54 $ */ public class RequestListener implements MessageListener { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListenersBuilder.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListenersBuilder.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListenersBuilder.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.bpel.integration.def.ReceiveAction; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/02 16:46:18 $ */ class StartListenersBuilder extends AbstractBpelVisitor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapBindConstants.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapBindConstants.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapBindConstants.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ import javax.xml.soap.SOAPConstants; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/04/11 06:37:35 $ */ public class SoapBindConstants { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapFormatter.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapFormatter.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/soap/SoapFormatter.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -402,7 +402,7 @@ SOAPElement accessor = SoapUtil.getElement(operationWrapper, partName); /* - * BPEL-243 - XML Schema Part 1 Second Edition, section 2.6.2: An element may be �valid� + * BPEL-243 - XML Schema Part 1 Second Edition, section 2.6.2: An element may be valid * without content if it has the attribute xsi:nil with the value true */ Boolean nil = DatatypeUtil.parseBoolean(accessor.getAttributeNS( @@ -515,7 +515,7 @@ + binding); } /* - * BPEL-243 - XML Schema Part 1 Second Edition, section 2.6.2: An element may be �valid� + * BPEL-243 - XML Schema Part 1 Second Edition, section 2.6.2: An element may be valid * without content if it has the attribute xsi:nil with the value true */ Boolean nil = DatatypeUtil.parseBoolean(element.getAttributeNS( Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/BpelArchiveParser.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/BpelArchiveParser.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/BpelArchiveParser.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ import org.jbpm.jpdl.xml.Problem; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/05/03 12:25:52 $ */ public class BpelArchiveParser implements ProcessArchiveParser { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DefinitionDescriptor.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DefinitionDescriptor.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DefinitionDescriptor.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ /** * Binding of <tt>bpelDefinition</tt> element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class DefinitionDescriptor { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DescriptorArchiveParser.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DescriptorArchiveParser.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/par/DescriptorArchiveParser.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -36,7 +36,7 @@ import org.jbpm.jpdl.xml.Problem; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class DescriptorArchiveParser implements ProcessArchiveParser { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/StringBufferReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/StringBufferReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/StringBufferReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ /** * A character stream whose source is a string buffer. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/03/05 12:58:13 $ */ public class StringBufferReader extends Reader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/def/Snippet.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/def/Snippet.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/def/Snippet.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ /** * Common base for {@linkplain Expression expressions} and {@linkplain PropertyQuery queries}. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:15 $ */ public abstract class Snippet implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/exe/EvaluatorFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/exe/EvaluatorFactory.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/exe/EvaluatorFactory.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ /** * Evaluator factories produce BPEL expression and query evaluators. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:15 $ */ public abstract class EvaluatorFactory { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusFunction.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusFunction.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusFunction.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ * <p> * <code><i>boolean</i> bpws:getLinkStatus(<i>string</i> linkName)</code> * </p> - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 00:16:08 $ */ public class GetLinkStatusFunction implements Function { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariableDataFunction.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariableDataFunction.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariableDataFunction.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -36,7 +36,7 @@ * <code><i>any</i> bpws:getVariableData(<i>string</i> variableName, * <i>string</i> partName?, <i>string</i> locationPath?)</code> * </p> - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:16 $ */ public class GetVariableDataFunction implements Function { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyFunction.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyFunction.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyFunction.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -37,7 +37,7 @@ * <code><i>any</i> bpws:getVariableProperty(<i>string</i> variableName, * <i>string</i> propertyName)</code> * </p> - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/26 00:16:08 $ */ public class GetVariablePropertyFunction implements Function { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/TokenVariableContext.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/TokenVariableContext.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/TokenVariableContext.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * An implementation of {@link VariableContext} that resolves variable bindings * from the values in the scope of the enclosed {@link Token token}. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/05/29 01:09:34 $ */ public class TokenVariableContext implements VariableContext, Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathEvaluatorFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathEvaluatorFactory.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathEvaluatorFactory.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ /** * A factory for expressions and queries written in XPath 1.0. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:16 $ */ public class XPathEvaluatorFactory extends EvaluatorFactory { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathExpressionEvaluator.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathExpressionEvaluator.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathExpressionEvaluator.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -47,7 +47,7 @@ /** * Evaluator for general expressions. When XPath 1.0 is used as an expression language, there is no * context node available. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:16 $ */ class XPathExpressionEvaluator extends XPathEvaluator implements ExpressionEvaluator { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathJoinConditionEvaluator.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathJoinConditionEvaluator.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathJoinConditionEvaluator.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ /** * Evaluator for expressions in join conditions. Only link status can be used within join conditions * and only join conditions can make use of link status. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/22 05:57:25 $ */ class XPathJoinConditionEvaluator extends XPathExpressionEvaluator { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathPropertyQueryEvaluator.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathPropertyQueryEvaluator.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/sublang/xpath/XPathPropertyQueryEvaluator.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -32,7 +32,7 @@ /** * Default evaluator for property queries. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:16 $ */ class XPathPropertyQueryEvaluator extends XPathEvaluator implements PropertyQueryEvaluator { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/ElementType.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/ElementType.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/ElementType.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ /** * Metadata related to an XML Schema element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public class ElementType extends XmlType { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/MessageType.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/MessageType.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/MessageType.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ /** * Metadata related to a WSDL message type. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:21 $ */ public class MessageType extends VariableType { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/SchemaType.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/SchemaType.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/SchemaType.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ /** * Metadata related to an XML Schema type, simple or complex. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public class SchemaType extends XmlType { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableDefinition.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableDefinition.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableDefinition.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ /** * Variables hold messages that are exchanged, as well as intermediate data used in business logic * and in composing messages sent to partners. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/02/01 05:43:09 $ */ public class VariableDefinition implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableType.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableType.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/variable/def/VariableType.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -31,7 +31,7 @@ /** * Common base for metadata related to a kind of variable declaration. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/04 06:42:27 $ */ public abstract class VariableType implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PartnerLinkType.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PartnerLinkType.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PartnerLinkType.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ * Characterizes the conversational relationship between two services. Defines * the {@linkplain Role roles} played by each service in the conversation and * specifies the portType provided by each service. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public interface PartnerLinkType extends ExtensibilityElement, Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/Property.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/Property.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/Property.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ /** * Creates a unique name and associates it with an XML Schema type. The intent * is to introduce a name that has semantic significance beyond the type itself. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public interface Property extends ExtensibilityElement, Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PropertyAlias.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PropertyAlias.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/PropertyAlias.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ * becomes an alias for the message part and/or location, and can be used as * such in {@linkplain Expression expressions} and * {@linkplain Assign assignments}. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:19 $ */ public interface PropertyAlias extends ExtensibilityElement, Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/AbstractExtension.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/AbstractExtension.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/AbstractExtension.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ /** * Basic implementation of a WSDL extensibility element. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:05:59 $ */ public abstract class AbstractExtension implements ExtensibilityElement, Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/DefinitionImpl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/DefinitionImpl.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/DefinitionImpl.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import javax.wsdl.Output; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/02/19 22:29:42 $ */ public class DefinitionImpl extends com.ibm.wsdl.DefinitionImpl { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/FaultImpl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/FaultImpl.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/FaultImpl.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -17,7 +17,7 @@ import javax.wsdl.Fault; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:05:59 $ */ public class FaultImpl extends OperationMember implements Fault { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/InputImpl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/InputImpl.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/InputImpl.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -17,7 +17,7 @@ import javax.wsdl.Input; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:05:59 $ */ public class InputImpl extends OperationMember implements Input { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/NamedExtension.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/NamedExtension.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/NamedExtension.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ /** * Represents extensibility elements having a qualified name. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:05:59 $ */ public class NamedExtension extends AbstractExtension { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OperationMember.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OperationMember.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OperationMember.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -30,7 +30,7 @@ import com.ibm.wsdl.Constants; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/04/11 06:37:35 $ */ public abstract class OperationMember implements Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OutputImpl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OutputImpl.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/OutputImpl.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -17,7 +17,7 @@ import javax.wsdl.Output; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:05:59 $ */ public class OutputImpl extends OperationMember implements Output { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PartnerLinkTypeImpl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PartnerLinkTypeImpl.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PartnerLinkTypeImpl.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ * services. It does so by defining the "roles" played by each of the services * in the conversation and specifying the portType provided by each service to * receive messages within the context of the conversation. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2006/08/21 01:05:59 $ */ public class PartnerLinkTypeImpl extends NamedExtension implements Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PropertyAliasImpl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PropertyAliasImpl.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/impl/PropertyAliasImpl.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ /** * A property alias maps a global property to a location in a specific message * part. The property name becomes an alias for the message part and location. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:20 $ */ public class PropertyAliasImpl extends AbstractExtension implements Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeSerializer.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeSerializer.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeSerializer.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -39,7 +39,7 @@ /** * Translates between <code>plt:partnerLinkType</code> elements and {@link PartnerLinkType} * instances. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/04 06:42:27 $ */ public class PartnerLinkTypeSerializer implements ExtensionDeserializer, ExtensionSerializer, Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertyAliasSerializer.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertyAliasSerializer.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertyAliasSerializer.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -43,7 +43,7 @@ /** * Translates between <code>bpel:propertyAlias</code> elements and {@link PropertyAlias} * instances. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:17 $ */ public class PropertyAliasSerializer implements ExtensionSerializer, ExtensionDeserializer, Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertySerializer.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertySerializer.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/PropertySerializer.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -36,7 +36,7 @@ /** * Translates between <code>bpel:property</code> elements and {@link Property} instances. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/04 06:42:27 $ */ public class PropertySerializer implements ExtensionSerializer, ExtensionDeserializer, Serializable { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlConstants.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlConstants.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlConstants.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ /** * Constant values used in WSDL extension definitions. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/25 13:03:13 $ */ public class WsdlConstants { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlFactoryImpl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlFactoryImpl.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlFactoryImpl.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Enhances the WSDL4J implementation of the {@link WSDLFactory} to accommodate * extension definitions introduced by BPEL. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/01/22 00:24:55 $ */ public class WsdlFactoryImpl extends com.ibm.wsdl.factory.WSDLFactoryImpl { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlUtil.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlUtil.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/wsdl/xml/WsdlUtil.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -55,7 +55,7 @@ /** * Utility methods for dealing with JWSDL objects. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/17 22:02:52 $ */ public class WsdlUtil { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ActivityReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ActivityReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ActivityReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/20 22:35:40 $ */ public abstract class ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/AssignReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/AssignReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/AssignReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -51,7 +51,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/09/12 23:20:20 $ */ public class AssignReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelConstants.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelConstants.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelConstants.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ /** * Constant values used in BPEL process definitions. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/29 10:17:06 $ */ public class BpelConstants { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/BpelReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -97,8 +97,8 @@ /** * Converts a process document in XML format to a * {@linkplain BpelProcessDefinition process definition}. - * @author Juan Cant� - * @author Alejandro Gu�zar + * @author Juan Cantu + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/29 10:16:30 $ */ public class BpelReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/CompensateReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/CompensateReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/CompensateReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ /** * Translates <code>bpel:compensate</code> elements to {@link Compensate} instances. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/29 10:16:30 $ */ public class CompensateReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DefinitionDescriptorReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DefinitionDescriptorReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DefinitionDescriptorReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -31,7 +31,7 @@ /** * Converts an definition descriptor in XML format to an * {@linkplain DefinitionDescriptor object model}. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class DefinitionDescriptorReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DeploymentDescriptorReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DeploymentDescriptorReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/DeploymentDescriptorReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -47,8 +47,8 @@ /** * Converts a deployment descriptor in XML format to an {@linkplain DeploymentDescriptor object}. - * @author Juan Cant� - * @author Alejandro Gu�zar + * @author Juan Cantu + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class DeploymentDescriptorReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/EmptyReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/EmptyReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/EmptyReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ import org.jbpm.bpel.graph.def.CompositeActivity; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class EmptyReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ExitReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ExitReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ExitReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ import org.jbpm.bpel.graph.def.CompositeActivity; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class ExitReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/FlowReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/FlowReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/FlowReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Encapsulates the logic to create and connect process elements that make up the <i>flow</i> * structure. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:08 $ */ public class FlowReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/IfReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/IfReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/IfReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Encapsulates the logic to create and connect process elements that make up * the <i>if</i> structure. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class IfReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/InvokeReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/InvokeReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/InvokeReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -37,7 +37,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 00:36:13 $ */ public class InvokeReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/PickReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/PickReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/PickReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class PickReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessArchiveWsdlLocator.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessArchiveWsdlLocator.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessArchiveWsdlLocator.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ import org.jbpm.jpdl.par.ProcessArchive; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/05/03 12:25:53 $ */ public class ProcessArchiveWsdlLocator extends ProcessWsdlLocator { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessWsdlLocator.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessWsdlLocator.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ProcessWsdlLocator.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -46,7 +46,7 @@ * Allows the {@linkplain BpelReader BPEL reader} to retrieve descriptions recursively imported by * the WSDL documents referenced in the {@linkplain BpelProcessDefinition process definition} or in * the {@linkplain DefinitionDescriptor definition descriptor}. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class ProcessWsdlLocator implements WSDLLocator { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReceiveReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReceiveReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReceiveReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ import org.jbpm.bpel.integration.def.ReceiveAction; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class ReceiveReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RepeatUntilReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RepeatUntilReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RepeatUntilReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ /** * Encapsulates the logic to create and connect process elements that constitute the <i>repeatUntil</i> * structure. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 08:15:33 $ */ public class RepeatUntilReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReplyReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReplyReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ReplyReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/09/04 06:42:26 $ */ public class ReplyReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RethrowReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RethrowReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/RethrowReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ import org.jbpm.bpel.graph.def.CompositeActivity; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class RethrowReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ScopeReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ScopeReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ScopeReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ import org.jbpm.bpel.graph.scope.Scope; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class ScopeReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SequenceReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SequenceReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SequenceReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ /** * Encapsulates the logic to create and connect process elements that make up * the <i>sequence</i> structure. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class SequenceReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ServiceCatalogReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ServiceCatalogReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ServiceCatalogReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ /** * Contract that readers must fulfill in order to convert {@linkplain Element DOM elements} to * {@linkplain ServiceCatalog service catalogs}. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/08/28 05:41:58 $ */ public interface ServiceCatalogReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SwitchReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SwitchReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/SwitchReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ /** * Encapsulates the logic to create and connect process elements that make up * the <i>switch</i> structure. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class SwitchReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ThrowReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ThrowReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ThrowReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/09/04 06:42:26 $ */ public class ThrowReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/UrlCatalogReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/UrlCatalogReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/UrlCatalogReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class UrlCatalogReader implements ServiceCatalogReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ValidateReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ValidateReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/ValidateReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ import org.jbpm.bpel.variable.def.VariableDefinition; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class ValidateReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WaitReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WaitReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WaitReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ import org.jbpm.bpel.graph.def.CompositeActivity; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class WaitReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WhileReader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WhileReader.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/WhileReader.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ /** * Encapsulates the logic to create and connect process elements that constitute * the <i>while</i> structure. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/05/31 12:55:12 $ */ public class WhileReader extends ActivityReader { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/DatatypeUtil.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/DatatypeUtil.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/DatatypeUtil.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -31,7 +31,7 @@ /** * Data type conversion utilities. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/02/01 05:45:29 $ */ public class DatatypeUtil { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/Duration.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/Duration.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/Duration.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ * Duration represents an interval of time. The value space of duration is a six-dimensional space * where the coordinates designate the Gregorian year, month, day, hour, minute, and second * components defined in <a href="http://www.w3.org/TR/xmlschema-2/#ISO8601">ISO 8601</a>. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/02/01 05:45:29 $ * @see <a href="http://www.w3.org/TR/xmlschema-2/#duration"> XML Schema Part 2: Datatypes * §3.2.6</a> Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/XmlUtil.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/XmlUtil.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/xml/util/XmlUtil.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -60,7 +60,7 @@ /** * Utility methods for dealing with JAXP objects. - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/25 13:03:14 $ */ public class XmlUtil { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/AllDbTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/AllDbTests.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/AllDbTests.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -78,7 +78,7 @@ import org.jbpm.bpel.wsdl.impl.PropertyImplDbTest; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 08:15:35 $ */ public class AllDbTests { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/deploy/ScopeMatcherTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/deploy/ScopeMatcherTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/deploy/ScopeMatcherTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -38,7 +38,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/25 13:03:15 $ */ public class ScopeMatcherTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/endpointref/wsa/WsaEndpointReferenceTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/04 06:42:27 $ */ public class WsaEndpointReferenceTest extends SoapEndpointReferenceTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/AssignTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/AssignTests.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/AssignTests.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ import junit.framework.TestSuite; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/03/22 13:32:55 $ */ public class AssignTests { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromExpressionTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromExpressionTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromExpressionTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -36,7 +36,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class FromExpressionTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromPropertyTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromPropertyTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromPropertyTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -36,7 +36,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/02/04 14:35:48 $ */ public class FromPropertyTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromVariableTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromVariableTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/FromVariableTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -44,7 +44,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class FromVariableTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToPropertyTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToPropertyTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToPropertyTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -38,7 +38,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/02/04 14:35:48 $ */ public class ToPropertyTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToVariableTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToVariableTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/basic/assign/ToVariableTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -44,7 +44,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class ToVariableTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/ActivityDefTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/ActivityDefTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/ActivityDefTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -21,7 +21,7 @@ import org.jbpm.graph.def.Transition; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:25 $ */ public class ActivityDefTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/GraphDefTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/GraphDefTests.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/def/GraphDefTests.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.graph.struct.WhileDefTest; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 08:15:34 $ */ public class GraphDefTests { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/AbstractExeTestCase.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/AbstractExeTestCase.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/AbstractExeTestCase.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -49,7 +49,7 @@ import org.jbpm.scheduler.SchedulerService; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:07 $ */ public abstract class AbstractExeTestCase extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ActivityExeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ActivityExeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ActivityExeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -31,7 +31,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/08/08 11:09:17 $ */ public class ActivityExeTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/FlowExeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/FlowExeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/FlowExeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.graph.struct.Flow; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 00:39:11 $ */ public class FlowExeTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/GraphExeTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/GraphExeTests.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/GraphExeTests.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -24,7 +24,7 @@ import org.jbpm.bpel.graph.exe.flow.LinkScopingTest; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 08:15:34 $ */ public class GraphExeTests { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/IfExeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/IfExeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/IfExeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/03/22 13:32:55 $ */ public class IfExeTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/InitialActivitiesTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/InitialActivitiesTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/InitialActivitiesTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -29,7 +29,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 00:39:11 $ */ public class InitialActivitiesTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/LinkInstanceTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/LinkInstanceTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/LinkInstanceTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class LinkInstanceTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/PickExeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/PickExeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/PickExeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -28,7 +28,7 @@ import org.jbpm.bpel.integration.def.ReceiveAction; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 00:39:11 $ */ public class PickExeTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ScopeExeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ScopeExeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/ScopeExeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -32,7 +32,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:07 $ */ public class ScopeExeTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/SequenceExeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/SequenceExeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/SequenceExeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.graph.struct.Sequence; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 00:39:11 $ */ public class SequenceExeTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/StructuredActivityTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/StructuredActivityTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/StructuredActivityTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.graph.struct.StructuredActivity; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/03/22 13:32:55 $ */ public class StructuredActivityTest extends ActivityExeTest { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/WhileExeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/WhileExeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/WhileExeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 08:15:34 $ */ public class WhileExeTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/AcyclicGraphTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/AcyclicGraphTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/AcyclicGraphTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/25 13:03:14 $ */ public class AcyclicGraphTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE1Test.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE1Test.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE1Test.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -32,7 +32,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/01 05:43:09 $ */ public class DPE1Test extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE2Test.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE2Test.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/DPE2Test.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/25 13:03:14 $ */ public class DPE2Test extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/LinkScopingTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/LinkScopingTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/graph/exe/flow/LinkScopingTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/25 13:03:14 $ */ public class LinkScopingTest extends AbstractExeTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/IntegrationTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/IntegrationTests.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/IntegrationTests.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ import org.jbpm.bpel.integration.exe.CorrelationSetTest; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:27 $ */ public class IntegrationTests { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/ServerTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/ServerTests.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/ServerTests.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.integration.soap.SoapUtilTest; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/01/30 07:19:06 $ */ public class ServerTests { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/catalog/UrlCatalogTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/catalog/UrlCatalogTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/catalog/UrlCatalogTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ import junit.framework.TestCase; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:23 $ */ public class UrlCatalogTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/exe/CorrelationSetTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/exe/CorrelationSetTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/exe/CorrelationSetTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -37,7 +37,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:29 $ */ public class CorrelationSetTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/StartListenerTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/StartListenerTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/StartListenerTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -17,7 +17,7 @@ import javax.jms.JMSException; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/02 16:46:19 $ */ public class StartListenerTest extends AbstractListenerTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/BpelArchiveParserTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/BpelArchiveParserTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/BpelArchiveParserTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -32,7 +32,7 @@ import org.jbpm.jpdl.par.ProcessArchive; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:28 $ */ public class BpelArchiveParserTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/DescriptorArchiveParserTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/DescriptorArchiveParserTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/DescriptorArchiveParserTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -27,7 +27,7 @@ import org.jbpm.jpdl.par.ProcessArchive; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:28 $ */ public class DescriptorArchiveParserTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/ProcessArchiveTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/ProcessArchiveTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/par/ProcessArchiveTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -32,7 +32,7 @@ import org.jbpm.jpdl.xml.Problem; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/20 22:35:40 $ */ public class ProcessArchiveTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DeadlineExpressionTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DeadlineExpressionTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DeadlineExpressionTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -40,7 +40,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class DeadlineExpressionTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DurationExpressionTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DurationExpressionTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/DurationExpressionTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -38,7 +38,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class DurationExpressionTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/GeneralExpressionTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/GeneralExpressionTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/GeneralExpressionTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -39,7 +39,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class GeneralExpressionTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/JoinConditionTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/JoinConditionTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/JoinConditionTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -34,7 +34,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class JoinConditionTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/VariableAccessTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/VariableAccessTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/exe/VariableAccessTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -46,7 +46,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class VariableAccessTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetLinkStatusTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -31,7 +31,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:25 $ */ public class GetLinkStatusTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariableDataTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariableDataTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariableDataTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -46,7 +46,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:25 $ */ public class GetVariableDataTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/sublang/xpath/GetVariablePropertyTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -46,7 +46,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:25 $ */ public class GetVariablePropertyTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/variable/exe/MessageValueTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/variable/exe/MessageValueTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/variable/exe/MessageValueTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -33,7 +33,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:26 $ */ public class MessageValueTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PartnerLinkTypeTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -22,7 +22,7 @@ import org.jbpm.bpel.wsdl.PartnerLinkType; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/06/09 23:36:38 $ */ public class PartnerLinkTypeTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyAliasTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyAliasTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyAliasTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -29,7 +29,7 @@ import org.jbpm.bpel.xml.BpelConstants; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:17 $ */ public class PropertyAliasTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/wsdl/xml/PropertyTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -23,7 +23,7 @@ import org.jbpm.bpel.xml.BpelConstants; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/06/09 23:36:38 $ */ public class PropertyTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AbstractReaderTestCase.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AbstractReaderTestCase.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AbstractReaderTestCase.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -40,7 +40,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public abstract class AbstractReaderTestCase extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ActivityReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ActivityReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ActivityReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ /** * Tests the parsing of standard attributes and elements into a bpel activity using <empty> * elements. - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class ActivityReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AssignReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AssignReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/AssignReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -39,8 +39,8 @@ import org.jbpm.bpel.sublang.def.VariableQuery; /** - * @author Juan Cant� - * @author Alejandro Gu�zar + * @author Juan Cantu + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/09/12 23:20:21 $ */ public class AssignReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelConverterTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelConverterTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelConverterTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -35,7 +35,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/09/04 06:42:26 $ */ public class BpelConverterTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/BpelReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -40,7 +40,7 @@ import org.jbpm.bpel.wsdl.impl.PropertyAliasImpl; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class BpelReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/CompensateReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/CompensateReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/CompensateReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -17,7 +17,7 @@ import org.jbpm.bpel.graph.scope.Compensate; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/03/22 13:32:55 $ */ public class CompensateReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/DefinitionDescriptorReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/DefinitionDescriptorReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/DefinitionDescriptorReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -25,7 +25,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class DefinitionDescriptorReaderTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/FlowReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/FlowReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/FlowReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ import org.jbpm.bpel.graph.struct.Flow; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2006/09/27 03:53:01 $ */ public class FlowReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/IfReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/IfReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/IfReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.graph.struct.If; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 11:19:17 $ */ public class IfReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/PickReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/PickReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/PickReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -29,7 +29,7 @@ import org.jbpm.bpel.variable.def.MessageType; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class PickReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReceiveReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReceiveReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReceiveReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -17,7 +17,7 @@ import org.jbpm.bpel.graph.basic.Receive; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/03/22 13:32:55 $ */ public class ReceiveReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/RepeatUntilReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/RepeatUntilReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/RepeatUntilReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ import org.jbpm.bpel.graph.struct.RepeatUntil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 08:15:35 $ */ public class RepeatUntilReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReplyReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReplyReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ReplyReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.variable.def.MessageType; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/10/13 02:53:24 $ */ public class ReplyReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ScopeReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ScopeReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ScopeReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -39,7 +39,7 @@ import org.jbpm.bpel.variable.def.VariableType; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/03/16 00:04:38 $ */ public class ScopeReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SequenceReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SequenceReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SequenceReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.graph.struct.Sequence; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/07/26 11:19:17 $ */ public class SequenceReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SwitchReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SwitchReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/SwitchReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.graph.struct.If; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/02/19 18:32:39 $ */ public class SwitchReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ThrowReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ThrowReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ThrowReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import org.jbpm.bpel.graph.basic.Throw; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/02/19 18:32:39 $ */ public class ThrowReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ValidateReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ValidateReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/ValidateReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -20,7 +20,7 @@ import org.jbpm.bpel.variable.def.VariableDefinition; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2006/09/27 03:53:01 $ */ public class ValidateReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WaitReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WaitReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WaitReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -17,7 +17,7 @@ import org.jbpm.bpel.graph.basic.Wait; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/02/19 18:32:39 $ */ public class WaitReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WhileReaderTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WhileReaderTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WhileReaderTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -18,7 +18,7 @@ import org.jbpm.bpel.graph.struct.While; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2008/01/30 08:15:35 $ */ public class WhileReaderTest extends AbstractReaderTestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WsdlConverterTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WsdlConverterTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/WsdlConverterTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -41,7 +41,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/09/04 06:42:26 $ */ public class WsdlConverterTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/XmlTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/XmlTests.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/XmlTests.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -26,7 +26,7 @@ import org.jbpm.bpel.xml.util.XmlUtilTest; /** - * @author Juan Cant� + * @author Juan Cantu * @version $Revision$ $Date: 2007/11/25 13:03:13 $ */ public class XmlTests { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/util/DurationTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/util/DurationTest.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/xml/util/DurationTest.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -19,7 +19,7 @@ import junit.framework.TestCase; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/02/01 05:45:29 $ */ public class DurationTest extends TestCase { Property changes on: jbpm3/branches/jpdl-3.2.3.CP/bpel/tools ___________________________________________________________________ Name: svn:ignore + target Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/tools/src/main/java/org/jbpm/bpel/tools/WsdlServiceTool.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/tools/src/main/java/org/jbpm/bpel/tools/WsdlServiceTool.java 2008-08-22 04:54:30 UTC (rev 1978) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/tools/src/main/java/org/jbpm/bpel/tools/WsdlServiceTool.java 2008-08-22 05:17:36 UTC (rev 1979) @@ -82,8 +82,8 @@ /** * Generates WSDL binding and service definitions. - * @author Alejandro Gu�zar - * @author Juan Cant� + * @author Alejandro Guizar + * @author Juan Cantu * @version $Revision$ $Date: 2008/02/05 05:37:34 $ */ public class WsdlServiceTool {

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1978 - jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-22 00:54:30 -0400 (Fri, 22 Aug 2008) New Revision: 1978 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/ElementType.java Log: check for abscense of entry jbpm.bpel.xml.deflate.level in jbpm.cfg.xml Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/ElementType.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/ElementType.java 2008-08-22 04:44:52 UTC (rev 1977) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/persistence/db/type/ElementType.java 2008-08-22 04:54:30 UTC (rev 1978) @@ -41,6 +41,7 @@ import org.jbpm.JbpmContext; import org.jbpm.bpel.xml.util.XmlUtil; +import org.jbpm.configuration.ObjectFactory; /** * Mapping between a DOM {@linkplain Element element} and a {@linkplain Types#VARBINARY VARBINARY} @@ -51,6 +52,8 @@ */ public class ElementType implements UserType { + public static final String XML_DEFLATE_LEVEL = "jbpm.bpel.xml.deflate.level"; + private static final int[] SQL_TYPES = { Types.VARBINARY }; private static final Log log = LogFactory.getLog(ElementType.class); @@ -97,7 +100,7 @@ return null; // introduce inflater, if requested - Number deflateLevel = getXmlDeflateLevel(); + Integer deflateLevel = getXmlDeflateLevel(); if (deflateLevel != null) xmlStream = new InflaterInputStream(xmlStream); @@ -136,7 +139,7 @@ ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); // deflate if requested - Number deflateLevel = getXmlDeflateLevel(); + Integer deflateLevel = getXmlDeflateLevel(); if (deflateLevel != null) { // introduce deflater stream Deflater deflater = new Deflater(deflateLevel.intValue()); @@ -171,15 +174,16 @@ } } - private static Number getXmlDeflateLevel() { + private static Integer getXmlDeflateLevel() { JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); if (jbpmContext != null) { - Object deflateLevel = jbpmContext.getObjectFactory().createObject( - "jbpm.bpel.xml.deflate.level"); - if (deflateLevel instanceof Number) - return (Number) deflateLevel; - else if (deflateLevel != null) - log.warn("xml deflate level is not a number: " + deflateLevel); + ObjectFactory objectFactory = jbpmContext.getObjectFactory(); + if (objectFactory.hasObject(XML_DEFLATE_LEVEL)) { + Object deflateLevel = objectFactory.createObject(XML_DEFLATE_LEVEL); + if (deflateLevel instanceof Integer) + return (Integer) deflateLevel; + log.warn("xml deflate level is not an integer: " + deflateLevel); + } } return null; }

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1977 - in jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration: def and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-22 00:44:52 -0400 (Fri, 22 Aug 2008) New Revision: 1977 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/client/SoapCallerTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/InvokeActionTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/ReplyActionTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/AbstractListenerTestCase.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/RequestListenerTest.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/server/SoapHandlerTest.java Log: incorporate jPDL 3.2.3 enterprise enhancements: BPEL-297 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/client/SoapCallerTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/client/SoapCallerTest.java 2008-08-22 04:36:35 UTC (rev 1976) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/client/SoapCallerTest.java 2008-08-22 04:44:52 UTC (rev 1977) @@ -40,7 +40,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/01/30 07:19:06 $ */ public class SoapCallerTest extends TestCase { Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/InvokeActionTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/InvokeActionTest.java 2008-08-22 04:36:35 UTC (rev 1976) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/InvokeActionTest.java 2008-08-22 04:44:52 UTC (rev 1977) @@ -17,15 +17,11 @@ import java.util.Map; import java.util.Random; -import javax.naming.InitialContext; -import javax.naming.LinkRef; import javax.xml.namespace.QName; import javax.xml.transform.dom.DOMSource; import junit.framework.Test; -import org.w3c.dom.Element; - import org.jbpm.bpel.deploy.DeploymentDescriptor; import org.jbpm.bpel.deploy.PartnerLinkDescriptor; import org.jbpm.bpel.deploy.PartnerRoleDescriptor; @@ -50,6 +46,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.graph.exe.Token; +import org.w3c.dom.Element; /** * @author Alejandro Guizar @@ -101,30 +98,17 @@ deploymentDescriptor.setServiceCatalog(catalog); deploymentDescriptor.addPartnerLink(partnerLink); - // link jms administered objects - InitialContext initialContext = new InitialContext(); - try { - initialContext.rebind("pl", new LinkRef("queue/testQueue")); - initialContext.rebind(IntegrationControl.CONNECTION_FACTORY_NAME, new LinkRef( - "ConnectionFactory")); - - // configure relation service factory - integrationControl = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration) - .getIntegrationControl(processDefinition); - integrationControl.setDeploymentDescriptor(deploymentDescriptor); - IntegrationControlHelper.setUp(integrationControl, jbpmContext); - - // unlink jms administered objects - initialContext.unbind("pl"); - initialContext.unbind(IntegrationControl.CONNECTION_FACTORY_NAME); - } - finally { - initialContext.close(); - } + // configure integration components + JmsIntegrationServiceFactory integrationServiceFactory = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration); + integrationServiceFactory.setConnectionFactoryName("ConnectionFactory"); + integrationControl = integrationServiceFactory.getIntegrationControl(processDefinition); + integrationControl.setDeploymentDescriptor(deploymentDescriptor); + // bind port entries and lookup destinations + IntegrationControlHelper.setUp(integrationControl, jbpmContext); } protected void tearDown() throws Exception { - // finalize relation service factory + // unbind port entries IntegrationControlHelper.tearDown(integrationControl); // tear down db super.tearDown(); @@ -162,8 +146,8 @@ token); messageValue.setPart("clientName", clientName); /* - * call status operation - quote is an one-way operation, so the status change might not be - * reflected immediately + * call status operation - quote is an one-way operation, so the status + * change might not be reflected immediately */ Thread.sleep(500); ReceiveAction.getIntegrationService(jbpmContext).invoke(statusInvoker, token); Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/ReplyActionTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/ReplyActionTest.java 2008-08-22 04:36:35 UTC (rev 1976) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/def/ReplyActionTest.java 2008-08-22 04:44:52 UTC (rev 1977) @@ -21,14 +21,9 @@ import javax.jms.MessageConsumer; import javax.jms.ObjectMessage; import javax.jms.Session; -import javax.naming.InitialContext; -import javax.naming.LinkRef; import javax.wsdl.Definition; import javax.xml.namespace.QName; -import org.w3c.dom.Element; -import org.xml.sax.InputSource; - import org.jbpm.bpel.deploy.DeploymentDescriptor; import org.jbpm.bpel.graph.basic.Receive; import org.jbpm.bpel.graph.basic.Reply; @@ -52,9 +47,11 @@ import org.jbpm.bpel.xml.util.XmlUtil; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.graph.exe.Token; +import org.w3c.dom.Element; +import org.xml.sax.InputSource; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/06/12 08:18:54 $ */ public class ReplyActionTest extends AbstractDbTestCase { @@ -180,30 +177,17 @@ deploymentDescriptor.setName(processDefinition.getName()); deploymentDescriptor.setTargetNamespace(processDefinition.getTargetNamespace()); - InitialContext initialContext = new InitialContext(); - try { - // link jms administered objects - initialContext.rebind(IntegrationControl.CONNECTION_FACTORY_NAME, new LinkRef( - "ConnectionFactory")); - initialContext.rebind("pl", new LinkRef("queue/testQueue")); + // configure integration components + JmsIntegrationServiceFactory integrationServiceFactory = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration); + integrationServiceFactory.setConnectionFactoryName("ConnectionFactory"); + integrationServiceFactory.setRequestDestinationName("queue/A"); + integrationServiceFactory.setResponseDestinationName("queue/B"); + integrationControl = integrationServiceFactory.getIntegrationControl(processDefinition); + integrationControl.setDeploymentDescriptor(deploymentDescriptor); + IntegrationControlHelper.setUp(integrationControl, jbpmContext); - // configure relation context - integrationControl = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration) - .getIntegrationControl(processDefinition); - integrationControl.setDeploymentDescriptor(deploymentDescriptor); - IntegrationControlHelper.setUp(integrationControl, jbpmContext); - - // unlink jms administered objects - initialContext.unbind(IntegrationControl.CONNECTION_FACTORY_NAME); - initialContext.unbind("pl"); - } - finally { - initialContext.close(); - } - // retrieve the partner link destination - PartnerLinkDefinition partnerLink = processDefinition.getGlobalScope().getPartnerLink( - "pl"); + PartnerLinkDefinition partnerLink = processDefinition.getGlobalScope().getPartnerLink("pl"); portDestination = integrationControl.getPartnerLinkEntry(partnerLink).getDestination(); } Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/AbstractListenerTestCase.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/AbstractListenerTestCase.java 2008-08-22 04:36:35 UTC (rev 1976) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/AbstractListenerTestCase.java 2008-08-22 04:44:52 UTC (rev 1977) @@ -23,14 +23,9 @@ import javax.jms.Message; import javax.jms.MessageProducer; import javax.jms.Session; -import javax.naming.InitialContext; -import javax.naming.LinkRef; import javax.wsdl.Definition; import javax.xml.namespace.QName; -import org.w3c.dom.Element; -import org.xml.sax.InputSource; - import org.jbpm.bpel.deploy.DeploymentDescriptor; import org.jbpm.bpel.graph.basic.Receive; import org.jbpm.bpel.graph.def.BpelProcessDefinition; @@ -52,9 +47,11 @@ import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.exe.Token; import org.jbpm.instantiation.Delegation; +import org.w3c.dom.Element; +import org.xml.sax.InputSource; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/06/12 08:18:54 $ */ public abstract class AbstractListenerTestCase extends AbstractDbTestCase { @@ -163,27 +160,15 @@ deploymentDescriptor.setName(processDefinition.getName()); deploymentDescriptor.setTargetNamespace(processDefinition.getTargetNamespace()); - InitialContext initialContext = new InitialContext(); - try { - // link jms administered objects - initialContext.bind(IntegrationControl.CONNECTION_FACTORY_NAME, new LinkRef( - "ConnectionFactory")); - initialContext.rebind("pl", new LinkRef("queue/testQueue")); + // configure integration components + JmsIntegrationServiceFactory integrationServiceFactory = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration); + integrationServiceFactory.setConnectionFactoryName("ConnectionFactory"); + integrationServiceFactory.setRequestDestinationName("queue/A"); + integrationServiceFactory.setResponseDestinationName("queue/B"); + integrationControl = integrationServiceFactory.getIntegrationControl(processDefinition); + integrationControl.setDeploymentDescriptor(deploymentDescriptor); + IntegrationControlHelper.setUp(integrationControl, jbpmContext); - // configure relation service factory - integrationControl = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration) - .getIntegrationControl(processDefinition); - integrationControl.setDeploymentDescriptor(deploymentDescriptor); - IntegrationControlHelper.setUp(integrationControl, jbpmContext); - - // unlink jms administered objects - initialContext.unbind(IntegrationControl.CONNECTION_FACTORY_NAME); - initialContext.unbind("pl"); - } - finally { - initialContext.close(); - } - jmsSession = integrationControl.getJmsConnection().createSession(false, Session.CLIENT_ACKNOWLEDGE); } Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/RequestListenerTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/RequestListenerTest.java 2008-08-22 04:36:35 UTC (rev 1976) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/jms/RequestListenerTest.java 2008-08-22 04:44:52 UTC (rev 1977) @@ -25,7 +25,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/08/08 11:20:32 $ */ public class RequestListenerTest extends AbstractListenerTestCase { @@ -62,6 +62,9 @@ } protected void closeListener() throws JMSException { - // we created a one-shot request listener, no need to close it + RequestListener requestListener = integrationControl.removeRequestListener(receiveAction, token); + // request listener might have been executed and removed already + if (requestListener != null) + requestListener.close(); } } \ No newline at end of file Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/server/SoapHandlerTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/server/SoapHandlerTest.java 2008-08-22 04:36:35 UTC (rev 1976) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/test/java/org/jbpm/bpel/integration/server/SoapHandlerTest.java 2008-08-22 04:44:52 UTC (rev 1977) @@ -27,8 +27,6 @@ import javax.jms.MessageProducer; import javax.jms.ObjectMessage; import javax.jms.Session; -import javax.naming.InitialContext; -import javax.naming.LinkRef; import javax.wsdl.Definition; import javax.wsdl.Port; import javax.xml.namespace.QName; @@ -67,7 +65,7 @@ import org.jbpm.bpel.xml.util.XmlUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/06/12 08:18:55 $ */ public class SoapHandlerTest extends AbstractDbTestCase { @@ -194,7 +192,8 @@ super.setUp(); // create bpel definition - BpelProcessDefinition processDefinition = new BpelProcessDefinition("testProcess", BpelConstants.NS_EXAMPLES); + BpelProcessDefinition processDefinition = new BpelProcessDefinition("testProcess", + BpelConstants.NS_EXAMPLES); definition = WsdlUtil.getFactory() .newWSDLReader() @@ -235,29 +234,15 @@ DeploymentDescriptor deploymentDescriptor = new DeploymentDescriptor(); deploymentDescriptor.setName(processDefinition.getName()); - InitialContext initialContext = new InitialContext(); - try { - // link jms administered objects - initialContext.rebind(IntegrationControl.CONNECTION_FACTORY_NAME, new LinkRef( - "ConnectionFactory")); - initialContext.rebind("rpcPl", new LinkRef("queue/testQueue")); - initialContext.rebind("docPl", new LinkRef("queue/testQueue")); - - // configure relation context - integrationControl = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration) - .getIntegrationControl(processDefinition); - integrationControl.setDeploymentDescriptor(deploymentDescriptor); - // bind port entries and lookup destinations - IntegrationControlHelper.setUp(integrationControl, jbpmContext); - - // unlink jms administered objects - initialContext.unbind(IntegrationControl.CONNECTION_FACTORY_NAME); - initialContext.unbind("rpcPl"); - initialContext.unbind("docPl"); - } - finally { - initialContext.close(); - } + // configure integration components + JmsIntegrationServiceFactory integrationServiceFactory = JmsIntegrationServiceFactory.getConfigurationInstance(jbpmConfiguration); + integrationServiceFactory.setConnectionFactoryName("ConnectionFactory"); + integrationServiceFactory.setRequestDestinationName("queue/A"); + integrationServiceFactory.setResponseDestinationName("queue/B"); + integrationControl = integrationServiceFactory.getIntegrationControl(processDefinition); + integrationControl.setDeploymentDescriptor(deploymentDescriptor); + // bind port entries and lookup destinations + IntegrationControlHelper.setUp(integrationControl, jbpmContext); } protected void tearDown() throws Exception { @@ -493,7 +478,8 @@ Connection connection = integrationControl.getJmsConnection(); Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); try { - Destination replyTo = integrationControl.getIntegrationServiceFactory().getResponseDestination(); + Destination replyTo = integrationControl.getIntegrationServiceFactory() + .getResponseDestination(); MessageProducer producer = session.createProducer(replyTo); // create parts map Map responseParts = createOutputRpcParts(); @@ -555,7 +541,8 @@ Connection connection = integrationControl.getJmsConnection(); Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); try { - Destination replyTo = integrationControl.getIntegrationServiceFactory().getResponseDestination(); + Destination replyTo = integrationControl.getIntegrationServiceFactory() + .getResponseDestination(); MessageProducer producer = session.createProducer(replyTo); // create parts map Map responseParts = createOutputDocParts();

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1976 - jbpm3/branches/jpdl-3.2.3.CP/bpel.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-22 00:36:35 -0400 (Fri, 22 Aug 2008) New Revision: 1976 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/user.libraries.xml Log: ensure compatibility with jboss 4.2.3.GA: BPEL-296 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/user.libraries.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/user.libraries.xml 2008-08-22 03:45:49 UTC (rev 1975) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/user.libraries.xml 2008-08-22 04:36:35 UTC (rev 1976) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE eclipse-userlibraries [ -<!ENTITY software.installation.dir "c:/dev"> +<!ENTITY software.installation.dir "/home/aguizar"> <!ENTITY jboss.home.4.0.3 "&software.installation.dir;/jboss-4.0.3.SP1"> <!ENTITY jboss.home.4.0.4 "&software.installation.dir;/jboss-4.0.4.GA"> <!ENTITY jboss.home.4.0.5 "&software.installation.dir;/jboss-4.0.5.GA"> <!ENTITY jboss.home.4.2.0 "&software.installation.dir;/jboss-4.2.0.GA"> <!ENTITY jboss.home.4.2.2 "&software.installation.dir;/jboss-4.2.2.GA"> +<!ENTITY jboss.home.4.2.3 "&software.installation.dir;/jboss-4.2.3.GA"> ]> <eclipse-userlibraries version="2"> <library name="JBoss 4.0.3" systemlibrary="false"> @@ -101,4 +102,24 @@ <archive path="&jboss.home.4.2.2;/client/jboss-client.jar" /> <archive path="&jboss.home.4.2.2;/client/jboss-common-client.jar" /> </library> + <library name="JBoss 4.2.3" systemlibrary="false"> + <archive path="&jboss.home.4.2.3;/client/jboss-jaxws.jar" /> + <archive path="&jboss.home.4.2.3;/client/jboss-saaj.jar" /> + <archive path="&jboss.home.4.2.3;/client/jbossmq-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/jboss-remoting.jar" /> + <archive path="&jboss.home.4.2.3;/client/jboss-serialization.jar" /> + <archive path="&jboss.home.4.2.3;/client/jbosssx-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/jboss-transaction-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/jbossws-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/jbossws-common.jar" /> + <archive path="&jboss.home.4.2.3;/client/jboss-xml-binding.jar" /> + <archive path="&jboss.home.4.2.3;/client/jmx-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/jmx-invoker-adaptor-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/jnp-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/mail.jar" /> + <archive path="&jboss.home.4.2.3;/client/activation.jar" /> + <archive path="&jboss.home.4.2.3;/client/concurrent.jar" /> + <archive path="&jboss.home.4.2.3;/client/jboss-client.jar" /> + <archive path="&jboss.home.4.2.3;/client/jboss-common-client.jar" /> + </library> </eclipse-userlibraries>

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1975 - in jbpm3/branches/jpdl-3.2.3.CP/bpel/dist: src/main/resources/runtime and 8 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-21 23:45:49 -0400 (Thu, 21 Aug 2008) New Revision: 1975 Added: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/jbpm-ds.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html/ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html/css/ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html/css/html.css jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html_single/ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html_single/css/ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html_single/css/html.css Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/build.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/change.log.html jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/config/build.properties jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/build.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/release.notes.html Log: prepare version 1.1.1 for release: BPEL-300 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/build.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/build.xml 2008-08-22 00:12:33 UTC (rev 1974) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/build.xml 2008-08-22 03:45:49 UTC (rev 1975) @@ -59,12 +59,8 @@  <copy todir="target/runtime/deploy"> - <fileset file="${lib.jbpm.bpel.console.local}" /> <fileset file="${lib.jbpm.bpel.enterprise.local}" /> </copy> - <copy todir="target/runtime/deploy/META-INF"> - <fileset file="${jbpm.root}/bpel/enterprise/src/main/resources/ear/application.xml" /> - </copy>  <copy todir="target/runtime/lib"> @@ -174,7 +170,7 @@ <copy tofile="target/runtime/jboss.eula.txt" file="${license.eula.local}" />  - <copy todir="target/runtime"> + <copy todir="target/runtime" overwrite="yes"> <fileset dir="src/main/resources/runtime" /> </copy> @@ -186,4 +182,4 @@ </target> -</project> \ No newline at end of file +</project> Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/change.log.html =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/change.log.html 2008-08-22 00:12:33 UTC (rev 1974) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/change.log.html 2008-08-22 03:45:49 UTC (rev 1975) @@ -35,95 +35,38 @@ <ul> <li><a href="http://jboss.org/wiki/Wiki.jsp?page=JbpmWiki">Wiki</a></li> <li><a href="http://jboss.org/index.html?module=bb&op=viewforum&f=217">Forum</a></li> - <li><a href="http://labs.jboss.com/jbossjbpm/blog">Blog</a></li> + <li><a href="http://www.jboss.org/feeds/view/jbossjbpm">Blog</a></li> <li><a href="http://www.jboss.com/services/index">Support</a></li> - <li><a href="http://labs.jboss.com/jbossjbpm/downloads">Download</a></li> + <li><a href="http://www.jboss.org/jbossjbpm/bpel_downloads/">Download</a></li> </ul> </div> </td> <td class="bodycell">  - <h1>Change Log - Version 1.1.GA</h1> + <h1>Change Log - Version 1.1.1</h1> <h2>Bug</h2> <ul> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-200'>BPEL-200</a>] - Redeployment of a changed PAR (with modified .bpel) requires App Server Restart</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-230'>BPEL-230</a>] - store element properties in a VARCHAR column instead of LONGVARCHAR for oracle compatibility</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-231'>BPEL-231</a>] - integration service opens request listeners even if tx marked for rollback</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-232'>BPEL-232</a>] - Missing "description" property in BpelDefinition mapping</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-242'>BPEL-242</a>] - <scope> not allowed to enclose a start activity</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-250'>BPEL-250</a>] - NPE when deploying a process using jbpm-bpel.jar from BPEL-230</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-256'>BPEL-256</a>] - First activity of a flow has to have a defined target even if the containing flow element has a target</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-258'>BPEL-258</a>] - non-start activities within initial flow are never entered</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-260'>BPEL-260</a>] - Flow activity might not reactivate parent token in race condition</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-264'>BPEL-264</a>] - NPE when dead-path elimination reaches a flow with local links</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-265'>BPEL-265</a>] - structured activities tell they are initial even if they are the targets of links</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-267'>BPEL-267</a>] - NPE extracting content from soap envelope containing default namespace declarations</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-271'>BPEL-271</a>] - NPE when a start IMA references a nonglobal variable</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-278'>BPEL-278</a>] - role referenced in <from> is not verified to exist in the partner link</li> - + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-287'>BPEL-287</a>] - Activity execution continues even tough the enclosing scope has terminated</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-288'>BPEL-288</a>] - invocation cannot be terminated</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-292'>BPEL-292</a>] - Code source for SOAPMessage class is null</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-293'>BPEL-293</a>] - xsd files in nested directories break deployment</li> </ul> <h2>Feature Request</h2> <ul> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-59'>BPEL-59</a>] - get original BPEL document after deployment</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-204'>BPEL-204</a>] - Add org.jbpm.webapp.servlet.UploadServlet as part of the bpel distribution. </li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-245'>BPEL-245</a>] - make xpath function library extensible</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-259'>BPEL-259</a>] - upgrade to hibernate 3.2.4.SP1</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-269'>BPEL-269</a>] - enhance assignment logging capabilities</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-272'>BPEL-272</a>] - allow xpath expression/query to create more than one occurrence of an element</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-279'>BPEL-279</a>] - variable variant is not supported in predicate</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-282'>BPEL-282</a>] - Engine runs process instances in serie instead of in parallel</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-286'>BPEL-286</a>] - SOAP Communication Exceptions should be catchable inside the process</li> - + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-286'>BPEL-286</a>] - SOAP Communication Exceptions should be catchable inside the process</li> </ul> <h2>Task</h2> <ul> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-86'>BPEL-86</a>] - Release jBPM BPEL 1.1</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-190'>BPEL-190</a>] - webservice descriptors generation tool</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-216'>BPEL-216</a>] - Fully automated process deployment</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-217'>BPEL-217</a>] - convert bpel-definition.xml into master wsdl document</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-218'>BPEL-218</a>] - introduce a central service catalog</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-229'>BPEL-229</a>] - move to a portable deployment model</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-233'>BPEL-233</a>] - Simplify activity XML readers</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-234'>BPEL-234</a>] - Convert Invoker, Receiver, Replier and Alarm into Actions</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-235'>BPEL-235</a>] - Revise NodeCollection view of CompositeActivity subclasses</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-236'>BPEL-236</a>] - Convert QNameType from UserType to CompositeUserType</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-237'>BPEL-237</a>] - Remove unnecessary persistent extensions of WSDL4J classes</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-238'>BPEL-238</a>] - Upgrade to jPDL 3.2.GA</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-239'>BPEL-239</a>] - detect and deal with jpdl deployments</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-240'>BPEL-240</a>] - upgrade bpel 1.1 compensate to bpel 2 compensate/compensateScope</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-241'>BPEL-241</a>] - provide a compensation example</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-243'>BPEL-243</a>] - throw selectionFailure when copying from an element with xsi:nil=true</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-249'>BPEL-249</a>] - create ws stack integration subprojects</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-251'>BPEL-251</a>] - cover document-style bindings in service generation tool</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-253'>BPEL-253</a>] - Skip service/artifact generation tools if sources have not changed</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-254'>BPEL-254</a>] - Fix namespace URIs and schema locations of definition and application descriptor schemas</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-255'>BPEL-255</a>] - Update the namespace URI of variable property elements</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-257'>BPEL-257</a>] - rename correlation patterns</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-261'>BPEL-261</a>] - use varbinary instead of varchar as data type to store dom elements</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-262'>BPEL-262</a>] - redeliver messages whose handling fails due to stale state exceptions</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-263'>BPEL-263</a>] - incorporate enterprise support features from jpdl</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-266'>BPEL-266</a>] - incorporate targetNamespace in process definition versioning</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-270'>BPEL-270</a>] - Add support for extensionAssignOperation</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-273'>BPEL-273</a>] - provide a declarative way to install new evaluator factories in the sublanguage framework</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-274'>BPEL-274</a>] - wsdl service generator: eliminate reliance on transitive imports</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-275'>BPEL-275</a>] - web module deployment tool</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-276'>BPEL-276</a>] - generate bpel application descriptor along with wsdl service description</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-280'>BPEL-280</a>] - redeploy web modules upon server restart</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-281'>BPEL-281</a>] - ant tasks for process deployment</li> - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-283'>BPEL-283</a>] - process deployment from web console</li> - - <li>[<a href='http://jira.jboss.com/jira/browse/BPEL-284'>BPEL-284</a>] - document new deployment model</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-268'>BPEL-268</a>] - provide a human task management example</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-289'>BPEL-289</a>] - repeatUntil should execute until the condition becomes true, *not* as long as the condition evaluates to true</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-290'>BPEL-290</a>] - Update examples to the WS-BPEL 2.0 OASIS Standard</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-291'>BPEL-291</a>] - Document JBoss AS deployment order feature which causes exceptions upon restart</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-296'>BPEL-296</a>] - ensure compatibility with jboss 4.2.3.GA</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-297'>BPEL-297</a>] - incorporate jPDL 3.2.3 enterprise enhancements</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-298'>BPEL-298</a>] - document transaction manager behavior in jboss 4.2</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-299'>BPEL-299</a>] - document proxy warn logs</li> + <li>[<a href='https://jira.jboss.org/jira/browse/BPEL-300'>BPEL-300</a>] - prepare jbpm bpel 1.1.1 for release</li> </ul>  @@ -142,4 +85,4 @@ </body> -</html> \ No newline at end of file +</html> Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/config/build.properties =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/config/build.properties 2008-08-22 00:12:33 UTC (rev 1974) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/config/build.properties 2008-08-22 03:45:49 UTC (rev 1975) @@ -1,11 +1,11 @@ # INSTALLED SOFTWARE PROPERTIES # property software.installation.dir is used to define jboss.home and jwsdp.home -software.installation.dir=c:/dev +software.installation.dir=${user.home} # jboss.home is used for deployment targets # this property is based on jboss.version to keep them in sync -jboss.version=4.2.2.GA +jboss.version=4.2.3.GA jboss.home=${software.installation.dir}/jboss-${jboss.version} jboss.server=default @@ -30,13 +30,13 @@ # JPDL FILE LOCATIONS -lib.jbpm.jpdl.version=3.2.2 +lib.jbpm.jpdl.version=3.2.3 lib.jbpm.jpdl.jar.local=${lib.dir}/jbpm-jpdl.jar lib.jbpm.identity.jar.local=${lib.dir}/jbpm-identity.jar # BPEL FILE LOCATIONS -lib.jbpm.bpel.version=1.1.GA +lib.jbpm.bpel.version=1.1.1 lib.jbpm.bpel.jar.local=${lib.dir}/jbpm-bpel.jar lib.jbpm.bpel.config.local=${lib.dir}/jbpm-bpel-config.jar lib.jbpm.bpel.tools.jar.local=${lib.dir}/jbpm-bpel-tools.jar @@ -77,4 +77,4 @@ lib.servlet-jsp.local=${lib.dir}/jsp-api.jar lib.wsdl4j.local=${lib.dir}/wsdl4j.jar lib.xercesimpl.local=${lib.dir}/xercesImpl.jar -lib.xml.apis.local=${lib.dir}/xml-apis.jar \ No newline at end of file +lib.xml.apis.local=${lib.dir}/xml-apis.jar Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/build.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/build.xml 2008-08-22 00:12:33 UTC (rev 1974) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/build.xml 2008-08-22 03:45:49 UTC (rev 1975) @@ -44,6 +44,7 @@ <equals arg1="${jboss.version}" arg2="4.2.0.GA" /> <equals arg1="${jboss.version}" arg2="4.2.1.GA" /> <equals arg1="${jboss.version}" arg2="4.2.2.GA" /> + <equals arg1="${jboss.version}" arg2="4.2.3.GA" /> </or> </condition> <fail unless="lib.jbpm.bpel.container.jar.local" @@ -57,41 +58,35 @@ <target name="package.ear" description="build jbpm bpel enterprise app" depends="create.config, determine.container"> - <manifest file="META-INF/MANIFEST.MF"> - <attribute name="Implementation-Version" value="${lib.jbpm.bpel.version} (date:${now})" /> - <attribute name="Implementation-URL" value="http://www.jboss.org/products/jbpm" /> - <attribute name="Implementation-Vendor" value="JBoss Inc." /> - <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org/" /> - </manifest> - <ear destfile="${lib.jbpm.bpel.application.name}" - appxml="META-INF/application.xml" - manifest="META-INF/MANIFEST.MF"> -  - <fileset file="${lib.jbpm.bpel.console.file}" /> - <fileset file="${lib.jbpm.bpel.enterprise.file}" /> -  - <zipfileset file="${lib.jbpm.jpdl.jar.local}" prefix="lib" /> - <zipfileset file="${lib.jbpm.identity.jar.local}" prefix="lib" /> - <zipfileset file="${lib.jbpm.bpel.jar.local}" prefix="lib" /> + <jar destfile="${lib.jbpm.bpel.application.name}" update="yes"> <zipfileset file="${lib.jbpm.bpel.container.name}" prefix="lib" /> <zipfileset file="${lib.jbpm.bpel.config.file}" prefix="lib" /> -  - <zipfileset file="${lib.commons.lang.local}" prefix="lib" /> - <zipfileset file="${lib.jaxen.local}" prefix="lib" /> - </ear> + <manifest> + <attribute name="Implementation-Version" value="${lib.jbpm.bpel.version} (date:${now})" /> + </manifest> + </jar> </target> <target name="deploy.ear" description="deploy jbpm bpel enterprise app to server" depends="package.ear"> - <copy todir="${jboss.home}/server/${jboss.server}/deploy" - file="${lib.jbpm.bpel.application.name}" /> + <copy todir="${jboss.home}/server/${jboss.server}/deploy"> + <fileset dir="${basedir}"> + <include name="jbpm-ds.xml" /> + <include name="${lib.jbpm.bpel.application.name}" /> + </fileset> + </copy> </target> <target name="undeploy.ear" description="undeploy jbpm bpel enterprise app from server" depends="package.ear"> - <delete file="${jboss.home}/server/${jboss.server}/deploy/${lib.jbpm.bpel.application.name}" /> + <delete> + <fileset dir="${jboss.home}/server/${jboss.server}/deploy"> + <include name="${lib.jbpm.bpel.application.name}" /> + <include name="jbpm-ds.xml" /> + </fileset> + </delete> </target> <target name="main" description="main target" depends="deploy.ear" /> Added: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/jbpm-ds.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/jbpm-ds.xml (rev 0) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/deploy/jbpm-ds.xml 2008-08-22 03:45:49 UTC (rev 1975) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<datasources> + <local-tx-datasource> + +  +  + <jndi-name>JbpmDS</jndi-name> + +  + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}JbpmDB</connection-url> + +  + <driver-class>org.hsqldb.jdbcDriver</driver-class> + +  + <user-name>sa</user-name> + <password></password> + +  + <min-pool-size>5</min-pool-size> + +  + <max-pool-size>20</max-pool-size> + +  +  +  + <idle-timeout-minutes>0</idle-timeout-minutes> + +  + <track-statements/> + +  + <prepared-statement-cache-size>32</prepared-statement-cache-size> + +  + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + +  + <depends>jboss:service=Hypersonic,database=JbpmDB</depends> +  + </local-tx-datasource> + +  + <mbean code="org.jboss.jdbc.HypersonicDatabase" + name="jboss:service=Hypersonic,database=JbpmDB"> + <attribute name="Database">JbpmDB</attribute> + <attribute name="InProcessMode">true</attribute> + </mbean> + +</datasources> Added: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html/css/html.css =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html/css/html.css (rev 0) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html/css/html.css 2008-08-22 03:45:49 UTC (rev 1975) @@ -0,0 +1,97 @@ +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +TABLE { + border-collapse: collapse; + border-spacing:0; + border: 1px thin black; + empty-cells: hide; +} + +TD { + padding: 4pt; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; } + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 100%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +} + + + + Added: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html_single/css/html.css =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html_single/css/html.css (rev 0) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/doc/userguide/html_single/css/html.css 2008-08-22 03:45:49 UTC (rev 1975) @@ -0,0 +1,97 @@ +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +TABLE { + border-collapse: collapse; + border-spacing:0; + border: 1px thin black; + empty-cells: hide; +} + +TD { + padding: 4pt; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; } + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 100%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +} + + + + Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/release.notes.html =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/release.notes.html 2008-08-22 00:12:33 UTC (rev 1974) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/dist/src/main/resources/runtime/release.notes.html 2008-08-22 03:45:49 UTC (rev 1975) @@ -35,9 +35,9 @@ <ul> <li><a href="http://jboss.org/wiki/Wiki.jsp?page=JbpmWiki">Wiki</a></li> <li><a href="http://jboss.org/index.html?module=bb&op=viewforum&f=217">Forum</a></li> - <li><a href="http://labs.jboss.com/jbossjbpm/blog">Blog</a></li> + <li><a href="http://www.jboss.org/feeds/view/jbossjbpm">Blog</a></li> <li><a href="http://www.jboss.com/services/index">Support</a></li> - <li><a href="http://labs.jboss.com/jbossjbpm/downloads">Download</a></li> + <li><a href="http://www.jboss.org/jbossjbpm/bpel_downloads/">Download</a></li> </ul> </div> </td>

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1974 - in jbpm3/branches/jpdl-3.2.3.CP/bpel: console/src/main/resources/web and 4 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-21 20:12:33 -0400 (Thu, 21 Aug 2008) New Revision: 1974 Added: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/JbpmConfigurationLoader.java Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/AdministrationServlet.java jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/DeploymentServlet.java jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/jboss-web.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/web.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/enterprise/build.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.cfg.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.hibernate.cfg.xml jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationControl.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationService.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationServiceFactory.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListener.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/server/SoapHandler.java Log: incorporate jPDL 3.2.3 enterprise enhancements: BPEL-297 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/AdministrationServlet.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/AdministrationServlet.java 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/AdministrationServlet.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -1,3 +1,17 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the JBPM BPEL PUBLIC LICENSE AGREEMENT as + * published by JBoss Inc.; either version 1.0 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. + */ package org.jbpm.bpel.web; import java.io.IOException; Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/DeploymentServlet.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/DeploymentServlet.java 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/DeploymentServlet.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -1,3 +1,17 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the JBPM BPEL PUBLIC LICENSE AGREEMENT as + * published by JBoss Inc.; either version 1.0 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. + */ package org.jbpm.bpel.web; import java.io.File; @@ -21,6 +35,7 @@ import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; +import org.jbpm.bpel.BpelException; import org.jbpm.bpel.graph.def.BpelProcessDefinition; import org.jbpm.bpel.persistence.db.BpelGraphSession; import org.jbpm.bpel.tools.WebModuleBuilder; @@ -93,10 +108,7 @@ FileItem fileItem = (FileItem) request.getAttribute(PARAM_PROCESS_ARCHIVE); String fileName = extractFileName(fileItem.getName()); ProcessDefinition processDefinition = readProcessDefinition(fileItem.getInputStream(), fileName); - deployProcessDefinition(processDefinition); - // build and deploy web module, if the language is BPEL - if (processDefinition instanceof BpelProcessDefinition) - deployWebModule((BpelProcessDefinition) processDefinition, fileName); + deployProcessDefinition(processDefinition, fileName); // transfer web flow response.sendRedirect("processes.jsp"); } @@ -150,11 +162,12 @@ private static String extractFileName(String filePath) { /* - * PORTABILITY INFO. Some browsers (e.g. internet explorer) send the file's absolute path. If - * this servlet ran on the client side, it could leverage the File class to extract the file - * name. However, since the separator char may differ between the client and the server, File is - * not reliable. This code splits the path around matches of all known file separators and takes - * the last fragment as the file name. + * PORTABILITY INFO. Some browsers (e.g. internet explorer) send the file's + * absolute path. If this servlet ran on the client side, it could leverage + * the File class to extract the file name. However, since the separator + * char may differ between the client and the server, File is not reliable. + * This code splits the path around matches of all known file separators and + * takes the last fragment as the file name. */ String[] fragments = fileSeparatorPattern.split(filePath); return fragments[fragments.length - 1]; @@ -176,15 +189,18 @@ } } - private void deployProcessDefinition(ProcessDefinition processDefinition) { + private void deployProcessDefinition(ProcessDefinition processDefinition, String fileName) { JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { if (processDefinition instanceof BpelProcessDefinition) { - BpelGraphSession graphSession = BpelGraphSession.getContextInstance(jbpmContext); - graphSession.deployProcessDefinition((BpelProcessDefinition) processDefinition); + BpelProcessDefinition bpelProcessDefinition = (BpelProcessDefinition) processDefinition; + BpelGraphSession.getContextInstance(jbpmContext).deployProcessDefinition( + bpelProcessDefinition); + deployWebModule(bpelProcessDefinition, fileName); } - else + else { jbpmContext.deployProcessDefinition(processDefinition); + } log.info("deployed process definition: " + processDefinition.getName()); } catch (RuntimeException e) { @@ -196,8 +212,7 @@ } } - private void deployWebModule(BpelProcessDefinition processDefinition, String fileName) - throws ServletException { + private void deployWebModule(BpelProcessDefinition processDefinition, String fileName) { File moduleFile = new File(deployDirectory, extractFilePrefix(fileName) + ".war"); WebModuleBuilder builder = new WebModuleBuilder(); @@ -205,7 +220,7 @@ builder.buildModule(processDefinition); if (builder.getProblemHandler().getProblemCount() > 0) - throw new ServletException("could not build web module for: " + processDefinition); + throw new BpelException("could not build web module for: " + processDefinition); log.info("deployed web module: " + moduleFile.getName()); } Added: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/JbpmConfigurationLoader.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/JbpmConfigurationLoader.java (rev 0) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/java/org/jbpm/bpel/web/JbpmConfigurationLoader.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the JBPM BPEL PUBLIC LICENSE AGREEMENT as + * published by JBoss Inc.; either version 1.0 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. + */ +package org.jbpm.bpel.web; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmContext; +import org.jbpm.bpel.integration.IntegrationService; +import org.jbpm.svc.Services; + +/** + * Loads and closes the {@linkplain JbpmConfiguration jBPM configuration} when + * the servlet context is initialized and destroyed, respectively. + * <h3>Configuration</h3> + * Servlet context init parameters + * <table border="1"> + * <tr> + * <th>Name</th> + * <th>Description</th> + * <th>Default value</th> + * </tr> + * <tr> + * <td>jbpm.configuration.resource</td> + * <td>name of the resource that defines the jBPM configuration</td> + * <td>jbpm.cfg.xml</td> + * </tr> + * </table> + * @author Alejandro Guizar + */ +public class JbpmConfigurationLoader implements ServletContextListener { + + public void contextInitialized(ServletContextEvent event) { + String resource = event.getServletContext().getInitParameter("jbpm.configuration.resource"); + JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(resource); + // force services to initialize here + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + Services services = jbpmContext.getServices(); + services.getPersistenceService(); + services.getMessageService(); + services.getSchedulerService(); + services.getService(IntegrationService.SERVICE_NAME); + } + finally { + jbpmContext.close(); + } + } + + public void contextDestroyed(ServletContextEvent event) { + String resource = event.getServletContext().getInitParameter("jbpm.configuration.resource"); + JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(resource); + jbpmConfiguration.close(); + } + +} Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/jboss-web.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/jboss-web.xml 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/jboss-web.xml 2008-08-22 00:12:33 UTC (rev 1974) @@ -16,13 +16,13 @@ </resource-ref> <message-destination-ref> - <message-destination-ref-name>jms/JbpmRequestQueue</message-destination-ref-name> - <jndi-name>queue/A</jndi-name> + <message-destination-ref-name>jms/RequestQueue</message-destination-ref-name> + <jndi-name>queue/JbpmRequestQueue</jndi-name> </message-destination-ref> <message-destination-ref> - <message-destination-ref-name>jms/JbpmResponseQueue</message-destination-ref-name> - <jndi-name>queue/B</jndi-name> + <message-destination-ref-name>jms/ResponseQueue</message-destination-ref-name> + <jndi-name>queue/JbpmResponseQueue</jndi-name> </message-destination-ref> </jboss-web> Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/web.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/web.xml 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/console/src/main/resources/web/web.xml 2008-08-22 00:12:33 UTC (rev 1974) @@ -33,6 +33,14 @@ <url-pattern>/registration</url-pattern> </servlet-mapping> + <listener> + <description> + Loads and closes the jBPM configuration when the servlet context is initialized and + destroyed, respectively. + </description> + <listener-class>org.jbpm.bpel.web.JbpmConfigurationLoader</listener-class> + </listener> + <resource-ref> <description> Logical name of the data source that provides connections to the persistence service. @@ -80,13 +88,13 @@ </message-destination-ref> <message-destination-ref> - <message-destination-ref-name>jms/JbpmRequestQueue</message-destination-ref-name> + <message-destination-ref-name>jms/RequestQueue</message-destination-ref-name> <message-destination-type>javax.jms.Queue</message-destination-type> <message-destination-usage>ConsumesProduces</message-destination-usage> </message-destination-ref> <message-destination-ref> - <message-destination-ref-name>jms/JbpmResponseQueue</message-destination-ref-name> + <message-destination-ref-name>jms/ResponseQueue</message-destination-ref-name> <message-destination-type>javax.jms.Queue</message-destination-type> <message-destination-usage>ConsumesProduces</message-destination-usage> </message-destination-ref> Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/enterprise/build.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/enterprise/build.xml 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/enterprise/build.xml 2008-08-22 00:12:33 UTC (rev 1974) @@ -86,6 +86,14 @@ <replacetoken><![CDATA[==== DataSource properties (end)]]></replacetoken> <replacevalue><![CDATA[]]></replacevalue> + </replace> + <replace file="target/config/jbpm.hibernate.cfg.xml"> + <replacetoken><![CDATA[==== JTA transaction properties (end)]]></replacetoken> + <replacevalue><![CDATA[ <replace file="target/config/jbpm.hibernate.cfg.xml"> @@ -164,7 +172,7 @@ <target name="undeploy.ear" description="undeploy enterprise application from server"> - <delete file="${jboss.home}/server/${jboss.server}/deploy/${lib.jbpm.bpel.application.name}" /> + <delete file="${jboss.home}/server/${jboss.server}/deploy/${lib.jbpm.bpel.enterprise.file}" /> </target> </project> \ No newline at end of file Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.cfg.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.cfg.xml 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.cfg.xml 2008-08-22 00:12:33 UTC (rev 1974) @@ -22,6 +22,9 @@ <factory> <bean class="org.jbpm.bpel.integration.jms.JmsIntegrationServiceFactory"> <field name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></field> + <field name="connectionFactoryName"><string value="java:ConnectionFactory"/></field> + <field name="requestDestinationName"><string value="queue/A"/></field> + <field name="responseDestinationName"><string value="queue/B"/></field> </bean> </factory> </service> @@ -53,8 +56,9 @@ <string name="resource.endpoint.metadata.lookups" value="org/jbpm/bpel/integration/server/endpoint.metadata.lookups.xml" />  -  - <int name="jbpm.bpel.xml.deflate.level" value="0" singleton="true" /> +  <bean name="jbpm.bpel.central.catalog" class="org.jbpm.bpel.integration.catalog.CentralCatalog" singleton="true"> Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.hibernate.cfg.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.hibernate.cfg.xml 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/config/jbpm.hibernate.cfg.xml 2008-08-22 00:12:33 UTC (rev 1974) @@ -26,7 +26,6 @@   Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationControl.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationControl.java 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/IntegrationControl.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -25,6 +25,7 @@ import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.JMSException; +import javax.jms.Session; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -64,7 +65,7 @@ import org.jbpm.svc.Services; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/01/30 07:18:22 $ */ public class IntegrationControl { @@ -106,6 +107,10 @@ return jmsConnection; } + public Session createJmsSession() throws JMSException { + return jmsConnection.createSession(false, Session.CLIENT_ACKNOWLEDGE); + } + public DeploymentDescriptor getDeploymentDescriptor() { return deploymentDescriptor; } Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationService.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationService.java 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationService.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -48,7 +48,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/01/30 07:18:22 $ */ public class JmsIntegrationService implements IntegrationService { @@ -76,7 +76,7 @@ void jmsReceive(ReceiveAction receiveAction, Token token, IntegrationControl integrationControl, boolean oneShot) throws JMSException { - Session jmsSession = createJmsSession(integrationControl); + Session jmsSession = integrationControl.createJmsSession(); RequestListener requestListener = new RequestListener(receiveAction, token, integrationControl, jmsSession, oneShot); requestListeners.add(requestListener); @@ -94,7 +94,7 @@ void jmsReceive(List receivers, Token token, IntegrationControl integrationControl) throws JMSException { - Session jmsSession = createJmsSession(integrationControl); + Session jmsSession = integrationControl.createJmsSession(); Iterator receiverIt = receivers.iterator(); while (receiverIt.hasNext()) { ReceiveAction receiveAction = (ReceiveAction) receiverIt.next(); @@ -104,11 +104,6 @@ } } - private static Session createJmsSession(IntegrationControl integrationControl) - throws JMSException { - return integrationControl.getJmsConnection().createSession(false, Session.CLIENT_ACKNOWLEDGE); - } - public void cancelReception(ReceiveAction receiveAction, Token token) { try { jmsCancelReception(receiveAction, token, getIntegrationControl(token)); @@ -136,14 +131,14 @@ public void reply(ReplyAction replyAction, Token token) { try { - replyOutstandingRequest(replyAction, token); + jmsReply(replyAction, token); } catch (JMSException e) { throw new BpelException("could not send reply", e); } } - private void replyOutstandingRequest(ReplyAction replyAction, Token token) throws JMSException { + private void jmsReply(ReplyAction replyAction, Token token) throws JMSException { // extract the output parts Map parts = replyAction.writeMessage(token); @@ -152,7 +147,7 @@ IntegrationControl integrationControl = getIntegrationControl(token); OutstandingRequest request = integrationControl.removeOutstandingRequest(replyAction, token); - Session jmsSession = createJmsSession(integrationControl); + Session jmsSession = integrationControl.createJmsSession(); try { request.sendReply(parts, replyAction.getFaultName(), jmsSession); } Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationServiceFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationServiceFactory.java 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/JmsIntegrationServiceFactory.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -21,6 +21,7 @@ import javax.jms.ConnectionFactory; import javax.jms.Destination; import javax.jms.JMSException; +import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -35,7 +36,7 @@ import org.jbpm.svc.ServiceFactory; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/06/12 08:18:54 $ */ public class JmsIntegrationServiceFactory implements ServiceFactory { @@ -43,8 +44,8 @@ // injected objects, see jbpm.cfg.xml private JbpmConfiguration jbpmConfiguration; private String connectionFactoryName = "java:comp/env/jms/JbpmConnectionFactory"; - private String requestDestinationName = "java:comp/env/jms/JbpmRequestQueue"; - private String responseDestinationName = "java:comp/env/jms/JbpmResponseQueue"; + private String requestDestinationName = "java:comp/env/jms/RequestQueue"; + private String responseDestinationName = "java:comp/env/jms/ResponseQueue"; private ConnectionFactory connectionFactory; private Destination requestDestination; @@ -71,6 +72,18 @@ } } + public void setConnectionFactoryName(String connectionFactoryName) { + this.connectionFactoryName = connectionFactoryName; + } + + public void setRequestDestinationName(String requestDestinationName) { + this.requestDestinationName = requestDestinationName; + } + + public void setResponseDestinationName(String responseDestinationName) { + this.responseDestinationName = responseDestinationName; + } + public JbpmConfiguration getJbpmConfiguration() { return jbpmConfiguration; } @@ -116,7 +129,7 @@ } private static Object lookup(String name) throws NamingException { - InitialContext initialContext = new InitialContext(); + Context initialContext = new InitialContext(); try { return initialContext.lookup(name); } @@ -126,13 +139,13 @@ } public IntegrationControl getIntegrationControl(ProcessDefinition processDefinition) { - Long processId = new Long(processDefinition.getId()); + Long processDefinitionId = new Long(processDefinition.getId()); synchronized (integrationControls) { - IntegrationControl integrationControl = (IntegrationControl) integrationControls.get(processId); + IntegrationControl integrationControl = (IntegrationControl) integrationControls.get(processDefinitionId); if (integrationControl == null) { log.debug("creating integration control: processDefinition=" + processDefinition); integrationControl = new IntegrationControl(this); - integrationControls.put(processId, integrationControl); + integrationControls.put(processDefinitionId, integrationControl); } return integrationControl; } Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListener.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListener.java 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/jms/StartListener.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -41,7 +41,7 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2008/06/12 08:18:54 $ */ public class StartListener implements MessageListener { @@ -65,8 +65,7 @@ // save integration control this.integrationControl = integrationControl; - jmsSession = integrationControl.getJmsConnection().createSession(false, - Session.CLIENT_ACKNOWLEDGE); + jmsSession = integrationControl.createJmsSession(); // create message consumer Destination destination = integrationControl.getPartnerLinkEntry(receiveAction.getPartnerLink()) @@ -98,8 +97,7 @@ this.integrationControl = other.integrationControl; - jmsSession = integrationControl.getJmsConnection().createSession(false, - Session.CLIENT_ACKNOWLEDGE); + jmsSession = integrationControl.createJmsSession(); messageConsumer = jmsSession.createConsumer(getDestination(other.messageConsumer), other.messageConsumer.getMessageSelector()); Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/server/SoapHandler.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/server/SoapHandler.java 2008-08-22 00:04:33 UTC (rev 1973) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/server/SoapHandler.java 2008-08-22 00:12:33 UTC (rev 1974) @@ -77,7 +77,7 @@ import org.jbpm.util.ClassLoaderUtil; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/11/25 13:06:55 $ */ public class SoapHandler implements Handler { @@ -159,8 +159,7 @@ .getJbpmConfiguration() .createJbpmContext(); try { - Session jmsSession = integrationControl.getJmsConnection().createSession(false, - Session.CLIENT_ACKNOWLEDGE); + Session jmsSession = integrationControl.createJmsSession(); try { SOAPMessage soapMessage = ((SOAPMessageContext) messageContext).getMessage(); ObjectMessage jmsRequest = sendRequest(soapMessage, jmsSession, jbpmContext);

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1973 - jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-08-21 20:04:33 -0400 (Thu, 21 Aug 2008) New Revision: 1973 Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InvokeAction.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReceiveAction.java jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReplyAction.java Log: removed redundant "implements Serializable" declarations Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InvokeAction.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InvokeAction.java 2008-08-21 23:41:08 UTC (rev 1972) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/InvokeAction.java 2008-08-22 00:04:33 UTC (rev 1973) @@ -14,7 +14,6 @@ */ package org.jbpm.bpel.integration.def; -import java.io.Serializable; import java.util.Map; import org.apache.commons.lang.builder.ToStringBuilder; @@ -27,10 +26,10 @@ /** * @author Juan Cantu - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/26 00:36:13 $ */ -public class InvokeAction extends MessageAction implements Serializable { +public class InvokeAction extends MessageAction { private VariableDefinition inputVariable; private VariableDefinition outputVariable; Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReceiveAction.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReceiveAction.java 2008-08-21 23:41:08 UTC (rev 1972) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReceiveAction.java 2008-08-22 00:04:33 UTC (rev 1973) @@ -14,7 +14,6 @@ */ package org.jbpm.bpel.integration.def; -import java.io.Serializable; import java.util.Map; import org.apache.commons.lang.builder.ToStringBuilder; @@ -29,10 +28,10 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/07/26 00:39:10 $ */ -public class ReceiveAction extends MessageAction implements Serializable { +public class ReceiveAction extends MessageAction { private String messageExchange; Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReplyAction.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReplyAction.java 2008-08-21 23:41:08 UTC (rev 1972) +++ jbpm3/branches/jpdl-3.2.3.CP/bpel/library/src/main/java/org/jbpm/bpel/integration/def/ReplyAction.java 2008-08-22 00:04:33 UTC (rev 1973) @@ -14,7 +14,6 @@ */ package org.jbpm.bpel.integration.def; -import java.io.Serializable; import java.util.Map; import javax.xml.namespace.QName; @@ -28,10 +27,10 @@ import org.jbpm.graph.exe.Token; /** - * @author Alejandro Gu�zar + * @author Alejandro Guizar * @version $Revision$ $Date: 2007/02/19 18:56:18 $ */ -public class ReplyAction extends MessageAction implements Serializable { +public class ReplyAction extends MessageAction { private static final long serialVersionUID = 1L;

17 years, 8 months

1
0
0 / 0

← Newer
1
...
5
6
7
8
9
10
11
...
26
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits August 2008