Remove deprecated API usage, checkstyle, serialVersionUIDs.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/scxml/trunk@602498 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 5ac8d90..8befe94 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -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:
diff --git a/src/main/java/org/apache/commons/scxml/SCInstance.java b/src/main/java/org/apache/commons/scxml/SCInstance.java
index 1ad3acf..357db10 100644
--- a/src/main/java/org/apache/commons/scxml/SCInstance.java
+++ b/src/main/java/org/apache/commons/scxml/SCInstance.java
@@ -39,7 +39,7 @@
/**
* Serial version UID.
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
/**
* The notification registry.
diff --git a/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java b/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
index ab5d19f..3392c01 100644
--- a/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
+++ b/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
@@ -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);
diff --git a/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java b/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java
index 303c55c..853115c 100644
--- a/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java
+++ b/src/main/java/org/apache/commons/scxml/invoke/SimpleSCXMLInvoker.java
@@ -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());
diff --git a/src/main/java/org/apache/commons/scxml/model/Parallel.java b/src/main/java/org/apache/commons/scxml/model/Parallel.java
index 9f0a8b4..bef9ac8 100644
--- a/src/main/java/org/apache/commons/scxml/model/Parallel.java
+++ b/src/main/java/org/apache/commons/scxml/model/Parallel.java
@@ -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>.
diff --git a/src/main/java/org/apache/commons/scxml/model/SCXML.java b/src/main/java/org/apache/commons/scxml/model/SCXML.java
index b33f298..d73f8a7 100644
--- a/src/main/java/org/apache/commons/scxml/model/SCXML.java
+++ b/src/main/java/org/apache/commons/scxml/model/SCXML.java
@@ -34,7 +34,7 @@
/**
* Serial version UID.
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
/**
* The SCXML XMLNS.
diff --git a/src/main/java/org/apache/commons/scxml/model/State.java b/src/main/java/org/apache/commons/scxml/model/State.java
index 5fb079d..567d897 100644
--- a/src/main/java/org/apache/commons/scxml/model/State.java
+++ b/src/main/java/org/apache/commons/scxml/model/State.java
@@ -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
diff --git a/src/main/java/org/apache/commons/scxml/model/Transition.java b/src/main/java/org/apache/commons/scxml/model/Transition.java
index 58ee962..cab652b 100644
--- a/src/main/java/org/apache/commons/scxml/model/Transition.java
+++ b/src/main/java/org/apache/commons/scxml/model/Transition.java
@@ -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.
diff --git a/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java b/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
index 2fd8914..bcfa0c6 100644
--- a/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
+++ b/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
@@ -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());
diff --git a/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java b/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
index 4d9acd7..1536314 100644
--- a/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
+++ b/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
@@ -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.
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 519850a..f1e6de3 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -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>
