You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ra...@apache.org on 2009/07/16 05:23:53 UTC
svn commit: r794503 - in /commons/proper/scxml/trunk: ./
src/main/java/org/apache/commons/scxml/
src/main/java/org/apache/commons/scxml/env/
src/main/java/org/apache/commons/scxml/invoke/
src/main/java/org/apache/commons/scxml/io/ src/main/java/org/apa...
Author: rahul
Date: Thu Jul 16 03:23:43 2009
New Revision: 794503
URL: http://svn.apache.org/viewvc?rev=794503&view=rev
Log:
Attribute "targettype" of the <send> and <invoke> elements changed to "type" in latest Working Draft.
Thanks to patch by Ales Dolecek <ales_d at seznam dot cz>.
Also added Ales to the contributors list.
SCXML-109
Modified:
commons/proper/scxml/trunk/pom.xml
commons/proper/scxml/trunk/project.xml
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/EventDispatcher.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCInstance.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/Invoker.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/ModelUpdater.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Invoke.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Send.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/WizardsTest.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/env/jexl/wizard-02.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoked-03.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-01.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-02.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-03.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-04.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-initial-test.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-parallel-test.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-state-test.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-01.xml
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-02.xml
commons/proper/scxml/trunk/xdocs/changes.xml
commons/proper/scxml/trunk/xdocs/guide/core-engine.xml
commons/proper/scxml/trunk/xdocs/guide/using-commons-scxml.xml
Modified: commons/proper/scxml/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/pom.xml (original)
+++ commons/proper/scxml/trunk/pom.xml Thu Jul 16 03:23:43 2009
@@ -120,6 +120,9 @@
<contributor>
<name>Joel Truher</name>
</contributor>
+ <contributor>
+ <name>Ales Dolecek</name>
+ </contributor>
</contributors>
<dependencies>
Modified: commons/proper/scxml/trunk/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/project.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/project.xml (original)
+++ commons/proper/scxml/trunk/project.xml Thu Jul 16 03:23:43 2009
@@ -172,6 +172,9 @@
<contributor>
<name>Joel Truher</name>
</contributor>
+ <contributor>
+ <name>Ales Dolecek</name>
+ </contributor>
</contributors>
<dependencies>
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/EventDispatcher.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/EventDispatcher.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/EventDispatcher.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/EventDispatcher.java Thu Jul 16 03:23:43 2009
@@ -40,8 +40,8 @@
*
* @param sendId The ID of the send message
* @param target An expression returning the target location of the event
- * @param targetType The type of the Event I/O Processor that the event
- * should be dispatched to
+ * @param target The type of the Event I/O Processor that the event should
+ * be dispatched to
* @param event The type of event being generated.
* @param params A list of zero or more whitespace separated variable
* names to be included with the event.
@@ -51,9 +51,8 @@
* @param externalNodes The list of external nodes associated with
* the <send> element.
*/
- void send(String sendId, String target, String targetType,
+ void send(String sendId, String target, String type,
String event, Map params, Object hints, long delay,
List externalNodes);
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCInstance.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCInstance.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCInstance.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCInstance.java Thu Jul 16 03:23:43 2009
@@ -66,7 +66,7 @@
/**
* The <code>Invoker</code> classes <code>Map</code>, keyed by
- * <invoke> target types (specified using "targettype" attribute).
+ * <invoke> target types (specified using "type" attribute).
*/
private Map invokerClasses;
@@ -279,24 +279,23 @@
/**
* Register an {@link Invoker} class for this target type.
*
- * @param targettype The target type (specified by "targettype"
- * attribute of <invoke> tag).
+ * @param type The target type (specified by "type" attribute of
+ * <invoke> tag).
* @param invokerClass The <code>Invoker</code> <code>Class</code>.
*/
- void registerInvokerClass(final String targettype,
- final Class invokerClass) {
- invokerClasses.put(targettype, invokerClass);
+ void registerInvokerClass(final String type, final Class invokerClass) {
+ invokerClasses.put(type, invokerClass);
}
/**
* Remove the {@link Invoker} class registered for this target
* type (if there is one registered).
*
- * @param targettype The target type (specified by "targettype"
- * attribute of <invoke> tag).
+ * @param type The target type (specified by "type" attribute of
+ * <invoke> tag).
*/
- void unregisterInvokerClass(final String targettype) {
- invokerClasses.remove(targettype);
+ void unregisterInvokerClass(final String type) {
+ invokerClasses.remove(type);
}
/**
@@ -305,19 +304,19 @@
* returned if and only if the <code>TransitionTarget</code> is
* currently active and contains an <invoke> child.
*
- * @param targettype The type of the target being invoked.
+ * @param type The type of the target being invoked.
* @return An {@link Invoker} for the specified type, if an
* invoker class is registered against that type,
* <code>null</code> otherwise.
* @throws InvokerException When a suitable {@link Invoker} cannot
* be instantiated.
*/
- public Invoker newInvoker(final String targettype)
+ public Invoker newInvoker(final String type)
throws InvokerException {
- Class invokerClass = (Class) invokerClasses.get(targettype);
+ Class invokerClass = (Class) invokerClasses.get(type);
if (invokerClass == null) {
- throw new InvokerException("No Invoker registered for "
- + "targettype \"" + targettype + "\"");
+ throw new InvokerException("No Invoker registered for type \""
+ + type + "\"");
}
Invoker invoker = null;
try {
@@ -396,4 +395,3 @@
}
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Thu Jul 16 03:23:43 2009
@@ -491,24 +491,24 @@
/**
* Register an <code>Invoker</code> for this target type.
*
- * @param targettype The target type (specified by "targettype"
- * attribute of <invoke> tag).
+ * @param type The target type (specified by "type"
+ * attribute of <invoke> tag).
* @param invokerClass The <code>Invoker</code> <code>Class</code>.
*/
- public void registerInvokerClass(final String targettype,
+ public void registerInvokerClass(final String type,
final Class invokerClass) {
- scInstance.registerInvokerClass(targettype, invokerClass);
+ scInstance.registerInvokerClass(type, invokerClass);
}
/**
* Remove the <code>Invoker</code> registered for this target
* type (if there is one registered).
*
- * @param targettype The target type (specified by "targettype"
- * attribute of <invoke> tag).
+ * @param type The target type (specified by "type"
+ * attribute of <invoke> tag).
*/
- public void unregisterInvokerClass(final String targettype) {
- scInstance.unregisterInvokerClass(targettype);
+ public void unregisterInvokerClass(final String type) {
+ scInstance.unregisterInvokerClass(type);
}
/**
@@ -602,4 +602,3 @@
"SCXMLExecutor: State machine not set";
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java Thu Jul 16 03:23:43 2009
@@ -56,13 +56,13 @@
@see EventDispatcher#send(String,String,String,String,Map,Object,long,List)
*/
public void send(final String sendId, final String target,
- final String targetType, final String event, final Map params,
+ final String type, final String event, final Map params,
final Object hints, final long delay, final List externalNodes) {
if (log.isInfoEnabled()) {
StringBuffer buf = new StringBuffer();
buf.append("send ( sendId: ").append(sendId);
buf.append(", target: ").append(target);
- buf.append(", targetType: ").append(targetType);
+ buf.append(", type: ").append(type);
buf.append(", event: ").append(event);
buf.append(", params: ").append(String.valueOf(params));
buf.append(", hints: ").append(String.valueOf(hints));
@@ -74,4 +74,3 @@
}
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java Thu Jul 16 03:23:43 2009
@@ -34,15 +34,15 @@
/**
* <p>EventDispatcher implementation that can schedule <code>delay</code>ed
- * <send> events for the "scxml" <code>targettype</code>
+ * <send> events for the "scxml" <code>type</code>
* attribute value (which is also the default). This implementation uses
* J2SE <code>Timer</code>s.</p>
*
- * <p>No other <code>targettype</code>s are processed. Subclasses may support
- * additional <code>targettype</code>s by overriding the
+ * <p>No other <code>type</code>s are processed. Subclasses may support
+ * additional <code>type</code>s by overriding the
* <code>send(...)</code> and <code>cancel(...)</code> methods and
* delegating to their <code>super</code> counterparts for the
- * "scxml" <code>targettype</code>.</p>
+ * "scxml" <code>type</code>.</p>
*
*/
public class SimpleScheduler implements EventDispatcher, Serializable {
@@ -101,14 +101,14 @@
@see EventDispatcher#send(String,String,String,String,Map,Object,long,List)
*/
public void send(final String sendId, final String target,
- final String targettype, final String event, final Map params,
+ final String type, final String event, final Map params,
final Object hints, final long delay, final List externalNodes) {
// Log callback
if (log.isInfoEnabled()) {
StringBuffer buf = new StringBuffer();
buf.append("send ( sendId: ").append(sendId);
buf.append(", target: ").append(target);
- buf.append(", targetType: ").append(targettype);
+ buf.append(", type: ").append(type);
buf.append(", event: ").append(event);
buf.append(", params: ").append(String.valueOf(params));
buf.append(", hints: ").append(String.valueOf(hints));
@@ -117,9 +117,9 @@
log.info(buf.toString());
}
- // We only handle the "scxml" targettype (which is the default too)
- if (SCXMLHelper.isStringEmpty(targettype)
- || targettype.trim().equalsIgnoreCase(TARGETTYPE_SCXML)) {
+ // We only handle the "scxml" type (which is the default too)
+ if (SCXMLHelper.isStringEmpty(type)
+ || type.trim().equalsIgnoreCase(TYPE_SCXML)) {
if (!SCXMLHelper.isStringEmpty(target)) {
// We know of no other target
@@ -246,9 +246,9 @@
}
/**
- * The default targettype.
+ * The default target type.
*/
- private static final String TARGETTYPE_SCXML = "scxml";
+ private static final String TYPE_SCXML = "scxml";
/**
* The spec mandated derived event when target cannot be reached.
@@ -257,4 +257,3 @@
"error.send.targetunavailable";
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/Invoker.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/Invoker.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/Invoker.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/Invoker.java Thu Jul 16 03:23:43 2009
@@ -27,7 +27,7 @@
* activities.</p>
*
* <p>Invocable activities must first register an Invoker implementation class
- * for the appropriate "targettype" (attribute of <invoke>) with the
+ * for the appropriate "type" (attribute of <invoke>) with the
* parent <code>SCXMLExecutor</code>.</p>
*
* <p>The communication link between the parent state machine executor and
@@ -35,16 +35,16 @@
*
* <p>All events triggered on the parent state machine get forwarded to the
* invoked activity. The processing semantics for these events depend
- * upon the "targettype", and thereby vary per concrete implementation of
+ * upon the "type", and thereby vary per concrete implementation of
* this interface.</p>
*
* <p>The invoked activity in turn must fire a special "done" event
* when it concludes. It may fire additional events before the "done"
* event. The semantics of any additional events depend upon the
- * "targettype". The invoked activity must not fire any events after the
- * "done" event. The name of the special "done" event must be
- * the ID of the parent state wherein the corresponding <invoke>
- * resides, with the String ".invoke.done" appended.</p>
+ * "type". The invoked activity must not fire any events after the "done"
+ * event. The name of the special "done" event must be the ID of the parent
+ * state wherein the corresponding <invoke> resides, with the String
+ * ".invoke.done" appended.</p>
*
* <p>The Invoker "lifecycle" is outlined below:
* <ol>
@@ -121,4 +121,3 @@
throws InvokerException;
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/ModelUpdater.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/ModelUpdater.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/ModelUpdater.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/ModelUpdater.java Thu Jul 16 03:23:43 2009
@@ -183,9 +183,9 @@
if (p != null) {
updateParallel(p, targets);
} else if (inv != null) {
- String ttype = inv.getTargettype();
- if (ttype == null || ttype.trim().length() == 0) {
- logAndThrowModelError(ERR_INVOKE_NO_TARGETTYPE,
+ String type = inv.getType();
+ if (type == null || type.trim().length() == 0) {
+ logAndThrowModelError(ERR_INVOKE_NO_TYPE,
new Object[] {getStateName(s)});
}
String src = inv.getSrc();
@@ -429,11 +429,11 @@
+ " belonging to \"{1}\" is also a history";
/**
- * Error message when an <invoke> does not specify a "targettype"
+ * Error message when an <invoke> does not specify a "type"
* attribute.
*/
- private static final String ERR_INVOKE_NO_TARGETTYPE = "{0} contains "
- + "<invoke> with no \"targettype\" attribute specified.";
+ private static final String ERR_INVOKE_NO_TYPE = "{0} contains "
+ + "<invoke> with no \"type\" attribute specified.";
/**
* Error message when an <invoke> does not specify a "src"
@@ -451,4 +451,3 @@
+ " must specify either one, but not both.";
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java Thu Jul 16 03:23:43 2009
@@ -223,11 +223,11 @@
public static void serializeInvoke(final StringBuffer b,
final Invoke i, final String indent) {
b.append(indent).append("<invoke");
- String ttype = i.getTargettype();
+ String type = i.getType();
String src = i.getSrc();
String srcexpr = i.getSrcexpr();
- if (ttype != null) {
- b.append(" targettype=\"").append(ttype).append("\"");
+ if (type != null) {
+ b.append(" type=\"").append(type).append("\"");
}
// Prefer src
if (src != null) {
@@ -519,8 +519,8 @@
if (send.getTarget() != null) {
b.append(" target=\"").append(send.getTarget()).append("\"");
}
- if (send.getTargettype() != null) {
- b.append(" targetType=\"").append(send.getTargettype()).append("\"");
+ if (send.getType() != null) {
+ b.append(" type=\"").append(send.getType()).append("\"");
}
if (send.getNamelist() != null) {
b.append(" namelist=\"").append(send.getNamelist()).append("\"");
@@ -671,4 +671,3 @@
}
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Invoke.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Invoke.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Invoke.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Invoke.java Thu Jul 16 03:23:43 2009
@@ -40,7 +40,7 @@
/**
* The type of target to be invoked.
*/
- private String targettype;
+ private String type;
/**
* The source URL for the external service.
@@ -93,18 +93,38 @@
* Get the target type for this <invoke> element.
*
* @return String Returns the targettype.
+ * @deprecated Use {@link #getType()} instead.
*/
public final String getTargettype() {
- return targettype;
+ return type;
}
/**
* Set the target type for this <invoke> element.
*
* @param targettype The targettype to set.
+ * @deprecated Use {@link #setType(String)} instead.
*/
public final void setTargettype(final String targettype) {
- this.targettype = targettype;
+ this.type = targettype;
+ }
+
+ /**
+ * Get the type for this <invoke> element.
+ *
+ * @return String Returns the type.
+ */
+ public final String getType() {
+ return type;
+ }
+
+ /**
+ * Set the type for this <invoke> element.
+ *
+ * @param type The type to set.
+ */
+ public final void setType(final String type) {
+ this.type = type;
}
/**
@@ -229,4 +249,3 @@
}
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Send.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Send.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Send.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Send.java Thu Jul 16 03:23:43 2009
@@ -47,13 +47,13 @@
private static final long serialVersionUID = 1L;
/**
- * The default targettype.
+ * The default target type.
*/
- private static final String TARGETTYPE_SCXML = "scxml";
+ private static final String TYPE_SCXML = "scxml";
/**
* The spec mandated derived event when target cannot be reached
- * for TARGETTYPE_SCXML.
+ * for TYPE_SCXML.
*/
private static final String EVENT_ERR_SEND_TARGETUNAVAILABLE =
"error.send.targetunavailable";
@@ -72,7 +72,7 @@
* The type of the Event I/O Processor that the event.
* should be dispatched to
*/
- private String targettype;
+ private String type;
/**
* The event is dispatched after the delay interval elapses.
@@ -230,18 +230,38 @@
* Get the target type for this <send> element.
*
* @return String Returns the targettype.
+ * @deprecated Use {@link #getType()} instead.
*/
public final String getTargettype() {
- return targettype;
+ return type;
}
/**
* Set the target type for this <send> element.
*
* @param targettype The targettype to set.
+ * @deprecated Use {@link #setType(String)} instead.
*/
public final void setTargettype(final String targettype) {
- this.targettype = targettype;
+ this.type = targettype;
+ }
+
+ /**
+ * Get the type for this <send> element.
+ *
+ * @return String Returns the type.
+ */
+ public final String getType() {
+ return type;
+ }
+
+ /**
+ * Set the type for this <send> element.
+ *
+ * @param type The type to set.
+ */
+ public final void setType(final String type) {
+ this.type = type;
}
/**
@@ -289,17 +309,17 @@
+ "\" evaluated to null or empty String");
}
}
- String targettypeValue = targettype;
- if (!SCXMLHelper.isStringEmpty(targettype)) {
- targettypeValue = (String) eval.eval(ctx, targettype);
- if (SCXMLHelper.isStringEmpty(targettypeValue)
+ String typeValue = type;
+ if (!SCXMLHelper.isStringEmpty(type)) {
+ typeValue = (String) eval.eval(ctx, type);
+ if (SCXMLHelper.isStringEmpty(typeValue)
&& appLog.isWarnEnabled()) {
- appLog.warn("<send>: targettype expression \"" + targettype
+ appLog.warn("<send>: type expression \"" + type
+ "\" evaluated to null or empty String");
}
} else {
// must default to 'scxml' when unspecified
- targettypeValue = TARGETTYPE_SCXML;
+ typeValue = TYPE_SCXML;
}
Map params = null;
if (!SCXMLHelper.isStringEmpty(namelist)) {
@@ -334,8 +354,8 @@
}
}
// Lets see if we should handle it ourselves
- if (targettypeValue != null
- && targettypeValue.trim().equalsIgnoreCase(TARGETTYPE_SCXML)) {
+ if (typeValue != null
+ && typeValue.trim().equalsIgnoreCase(TYPE_SCXML)) {
if (SCXMLHelper.isStringEmpty(targetValue)) {
// TODO: Remove both short-circuit passes in v1.0
if (wait == 0L) {
@@ -364,11 +384,11 @@
if (appLog.isDebugEnabled()) {
appLog.debug("<send>: Dispatching event '" + eventValue
+ "' to target '" + targetValue + "' of target type '"
- + targettypeValue + "' with suggested delay of " + wait
+ + typeValue + "' with suggested delay of " + wait
+ "ms");
}
// Else, let the EventDispatcher take care of it
- evtDispatcher.send(sendid, targetValue, targettypeValue, eventValue,
+ evtDispatcher.send(sendid, targetValue, typeValue, eventValue,
params, hintsValue, wait, externalNodes);
}
@@ -430,4 +450,3 @@
private static final long MILLIS_IN_A_MINUTE = 60000L;
}
-
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java Thu Jul 16 03:23:43 2009
@@ -795,10 +795,10 @@
if (pr != null) {
source = i.getPathResolver().resolvePath(src);
}
- String ttype = i.getTargettype();
+ String type = i.getType();
Invoker inv = null;
try {
- inv = scInstance.newInvoker(ttype);
+ inv = scInstance.newInvoker(type);
} catch (InvokerException ie) {
TriggerEvent te = new TriggerEvent(s.getId()
+ ".invoke.failed", TriggerEvent.ERROR_EVENT);
@@ -948,4 +948,3 @@
}
}
-
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java Thu Jul 16 03:23:43 2009
@@ -256,7 +256,7 @@
next()).getId());
}
- public void testSend02TargettypeSCXMLSample() throws Exception {
+ public void testSend02TypeSCXMLSample() throws Exception {
exec = SCXMLTestHelper.getExecutor(send02);
assertNotNull(exec);
Set currentStates = exec.getCurrentStatus().getStates();
@@ -284,4 +284,3 @@
TestRunner.run(suite());
}
}
-
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/WizardsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/WizardsTest.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/WizardsTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/WizardsTest.java Thu Jul 16 03:23:43 2009
@@ -124,7 +124,7 @@
private static final long serialVersionUID = 1L;
// If you change this, you must also change testWizard02Sample()
int callback = 0;
- public void send(String sendId, String target, String targetType,
+ public void send(String sendId, String target, String type,
String event, Map params, Object hints, long delay,
List externalNodes) {
int i = ((Integer) params.get("aValue")).intValue();
@@ -150,4 +150,4 @@
public static void main(String args[]) {
TestRunner.run(suite());
}
-}
+}
\ No newline at end of file
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/env/jexl/wizard-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/env/jexl/wizard-02.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/env/jexl/wizard-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/env/jexl/wizard-02.xml Thu Jul 16 03:23:43 2009
@@ -20,7 +20,7 @@
initialstate="state1">
<state id="state1">
<onentry>
- <!-- Send without a targettype causes the
+ <!-- Send without a type causes the
default to be chosen as "scxml".
This will cause the first transition
to state2 to be immediately followed. -->
@@ -34,11 +34,11 @@
<onentry>
<var name="aValue" expr="2"/>
<!-- Send with a non-empty (and not "scxml")
- targettype causes the callback on the
+ type causes the callback on the
EventDispatcher implementation. See
testWizard02Sample() in WizardsTest
(org.apache.commons.scxml test package) -->
- <send namelist="aValue" targettype="'foo'" />
+ <send namelist="aValue" type="'foo'" />
</onentry>
<transition event="event1" target="state1"/>
<transition event="event3" target="state3"/>
@@ -47,7 +47,7 @@
<state id="state3">
<onentry>
<var name="aValue" expr="3"/>
- <send namelist="aValue" targettype="'foo'" />
+ <send namelist="aValue" type="'foo'" />
</onentry>
<transition event="event1" target="state1"/>
<transition event="event2" target="state2"/>
@@ -56,10 +56,10 @@
<state id="state4">
<onentry>
<var name="aValue" expr="4"/>
- <send namelist="aValue" targettype="'foo'" />
+ <send namelist="aValue" type="'foo'" />
</onentry>
<transition event="event1" target="state1"/>
<transition event="event2" target="state2"/>
<transition event="event3" target="state3"/>
</state>
-</scxml>
+</scxml>
\ No newline at end of file
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoked-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoked-03.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoked-03.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoked-03.xml Thu Jul 16 03:23:43 2009
@@ -24,7 +24,7 @@
<onentry>
<log expr="' Outer invoke ...'"/>
</onentry>
- <invoke targettype="scxml" src="invoked-03-01.xml"/>
+ <invoke type="scxml" src="invoked-03-01.xml"/>
<transition event="state1.next" target="end1" />
</state>
@@ -35,4 +35,3 @@
</state>
</scxml>
-
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-01.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-01.xml Thu Jul 16 03:23:43 2009
@@ -23,7 +23,7 @@
<onentry>
<log expr="'Begin invoke test ...'" />
</onentry>
- <invoke targettype="scxml" src="invoked-01.xml">
+ <invoke type="scxml" src="invoked-01.xml">
<param name="foo" expr="'foo'" />
<param name="bar" expr="'bar'" />
<finalize>
@@ -36,4 +36,3 @@
<state id="end" final="true" />
</scxml>
-
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-02.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-02.xml Thu Jul 16 03:23:43 2009
@@ -20,11 +20,10 @@
initialstate="invoker">
<state id="invoker">
- <invoke targettype="scxml" src="invoked-02.xml"/>
+ <invoke type="scxml" src="invoked-02.xml"/>
<transition event="invoker.invoke.done" target="end" />
</state>
<state id="end" final="true" />
</scxml>
-
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-03.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-03.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-03.xml Thu Jul 16 03:23:43 2009
@@ -24,7 +24,7 @@
<onentry>
<log expr="'Invoker ...'"/>
</onentry>
- <invoke targettype="scxml" src="invoked-03.xml"/>
+ <invoke type="scxml" src="invoked-03.xml"/>
<transition event="invoker.invoke.done" target="end">
<log expr="' Outer invoke completed'"/>
</transition>
@@ -37,4 +37,3 @@
</state>
</scxml>
-
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-04.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-04.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-04.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/invoker-04.xml Thu Jul 16 03:23:43 2009
@@ -34,22 +34,22 @@
</state>
<state id="first">
- <invoke src="FirstTestSrc" targettype="x-test">
+ <invoke src="FirstTestSrc" type="x-test">
<param name="ding" expr="Data(foo,'node()')"/>
</invoke>
<transition event="test.trigger" target="second"/>
</state>
<state id="second">
- <invoke src="SecondTestSrc" targettype="x-test">
+ <invoke src="SecondTestSrc" type="x-test">
<param name="Data(foo,'node()')"/>
</invoke>
<transition event="test.trigger" target="third"/>
</state>
<state id="third">
- <invoke src="ThirdTestSrc" targettype="x-test">
+ <invoke src="ThirdTestSrc" type="x-test">
<param name="Data(foo,'gibberish')"/>
</invoke>
</state>
-</scxml>
+</scxml>
\ No newline at end of file
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java Thu Jul 16 03:23:43 2009
@@ -82,7 +82,7 @@
Send send = new Send();
send.setSendid("1");
send.setTarget("newTarget");
- send.setTargettype("newTargetType");
+ send.setType("newType");
send.setNamelist("names");
send.setDelay("4s");
send.setEvent("turnoff");
@@ -90,7 +90,7 @@
String assertValue = " <send sendid=\"1\" " +
"target=\"newTarget\" " +
- "targetType=\"newTargetType\" " +
+ "type=\"newType\" " +
"namelist=\"names\" " +
"delay=\"4s\" " +
"event=\"turnoff\" " +
@@ -395,4 +395,4 @@
assertEquals(assertValue, s);
}
-}
+}
\ No newline at end of file
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-initial-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-initial-test.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-initial-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-initial-test.xml Thu Jul 16 03:23:43 2009
@@ -35,7 +35,7 @@
</if>
<cs:var name="drink" expr="water" />
<cs:var name="eat" expr="flies" />
- <send sendid="send12345" target="freddy" targettype="frog"
+ <send sendid="send12345" target="freddy" type="frog"
event="croak" namelist="drink eat" hints="h2o bzz"
delay="${1000+500}" />
<cancel sendId="send12345"/>
@@ -54,4 +54,4 @@
</state>
-</scxml>
+</scxml>
\ No newline at end of file
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-parallel-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-parallel-test.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-parallel-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-parallel-test.xml Thu Jul 16 03:23:43 2009
@@ -34,7 +34,7 @@
</if>
<cs:var name="drink" expr="water" />
<cs:var name="eat" expr="flies" />
- <send sendid="send12345" target="freddy" targettype="frog"
+ <send sendid="send12345" target="freddy" type="frog"
event="croak" namelist="drink eat" hints="h2o bzz"
delay="${1000+500}" />
<cancel sendId="send12345"/>
@@ -52,4 +52,4 @@
<state id="state02"/>
</parallel>
-</scxml>
+</scxml>
\ No newline at end of file
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-state-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-state-test.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-state-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-state-test.xml Thu Jul 16 03:23:43 2009
@@ -34,7 +34,7 @@
</if>
<cs:var name="drink" expr="water" />
<cs:var name="eat" expr="flies" />
- <send sendid="send12345" target="freddy" targettype="frog"
+ <send sendid="send12345" target="freddy" type="frog"
event="croak" namelist="drink eat" hints="h2o bzz"
delay="${1000+500}" />
<cancel sendId="send12345"/>
@@ -49,4 +49,4 @@
</state>
-</scxml>
+</scxml>
\ No newline at end of file
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-01.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-01.xml Thu Jul 16 03:23:43 2009
@@ -22,7 +22,7 @@
<state id="ten">
<transition event="ten.done" target="twenty">
<send sendid="send1" delay="'0'"
- target="'http://localhost:8080/VXMLInterpreter'" targettype="'v3'"
+ target="'http://localhost:8080/VXMLInterpreter'" type="'v3'"
xmlns:v3="http://foo.bar.com/vxml3"
xmlns:test="http://my.test.namespace">
<v3:form id="Confirm">
@@ -45,4 +45,3 @@
<state id="twenty" final="true" />
</scxml>
-
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-02.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/send-02.xml Thu Jul 16 03:23:43 2009
@@ -32,21 +32,21 @@
<state id="twenty">
<onentry>
- <send event="'twenty.done'" targettype="'scxml'" />
+ <send event="'twenty.done'" type="'scxml'" />
</onentry>
<transition event="twenty.done" target="thirty" />
</state>
<state id="thirty">
<onentry>
- <send event="'thirty.done'" targettype="' sCxML '" />
+ <send event="'thirty.done'" type="' sCxML '" />
</onentry>
<transition event="thirty.done" target="forty" />
</state>
<state id="forty">
<onentry>
- <send event="'forty.done'" targettype=" " target=" " />
+ <send event="'forty.done'" type=" " target=" " />
</onentry>
<transition event="forty.done" target="fifty" />
</state>
@@ -60,14 +60,14 @@
<state id="sixty">
<onentry>
- <send event="'sixty.done'" targettype="'scxml'" target=" " />
+ <send event="'sixty.done'" type="'scxml'" target=" " />
</onentry>
<transition event="sixty.done" target="seventy" />
</state>
<state id="seventy">
<onentry>
- <send event="'seventy.done'" targettype="'scxml'" target="'foo'" />
+ <send event="'seventy.done'" type="'scxml'" target="'foo'" />
</onentry>
<!-- This transition should not be followed since
@@ -87,4 +87,3 @@
<state id="ninety" final="true" />
</scxml>
-
Modified: commons/proper/scxml/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/xdocs/changes.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/xdocs/changes.xml (original)
+++ commons/proper/scxml/trunk/xdocs/changes.xml Thu Jul 16 03:23:43 2009
@@ -418,7 +418,7 @@
description="Release">
<action dev="rahul" type="fix" issue="SCXML-16" due-to="Sitthichai Rernglertpricha">
- [12-12-2006] target and targettype attributes of <send> element
+ [12-12-2006] target and type attributes of <send> element
are now evaluated as expressions.
</action>
@@ -475,7 +475,7 @@
<action dev="rahul" type="fix" issue="SCXML-21">
[10-17-2006] New EventDispatcher implementation (SimpleScheduler)
that provides the ability to deal with delayed events for the
- "scxml" <send> targettype.
+ "scxml" <send> type.
</action>
<action dev="rahul" type="fix" issue="SCXML-2">
Modified: commons/proper/scxml/trunk/xdocs/guide/core-engine.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/xdocs/guide/core-engine.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/xdocs/guide/core-engine.xml (original)
+++ commons/proper/scxml/trunk/xdocs/guide/core-engine.xml Thu Jul 16 03:23:43 2009
@@ -69,7 +69,7 @@
<p>Commons SCXML provides an
<a href="../apidocs/org/apache/commons/scxml/EventDispatcher.html">EventDispatcher</a>
interface for wiring the behavior of SCXML <send> and
- <cancel> actions. This allows users to define custom "targettypes"
+ <cancel> actions. This allows users to define custom target "types"
as long as they handle the callbacks on the <code>EventDispatcher</code>
implementation provided to the executor. The introductory section on
using Commons SCXML has a brief discussion on
@@ -120,4 +120,4 @@
</body>
-</document>
+</document>
\ No newline at end of file
Modified: commons/proper/scxml/trunk/xdocs/guide/using-commons-scxml.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/xdocs/guide/using-commons-scxml.xml?rev=794503&r1=794502&r2=794503&view=diff
==============================================================================
--- commons/proper/scxml/trunk/xdocs/guide/using-commons-scxml.xml (original)
+++ commons/proper/scxml/trunk/xdocs/guide/using-commons-scxml.xml Thu Jul 16 03:23:43 2009
@@ -116,8 +116,8 @@
<p>SCXML includes the <send> action to "dispatch" an event of choice
(including whatever payload) to a specified target (of a specified
- targettype). The payload is delivered in the form of a namelist,
- which can be considered as params for the event target.</p>
+ type). The payload is delivered in the form of a namelist, which can be
+ considered as params for the event target.</p>
<p>The callbacks are received on the
<a href="../apidocs/org/apache/commons/scxml/EventDispatcher.html">EventDispatcher</a>
@@ -177,4 +177,3 @@
</body>
</document>
-