commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r602498 - 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/model/ src/test/java/org/...
Date Sat, 08 Dec 2007 16:30:01 GMT
Author: rahul
Date: Sat Dec  8 08:30:00 2007
New Revision: 602498

URL: http://svn.apache.org/viewvc?rev=602498&view=rev
Log:
Remove deprecated API usage, checkstyle, serialVersionUIDs.

Modified:
    commons/proper/scxml/trunk/RELEASE-NOTES.txt
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCInstance.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Parallel.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/SCXML.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/State.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Transition.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
    commons/proper/scxml/trunk/xdocs/changes.xml

Modified: commons/proper/scxml/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/RELEASE-NOTES.txt?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/scxml/trunk/RELEASE-NOTES.txt Sat Dec  8 08:30:00 2007
@@ -124,6 +124,10 @@
  o The regions of a parallel are entered in document order. This is
    implementation-specific behavior and users should not rely on it.
 
+ o AbstractStateMachine and SimpleSCXMLListener classes, as well as the two
+   standalone testing classes in the test package, have switched to the new
+   SCXMLParser class.
+
  o Recommended version of Commons Logging has been upgraded to v1.1.1.
 
 ABOUT COMMONS SCXML:

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=602498&r1=602497&r2=602498&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 Sat
Dec  8 08:30:00 2007
@@ -39,7 +39,7 @@
     /**
      * Serial version UID.
      */
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
 
     /**
      * The notification registry.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
(original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
Sat Dec  8 08:30:00 2007
@@ -30,7 +30,7 @@
 import org.apache.commons.scxml.TriggerEvent;
 import org.apache.commons.scxml.env.jexl.JexlContext;
 import org.apache.commons.scxml.env.jexl.JexlEvaluator;
-import org.apache.commons.scxml.io.SCXMLDigester;
+import org.apache.commons.scxml.io.SCXMLParser;
 import org.apache.commons.scxml.model.ModelException;
 import org.apache.commons.scxml.model.SCXML;
 import org.apache.commons.scxml.model.Transition;
@@ -120,7 +120,7 @@
         log = LogFactory.getLog(this.getClass());
         ErrorHandler errHandler = new SimpleErrorHandler();
         try {
-            stateMachine = SCXMLDigester.digest(scxmlDocument,
+            stateMachine = SCXMLParser.parse(scxmlDocument,
                 errHandler);
         } catch (IOException ioe) {
             logError(ioe);

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java
(original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java
Sat Dec  8 08:30:00 2007
@@ -31,7 +31,7 @@
 import org.apache.commons.scxml.env.SimpleErrorHandler;
 import org.apache.commons.scxml.env.SimpleErrorReporter;
 import org.apache.commons.scxml.env.SimpleSCXMLListener;
-import org.apache.commons.scxml.io.SCXMLDigester;
+import org.apache.commons.scxml.io.SCXMLParser;
 import org.apache.commons.scxml.model.ModelException;
 import org.apache.commons.scxml.model.SCXML;
 import org.xml.sax.SAXException;
@@ -69,7 +69,7 @@
      */
     public void setParentStateId(final String parentStateId) {
         this.parentStateId = parentStateId;
-        this.eventPrefix = parentStateId + invokePrefix;
+        this.eventPrefix = this.parentStateId + invokePrefix;
         this.cancelled = false;
     }
 
@@ -87,7 +87,7 @@
     throws InvokerException {
         SCXML scxml = null;
         try {
-            scxml = SCXMLDigester.digest(new URL(source),
+            scxml = SCXMLParser.parse(new URL(source),
                 new SimpleErrorHandler());
         } catch (ModelException me) {
             throw new InvokerException(me.getMessage(), me.getCause());

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Parallel.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Parallel.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Parallel.java
(original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Parallel.java
Sat Dec  8 08:30:00 2007
@@ -33,7 +33,7 @@
     /**
      * Serial version UID.
      */
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
 
     /**
      * The set of parallel state machines contained in this <parallel>.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/SCXML.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/SCXML.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/SCXML.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/SCXML.java Sat
Dec  8 08:30:00 2007
@@ -34,7 +34,7 @@
     /**
      * Serial version UID.
      */
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
 
     /**
      * The SCXML XMLNS.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/State.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/State.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/State.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/State.java Sat
Dec  8 08:30:00 2007
@@ -32,7 +32,7 @@
     /**
      * Serial version UID.
      */
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
 
     /**
      * The Map containing immediate children of this State, keyed by

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Transition.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Transition.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Transition.java
(original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/model/Transition.java
Sat Dec  8 08:30:00 2007
@@ -33,7 +33,7 @@
     /**
      * Serial version UID.
      */
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
 
     /**
      * Property that specifies the trigger for this transition.

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
(original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
Sat Dec  8 08:30:00 2007
@@ -31,7 +31,7 @@
 import org.apache.commons.scxml.env.SimpleErrorReporter;
 import org.apache.commons.scxml.env.jexl.JexlContext;
 import org.apache.commons.scxml.env.jexl.JexlEvaluator;
-import org.apache.commons.scxml.io.SCXMLDigester;
+import org.apache.commons.scxml.io.SCXMLParser;
 import org.apache.commons.scxml.model.SCXML;
 import org.apache.commons.scxml.model.State;
 
@@ -82,7 +82,7 @@
      */
     public void testInvoke01Sample() {
         try {
-            SCXML scxml = SCXMLDigester.digest(invoke01,
+            SCXML scxml = SCXMLParser.parse(invoke01,
                 new SimpleErrorHandler());
             exec = new SCXMLExecutor(new JexlEvaluator(), new SimpleDispatcher(),
                 new SimpleErrorReporter());
@@ -103,7 +103,7 @@
 
     public void testInvoke02Sample() {
         try {
-            SCXML scxml = SCXMLDigester.digest(invoke02,
+            SCXML scxml = SCXMLParser.parse(invoke02,
                 new SimpleErrorHandler());
             exec = new SCXMLExecutor(new JexlEvaluator(), new SimpleDispatcher(),
                 new SimpleErrorReporter());
@@ -122,7 +122,7 @@
 
     public void testInvoke03Sample() {
         try {
-            SCXML scxml = SCXMLDigester.digest(invoke03,
+            SCXML scxml = SCXMLParser.parse(invoke03,
                 new SimpleErrorHandler());
             exec = new SCXMLExecutor(new JexlEvaluator(), new SimpleDispatcher(),
                 new SimpleErrorReporter());

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
(original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
Sat Dec  8 08:30:00 2007
@@ -51,7 +51,7 @@
     // Test data
     private URL stateless01jexl, stateless01jsp, stateless01par;
     private SCXML scxml01jexl, scxml01jsp, scxml01par, scxml02par;
-    private SCXMLExecutor exec01, exec02, exec03;
+    private SCXMLExecutor exec01, exec02;
 
     /**
      * Set up instance variables required by this test case.

Modified: commons/proper/scxml/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/xdocs/changes.xml?rev=602498&r1=602497&r2=602498&view=diff
==============================================================================
--- commons/proper/scxml/trunk/xdocs/changes.xml (original)
+++ commons/proper/scxml/trunk/xdocs/changes.xml Sat Dec  8 08:30:00 2007
@@ -37,6 +37,11 @@
      description="Latest release">
 
       <action dev="rahul" type="update">
+       [12-08-2007] AbstractStateMachine and SimpleSCXMLListener classes
+       switched to the new SCXMLParser.
+      </action>
+
+      <action dev="rahul" type="update">
        [12-06-2007] Recommended version of Commons Logging has been upgraded
        to v1.1.1.
       </action>



Mime
View raw message