commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1532375 [2/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
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/servlet/ServletContextResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/servlet/ServletContextResolver.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/servlet/ServletContextResolver.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/servlet/ServletContextResolver.java Tue Oct 15 14:59:18 2013
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.env.servlet;
+package org.apache.commons.scxml2.env.servlet;
 
 import javax.servlet.ServletContext;
 
-import org.apache.commons.scxml.PathResolver;
+import org.apache.commons.scxml2.PathResolver;
 
 /**
  * A wrapper around ServletContext that implements PathResolver.
  *
- * @see org.apache.commons.scxml.PathResolver
+ * @see org.apache.commons.scxml2.PathResolver
  */
 public class ServletContextResolver implements PathResolver {
 
@@ -53,7 +53,7 @@ public class ServletContextResolver impl
      *
      * @param ctxPath context sensitive path, can be a relative URL
      * @return resolved path (an absolute URL) or <code>null</code>
-     * @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) {
         return ctx.getRealPath(ctxPath);
@@ -64,7 +64,7 @@ public class ServletContextResolver impl
      *
      * @param ctxPath context sensitive path, can be a relative URL
      * @return returns a new resolver rooted at ctxPath
-     * @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) {
         return this;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/FunctionResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/FunctionResolver.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/FunctionResolver.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/FunctionResolver.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.xpath;
+package org.apache.commons.scxml2.env.xpath;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -27,9 +27,9 @@ import javax.xml.xpath.XPathFunction;
 import javax.xml.xpath.XPathFunctionException;
 import javax.xml.xpath.XPathFunctionResolver;
 
-import org.apache.commons.scxml.Builtin;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.Builtin;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * A {@link XPathFunctionResolver} for the Commons SCXML environment.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathContext.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathContext.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathContext.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.xpath;
+package org.apache.commons.scxml2.env.xpath;
 
 import javax.xml.namespace.QName;
 import javax.xml.xpath.XPathVariableResolver;
 
-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;
 
 /**
  * A {@link Context} implementation for XPath environments.

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathEvaluator.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathEvaluator.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathEvaluator.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/xpath/XPathEvaluator.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.xpath;
+package org.apache.commons.scxml2.env.xpath;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -31,10 +31,10 @@ import javax.xml.xpath.XPathExpressionEx
 import javax.xml.xpath.XPathFactory;
 import javax.xml.xpath.XPathFunction;
 
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.env.xpath.FunctionResolver.FunctionKey;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.env.xpath.FunctionResolver.FunctionKey;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/AsyncTrigger.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/AsyncTrigger.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/AsyncTrigger.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/AsyncTrigger.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.invoke;
+package org.apache.commons.scxml2.invoke;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.SCXMLExecutor;
-import org.apache.commons.scxml.TriggerEvent;
-import org.apache.commons.scxml.model.ModelException;
+import org.apache.commons.scxml2.SCXMLExecutor;
+import org.apache.commons.scxml2.TriggerEvent;
+import org.apache.commons.scxml2.model.ModelException;
 
 /**
  * Trigger the given {@link TriggerEvent} (or array of) on the given

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/Invoker.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.invoke;
+package org.apache.commons.scxml2.invoke;
 
 import java.util.Map;
 
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * <p>The Invoker interface is used to define the possible interactions

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/InvokerException.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/InvokerException.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/InvokerException.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/InvokerException.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.invoke;
+package org.apache.commons.scxml2.invoke;
 
 /**
  * Exception thrown when a process specified by an &lt;invoke&gt;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.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.invoke;
+package org.apache.commons.scxml2.invoke;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -23,17 +23,17 @@ import java.util.Map;
 
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExecutor;
-import org.apache.commons.scxml.TriggerEvent;
-import org.apache.commons.scxml.env.SimpleDispatcher;
-import org.apache.commons.scxml.env.SimpleErrorReporter;
-import org.apache.commons.scxml.env.SimpleSCXMLListener;
-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.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExecutor;
+import org.apache.commons.scxml2.TriggerEvent;
+import org.apache.commons.scxml2.env.SimpleDispatcher;
+import org.apache.commons.scxml2.env.SimpleErrorReporter;
+import org.apache.commons.scxml2.env.SimpleSCXMLListener;
+import org.apache.commons.scxml2.io.SCXMLReader;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.SCXML;
 
 /**
  * A simple {@link Invoker} for SCXML documents. Invoked SCXML document

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/ModelUpdater.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/ModelUpdater.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/ModelUpdater.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/ModelUpdater.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.io;
+package org.apache.commons.scxml2.io;
 
 import java.text.MessageFormat;
 import java.util.Collection;
@@ -25,16 +25,16 @@ import java.util.Set;
 import java.util.StringTokenizer;
 
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.Initial;
-import org.apache.commons.scxml.model.Invoke;
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.SCXML;
-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.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.Initial;
+import org.apache.commons.scxml2.model.Invoke;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * The ModelUpdater provides the utility methods to check the Commons

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLParser.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLParser.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLParser.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLParser.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.io;
+package org.apache.commons.scxml2.io;
 
 import java.io.IOException;
 import java.net.URL;
@@ -36,43 +36,43 @@ import org.apache.commons.digester.SetNe
 import org.apache.commons.digester.SetPropertiesRule;
 import org.apache.commons.digester.WithDefaultsRulesWrapper;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.PathResolver;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.env.URLResolver;
-import org.apache.commons.scxml.model.Action;
-import org.apache.commons.scxml.model.Assign;
-import org.apache.commons.scxml.model.BodyContainer;
-import org.apache.commons.scxml.model.Cancel;
-import org.apache.commons.scxml.model.CustomAction;
-import org.apache.commons.scxml.model.Data;
-import org.apache.commons.scxml.model.Datamodel;
-import org.apache.commons.scxml.model.Else;
-import org.apache.commons.scxml.model.ElseIf;
-import org.apache.commons.scxml.model.Event;
-import org.apache.commons.scxml.model.Executable;
-import org.apache.commons.scxml.model.Exit;
-import org.apache.commons.scxml.model.ExternalContent;
-import org.apache.commons.scxml.model.Final;
-import org.apache.commons.scxml.model.Finalize;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.If;
-import org.apache.commons.scxml.model.Initial;
-import org.apache.commons.scxml.model.Invoke;
-import org.apache.commons.scxml.model.Log;
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.NamespacePrefixesHolder;
-import org.apache.commons.scxml.model.OnEntry;
-import org.apache.commons.scxml.model.OnExit;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.Param;
-import org.apache.commons.scxml.model.PathResolverHolder;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.Script;
-import org.apache.commons.scxml.model.Send;
-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.model.Var;
+import org.apache.commons.scxml2.PathResolver;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.env.URLResolver;
+import org.apache.commons.scxml2.model.Action;
+import org.apache.commons.scxml2.model.Assign;
+import org.apache.commons.scxml2.model.BodyContainer;
+import org.apache.commons.scxml2.model.Cancel;
+import org.apache.commons.scxml2.model.CustomAction;
+import org.apache.commons.scxml2.model.Data;
+import org.apache.commons.scxml2.model.Datamodel;
+import org.apache.commons.scxml2.model.Else;
+import org.apache.commons.scxml2.model.ElseIf;
+import org.apache.commons.scxml2.model.Event;
+import org.apache.commons.scxml2.model.Executable;
+import org.apache.commons.scxml2.model.Exit;
+import org.apache.commons.scxml2.model.ExternalContent;
+import org.apache.commons.scxml2.model.Final;
+import org.apache.commons.scxml2.model.Finalize;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.If;
+import org.apache.commons.scxml2.model.Initial;
+import org.apache.commons.scxml2.model.Invoke;
+import org.apache.commons.scxml2.model.Log;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.NamespacePrefixesHolder;
+import org.apache.commons.scxml2.model.OnEntry;
+import org.apache.commons.scxml2.model.OnExit;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.Param;
+import org.apache.commons.scxml2.model.PathResolverHolder;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.Script;
+import org.apache.commons.scxml2.model.Send;
+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.model.Var;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.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.io;
+package org.apache.commons.scxml2.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,41 +48,41 @@ import javax.xml.validation.SchemaFactor
 import javax.xml.validation.Validator;
 
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.PathResolver;
-import org.apache.commons.scxml.env.SimpleErrorHandler;
-import org.apache.commons.scxml.env.URLResolver;
-import org.apache.commons.scxml.model.Action;
-import org.apache.commons.scxml.model.Assign;
-import org.apache.commons.scxml.model.Cancel;
-import org.apache.commons.scxml.model.CustomAction;
-import org.apache.commons.scxml.model.Data;
-import org.apache.commons.scxml.model.Datamodel;
-import org.apache.commons.scxml.model.Else;
-import org.apache.commons.scxml.model.ElseIf;
-import org.apache.commons.scxml.model.Event;
-import org.apache.commons.scxml.model.Executable;
-import org.apache.commons.scxml.model.Exit;
-import org.apache.commons.scxml.model.ExternalContent;
-import org.apache.commons.scxml.model.Final;
-import org.apache.commons.scxml.model.Finalize;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.If;
-import org.apache.commons.scxml.model.Initial;
-import org.apache.commons.scxml.model.Invoke;
-import org.apache.commons.scxml.model.Log;
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.NamespacePrefixesHolder;
-import org.apache.commons.scxml.model.OnEntry;
-import org.apache.commons.scxml.model.OnExit;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.Param;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.Script;
-import org.apache.commons.scxml.model.Send;
-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.model.Var;
+import org.apache.commons.scxml2.PathResolver;
+import org.apache.commons.scxml2.env.SimpleErrorHandler;
+import org.apache.commons.scxml2.env.URLResolver;
+import org.apache.commons.scxml2.model.Action;
+import org.apache.commons.scxml2.model.Assign;
+import org.apache.commons.scxml2.model.Cancel;
+import org.apache.commons.scxml2.model.CustomAction;
+import org.apache.commons.scxml2.model.Data;
+import org.apache.commons.scxml2.model.Datamodel;
+import org.apache.commons.scxml2.model.Else;
+import org.apache.commons.scxml2.model.ElseIf;
+import org.apache.commons.scxml2.model.Event;
+import org.apache.commons.scxml2.model.Executable;
+import org.apache.commons.scxml2.model.Exit;
+import org.apache.commons.scxml2.model.ExternalContent;
+import org.apache.commons.scxml2.model.Final;
+import org.apache.commons.scxml2.model.Finalize;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.If;
+import org.apache.commons.scxml2.model.Initial;
+import org.apache.commons.scxml2.model.Invoke;
+import org.apache.commons.scxml2.model.Log;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.NamespacePrefixesHolder;
+import org.apache.commons.scxml2.model.OnEntry;
+import org.apache.commons.scxml2.model.OnExit;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.Param;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.Script;
+import org.apache.commons.scxml2.model.Send;
+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.model.Var;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLSerializer.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLSerializer.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLSerializer.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLSerializer.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.io;
+package org.apache.commons.scxml2.io;
 
 import java.io.StringWriter;
 import java.util.List;
@@ -34,33 +34,33 @@ import javax.xml.transform.dom.DOMSource
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.model.Action;
-import org.apache.commons.scxml.model.Assign;
-import org.apache.commons.scxml.model.Cancel;
-import org.apache.commons.scxml.model.Data;
-import org.apache.commons.scxml.model.Datamodel;
-import org.apache.commons.scxml.model.Else;
-import org.apache.commons.scxml.model.ElseIf;
-import org.apache.commons.scxml.model.Exit;
-import org.apache.commons.scxml.model.ExternalContent;
-import org.apache.commons.scxml.model.Finalize;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.If;
-import org.apache.commons.scxml.model.Initial;
-import org.apache.commons.scxml.model.Invoke;
-import org.apache.commons.scxml.model.Log;
-import org.apache.commons.scxml.model.NamespacePrefixesHolder;
-import org.apache.commons.scxml.model.OnEntry;
-import org.apache.commons.scxml.model.OnExit;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.Param;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.Send;
-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.model.Var;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.model.Action;
+import org.apache.commons.scxml2.model.Assign;
+import org.apache.commons.scxml2.model.Cancel;
+import org.apache.commons.scxml2.model.Data;
+import org.apache.commons.scxml2.model.Datamodel;
+import org.apache.commons.scxml2.model.Else;
+import org.apache.commons.scxml2.model.ElseIf;
+import org.apache.commons.scxml2.model.Exit;
+import org.apache.commons.scxml2.model.ExternalContent;
+import org.apache.commons.scxml2.model.Finalize;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.If;
+import org.apache.commons.scxml2.model.Initial;
+import org.apache.commons.scxml2.model.Invoke;
+import org.apache.commons.scxml2.model.Log;
+import org.apache.commons.scxml2.model.NamespacePrefixesHolder;
+import org.apache.commons.scxml2.model.OnEntry;
+import org.apache.commons.scxml2.model.OnExit;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.Param;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.Send;
+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.model.Var;
 import org.w3c.dom.Node;
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.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.io;
+package org.apache.commons.scxml2.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -42,35 +42,35 @@ import javax.xml.transform.stream.Stream
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.model.Action;
-import org.apache.commons.scxml.model.Assign;
-import org.apache.commons.scxml.model.Cancel;
-import org.apache.commons.scxml.model.Data;
-import org.apache.commons.scxml.model.Datamodel;
-import org.apache.commons.scxml.model.Else;
-import org.apache.commons.scxml.model.ElseIf;
-import org.apache.commons.scxml.model.Event;
-import org.apache.commons.scxml.model.Exit;
-import org.apache.commons.scxml.model.ExternalContent;
-import org.apache.commons.scxml.model.Final;
-import org.apache.commons.scxml.model.Finalize;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.If;
-import org.apache.commons.scxml.model.Initial;
-import org.apache.commons.scxml.model.Invoke;
-import org.apache.commons.scxml.model.Log;
-import org.apache.commons.scxml.model.OnEntry;
-import org.apache.commons.scxml.model.OnExit;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.Param;
-import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.Script;
-import org.apache.commons.scxml.model.Send;
-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.model.Var;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.model.Action;
+import org.apache.commons.scxml2.model.Assign;
+import org.apache.commons.scxml2.model.Cancel;
+import org.apache.commons.scxml2.model.Data;
+import org.apache.commons.scxml2.model.Datamodel;
+import org.apache.commons.scxml2.model.Else;
+import org.apache.commons.scxml2.model.ElseIf;
+import org.apache.commons.scxml2.model.Event;
+import org.apache.commons.scxml2.model.Exit;
+import org.apache.commons.scxml2.model.ExternalContent;
+import org.apache.commons.scxml2.model.Final;
+import org.apache.commons.scxml2.model.Finalize;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.If;
+import org.apache.commons.scxml2.model.Initial;
+import org.apache.commons.scxml2.model.Invoke;
+import org.apache.commons.scxml2.model.Log;
+import org.apache.commons.scxml2.model.OnEntry;
+import org.apache.commons.scxml2.model.OnExit;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.Param;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.Script;
+import org.apache.commons.scxml2.model.Send;
+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.model.Var;
 import org.w3c.dom.Node;
 
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * An abstract base class for executable elements in SCXML,
@@ -98,7 +98,7 @@ public abstract class Action implements 
     }
 
     /**
-     * Return the {@link TransitionTarget} whose {@link org.apache.commons.scxml.Context} this action
+     * Return the {@link TransitionTarget} whose {@link org.apache.commons.scxml2.Context} this action
      * executes in.
      *
      * @return The parent {@link TransitionTarget}

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Assign.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Assign.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Assign.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Assign.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -25,16 +25,16 @@ import javax.xml.parsers.ParserConfigura
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.PathResolver;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.TriggerEvent;
-import org.apache.commons.scxml.semantics.ErrorConstants;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.PathResolver;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.TriggerEvent;
+import org.apache.commons.scxml2.semantics.ErrorConstants;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/BodyContainer.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/BodyContainer.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/BodyContainer.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/BodyContainer.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * A <code>BodyContainer</code> is an entity that retains the element body

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Cancel.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Cancel.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Cancel.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Cancel.java Tue Oct 15 14:59:18 2013
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Collection;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/CustomAction.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/CustomAction.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/CustomAction.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/CustomAction.java Tue Oct 15 14:59:18 2013
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.SCXMLHelper;
+import org.apache.commons.scxml2.SCXMLHelper;
 
 /**
  * A custom action is simply a tuple consisting of a namespace URI,

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Data.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Data.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Data.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Data.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.Map;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Datamodel.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Datamodel.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Datamodel.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Datamodel.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Else.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Else.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Else.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Else.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ElseIf.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ElseIf.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ElseIf.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ElseIf.java Tue Oct 15 14:59:18 2013
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Collection;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Event.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Event.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Event.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Event.java Tue Oct 15 14:59:18 2013
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Collection;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Executable.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Executable.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Executable.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Executable.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Exit.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Exit.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Exit.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Exit.java Tue Oct 15 14:59:18 2013
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Collection;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ExternalContent.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ExternalContent.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ExternalContent.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ExternalContent.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.List;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Final.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Final.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Final.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Final.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Finalize.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Finalize.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Finalize.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Finalize.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/History.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/History.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/History.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/History.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/If.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/If.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/If.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/If.java Tue Oct 15 14:59:18 2013
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Initial.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Initial.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Initial.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Initial.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Invoke.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Invoke.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Invoke.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Invoke.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.scxml.PathResolver;
+import org.apache.commons.scxml2.PathResolver;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Log.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Log.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Log.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Log.java Tue Oct 15 14:59:18 2013
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Collection;
 
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ModelException.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ModelException.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ModelException.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/ModelException.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * Exception that is thrown when the SCXML model supplied to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/NamespacePrefixesHolder.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/NamespacePrefixesHolder.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/NamespacePrefixesHolder.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/NamespacePrefixesHolder.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Map;
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Observable.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Observable.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Observable.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Observable.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * Marker interface to flag elements of the SCXML object model whose progress
- * can be observed using the {@link org.apache.commons.scxml.NotificationRegistry}. These include
+ * can be observed using the {@link org.apache.commons.scxml2.NotificationRegistry}. These include
  * individual {@link TransitionTarget}s, {@link Transition}s or entire state
  * machines, {@link SCXML}.
  *

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnEntry.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnEntry.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnEntry.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnExit.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnExit.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnExit.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/OnExit.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.model;
+package org.apache.commons.scxml2.model;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Parallel.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Parallel.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Parallel.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Parallel.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Param.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Param.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Param.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Param.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.Map;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Path.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Path.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Path.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Path.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.scxml.SCXMLHelper;
+import org.apache.commons.scxml2.SCXMLHelper;
 
 /**
  * A helper class for this SCXML implementation that represents the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/PathResolverHolder.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/PathResolverHolder.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/PathResolverHolder.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/PathResolverHolder.java Tue Oct 15 14:59:18 2013
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.model;
+package org.apache.commons.scxml2.model;
 
-import org.apache.commons.scxml.PathResolver;
+import org.apache.commons.scxml2.PathResolver;
 
 /**
  * A <code>PathResolverHolder</code> is an entity that holds a

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/SCXML.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/SCXML.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/SCXML.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/SCXML.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.commons.scxml.SCXMLHelper;
+import org.apache.commons.scxml2.SCXMLHelper;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Script.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Script.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Script.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Script.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Collection;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Send.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Send.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Send.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Send.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,15 +24,15 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.TriggerEvent;
-import org.apache.commons.scxml.semantics.ErrorConstants;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.TriggerEvent;
+import org.apache.commons.scxml2.semantics.ErrorConstants;
 import org.w3c.dom.Node;
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/State.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/State.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/State.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/State.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Transition.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Transition.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Transition.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Transition.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Var.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Var.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Var.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Var.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.model;
+package org.apache.commons.scxml2.model;
 
 import java.util.Collection;
 
 import org.apache.commons.logging.Log;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.TriggerEvent;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.TriggerEvent;
 
 /**
  * The class in this SCXML object model that corresponds to the

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/ErrorConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/ErrorConstants.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/ErrorConstants.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/ErrorConstants.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.semantics;
+package org.apache.commons.scxml2.semantics;
 
 /**
  * Errors reported by the default SCXMLSemantics implementation.
@@ -25,8 +25,8 @@ public class ErrorConstants {
     /**
      * Missing initial state for a composite state or for the scxml root.
      *
-     * @see org.apache.commons.scxml.model.SCXML#getInitialTarget()
-     * @see org.apache.commons.scxml.model.State#getInitial()
+     * @see org.apache.commons.scxml2.model.SCXML#getInitialTarget()
+     * @see org.apache.commons.scxml2.model.State#getInitial()
      */
     public static final String NO_INITIAL = "NO_INITIAL";
 

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.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.semantics;
+package org.apache.commons.scxml2.semantics;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -31,35 +31,35 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.ErrorReporter;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.EventDispatcher;
-import org.apache.commons.scxml.NotificationRegistry;
-import org.apache.commons.scxml.PathResolver;
-import org.apache.commons.scxml.SCInstance;
-import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.SCXMLSemantics;
-import org.apache.commons.scxml.Step;
-import org.apache.commons.scxml.TriggerEvent;
-import org.apache.commons.scxml.invoke.Invoker;
-import org.apache.commons.scxml.invoke.InvokerException;
-import org.apache.commons.scxml.model.Action;
-import org.apache.commons.scxml.model.Finalize;
-import org.apache.commons.scxml.model.History;
-import org.apache.commons.scxml.model.Initial;
-import org.apache.commons.scxml.model.Invoke;
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.OnEntry;
-import org.apache.commons.scxml.model.OnExit;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.Param;
-import org.apache.commons.scxml.model.Path;
-import org.apache.commons.scxml.model.SCXML;
-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.scxml2.Context;
+import org.apache.commons.scxml2.ErrorReporter;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.EventDispatcher;
+import org.apache.commons.scxml2.NotificationRegistry;
+import org.apache.commons.scxml2.PathResolver;
+import org.apache.commons.scxml2.SCInstance;
+import org.apache.commons.scxml2.SCXMLExpressionException;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.SCXMLSemantics;
+import org.apache.commons.scxml2.Step;
+import org.apache.commons.scxml2.TriggerEvent;
+import org.apache.commons.scxml2.invoke.Invoker;
+import org.apache.commons.scxml2.invoke.InvokerException;
+import org.apache.commons.scxml2.model.Action;
+import org.apache.commons.scxml2.model.Finalize;
+import org.apache.commons.scxml2.model.History;
+import org.apache.commons.scxml2.model.Initial;
+import org.apache.commons.scxml2.model.Invoke;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.OnEntry;
+import org.apache.commons.scxml2.model.OnExit;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.Param;
+import org.apache.commons.scxml2.model.Path;
+import org.apache.commons.scxml2.model.SCXML;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.Transition;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 /**
  * <p>This class encapsulates a particular SCXML semantics, that is, a

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/TransitionTargetComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/TransitionTargetComparator.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/TransitionTargetComparator.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/TransitionTargetComparator.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.semantics;
+package org.apache.commons.scxml2.semantics;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.apache.commons.scxml.SCXMLHelper;
-import org.apache.commons.scxml.model.Parallel;
-import org.apache.commons.scxml.model.State;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.SCXMLHelper;
+import org.apache.commons.scxml2.model.Parallel;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.TransitionTarget;
 
 
 /**

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/package.html
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/package.html?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/package.html (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/package.html Tue Oct 15 14:59:18 2013
@@ -20,7 +20,7 @@
 <body>
 
  <p>A collection of classes responsible for implementations of the
- <code>org.apache.commons.scxml.SCXMLSemantics</code> interface.</p>
+ <code>org.apache.commons.scxml2.SCXMLSemantics</code> interface.</p>
 
  <p>Some possible semantic interpretations are, for example:</p>
 
@@ -33,7 +33,7 @@
  </ul>
 
  <p>Specific semantics can be created by subclassing
- <code>org.apache.commons.scxml.semantics.SCXMLSemanticsImpl</code>,
+ <code>org.apache.commons.scxml2.semantics.SCXMLSemanticsImpl</code>,
  which is the default implementation used.</p>
 
 </body>

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneElExpressions.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneElExpressions.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneElExpressions.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneElExpressions.java Tue Oct 15 14:59:18 2013
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.test;
+package org.apache.commons.scxml2.test;
 
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.env.jsp.ELEvaluator;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.env.jsp.ELEvaluator;
 
 /**
  * Standalone SCXML interpreter, useful for command-line testing and
  * debugging, where expressions are JSP 2.0 EL expressions.
  *
  * <p>USAGE:</p>
- * <p><code>java org.apache.commons.scxml.test.StandaloneElExpressions
+ * <p><code>java org.apache.commons.scxml2.test.StandaloneElExpressions
  *          url</code></p>
  * <p>or</p>
- * <p><code>java org.apache.commons.scxml.test.StandaloneElExpressions
+ * <p><code>java org.apache.commons.scxml2.test.StandaloneElExpressions
  *          filename</code>
  * </p>
  *

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneJexlExpressions.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneJexlExpressions.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneJexlExpressions.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneJexlExpressions.java Tue Oct 15 14:59:18 2013
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.test;
+package org.apache.commons.scxml2.test;
 
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.env.jexl.JexlEvaluator;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
 
 /**
  * Standalone SCXML interpreter, useful for command-line testing and
  * debugging, where expressions are JEXL expressions.
  *
  * <p>USAGE:</p>
- * <p><code>java org.apache.commons.scxml.test.StandaloneJexlExpressions
+ * <p><code>java org.apache.commons.scxml2.test.StandaloneJexlExpressions
  *          url</code></p>
  * <p>or</p>
- * <p><code>java org.apache.commons.scxml.test.StandaloneJexlExpressions
+ * <p><code>java org.apache.commons.scxml2.test.StandaloneJexlExpressions
  *          filename</code>
  * </p>
  *

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneRhinoExpressions.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneRhinoExpressions.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneRhinoExpressions.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneRhinoExpressions.java Tue Oct 15 14:59:18 2013
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.test;
+package org.apache.commons.scxml2.test;
 
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.env.rhino.RhinoEvaluator;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.env.rhino.RhinoEvaluator;
 
 /**
  * Standalone SCXML interpreter, useful for command-line testing and
  * debugging, where expressions are ECMA script expressions.
  *
  * <p>USAGE:</p>
- * <p><code>java org.apache.commons.scxml.test.StandaloneRhinoExpressions
+ * <p><code>java org.apache.commons.scxml2.test.StandaloneRhinoExpressions
  *          url</code></p>
  * <p>or</p>
- * <p><code>java org.apache.commons.scxml.test.StandaloneRhinoExpressions
+ * <p><code>java org.apache.commons.scxml2.test.StandaloneRhinoExpressions
  *          filename</code>
  * </p>
  *

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java 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.test;
+package org.apache.commons.scxml2.test;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -25,19 +25,19 @@ import java.util.StringTokenizer;
 
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-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.env.SimpleScheduler;
-import org.apache.commons.scxml.env.Tracer;
-import org.apache.commons.scxml.invoke.SimpleSCXMLInvoker;
-import org.apache.commons.scxml.io.SCXMLReader;
-import org.apache.commons.scxml.io.SCXMLWriter;
-import org.apache.commons.scxml.model.ModelException;
-import org.apache.commons.scxml.model.SCXML;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+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.env.SimpleScheduler;
+import org.apache.commons.scxml2.env.Tracer;
+import org.apache.commons.scxml2.invoke.SimpleSCXMLInvoker;
+import org.apache.commons.scxml2.io.SCXMLReader;
+import org.apache.commons.scxml2.io.SCXMLWriter;
+import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.SCXML;
 
 /**
  * Utility methods used by command line SCXML execution, useful for
@@ -49,8 +49,8 @@ import org.apache.commons.scxml.model.SC
  *  <li>EL - Using Commons EL</li>
  * </ol>
  *
- * @see org.apache.commons.scxml.env.jexl
- * @see org.apache.commons.scxml.env.jsp
+ * @see org.apache.commons.scxml2.env.jexl
+ * @see org.apache.commons.scxml2.env.jsp
  */
 public final class StandaloneUtils {
 

Modified: commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml?rev=1532375&r1=1532374&r2=1532375&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml (original)
+++ commons/proper/scxml/trunk/src/site/xdoc/guide/contexts-evaluators.xml Tue Oct 15 14:59:18 2013
@@ -98,15 +98,15 @@
 
    <subsection name="Commons JEXL">
     <p>See
-    <a href="../apidocs/org/apache/commons/scxml/env/jexl/package-summary.html">
-    org.apache.commons.scxml.env.jexl package summary</a> for the
+    <a href="../apidocs/org/apache/commons/scxml2/env/jexl/package-summary.html">
+    org.apache.commons.scxml2.env.jexl package summary</a> for the
     relevant root context and evaluator tuple to use.</p>
    </subsection>
 
    <subsection name="Commons EL (JSP 2.0 EL)">
     <p>See
-    <a href="../apidocs/org/apache/commons/scxml/env/jsp/package-summary.html">
-    org.apache.commons.scxml.env.jsp package summary</a> for the
+    <a href="../apidocs/org/apache/commons/scxml2/env/jsp/package-summary.html">
+    org.apache.commons.scxml2.env.jsp package summary</a> for the
     relevant root context and evaluator tuple to use.</p>
    </subsection>
 
@@ -131,7 +131,7 @@
 
    <subsection name="Commons EL (JSP 2.0 EL)">
     <p>It is possible to register "namespaced" functions with the
-    <a href="../apidocs/org/apache/commons/scxml/env/jsp/ELEvaluator.html">
+    <a href="../apidocs/org/apache/commons/scxml2/env/jsp/ELEvaluator.html">
     ELEvaluator</a> to enable method invocation. The methods need to be
     static accessible methods in the class(es) that implement(s) them,
     and a suitable <code>FunctionMapper</code> is passed in via the



Mime
View raw message