commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1573253 - in /commons/proper/scxml/trunk: ./ src/main/java/org/apache/commons/scxml2/env/faces/ src/main/java/org/apache/commons/scxml2/env/jsp/ src/main/java/org/apache/commons/scxml2/env/rhino/ src/main/java/org/apache/commons/scxml2/env...
Date Sun, 02 Mar 2014 02:23:15 GMT
Author: ate
Date: Sun Mar  2 02:23:14 2014
New Revision: 1573253

URL: http://svn.apache.org/r1573253
Log:
SCXML-194: Drop outdated, incomplete, broken or no longer supported features for SCXML 2.0
See: https://issues.apache.org/jira/browse/SCXML-194

Removed:
    commons/proper/scxml/trunk/BRANCHINFO.txt
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/faces/
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/servlet/
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneElExpressions.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneRhinoExpressions.java
    commons/proper/scxml/trunk/src/site/xdoc/guide/side-effect-el.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/rdc-group/
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-in-rdc-group.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-in-shale-dialogs.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch-on-android/
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch-on-android.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/shale-dialogs/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/custom-hello-world-04-el.xml
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/faces/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jsp/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/test/
Modified:
    commons/proper/scxml/trunk/pom.xml
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
    commons/proper/scxml/trunk/src/site/fml/faq.fml
    commons/proper/scxml/trunk/src/site/site.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/core-engine.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/datamodel.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/testing-standalone.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/using-commons-scxml.xml
    commons/proper/scxml/trunk/src/site/xdoc/index.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch.xml
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/NamespacePrefixedXPathsTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/SCXMLExecutorTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml

Modified: commons/proper/scxml/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/pom.xml (original)
+++ commons/proper/scxml/trunk/pom.xml Sun Mar  2 02:23:14 2014
@@ -149,57 +149,25 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-jexl</artifactId>
       <version>2.1.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>rhino</groupId>
-      <artifactId>js</artifactId>
-      <version>1.6R7</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
       <version>2.2.1</version>
       <optional>true</optional>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
       <version>2.3.0</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-api</artifactId>
-      <version>1.1.8</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
+    -->
   </dependencies>
 
   <distributionManagement>

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java Sun Mar  2 02:23:14 2014
@@ -46,11 +46,9 @@ import org.apache.commons.scxml2.model.S
  * The following expression languages are supported in SCXML documents:
  * <ol>
  *  <li>JEXL - Using Commons JEXL</li>
- *  <li>EL - Using Commons EL</li>
  * </ol>
  *
  * @see org.apache.commons.scxml2.env.jexl
- * @see org.apache.commons.scxml2.env.jsp
  */
 public final class StandaloneUtils {
 
@@ -94,7 +92,7 @@ public final class StandaloneUtils {
             exec.go();
             BufferedReader br = new BufferedReader(new
                 InputStreamReader(System.in));
-            String event = null;
+            String event;
             while ((event = br.readLine()) != null) {
                 event = event.trim();
                 if (event.equalsIgnoreCase("help") || event.equals("?")) {

Modified: commons/proper/scxml/trunk/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/fml/faq.fml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/fml/faq.fml (original)
+++ commons/proper/scxml/trunk/src/site/fml/faq.fml Sun Mar  2 02:23:14 2014
@@ -57,17 +57,12 @@
 
   <faq id="dependencies">
    <question>
-    What are the core requirements of SCXML? Do I need to include
-    the JSP and Servlet API or the Faces libraries?
+    What are the core requirements of SCXML?
    </question>
    <answer>
-    The "core" requirements for Commons SCXML are Commons Digester and
-    Commons Logging. Commons Digester, at the minimum (if you use Commons
-    Digester 1.7+), has a runtime dependency on Commons BeanUtils. 
-    You do not need to include JSP or Servlet or Faces libraries. These
-    are meant to come in via the servlet container (if at
-    all you need them). You will need to choose an expression
-    language for your SCXML documents (details in next section of this
+    The "core" requirements for Commons SCXML are Commons Logging.
+    You will need to choose an expression language for your SCXML documents
+    (details in next section of this
     FAQ). See the <a href="dependencies.html">dependencies page</a>
     for details about the dependency versions.
    </answer>
@@ -85,8 +80,8 @@
    </question>
    <answer>
     Commons SCXML currently supports
-    <a href="http://commons.apache.org/jexl/">Commons JEXL</a> and
-    <a href="http://commons.apache.org/el/">Commons EL</a>. For details,
+    <a href="http://commons.apache.org/jexl/">Commons JEXL</a>, Javascript, XPath and
+    <a href="http://groovy.codehaus.org/">Groovy</a>. For details,
     see the <a href="guide/testing-standalone.html">trying out</a> and
     <a href="guide/contexts-evaluators.html">contexts and evaluators</a>
     pages of the user guide.
@@ -99,7 +94,7 @@
    </question>
    <answer>
     No, the expressions throughout the document must be homogeneous. This
-    also applies to any external documents that may be refered by this
+    also applies to any external documents that may be referred by this
     document, for example via "src" attributes.
    </answer>
   </faq>

Modified: commons/proper/scxml/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/site.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/site.xml (original)
+++ commons/proper/scxml/trunk/src/site/site.xml Sun Mar  2 02:23:14 2014
@@ -61,9 +61,6 @@
         <item     name="Custom Semantics"
                   href="/guide/custom-semantics.html" />
 
-        <item     name="Side Effect - EL"  
-                  href="/guide/side-effect-el.html" />
-
       </item>
 
       <item       name="Javadoc"
@@ -79,15 +76,6 @@
         <item     name="SCXML Stopwatch"
                   href="/usecases/scxml-stopwatch.html" />
 
-        <item     name="SCXML in RDC group container"  
-                  href="/usecases/scxml-in-rdc-group.html" />
-
-        <item     name="SCXML in Shale dialogs"        
-                  href="/usecases/scxml-in-shale-dialogs.html" />
-
-        <item     name="SCXML in Google Android"
-                  href="/usecases/scxml-stopwatch-on-android.html" />
-
       </item>
 
       <item       name="Building"                      

Modified: commons/proper/scxml/trunk/src/site/xdoc/guide.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/guide.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/guide.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/guide.xml Sun Mar  2 02:23:14 2014
@@ -84,8 +84,6 @@
   <subsection name="Side-effects">
    <p>Contains notes about non-primary uses for Commons SCXML.</p>
    <ul>
-    <li><a href="guide/side-effect-el.html">EL</a> - Trying Commons EL outside
-    a servlet container.</li>
    </ul>
   </subsection>
 

Modified: commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml Sun Mar  2 02:23:14 2014
@@ -77,10 +77,10 @@
 
   <section name="Available expression languages">
 
-   <p>Commons SCXML currently supports using Commons JEXL and
-      Commons EL (JSP 2.0 EL) as the expression language.
+   <p>Commons SCXML currently supports using Commons JEXL, Javascript, XPath and
+      Groovy as the expression language.
       The expressions throughout the document must be homogeneous.
-      This also applies to any external documents that may be refered
+      This also applies to any external documents that may be referred
       by this document, for example via "src" attributes, like so: 
 
     <pre>
@@ -103,10 +103,24 @@
     relevant root context and evaluator tuple to use.</p>
    </subsection>
 
-   <subsection name="Commons EL (JSP 2.0 EL)">
+    <subsection name="Javascript">
+      <p>See
+        <a href="../apidocs/org/apache/commons/scxml2/env/javascript/package-summary.html">
+          org.apache.commons.scxml2.env.javascript package summary</a> for the
+        relevant root context and evaluator tuple to use.</p>
+    </subsection>
+
+    <subsection name="XPath">
+      <p>See
+        <a href="../apidocs/org/apache/commons/scxml2/env/xpath/package-summary.html">
+          org.apache.commons.scxml2.env.xpath package summary</a> for the
+        relevant root context and evaluator tuple to use.</p>
+    </subsection>
+
+    <subsection name="Groovy">
     <p>See
-    <a href="../apidocs/org/apache/commons/scxml2/env/jsp/package-summary.html">
-    org.apache.commons.scxml2.env.jsp package summary</a> for the
+    <a href="../apidocs/org/apache/commons/scxml2/env/groovy/package-summary.html">
+    org.apache.commons.scxml2.env.groovy package summary</a> for the
     relevant root context and evaluator tuple to use.</p>
    </subsection>
 
@@ -115,8 +129,8 @@
   <section name="Method invocation in expressions">
 
    <p>Commons SCXML uses the mechanisms provided by the expression language
-   chosen for the document to support method invocation. Commons JEXL and
-   Commons EL allow for method invocations as follows:</p>
+   chosen for the document to support method invocation. Commons JEXL
+   allow for method invocations as follows:</p>
 
    <subsection name="Commons JEXL">
     <p>See Commons JEXL reference for 
@@ -129,15 +143,6 @@
     <code>foo.bar()</code></p>
    </subsection>
 
-   <subsection name="Commons EL (JSP 2.0 EL)">
-    <p>It is possible to register "namespaced" functions with the
-    <a href="../apidocs/org/apache/commons/scxml2/env/jsp/ELEvaluator.html">
-    ELEvaluator</a> to enable method invocation. The methods need to be
-    static accessible methods in the class(es) that implement(s) them,
-    and a suitable <code>FunctionMapper</code> is passed in via the
-    ELEvaluator constructor. For further details, see the JSP 2.0 EL API.</p>
-   </subsection>
-
   </section>
 
  </body>

Modified: commons/proper/scxml/trunk/src/site/xdoc/guide/core-engine.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/guide/core-engine.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/guide/core-engine.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/guide/core-engine.xml Sun Mar  2 02:23:14 2014
@@ -61,7 +61,7 @@
      expression languages so SCXML documents can be used in varying
      environments. The <code>Context</code> and <code>Evaluator</code>
      interfaces serve as adapters to the particular expression language
-     APIs. Commons SCXML currently supports JEXL and JSP 2.0 EL
+     APIs. Commons SCXML currently supports JEXL, Javascript, Groovy and XPath
      expressions. See the section on
      <a href="contexts-evaluators.html">contexts and evaluators</a>
      for further details about contexts, evaluators and root contexts.</p>

Modified: commons/proper/scxml/trunk/src/site/xdoc/guide/datamodel.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/guide/datamodel.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/guide/datamodel.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/guide/datamodel.xml Sun Mar  2 02:23:14 2014
@@ -205,9 +205,9 @@
    <p>Since the data elements contain XML data trees, the straightforward
    way to refer to bits inside these in expressions is to use XPath or an
    equivalent language. Commons SCXML currently supports expression languages
-   such as Commons JEXL and Commons EL, which do not have any inherent
+   such as Commons JEXL which do not have any inherent
    understanding of XPath. Therefore, Commons SCXML defines a <b>Data()</b>
-   function for use in JEXL or EL expressions, for example:</p>
+   function for use in JEXL or other expression languages, for example:</p>
 
    <pre>
     &lt;var name="arrival" expr="Data(hotelbooking, 'hotel/stay/arrival')" /&gt;

Modified: commons/proper/scxml/trunk/src/site/xdoc/guide/testing-standalone.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/guide/testing-standalone.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/guide/testing-standalone.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/guide/testing-standalone.xml Sun Mar  2 02:23:14 2014
@@ -38,7 +38,7 @@
    numbers for the Commons dependencies.</i></p>
 
    <p>An environment specific expression language is used in SCXML
-   documents. Commons SCXML currently supports the use of JEXL or JSP 2.0 EL
+   documents. Commons SCXML currently supports the use of JEXL, Javascript, XPath or Groovy
    in SCXML documents.</p>
 
    <subsection name="Using JEXL in SCXML documents">
@@ -52,9 +52,7 @@
     <pre>
     java -classpath
 
-    commons-digester-2.0.jar;commons-beanutils-1.8.0.jar;
-    commons-logging-1.1.1.jar;commons-scxml-0.9.jar;
-    commons-jexl-1.1.jar
+    commons-logging-1.1.1.jar;commons-scxml2-2.0-SNAPSHOT.jar;commons-jexl-2.1.1.jar
 
     <a href="../xref/org/apache/commons/scxml2/test/StandaloneJexlExpressions.html">org.apache.commons.scxml2.test.StandaloneJexlExpressions</a>
 
@@ -63,28 +61,6 @@
 
    </subsection>
 
-   <subsection name="Using JSP 2.0 EL in SCXML documents">
-
-    <p>The JSP Standalone class anticipates expressions in the JSP 2.0 
-    Expression Language, and hence requires commons-el.jar and jsp-api.jar.</p>
-
-    <p>So that amounts to (use the correct local paths and filenames to the
-    <code>jar</code> files and the SCXML document, without the line breaks):</p>
-
-    <pre>
-    java -classpath
-
-    commons-digester-1.7.jar;commons-beanutils-1.7.0.jar;
-    commons-logging-1.0.4.jar;commons-scxml-1.0-SNAPSHOT.jar;
-    commons-el-1.0.jar;jsp-api-2.0.jar
-
-    <a href="../xref/org/apache/commons/scxml2/test/StandaloneElExpressions.html">org.apache.commons.scxml2.test.StandaloneElExpressions</a>
-
-    <a href="http://svn.apache.org/repos/asf/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jsp/microwave-01.xml">microwave01.xml</a>
-    </pre>
-
-   </subsection>
-
    <p>You could set up something more elegant (a script, an ant task etc.),
    but that is what it boils down to.
    If the document is a well-formed SCXML document, you will be able to 
@@ -94,7 +70,7 @@
 
    <p>A few examples are available as part of the 
    <a href="http://svn.apache.org/repos/asf/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/">
-   Commons SCXML test suite</a> (look in env.jexl and env.jsp child packages as well).</p>
+   Commons SCXML test suite</a> (look in env.* child packages as well).</p>
 
   </section> 
 

Modified: commons/proper/scxml/trunk/src/site/xdoc/guide/using-commons-scxml.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/guide/using-commons-scxml.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/guide/using-commons-scxml.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/guide/using-commons-scxml.xml Sun Mar  2 02:23:14 2014
@@ -151,7 +151,7 @@
     children). The process may return a payload with the "done" event,
     that becomes available for decision making in the state machine
     context. Some related details are currently <b>TBD</b> in the Working
-    Draft and thefore, susceptible to change.</p>
+    Draft and therefore, susceptible to change.</p>
 
    </subsection>
 
@@ -166,10 +166,6 @@
    <ul>
     <li>The StopWatch usecases registers a SCXMLListener at the
     document root to manage the UI updates.</li>
-    <li>The RDC usecase (dialog management in speech apps) implicitly
-    maps state IDs to IDs of speech components that get activated.</li>
-    <li>The Shale usecase (cross-page navigation for JSF apps) has an
-    explicit lookup table mapping state IDs to JSF view IDs.</li>
    </ul>
 
   </section>

Modified: commons/proper/scxml/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/index.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/index.xml Sun Mar  2 02:23:14 2014
@@ -108,23 +108,13 @@
   <p>
    Projects that use Commons SCXML:
    <ul>
-    <li><a href="http://jakarta.apache.org/taglibs/doc/rdc-doc/intro.html">Reusable Dialog Components (RDC)</a>,
-        part of Apache Jakarta Taglibs - For choreographing the execution of speech components
-        taking part in a voice interaction bounded by a RDC group container.</li>
-    <li><a href="http://shale.apache.org/">Apache Shale</a> - For managing the flow of control in
-        web based applications, using <a href="http://shale.apache.org/shale-dialog/">Shale dialogs</a>.</li>
-    <li><a href="http://www.softwaredemo.de/en">Softwaredemo</a> - A platform for online live testing of software.
-        SCXML is responsible for managing all resources like VMs, storage and virtual desktop components.</li>
-    <li><a href="http://mymobileweb.morfeo-project.org/">MyMobileWeb project</a> - Open source software platform
-        for simplifying development of mobile web applications. Flow manager uses SCXML to control mobile
-        application flow.</li>
    </ul>
   </p>
  </section>
 
  <section name="Related Projects">
   <p>
-   Related projects providing some SCXML-related functionality:
+   Related projects providing some SCXML-related functionality (based on Commons SCXML 0.9):
    <ul>
     <li>
      <a href="http://commons.apache.org/sandbox/gsoc/2010/scxml-eclipse/">Commons SCXML - Eclipse</a> -

Modified: commons/proper/scxml/trunk/src/site/xdoc/usecases.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/usecases.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/usecases.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/usecases.xml Sun Mar  2 02:23:14 2014
@@ -54,23 +54,6 @@
        </ul>
     </p>
    </subsection>
-   <subsection name="Advanced">
-    <p>These are usecases within frameworks available in the open source
-       community, and are labeled advanced since they require some additional
-       knowledge about the framework relevant to the particular usecase.
-       <ul>
-        <li><a href="usecases/scxml-in-rdc-group.html">Usecase 2</a> - Use in
-        <a href="http://jakarta.apache.org/taglibs/doc/rdc-doc/intro.html">
-        Reusable Dialog Components (RDC) Framework</a> &lt;group&gt;
-        container.</li>
-        <li><a href="usecases/scxml-in-shale-dialogs.html">Usecase 3</a> -
-        Use in <a href="http://shale.apache.org/">Shale</a> dialogs</li>
-        <li><a href="usecases/scxml-stopwatch-on-android.html">Usecase 4</a> -
-        SCXML stopwatch example in <a href="http://code.google.com/android/">Google Android</a>
-        </li>
-       </ul>
-    </p>
-   </subsection>
    <p>If you know of another usecase we should list or if you are interesting
    in seeing if SCXML fits a usecase you have in mind, contact us via the
    <a href="mail-lists.html">mailing lists</a>.

Modified: commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch.xml Sun Mar  2 02:23:14 2014
@@ -36,10 +36,7 @@
 
    <subsection name="Motivation">
     <ul>
-     <li>Demonstrate a "standalone" usecase of Commons SCXML
-         (some of the other usecases are "frameworky" in nature and require
-         additional knowledge of the framework the particular usecase
-         refers to).</li>
+     <li>Demonstrate a "standalone" usecase of Commons SCXML</li>
      <li>Demonstrate the useful separation of concerns, the
          simplicity of the resulting artifacts, and the direct association
          between the model and the code when using Commons SCXML to

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/NamespacePrefixedXPathsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/NamespacePrefixedXPathsTest.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/NamespacePrefixedXPathsTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/NamespacePrefixedXPathsTest.java Sun Mar  2 02:23:14 2014
@@ -19,8 +19,6 @@ package org.apache.commons.scxml2;
 import java.net.URL;
 import java.util.Set;
 
-import org.apache.commons.scxml2.env.jsp.ELContext;
-import org.apache.commons.scxml2.env.jsp.ELEvaluator;
 import org.apache.commons.scxml2.model.State;
 import org.apache.commons.scxml2.model.TransitionTarget;
 import org.junit.After;
@@ -34,8 +32,8 @@ import org.junit.Test;
 public class NamespacePrefixedXPathsTest {
 
     // Test data
-    private URL datamodel03jexl, datamodel03jsp;
-    private SCXMLExecutor exec01, exec02;
+    private URL datamodel03jexl;
+    private SCXMLExecutor exec01;
 
     /**
      * Set up instance variables required by this test case.
@@ -44,10 +42,7 @@ public class NamespacePrefixedXPathsTest
     public void setUp() throws Exception {
         datamodel03jexl = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/env/jexl/datamodel-03.xml");
-        datamodel03jsp = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/datamodel-03.xml");
         exec01 = SCXMLTestHelper.getExecutor(datamodel03jexl);
-        exec02 = SCXMLTestHelper.getExecutor(datamodel03jsp, new ELContext(), new ELEvaluator());
     }
 
     /**
@@ -55,8 +50,8 @@ public class NamespacePrefixedXPathsTest
      */
     @After
     public void tearDown() {
-        datamodel03jexl = datamodel03jsp = null;
-        exec01 = exec02 = null;
+        datamodel03jexl = null;
+        exec01 = null;
     }
 
     /**
@@ -68,12 +63,6 @@ public class NamespacePrefixedXPathsTest
         runtest(exec01);
     }
 
-    // EL
-    @Test
-    public void testNamespacePrefixedXPathsEL() throws Exception {
-        runtest(exec02);
-    }
-
     // Same test, since same documents (different expression languages)
     private void runtest(SCXMLExecutor exec) throws Exception {
         // must be in state "ten" at the onset
@@ -111,7 +100,7 @@ public class NamespacePrefixedXPathsTest
 
         currentStates = SCXMLTestHelper.fireEvent(exec, "fifty.done");
         Assert.assertEquals(1, currentStates.size());
-        Assert.assertEquals("sixty", ((State)currentStates.iterator().
+        Assert.assertEquals("sixty", (currentStates.iterator().
             next()).getId());
 
         currentStates = SCXMLTestHelper.fireEvent(exec, "sixty.done");

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/SCXMLExecutorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/SCXMLExecutorTest.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/SCXMLExecutorTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/SCXMLExecutorTest.java Sun Mar  2 02:23:14 2014
@@ -22,10 +22,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.scxml2.env.SimpleContext;
 import org.apache.commons.scxml2.env.groovy.GroovyContext;
 import org.apache.commons.scxml2.env.groovy.GroovyEvaluator;
-import org.apache.commons.scxml2.env.jsp.ELEvaluator;
 import org.apache.commons.scxml2.model.SCXML;
 import org.apache.commons.scxml2.model.State;
 import org.apache.commons.scxml2.model.TransitionTarget;
@@ -39,8 +37,7 @@ import org.junit.Test;
 public class SCXMLExecutorTest {
 
     // Test data
-    private URL microwave01jsp, microwave02jsp, microwave01jexl,
-        microwave02jexl, microwave03jexl, microwave04jexl, microwave05jexl,
+    private URL microwave01jexl, microwave02jexl, microwave03jexl, microwave04jexl, microwave05jexl,
             microwave01grv, microwave02grv, microwave03grv, microwave04grv, microwave05grv, transitions01,
         transitions02, transitions03, transitions04, transitions05, transitions06, prefix01, send01, send02,
         transitionsWithCond01, transitionsEventVar;
@@ -51,10 +48,6 @@ public class SCXMLExecutorTest {
      */
     @Before
     public void setUp() {
-        microwave01jsp = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/microwave-01.xml");
-        microwave02jsp = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/microwave-02.xml");
         microwave01jexl = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/env/jexl/microwave-01.xml");
         microwave02jexl = this.getClass().getClassLoader().
@@ -104,7 +97,7 @@ public class SCXMLExecutorTest {
      */
     @After
     public void tearDown() {
-        microwave01jsp = microwave02jsp = microwave01jexl = microwave02jexl =
+        microwave01jexl = microwave02jexl =
             microwave04jexl = microwave05jexl = transitions01 = transitions02 = transitions03 =
             transitions04 = transitions05 = transitions06 = prefix01 = send01 = send02 = 
             transitionsWithCond01 = transitionsEventVar = null;
@@ -114,22 +107,6 @@ public class SCXMLExecutorTest {
      * Test the implementation
      */
     @Test
-    public void testSCXMLExecutorMicrowave01JspSample() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(microwave01jsp,
-            new SimpleContext(), new ELEvaluator());
-        Assert.assertNotNull(exec);
-        checkMicrowave01Sample();
-    }
-
-    @Test
-    public void testSCXMLExecutorMicrowave02JspSample() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(microwave02jsp,
-            new SimpleContext(), new ELEvaluator());
-        Assert.assertNotNull(exec);
-        checkMicrowave02Sample();
-    }
-
-    @Test
     public void testSCXMLExecutorMicrowave01JexlSample() throws Exception {
         exec = SCXMLTestHelper.getExecutor(microwave01jexl);
         Assert.assertNotNull(exec);
@@ -233,7 +210,7 @@ public class SCXMLExecutorTest {
         currentStates = SCXMLTestHelper.fireEvent(exec, "twenty_one.done");
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("twenty_two", currentStates.iterator().next().getId());
-        currentStates = SCXMLTestHelper.fireEvent(exec, "twenty_two.done");
+        SCXMLTestHelper.fireEvent(exec, "twenty_two.done");
         Assert.assertEquals(3, exec.getCurrentStatus().getStates().size());
     }
 
@@ -291,7 +268,7 @@ public class SCXMLExecutorTest {
         }
         currentStates = SCXMLTestHelper.fireEvent(exec, "bar");
         Assert.assertEquals(1, currentStates.size());
-        Assert.assertEquals("thirty", ((State)currentStates.iterator().
+        Assert.assertEquals("thirty", (currentStates.iterator().
             next()).getId());
     }
 
@@ -391,7 +368,7 @@ public class SCXMLExecutorTest {
     private void checkMicrowave02Sample() throws Exception {
         Set<TransitionTarget> currentStates = SCXMLTestHelper.fireEvent(exec, "turn_on");
         Assert.assertEquals(2, currentStates.size());
-        String id = ((State)currentStates.iterator().next()).getId();
+        String id = (currentStates.iterator().next()).getId();
         Assert.assertTrue(id.equals("closed") || id.equals("cooking"));
     }
 

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java Sun Mar  2 02:23:14 2014
@@ -65,7 +65,7 @@ public class SCXMLReaderTest {
     private static String oldLogFactoryProperty;
 
     // Test data
-    private URL microwave01, microwave02, transitions01, prefix01, send01,
+    private URL transitions01, prefix01, send01,
         microwave03, microwave04, scxmlinitialattr, action01,
         scxmlWithInvalidElems, groovyClosure;
     private SCXML scxml;
@@ -93,10 +93,6 @@ public class SCXMLReaderTest {
      */
     @Before
     public void before() {
-        microwave01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/microwave-01.xml");
-        microwave02 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/microwave-02.xml");
         microwave03 = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/env/jexl/microwave-03.xml");
         microwave04 = this.getClass().getClassLoader().
@@ -125,7 +121,7 @@ public class SCXMLReaderTest {
      */
     @After
     public void after() {
-        microwave01 = microwave02 = microwave03 = microwave04 = transitions01 = prefix01 = send01 = action01 = 
+        microwave03 = microwave04 = transitions01 = prefix01 = send01 = action01 =
                 scxmlinitialattr = scxmlWithInvalidElems = groovyClosure = null;
         scxml = null;
         scxmlAsString = null;
@@ -135,22 +131,6 @@ public class SCXMLReaderTest {
      * Test the implementation
      */    
     @Test
-    public void testSCXMLReaderMicrowave01Sample() throws Exception {
-        scxml = SCXMLTestHelper.parse(microwave01);
-        Assert.assertNotNull(scxml);
-        scxmlAsString = serialize(scxml);
-        Assert.assertNotNull(scxmlAsString);
-    }
-    
-    @Test
-    public void testSCXMLReaderMicrowave02Sample() throws Exception {
-        scxml = SCXMLTestHelper.parse(microwave02);
-        Assert.assertNotNull(scxml);
-        scxmlAsString = serialize(scxml);
-        Assert.assertNotNull(scxmlAsString);
-    }
-    
-    @Test
     public void testSCXMLReaderMicrowave03Sample() throws Exception {
         scxml = SCXMLTestHelper.parse(microwave03);
         Assert.assertNotNull(scxml);

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java Sun Mar  2 02:23:14 2014
@@ -20,8 +20,8 @@ import java.net.URL;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.apache.commons.scxml2.env.jsp.ELContext;
-import org.apache.commons.scxml2.env.jsp.ELEvaluator;
+import org.apache.commons.scxml2.env.jexl.JexlContext;
+import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -40,8 +40,8 @@ public class ActionsTest {
 
     // Test data
     private URL actionsSample01, actionsSample02, actionsSample03;
-    private ELEvaluator evaluator;
-    private ELContext ctx;
+    private JexlEvaluator evaluator;
+    private JexlContext ctx;
     private SCXMLExecutor exec;
 
     /**
@@ -55,8 +55,8 @@ public class ActionsTest {
             getResource("org/apache/commons/scxml2/model/actions-parallel-test.xml");
         actionsSample03 = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/model/actions-initial-test.xml");
-        evaluator = new ELEvaluator();
-        ctx = new ELContext();
+        evaluator = new JexlEvaluator();
+        ctx = new JexlContext();
     }
 
     /**
@@ -93,11 +93,11 @@ public class ActionsTest {
 
     private void runTest(SCXML scxml) throws Exception {
         exec = SCXMLTestHelper.getExecutor(scxml, ctx, evaluator);
-        ELContext ctx = (ELContext) SCXMLTestHelper.lookupContext(exec,
+        JexlContext ctx = (JexlContext) SCXMLTestHelper.lookupContext(exec,
             "actionsTest");
-        Assert.assertEquals((String) ctx.get("foo"), "foobar");
+        Assert.assertEquals(ctx.get("foo"), "foobar");
         Assert.assertEquals("Missed event transition",
-            "true", (String) ctx.get("eventsent"));
+            true, ctx.get("eventsent"));
     }
 }
 

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java Sun Mar  2 02:23:14 2014
@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.apache.commons.scxml2.env.jsp.ELEvaluator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -30,7 +29,7 @@ import org.junit.Test;
 
 public class CustomActionTest {
 
-    private URL hello01, custom01, external01, override01, payload01, payload02;
+    private URL hello01, custom01, external01, override01, payload01;
     private SCXMLExecutor exec;
 
     /**
@@ -48,8 +47,6 @@ public class CustomActionTest {
             getResource("org/apache/commons/scxml2/custom-hello-world-03.xml");
         payload01 = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/custom-hello-world-04-jexl.xml");
-        payload02 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/custom-hello-world-04-el.xml");
 
         Hello.callbacks = 0;
     }
@@ -59,7 +56,7 @@ public class CustomActionTest {
      */
     @After
     public void tearDown() {
-        hello01 = custom01 = external01 = payload01 = payload02 = null;
+        hello01 = custom01 = external01 = payload01 = null;
         exec = null;
     }
 
@@ -128,7 +125,7 @@ public class CustomActionTest {
         // (1) Get a SCXMLExecutor
         exec = SCXMLTestHelper.getExecutor(hello01);
         // (2) Single, final state
-        Assert.assertEquals("hello", ((State) exec.getCurrentStatus().getStates().
+        Assert.assertEquals("hello", (exec.getCurrentStatus().getStates().
                 iterator().next()).getId());
         Assert.assertTrue(exec.getCurrentStatus().isFinal());
     }
@@ -154,7 +151,7 @@ public class CustomActionTest {
         // (3) Get a SCXMLExecutor
         exec = SCXMLTestHelper.getExecutor(scxml);
         // (4) Single, final state
-        Assert.assertEquals("custom", ((State) exec.getCurrentStatus().getStates().
+        Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
                 iterator().next()).getId());
         Assert.assertTrue(exec.getCurrentStatus().isFinal());
 
@@ -179,7 +176,7 @@ public class CustomActionTest {
         // (3) Get a SCXMLExecutor
         exec = SCXMLTestHelper.getExecutor(scxml);
         // (4) Single, final state
-        Assert.assertEquals("custom", ((State) exec.getCurrentStatus().getStates().
+        Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
             iterator().next()).getId());
 
         // The custom action defined by Hello.class should be called
@@ -202,7 +199,7 @@ public class CustomActionTest {
         // (3) Get a SCXMLExecutor
         exec = SCXMLTestHelper.getExecutor(scxml);
         // (4) Single, final state
-        Assert.assertEquals("custom", ((State) exec.getCurrentStatus().getStates().
+        Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
             iterator().next()).getId());
 
         // The custom action defined by Hello.class should be called
@@ -227,11 +224,11 @@ public class CustomActionTest {
         exec = SCXMLTestHelper.getExecutor(scxml);
         // (4) Single, final state
         Assert.assertEquals("Invalid intermediate state",
-                     "custom1", ((State) exec.getCurrentStatus().getStates().
+                     "custom1", (exec.getCurrentStatus().getStates().
                                 iterator().next()).getId());
         // (5) Verify datamodel variable is correct
         Assert.assertEquals("Missing helloName1 in root context", "custom04a",
-                     (String) exec.getRootContext().get("helloName1"));
+                     exec.getRootContext().get("helloName1"));
 
         // The custom action defined by Hello.class should be called
         // to execute() exactly once at this point (by onentry in init state).
@@ -241,9 +238,9 @@ public class CustomActionTest {
         SCXMLTestHelper.fireEvent(exec, "custom.next");
         // (7) Verify correct end state
         Assert.assertEquals("Missing helloName1 in root context", "custom04b",
-                (String) exec.getRootContext().get("helloName1"));
+                exec.getRootContext().get("helloName1"));
         Assert.assertEquals("Invalid final state",
-                "end", ((State) exec.getCurrentStatus().getStates().
+                "end", (exec.getCurrentStatus().getStates().
                 iterator().next()).getId());
         Assert.assertTrue(exec.getCurrentStatus().isFinal());
 
@@ -251,33 +248,5 @@ public class CustomActionTest {
         // to execute() exactly two times at this point (by onentry in custom2 state).
         Assert.assertEquals(2, Hello.callbacks);
     }
-
-    // Hello World example using custom <my:hello> action that generates an
-    // event which has the payload examined with EL expressions
-    @Test
-    public void testCustomActionEventPayloadHelloWorldEL() throws Exception {
-        // (1) Form a list of custom actions defined in the SCXML
-        //     document (and any included documents via "src" attributes)
-        CustomAction ca =
-            new CustomAction("http://my.custom-actions.domain/CUSTOM",
-                             "hello", Hello.class);
-        List<CustomAction> customActions = new ArrayList<CustomAction>();
-        customActions.add(ca);
-        // (2) Parse the document with a custom digester.
-        SCXML scxml = SCXMLTestHelper.parse(payload02, customActions);
-        // (3) Get a SCXMLExecutor
-        exec = SCXMLTestHelper.getExecutor(new ELEvaluator(), scxml);
-        // (4) Single, final state
-        Assert.assertEquals("Invalid final state",
-                     "custom", ((State) exec.getCurrentStatus().getStates().
-                                iterator().next()).getId());
-        // (5) Verify datamodel variable is correct
-        Assert.assertEquals("Missing helloName1 in root context", "custom04",
-                     (String) exec.getRootContext().get("helloName1"));
-
-        // The custom action defined by Hello.class should be called
-        // to execute() exactly once at this point (by onentry in init state).
-        Assert.assertEquals(1, Hello.callbacks);
-    }
 }
 

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java Sun Mar  2 02:23:14 2014
@@ -26,8 +26,6 @@ import org.apache.commons.scxml2.SCXMLTe
 import org.apache.commons.scxml2.TriggerEvent;
 import org.apache.commons.scxml2.env.jexl.JexlContext;
 import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
-import org.apache.commons.scxml2.env.jsp.ELContext;
-import org.apache.commons.scxml2.env.jsp.ELEvaluator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -38,7 +36,7 @@ import org.junit.Test;
 public class DatamodelTest {
 
     // Test data
-    private URL datamodel01jexl, datamodel02jexl, datamodel04jexl, datamodel05jexl, datamodel01jsp, datamodel02jsp;
+    private URL datamodel01jexl, datamodel02jexl, datamodel04jexl, datamodel05jexl;
     private SCXMLExecutor exec01, exec02;
 
     /**
@@ -54,10 +52,6 @@ public class DatamodelTest {
             getResource("org/apache/commons/scxml2/env/jexl/datamodel-04.xml");
         datamodel05jexl = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/env/jexl/datamodel-05.xml");
-        datamodel01jsp = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/datamodel-01.xml");
-        datamodel02jsp = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/datamodel-02.xml");
     }
 
     /**
@@ -65,7 +59,7 @@ public class DatamodelTest {
      */
     @After
     public void tearDown() {
-        datamodel01jexl = datamodel02jexl = datamodel04jexl = datamodel05jexl = datamodel01jsp = datamodel02jsp = null;
+        datamodel01jexl = datamodel02jexl = datamodel04jexl = datamodel05jexl = null;
     }
 
     /**
@@ -84,24 +78,12 @@ public class DatamodelTest {
     }
     
     @Test
-    public void testDatamodelSimultaneousJsp() throws Exception {
-        exec01 = SCXMLTestHelper.getExecutor(datamodel01jsp,
-            new ELContext(), new ELEvaluator());
-        Assert.assertNotNull(exec01);
-        exec02 = SCXMLTestHelper.getExecutor(datamodel01jsp,
-            new ELContext(), new ELEvaluator());
-        Assert.assertNotNull(exec02);
-        Assert.assertFalse(exec01 == exec02);
-        runtest();
-    }
-    
-    @Test
     public void testDatamodelNamespacePrefixedXPaths() throws Exception {
         exec01 = SCXMLTestHelper.getExecutor(datamodel02jexl,
             new JexlContext(), new JexlEvaluator());
         Assert.assertNotNull(exec01);
-        exec02 = SCXMLTestHelper.getExecutor(datamodel02jsp,
-            new ELContext(), new ELEvaluator());
+        exec02 = SCXMLTestHelper.getExecutor(datamodel02jexl,
+                new JexlContext(), new JexlEvaluator());
         Assert.assertNotNull(exec02);
         Assert.assertFalse(exec01 == exec02);
         runtest();

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java Sun Mar  2 02:23:14 2014
@@ -24,8 +24,6 @@ import org.apache.commons.scxml2.SCXMLEx
 import org.apache.commons.scxml2.SCXMLTestHelper;
 import org.apache.commons.scxml2.TriggerEvent;
 import org.apache.commons.scxml2.env.SimpleSCXMLListener;
-import org.apache.commons.scxml2.env.jsp.ELContext;
-import org.apache.commons.scxml2.env.jsp.ELEvaluator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -36,8 +34,8 @@ import org.junit.Test;
 public class StatelessModelTest {
 
     // Test data
-    private URL stateless01jexl, stateless01jsp, stateless01par;
-    private SCXML scxml01jexl, scxml01jsp, scxml01par, scxml02par;
+    private URL stateless01jexl, stateless01par;
+    private SCXML scxml01jexl, scxml01par, scxml02par;
     private SCXMLExecutor exec01, exec02;
 
     /**
@@ -47,12 +45,9 @@ public class StatelessModelTest {
     public void setUp() throws Exception {
         stateless01jexl = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/env/jexl/stateless-01.xml");
-        stateless01jsp = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jsp/stateless-01.xml");
         stateless01par = this.getClass().getClassLoader().
             getResource("org/apache/commons/scxml2/model/stateless-parallel-01.xml");
         scxml01jexl = SCXMLTestHelper.parse(stateless01jexl);
-        scxml01jsp = SCXMLTestHelper.parse(stateless01jsp);
         scxml01par = SCXMLTestHelper.parse(stateless01par);
         scxml02par = SCXMLTestHelper.parse(stateless01par);
     }
@@ -93,36 +88,6 @@ public class StatelessModelTest {
     }
 
     /**
-     * Test the stateless model, simultaneous executions, EL expressions
-     */    
-    @Test
-    public void testStatelessModelSimultaneousEl() throws Exception {
-    	// parse once, use many times
-        exec01 = SCXMLTestHelper.getExecutor(scxml01jsp,
-            new ELContext(), new ELEvaluator());
-        Assert.assertNotNull(exec01);
-        exec02 = SCXMLTestHelper.getExecutor(scxml01jsp,
-            new ELContext(), new ELEvaluator());
-        Assert.assertNotNull(exec02);
-        Assert.assertFalse(exec01 == exec02);
-        runSimultaneousTest();
-    }
-
-    /**
-     * Test the stateless model, sequential executions, EL expressions
-     */    
-    @Test
-    public void testStatelessModelSequentialEl() throws Exception {
-        // rinse and repeat
-        for (int i = 0; i < 3; i++) {
-            exec01 = SCXMLTestHelper.getExecutor(scxml01jsp,
-                new ELContext(), new ELEvaluator());
-            Assert.assertNotNull(exec01);
-            runSequentialTest();
-        }
-    }
-
-    /**
      * Test sharing a single SCXML object between two executors
      */    
     @Test
@@ -178,7 +143,7 @@ public class StatelessModelTest {
         Iterator<TransitionTarget> i = currentStates.iterator();
         Assert.assertTrue("Not enough states", i.hasNext());
         String cs1 = i.next().getId();
-        String cs2 = null;
+        String cs2;
         if (s2 != null) {
             Assert.assertTrue("Not enough states, found one state: " + cs1, i.hasNext());
             cs2 = i.next().getId();
@@ -231,15 +196,15 @@ public class StatelessModelTest {
     private void runSequentialTest() throws Exception {
         Set<TransitionTarget> currentStates = exec01.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
-        Assert.assertEquals("ten", ((State)currentStates.iterator().
+        Assert.assertEquals("ten", (currentStates.iterator().
             next()).getId());
         currentStates = fireEvent("ten.done", exec01);
         Assert.assertEquals(1, currentStates.size());
-        Assert.assertEquals("twenty", ((State)currentStates.iterator().
+        Assert.assertEquals("twenty", (currentStates.iterator().
             next()).getId());
         currentStates = fireEvent("twenty.done", exec01);
         Assert.assertEquals(1, currentStates.size());
-        Assert.assertEquals("thirty", ((State)currentStates.iterator().
+        Assert.assertEquals("thirty", (currentStates.iterator().
             next()).getId());
     }
 

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml Sun Mar  2 02:23:14 2014
@@ -24,20 +24,20 @@
     <initial>
       <transition target="child1">
         <cs:var name="foo"/>
-        <cs:var name="delta" expr="${1+2+3}" />
+        <cs:var name="delta" expr="1+2+3" />
         <cs:var name="eventsent"/>
-        <if cond="${delta le 3}">
-          <assign name="foo" expr="bar" />
-        <elseif cond="${delta eq 3}"/>
-          <assign name="foo" expr="fubar" />
+        <if cond="delta le 3">
+          <assign name="foo" expr="'bar'" />
+        <elseif cond="delta eq 3"/>
+          <assign name="foo" expr="'fubar'" />
         <else/>
-          <assign name="foo" expr="foobar" />
+          <assign name="foo" expr="'foobar'" />
         </if>
-        <cs:var name="drink" expr="water" />
-        <cs:var name="eat" expr="flies" />
+        <cs:var name="drink" expr="'water'" />
+        <cs:var name="eat" expr="'flies'" />
         <send sendid="send12345" target="freddy" type="frog"
-         event="croak" namelist="drink eat" hints="h2o bzz"
-         delay="${1000+500}" />
+         event="croak" namelist="drink eat" hints="'h2o bzz'"
+         delay="1000+500" />
         <cancel sendId="send12345"/>
         <log expr="leaving" label="entry001" />
         <raise event="event.test"/>

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml Sun Mar  2 02:23:14 2014
@@ -23,20 +23,20 @@
   <parallel id="actionsTest">
     <onentry>
       <cs:var name="foo"/>
-      <cs:var name="delta" expr="${1+2+3}" />
+      <cs:var name="delta" expr="1+2+3" />
       <cs:var name="eventsent"/>
-      <if cond="${delta le 3}">
-        <assign name="foo" expr="bar" />
-      <elseif cond="${delta eq 3}"/>
-        <assign name="foo" expr="fubar" />
+      <if cond="delta le 3">
+        <assign name="foo" expr="'bar'" />
+      <elseif cond="delta eq 3"/>
+        <assign name="foo" expr="'fubar'" />
       <else/>
-        <assign name="foo" expr="foobar" />
+        <assign name="foo" expr="'foobar'" />
       </if>
-      <cs:var name="drink" expr="water" />
-      <cs:var name="eat" expr="flies" />
+      <cs:var name="drink" expr="'water'" />
+      <cs:var name="eat" expr="'flies'" />
       <send sendid="send12345" target="freddy" type="frog"
-       event="croak" namelist="drink eat" hints="h2o bzz"
-       delay="${1000+500}" />
+       event="croak" namelist="drink eat" hints="'h2o bzz'"
+       delay="1000+500" />
       <cancel sendId="send12345"/>
       <log expr="leaving" label="entry001" />
       <raise event="event.test"/>

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml?rev=1573253&r1=1573252&r2=1573253&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml Sun Mar  2 02:23:14 2014
@@ -23,20 +23,20 @@
   <state id="actionsTest" final="true">
     <onentry>
       <cs:var name="foo"/>
-      <cs:var name="delta" expr="${1+2+3}" />
+      <cs:var name="delta" expr="1+2+3" />
       <cs:var name="eventsent"/>
-      <if cond="${delta le 3}">
-        <assign name="foo" expr="bar" />
-      <elseif cond="${delta eq 3}"/>
-        <assign name="foo" expr="fubar" />
+      <if cond="delta le 3">
+        <assign name="foo" expr="'bar'" />
+      <elseif cond="delta eq 3"/>
+        <assign name="foo" expr="'fubar'" />
       <else/>
-        <assign name="foo" expr="foobar" />
+        <assign name="foo" expr="'foobar'" />
       </if>
-      <cs:var name="drink" expr="water" />
-      <cs:var name="eat" expr="flies" />
+      <cs:var name="drink" expr="'water'" />
+      <cs:var name="eat" expr="'flies'" />
       <send sendid="send12345" target="freddy" type="frog"
-       event="croak" namelist="drink eat" hints="h2o bzz"
-       delay="${1000+500}" />
+       event="croak" namelist="drink eat" hints="'h2o bzz'"
+       delay="1000+500" />
       <cancel sendId="send12345"/>
       <log expr="leaving" label="entry001" />
       <raise event="event.test"/>



Mime
View raw message