commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1532375 [1/4] - in /commons/proper/scxml/trunk: ./ src/main/java/org/apache/commons/scxml/ src/main/java/org/apache/commons/scxml2/ src/main/java/org/apache/commons/scxml2/env/ src/main/java/org/apache/commons/scxml2/env/faces/ src/main/ja...
Date Tue, 15 Oct 2013 14:59:21 GMT
Author: ate
Date: Tue Oct 15 14:59:18 2013
New Revision: 1532375

URL: http://svn.apache.org/r1532375
Log:
SCXML-170: Move to new package and artifact org.apache.commons.scxml2 and version 2.0
- also: bump to latest commons-parent-32 and fixing the checkstyle configuration (scxml-checks.xml)

Added:
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/
      - copied from r1532061, commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/
      - copied from r1532061, commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java
      - copied, changed from r1532071, commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java
Removed:
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/
Modified:
    commons/proper/scxml/trunk/RELEASE-NOTES.txt
    commons/proper/scxml/trunk/pom.xml
    commons/proper/scxml/trunk/scxml-checks.xml
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Builtin.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Context.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/ErrorReporter.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Evaluator.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/EventDispatcher.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/NotificationRegistry.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/PathResolver.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCInstance.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExpressionException.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLHelper.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLListener.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLSemantics.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Status.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Step.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/TriggerEvent.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/LogUtils.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/Tracer.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/URLResolver.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/faces/SessionContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSBindings.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELEvaluator.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/RootContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluator.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/servlet/ServletContextResolver.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/FunctionResolver.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathContext.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathEvaluator.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/AsyncTrigger.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/InvokerException.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/ModelUpdater.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLParser.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLSerializer.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Assign.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/BodyContainer.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Cancel.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/CustomAction.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Data.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Datamodel.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Else.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ElseIf.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Event.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Executable.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Exit.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ExternalContent.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Final.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Finalize.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/History.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/If.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Initial.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Invoke.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Log.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ModelException.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/NamespacePrefixesHolder.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Observable.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnEntry.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnExit.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Parallel.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Param.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Path.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/PathResolverHolder.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/SCXML.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Script.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Send.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/State.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Transition.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Var.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/ErrorConstants.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/TransitionTargetComparator.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/package.html
    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/StandaloneJexlExpressions.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneRhinoExpressions.java
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
    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/core-events.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/core-parser.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/custom-actions.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/custom-semantics.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/datamodel.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/scxml-documents.xml
    commons/proper/scxml/trunk/src/site/xdoc/guide/side-effect-el.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/usecases/scxml-stopwatch-on-android.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch-on-android/AndroidManifest.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch-on-android/StopWatchActivity.java.txt
    commons/proper/scxml/trunk/src/site/xdoc/usecases/scxml-stopwatch.xml
    commons/proper/scxml/trunk/src/site/xdoc/usecases/shale-dialogs/SCXMLDialogNavigationHandler.java
    commons/proper/scxml/trunk/src/site/xdoc/usecases/shale-dialogs/SCXMLDialogNavigationHandler.java.txt
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/BuiltinTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/EventDataTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/NamespacePrefixedXPathsTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/SCInstanceTest.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/SCXMLHelperTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/SCXMLTestHelper.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/StatusTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TieBreakerTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TriggerEventTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/WildcardTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/WizardsTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/AbstractSCXMLListenerTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/AbstractStateMachineTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/LogUtilsTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/SimpleContextTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/StopWatch.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/StopWatchDisplay.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/StopWatchTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/faces/SessionContextTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/javascript/JSBindingsTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/javascript/JSContextTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/javascript/JSEvaluatorTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jexl/JexlContextTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jexl/JexlEvaluatorTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jexl/StaticMethodTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jexl/datamodel-03.xml
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jsp/ELEvaluatorTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jsp/MockJspContext.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jsp/RootContextTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/jsp/datamodel-03.xml
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoContextTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.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/io/SCXMLSerializerTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionTest.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/AssignTest.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/Hello.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/PathTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.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/TransitionTest.java
    commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/TransitionTargetComparatorTest.java

Modified: commons/proper/scxml/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/RELEASE-NOTES.txt?rev=1532375&r1=1532374&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/scxml/trunk/RELEASE-NOTES.txt Tue Oct 15 14:59:18 2013
@@ -17,14 +17,14 @@
 $Id$
 
                          Commons SCXML Package
-                          Version 1.0-SNAPSHOT
+                          Version 2.0-SNAPSHOT
                             Release Notes
 
 INTRODUCTION:
 
-Commons SCXML 1.0 is a major release. It contains non backwards compatible
-changes from the 0.x releases. See about section at the end for general
-information on Commons SCXML.
+Commons SCXML 2.0 is a major release. It contains non backwards compatible
+changes from the 0.x releases. Note: version 1.0 never came to be and was skipped.
+See about section at the end for general information on Commons SCXML.
 
 IMPORTANT NOTES:
 

Modified: commons/proper/scxml/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=1532375&r1=1532374&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/pom.xml (original)
+++ commons/proper/scxml/trunk/pom.xml Tue Oct 15 14:59:18 2013
@@ -20,14 +20,13 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>17</version>
+    <version>32</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <name>Commons SCXML</name>
-  <groupId>commons-scxml</groupId>
-  <artifactId>commons-scxml</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <artifactId>commons-scxml2</artifactId>
+  <version>2.0-SNAPSHOT</version>
 
   <inceptionYear>2005</inceptionYear>
   <description>A Java Implementation of a State Chart XML Engine</description>
@@ -211,13 +210,16 @@
   </distributionManagement>
 
   <properties>
-    <maven.compile.source>1.6</maven.compile.source>
-    <maven.compile.target>1.6</maven.compile.target>
-    <commons.componentid>scxml</commons.componentid>
-    <commons.release.version>1.0</commons.release.version>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
+    <commons.componentid>scxml2</commons.componentid>
+    <commons.release.version>2.0-alpha-1</commons.release.version>
+    <commons.release.desc>(Java 6.0+)</commons.release.desc>
     <commons.rc.version>RC1</commons.rc.version>
     <commons.jira.id>SCXML</commons.jira.id>
     <commons.jira.pid>12310492</commons.jira.pid>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- Allow override of the logging level -->
     <simplelog.defaultlog>fatal</simplelog.defaultlog>
   </properties> 
@@ -261,10 +263,10 @@
 
   <reporting>
     <plugins>
+      <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
-        <version>2.6</version>
         <configuration>
           <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
           <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
@@ -277,24 +279,25 @@
           </reportSet>
         </reportSets>
       </plugin>
+      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <configLocation>${basedir}/scxml-checks.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
           <headerFile>${basedir}/scxml-asl-header.txt</headerFile>
         </configuration>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>clirr-maven-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <comparisonVersion>0.9</comparisonVersion>
         </configuration>
       </plugin>
+      -->
     </plugins>
   </reporting>
 

Modified: commons/proper/scxml/trunk/scxml-checks.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/scxml-checks.xml?rev=1532375&r1=1532374&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/scxml-checks.xml (original)
+++ commons/proper/scxml/trunk/scxml-checks.xml Tue Oct 15 14:59:18 2013
@@ -56,8 +56,10 @@
 <module name="Checker">
 
     <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <!-- See http://checkstyle.sourceforge.net/config_javadoc.html#JavadocPackage -->
+    <module name="JavadocPackage">
+      <property name="allowLegacy" value="true"/>
+    </module>
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -67,8 +69,38 @@
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+  <!-- Checks for Headers                              -->
+  <!-- See http://checkstyle.sf.net/config_header.html -->
+  <module name="Header">
+    <!-- The follow property value demonstrates the ability     -->
+    <!-- to have access to ANT properties. In this case it uses -->
+    <!-- the ${basedir} property to allow Checkstyle to be run  -->
+    <!-- from any directory within a project. See property      -->
+    <!-- expansion,                                             -->
+    <!-- http://checkstyle.sf.net/config.html#properties        -->
+    <!-- <property                                              -->
+    <!--     name="headerFile"                                  -->
+    <!--     value="${basedir}/java.header"/>                   -->
+    <property name="headerFile" value="${checkstyle.header.file}"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+
+  <!-- Checks for File length Violations.                    -->
+  <!-- See http://checkstyle.sf.net/config_sizes.html -->
+  <module name="FileLength"/>
+
+  <!-- See: http://checkstyle.sourceforge.net/config_whitespace.html#FileTabCharacter -->
+  <module name="FileTabCharacter">
+    <property name="fileExtensions" value="java"/>
+  </module>
+
+  <!-- See: http://checkstyle.sourceforge.net/config_regexp.html#RegexpSingleline -->
+  <module name="RegexpSingleline">
+    <property name="format" value="\s+$"/>
+    <property name="message" value="Line has trailing spaces."/>
+  </module>
 
-    <module name="TreeWalker">
+  <module name="TreeWalker">
 
         <property name="cacheFile" value="${checkstyle.cache.file}"/>
 
@@ -79,7 +111,6 @@
         <module name="JavadocVariable"/>
         <module name="JavadocStyle"/>
 
-
         <!-- Checks for Naming Conventions.                  -->
         <!-- See http://checkstyle.sf.net/config_naming.html -->
         <module name="ConstantName"/>
@@ -92,26 +123,6 @@
         <module name="StaticVariableName"/>
         <module name="TypeName"/>
 
-
-        <!-- Checks for Headers                              -->
-        <!-- See http://checkstyle.sf.net/config_header.html -->
-        <module name="Header">
-            <!-- The follow property value demonstrates the ability     -->
-            <!-- to have access to ANT properties. In this case it uses -->
-            <!-- the ${basedir} property to allow Checkstyle to be run  -->
-            <!-- from any directory within a project. See property      -->
-            <!-- expansion,                                             -->
-            <!-- http://checkstyle.sf.net/config.html#properties        -->
-            <!-- <property                                              -->
-            <!--     name="headerFile"                                  -->
-            <!--     value="${basedir}/java.header"/>                   -->
-            <property name="headerFile" value="${checkstyle.header.file}"/>
-        </module>
-
-        <!-- Following interprets the header file as regular expressions. -->
-        <!-- <module name="RegexpHeader"/>                                -->
-
-
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
         <module name="AvoidStarImport"/>
@@ -119,15 +130,12 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
 
-
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
         <module name="LineLength"/>
         <module name="MethodLength"/>
         <!--module name="ParameterNumber"/-->
 
-
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
         <module name="EmptyForIteratorPad"/>
@@ -136,17 +144,14 @@
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
-
         <!-- Modifier Checks                                    -->
         <!-- See http://checkstyle.sf.net/config_modifiers.html -->
         <module name="ModifierOrder"/>
         <module name="RedundantModifier"/>
 
-
         <!-- Checks for blocks. You know, those {}'s         -->
         <!-- See http://checkstyle.sf.net/config_blocks.html -->
         <module name="AvoidNestedBlocks"/>
@@ -159,7 +164,6 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <module name="AvoidInlineConditionals"/>
-        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <!-- Commons SCXML change # 2 :
@@ -187,15 +191,10 @@
         <module name="InterfaceIsType"/>
         <module name="VisibilityModifier"/>
 
-
         <!-- Miscellaneous other checks.                   -->
         <!-- See http://checkstyle.sf.net/config_misc.html -->
         <module name="ArrayTypeStyle"/>
         <module name="FinalParameters"/>
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
         <module name="TodoComment"/>
         <module name="UpperEll"/>
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Builtin.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Builtin.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Builtin.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Builtin.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -31,7 +31,7 @@ import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.model.TransitionTarget;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Context.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Context.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Context.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Context.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.util.Map;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/ErrorReporter.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/ErrorReporter.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/ErrorReporter.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/ErrorReporter.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 /**
  * An interface for reporting SCXML errors to the host environment,

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Evaluator.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Evaluator.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Evaluator.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Evaluator.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import org.w3c.dom.Node;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/EventDispatcher.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/EventDispatcher.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/EventDispatcher.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/EventDispatcher.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.util.List;
 import java.util.Map;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/NotificationRegistry.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/NotificationRegistry.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/NotificationRegistry.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/NotificationRegistry.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -23,9 +23,9 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.scxml.model.Observable;
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.model.Observable;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * The registry where SCXML listeners are recorded for nodes of

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/PathResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/PathResolver.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/PathResolver.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/PathResolver.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 /**
  * Interface for a component that may be used by the SCXML engines

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCInstance.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCInstance.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCInstance.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCInstance.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -23,11 +23,11 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.scxml.invoke.Invoker;
-import org.apache.commons.scxml.invoke.InvokerException;
-import org.apache.commons.scxml.model.Datamodel;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.invoke.Invoker;
+import org.apache.commons.scxml2.invoke.InvokerException;
+import org.apache.commons.scxml2.model.Datamodel;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * The <code>SCInstance</code> performs book-keeping functions for
@@ -257,7 +257,7 @@ public class SCInstance implements Seria
      * Resets the history state.
      *
      * @param history The history.
-     * @see org.apache.commons.scxml.SCXMLExecutor#reset()
+     * @see org.apache.commons.scxml2.SCXMLExecutor#reset()
      */
     public void reset(final History history) {
         Set<TransitionTarget> lastConfiguration = histories.get(history);
@@ -270,7 +270,7 @@ public class SCInstance implements Seria
      * Get the {@link SCXMLExecutor} this instance is attached to.
      *
      * @return The SCXMLExecutor this instance is attached to.
-     * @see org.apache.commons.scxml.SCXMLExecutor
+     * @see org.apache.commons.scxml2.SCXMLExecutor
      */
     public SCXMLExecutor getExecutor() {
         return executor;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -25,15 +25,15 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.invoke.Invoker;
-import org.apache.commons.scxml.model.Datamodel;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.Observable;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.State;
-import org.apache.commons.scxml.model.TransitionTarget;
-import org.apache.commons.scxml.semantics.SCXMLSemanticsImpl;
+import org.apache.commons.scxml2.invoke.Invoker;
+import org.apache.commons.scxml2.model.Datamodel;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.Observable;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.TransitionTarget;
+import org.apache.commons.scxml2.semantics.SCXMLSemanticsImpl;
 
 /**
  * <p>The SCXML &quot;engine&quot; that executes SCXML documents. The
@@ -41,7 +41,7 @@ import org.apache.commons.scxml.semantic
  * encapsulated in the SCXMLSemantics implementation that it uses.</p>
  *
  * <p>The default implementation is
- * <code>org.apache.commons.scxml.semantics.SCXMLSemanticsImpl</code></p>
+ * <code>org.apache.commons.scxml2.semantics.SCXMLSemanticsImpl</code></p>
  *
  * @see SCXMLSemantics
  */

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExpressionException.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExpressionException.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExpressionException.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLExpressionException.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 /**
  * Exception thrown when a malformed expression is encountered during

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLHelper.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLHelper.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLHelper.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.io.StringWriter;
 import java.util.HashSet;
@@ -25,14 +25,14 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.model.Data;
-import org.apache.commons.scxml.model.Datamodel;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.Path;
-import org.apache.commons.scxml.model.State;
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
-import org.apache.commons.scxml.semantics.ErrorConstants;
+import org.apache.commons.scxml2.model.Data;
+import org.apache.commons.scxml2.model.Datamodel;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.Path;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
+import org.apache.commons.scxml2.semantics.ErrorConstants;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLListener.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLListener.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLListener.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLListener.java Tue Oct 15 14:59:18 2013
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * Listener interface for observable entities in the SCXML model.
- * Observable entities include {@link org.apache.commons.scxml.model.SCXML}
+ * Observable entities include {@link org.apache.commons.scxml2.model.SCXML}
  * instances (subscribe to all entry, exit and transition notifications),
- * {@link org.apache.commons.scxml.model.State} instances (subscribe to
+ * {@link org.apache.commons.scxml2.model.State} instances (subscribe to
  * particular entry and exit notifications) and
- * {@link org.apache.commons.scxml.model.Transition} instances (subscribe to
+ * {@link org.apache.commons.scxml2.model.Transition} instances (subscribe to
  * particular transitions).
  *
  */

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLSemantics.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLSemantics.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLSemantics.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/SCXMLSemantics.java Tue Oct 15 14:59:18 2013
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * <p>The purpose of this interface is to separate the interpretation algorithm
@@ -41,7 +41,7 @@ import org.apache.commons.scxml.model.Tr
  * </ul>
  *
  * <p>Specific semantics can be created by subclassing
- * <code>org.apache.commons.scxml.semantics.SCXMLSemanticsImpl</code>.</p>
+ * <code>org.apache.commons.scxml2.semantics.SCXMLSemanticsImpl</code>.</p>
  */
 public interface SCXMLSemantics {
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Status.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Status.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Status.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Status.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.scxml.model.State;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * The encapsulation of the current state of a state machine.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Step.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Step.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Step.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/Step.java Tue Oct 15 14:59:18 2013
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * A logical unit of progression in the execution of a SCXML model.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/TriggerEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/TriggerEvent.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/TriggerEvent.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/TriggerEvent.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml;
+package org.apache.commons.scxml2;
 
 import java.io.Serializable;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java Tue Oct 15 14:59:18 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
-import org.apache.commons.scxml.SCXMLListener;
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.SCXMLListener;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * An abstract adapter class for the <code>SXCMLListener</code> interface.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -25,18 +25,18 @@ import javax.xml.stream.XMLStreamExcepti
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExecutor;
-import org.apache.commons.scxml.SCXMLListener;
-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.SCXMLReader;
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCXMLExecutor;
+import org.apache.commons.scxml2.SCXMLListener;
+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.io.SCXMLReader;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * <p>This class demonstrates one approach for providing the base

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/LogUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/LogUtils.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/LogUtils.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/LogUtils.java Tue Oct 15 14:59:18 2013
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.util.LinkedList;
 
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * Helper methods for Commons SCXML logging.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.Context;
+import org.apache.commons.scxml2.Context;
 
 /**
  * Simple Context wrapping a map of variables.
@@ -86,7 +86,7 @@ public class SimpleContext implements Co
      *
      * @param name The variable name
      * @param value The variable value
-     * @see org.apache.commons.scxml.Context#set(String, Object)
+     * @see org.apache.commons.scxml2.Context#set(String, Object)
      */
     public void set(final String name, final Object value) {
         if (vars.containsKey(name)) { //first try to override local
@@ -103,7 +103,7 @@ public class SimpleContext implements Co
      *
      * @param name The variable name
      * @return Object The variable value
-     * @see org.apache.commons.scxml.Context#get(java.lang.String)
+     * @see org.apache.commons.scxml2.Context#get(java.lang.String)
      */
     public Object get(final String name) {
         if (vars.containsKey(name)) {
@@ -120,7 +120,7 @@ public class SimpleContext implements Co
      *
      * @param name The variable name
      * @return boolean true if this variable exists
-     * @see org.apache.commons.scxml.Context#has(java.lang.String)
+     * @see org.apache.commons.scxml2.Context#has(java.lang.String)
      */
     public boolean has(final String name) {
         if (vars.containsKey(name)) {
@@ -134,7 +134,7 @@ public class SimpleContext implements Co
     /**
      * Clear this Context.
      *
-     * @see org.apache.commons.scxml.Context#reset()
+     * @see org.apache.commons.scxml2.Context#reset()
      */
     public void reset() {
         vars.clear();
@@ -144,7 +144,7 @@ public class SimpleContext implements Co
      * Get the parent Context, may be null.
      *
      * @return Context The parent Context
-     * @see org.apache.commons.scxml.Context#getParent()
+     * @see org.apache.commons.scxml2.Context#getParent()
      */
     public Context getParent() {
         return parent;
@@ -157,7 +157,7 @@ public class SimpleContext implements Co
      *
      * @param name The variable name
      * @param value The variable value
-     * @see org.apache.commons.scxml.Context#setLocal(String, Object)
+     * @see org.apache.commons.scxml2.Context#setLocal(String, Object)
      */
     public void setLocal(final String name, final Object value) {
         vars.put(name, value);

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 import java.util.List;
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.EventDispatcher;
+import org.apache.commons.scxml2.EventDispatcher;
 import org.w3c.dom.Node;
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -23,11 +23,11 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.State;
-import org.apache.commons.scxml.model.TransitionTarget;
-import org.apache.commons.scxml.semantics.ErrorConstants;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.TransitionTarget;
+import org.apache.commons.scxml2.semantics.ErrorConstants;
 
 /**
  * Custom error reporter that log execution errors.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java Tue Oct 15 14:59:18 2013
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.SCXMLListener;
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.SCXMLListener;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -26,11 +26,11 @@ import java.util.TimerTask;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCXMLExecutor;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.TriggerEvent;
-import org.apache.commons.scxml.model.ModelException;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCXMLExecutor;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.TriggerEvent;
+import org.apache.commons.scxml2.model.ModelException;
 import org.w3c.dom.Node;
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/Tracer.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/Tracer.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/Tracer.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/Tracer.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 
@@ -22,10 +22,10 @@ import javax.xml.stream.Location;
 import javax.xml.stream.XMLReporter;
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.SCXMLListener;
-import org.apache.commons.scxml.model.Transition;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.SCXMLListener;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/URLResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/URLResolver.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/URLResolver.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/URLResolver.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env;
+package org.apache.commons.scxml2.env;
 
 import java.io.Serializable;
 import java.net.MalformedURLException;
@@ -22,12 +22,12 @@ import java.net.URL;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.PathResolver;
+import org.apache.commons.scxml2.PathResolver;
 
 /**
  * A PathResolver implementation that resolves against a base URL.
  *
- * @see org.apache.commons.scxml.PathResolver
+ * @see org.apache.commons.scxml2.PathResolver
  */
 public class URLResolver implements PathResolver, Serializable {
 
@@ -51,7 +51,7 @@ public class URLResolver implements Path
 
     /**
      * Uses URL(URL, String) constructor to combine URL's.
-     * @see org.apache.commons.scxml.PathResolver#resolvePath(java.lang.String)
+     * @see org.apache.commons.scxml2.PathResolver#resolvePath(java.lang.String)
      */
     public String resolvePath(final String ctxPath) {
         URL combined;
@@ -65,7 +65,7 @@ public class URLResolver implements Path
     }
 
     /**
-     * @see org.apache.commons.scxml.PathResolver#getResolver(java.lang.String)
+     * @see org.apache.commons.scxml2.PathResolver#getResolver(java.lang.String)
      */
     public PathResolver getResolver(final String ctxPath) {
         URL combined;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/faces/SessionContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/faces/SessionContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/faces/SessionContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/faces/SessionContext.java Tue Oct 15 14:59:18 2013
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.faces;
+package org.apache.commons.scxml2.env.faces;
 
 import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.env.SimpleContext;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.env.SimpleContext;
 
 /**
  * <p>A Faces Session Context.</p>
@@ -75,7 +75,7 @@ public class SessionContext extends Simp
      *
      * @param name The name of the variable
      * @return The value (or null)
-     * @see org.apache.commons.scxml.Context#get(java.lang.String)
+     * @see org.apache.commons.scxml2.Context#get(java.lang.String)
      */
     @Override
     public Object get(final String name) {
@@ -91,7 +91,7 @@ public class SessionContext extends Simp
      *
      * @param name The name of the variable
      * @return boolean true if the variable exists
-     * @see org.apache.commons.scxml.Context#has(java.lang.String)
+     * @see org.apache.commons.scxml2.Context#has(java.lang.String)
      */
     @Override
     public boolean has(final String name) {

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSBindings.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSBindings.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSBindings.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSBindings.java Tue Oct 15 14:59:18 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.scxml.env.javascript;
+package org.apache.commons.scxml2.env.javascript;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.script.Bindings;
 import javax.script.SimpleBindings;
 
-import org.apache.commons.scxml.Context;
+import org.apache.commons.scxml2.Context;
 
 /**
  * Wrapper class for the JDK Javascript engine Bindings class that extends the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSContext.java Tue Oct 15 14:59:18 2013
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.scxml.env.javascript;
+package org.apache.commons.scxml2.env.javascript;
 
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.env.SimpleContext;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.env.SimpleContext;
 
 /**
  * SCXML Context for use by the JSEvaluator. It is simply a 'no functionality'

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java Tue Oct 15 14:59:18 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.scxml.env.javascript;
+package org.apache.commons.scxml2.env.javascript;
 
 import java.util.regex.Pattern;
 
@@ -24,10 +24,10 @@ import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
-import org.apache.commons.scxml.Builtin;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml2.Builtin;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCXMLExpressionException;
 import org.w3c.dom.Node;
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlContext.java Tue Oct 15 14:59:18 2013
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.jexl;
+package org.apache.commons.scxml2.env.jexl;
 
 import java.util.Map;
 
-import org.apache.commons.scxml.Builtin;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.env.SimpleContext;
+import org.apache.commons.scxml2.Builtin;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.env.SimpleContext;
 
 /**
  * JEXL Context implementation for Commons SCXML.
@@ -66,7 +66,7 @@ public class JexlContext extends SimpleC
      * @param vars The new variables map.
      *
      * @see org.apache.commons.jexl.JexlContext#setVars(Map)
-     * @see org.apache.commons.scxml.env.SimpleContext#setVars(Map)
+     * @see org.apache.commons.scxml2.env.SimpleContext#setVars(Map)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -79,7 +79,7 @@ public class JexlContext extends SimpleC
     /**
      * Clear this Context.
      *
-     * @see org.apache.commons.scxml.Context#reset()
+     * @see org.apache.commons.scxml2.Context#reset()
      */
     @Override
     public void reset() {

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.jexl;
+package org.apache.commons.scxml2.env.jexl;
 
 import java.io.Serializable;
 import java.util.AbstractMap;
@@ -27,9 +27,9 @@ import org.apache.commons.jexl.Expressio
 import org.apache.commons.jexl.ExpressionFactory;
 import org.apache.commons.jexl.Script;
 import org.apache.commons.jexl.ScriptFactory;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCXMLExpressionException;
 import org.w3c.dom.Node;
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELContext.java Tue Oct 15 14:59:18 2013
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.jsp;
+package org.apache.commons.scxml2.env.jsp;
 
 import javax.servlet.jsp.el.ELException;
 import javax.servlet.jsp.el.VariableResolver;
 
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.env.SimpleContext;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.env.SimpleContext;
 
 /**
  * EL Context for SCXML interpreter.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELEvaluator.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELEvaluator.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELEvaluator.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/ELEvaluator.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.jsp;
+package org.apache.commons.scxml2.env.jsp;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -30,10 +30,10 @@ import javax.servlet.jsp.el.VariableReso
 import org.apache.commons.el.ExpressionEvaluatorImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.Builtin;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml2.Builtin;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCXMLExpressionException;
 import org.w3c.dom.Node;
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/RootContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/RootContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/RootContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/jsp/RootContext.java Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.jsp;
+package org.apache.commons.scxml2.env.jsp;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
@@ -60,7 +60,7 @@ public final class RootContext extends E
      *
      * @param name The name of the variable
      * @return The value (or null)
-     * @see org.apache.commons.scxml.Context#get(java.lang.String)
+     * @see org.apache.commons.scxml2.Context#get(java.lang.String)
      */
     @Override
     public Object get(final String name) {
@@ -80,7 +80,7 @@ public final class RootContext extends E
      *
      * @param name The name of the variable
      * @return boolean true if the variable exists
-     * @see org.apache.commons.scxml.Context#has(java.lang.String)
+     * @see org.apache.commons.scxml2.Context#has(java.lang.String)
      */
     @Override
     public boolean has(final String name) {

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoContext.java Tue Oct 15 14:59:18 2013
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.rhino;
+package org.apache.commons.scxml2.env.rhino;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.scxml.env.SimpleContext;
+import org.apache.commons.scxml2.env.SimpleContext;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
@@ -28,7 +28,7 @@ import org.mozilla.javascript.Scriptable
 import org.w3c.dom.Node;
 
 /**
- * @see org.apache.commons.scxml.Context
+ * @see org.apache.commons.scxml2.Context
  */
 public class RhinoContext extends SimpleContext {
 
@@ -57,16 +57,16 @@ public class RhinoContext extends Simple
      *
      * @param parent Parent context.
      */
-    public RhinoContext(org.apache.commons.scxml.Context parent) {
+    public RhinoContext(org.apache.commons.scxml2.Context parent) {
         super(parent);
         initContext();
     }
 
     /**
-     * @see org.apache.commons.scxml.Context#set(String, Object)
+     * @see org.apache.commons.scxml2.Context#set(String, Object)
      */
     public void set(String name, Object value) {
-        org.apache.commons.scxml.Context parent = getParent();
+        org.apache.commons.scxml2.Context parent = getParent();
         // if variable is local => override it
         if (scope.has(name, scope)) {
             setLocal(name, value);
@@ -82,7 +82,7 @@ public class RhinoContext extends Simple
     }
 
     /**
-     * @see org.apache.commons.scxml.Context#setLocal(String, Object)
+     * @see org.apache.commons.scxml2.Context#setLocal(String, Object)
      */
     @SuppressWarnings("unchecked")
     public void setLocal(String name, Object value) {
@@ -115,10 +115,10 @@ public class RhinoContext extends Simple
     }
 
     /**
-     * @see org.apache.commons.scxml.Context#has(String)
+     * @see org.apache.commons.scxml2.Context#has(String)
      */
     public boolean has(String name) {
-        org.apache.commons.scxml.Context parent = getParent();
+        org.apache.commons.scxml2.Context parent = getParent();
         Context.enter();
         try {
             // search local
@@ -139,10 +139,10 @@ public class RhinoContext extends Simple
     }
 
     /**
-     * @see org.apache.commons.scxml.Context#get(String)
+     * @see org.apache.commons.scxml2.Context#get(String)
      */
     public Object get(String name) {
-        org.apache.commons.scxml.Context parent = getParent();
+        org.apache.commons.scxml2.Context parent = getParent();
         Context.enter();
         try {
             // get local
@@ -170,7 +170,7 @@ public class RhinoContext extends Simple
     /**
      * Get the variable map for this Rhino context's scope.
      *
-     * @see org.apache.commons.scxml.Context#getVars()
+     * @see org.apache.commons.scxml2.Context#getVars()
      */
     public Map<String, Object> getVars() {
         Map<String, Object> vars = new HashMap<String, Object>();
@@ -188,7 +188,7 @@ public class RhinoContext extends Simple
     }
 
     /**
-     * @see org.apache.commons.scxml.Context#reset()
+     * @see org.apache.commons.scxml2.Context#reset()
      */
     public void reset() {
         initContext();
@@ -214,7 +214,7 @@ public class RhinoContext extends Simple
             scope = cx.initStandardObjects();
         } else {
             // get the root scope...
-            org.apache.commons.scxml.Context rootContext = getParent();
+            org.apache.commons.scxml2.Context rootContext = getParent();
             while (rootContext.getParent() != null) {
                 rootContext = rootContext.getParent();
             }
@@ -229,7 +229,7 @@ public class RhinoContext extends Simple
      * Puts scopes as variables into the scope of this context according to the scope chain.
      */
     private void setScopeAttributes() {
-        org.apache.commons.scxml.Context parent = getParent();
+        org.apache.commons.scxml2.Context parent = getParent();
 
         // set itself as "local"
         scope.put(SCOPE_LOCAL, scope, scope);

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluator.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluator.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluator.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluator.java Tue Oct 15 14:59:18 2013
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.rhino;
+package org.apache.commons.scxml2.env.rhino;
 
 import java.io.Serializable;
 import java.util.regex.Pattern;
 
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCXMLExpressionException;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Script;
 import org.w3c.dom.Node;
@@ -45,9 +45,9 @@ public class RhinoEvaluator implements E
     }
 
     /**
-     * @see Evaluator#eval(org.apache.commons.scxml.Context, String)
+     * @see Evaluator#eval(org.apache.commons.scxml2.Context, String)
      */
-    public Object eval(final org.apache.commons.scxml.Context ctx, final String expr)
+    public Object eval(final org.apache.commons.scxml2.Context ctx, final String expr)
             throws SCXMLExpressionException {
         if(expr == null) {
             return null;
@@ -56,7 +56,7 @@ public class RhinoEvaluator implements E
         RhinoContext rhinocx = getRhinoContext(ctx);
         Context cx = Context.enter();
         String jsExpression = IN_FN.matcher(expr).
-            replaceAll("Packages.org.apache.commons.scxml.Builtin.isMember(_ALL_STATES, ");
+            replaceAll("Packages.org.apache.commons.scxml2.Builtin.isMember(_ALL_STATES, ");
 
         try {
             Script compliedScript = cx.compileString(jsExpression, "RhinoEvaluator", 1, null);
@@ -70,9 +70,9 @@ public class RhinoEvaluator implements E
     }
 
     /**
-     * @see Evaluator#evalCond(org.apache.commons.scxml.Context, String)
+     * @see Evaluator#evalCond(org.apache.commons.scxml2.Context, String)
      */
-    public Boolean evalCond(final org.apache.commons.scxml.Context ctx,
+    public Boolean evalCond(final org.apache.commons.scxml2.Context ctx,
             final String expr)
             throws SCXMLExpressionException {
         if(expr == null) {
@@ -82,7 +82,7 @@ public class RhinoEvaluator implements E
         RhinoContext rhinocx = getRhinoContext(ctx);
         Context cx = Context.enter();
         String jsExpression = IN_FN.matcher(expr).
-            replaceAll("Packages.org.apache.commons.scxml.Builtin.isMember(_ALL_STATES, ");
+            replaceAll("Packages.org.apache.commons.scxml2.Builtin.isMember(_ALL_STATES, ");
 
         try {
             Script compliedScript = cx.compileString(jsExpression, "RhinoEvaluator", 1, null);
@@ -95,10 +95,10 @@ public class RhinoEvaluator implements E
     }
 
     /**
-     * @see Evaluator#evalLocation(org.apache.commons.scxml.Context, String)
+     * @see Evaluator#evalLocation(org.apache.commons.scxml2.Context, String)
      * @deprecated because of E4X availability of Rhino
      */
-    public Node evalLocation(final org.apache.commons.scxml.Context ctx, final String expr)
+    public Node evalLocation(final org.apache.commons.scxml2.Context ctx, final String expr)
     throws SCXMLExpressionException {
         if(expr == null) {
             return null;
@@ -110,18 +110,18 @@ public class RhinoEvaluator implements E
     }
 
     /**
-     * @see Evaluator#evalScript(org.apache.commons.scxml.Context, String)
+     * @see Evaluator#evalScript(org.apache.commons.scxml2.Context, String)
      */
-    public Object evalScript(org.apache.commons.scxml.Context ctx, String script)
+    public Object evalScript(org.apache.commons.scxml2.Context ctx, String script)
             throws SCXMLExpressionException {
         return eval(ctx, script);
     }
 
     /**
-     * @see Evaluator#newContext(org.apache.commons.scxml.Context)
+     * @see Evaluator#newContext(org.apache.commons.scxml2.Context)
      */
-    public org.apache.commons.scxml.Context newContext(
-            final org.apache.commons.scxml.Context parent) {
+    public org.apache.commons.scxml2.Context newContext(
+            final org.apache.commons.scxml2.Context parent) {
         return new RhinoContext(parent);
     }
 
@@ -132,13 +132,13 @@ public class RhinoEvaluator implements E
      * @return RhinoContext
      * @throws SCXMLExpressionException If Context is not an instance of RhinoContext
      */
-    private RhinoContext getRhinoContext(org.apache.commons.scxml.Context ctx)
+    private RhinoContext getRhinoContext(org.apache.commons.scxml2.Context ctx)
             throws SCXMLExpressionException {
         if(ctx instanceof RhinoContext) {
             return (RhinoContext)ctx;
         } else {
             throw new SCXMLExpressionException("Error evaluating Rhino expression. "
-                + "Context must be a org.apache.commons.scxml.env.rhino.RhinoContext");
+                + "Context must be a org.apache.commons.scxml2.env.rhino.RhinoContext");
         }
     }
 



Mime
View raw message