Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.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 junit.framework.TestCase; -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; public class RhinoEvaluatorTest extends TestCase {
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.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.env.rhino; +package org.apache.commons.scxml2.env.rhino; import java.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.model.State; -import org.apache.commons.scxml.model.TransitionTarget; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.model.State; +import org.apache.commons.scxml2.model.TransitionTarget; public class RhinoExampleTest extends TestCase { @@ -39,7 +39,7 @@ public class RhinoExampleTest extends Te @Override protected void setUp() throws Exception { example01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/rhino/example-01.xml"); + getResource("org/apache/commons/scxml2/env/rhino/example-01.xml"); } @Override Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.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.servlet; +package org.apache.commons.scxml2.env.servlet; import junit.framework.TestCase; Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java Tue Oct 15 14:59:18 2013 @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.apache.commons.scxml.env.xpath; +package org.apache.commons.scxml2.env.xpath; import java.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.Context; -import org.apache.commons.scxml.Evaluator; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.TriggerEvent; -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.scxml2.Context; +import org.apache.commons.scxml2.Evaluator; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.TriggerEvent; +import org.apache.commons.scxml2.model.SCXML; +import org.apache.commons.scxml2.model.State; +import org.apache.commons.scxml2.model.TransitionTarget; /** * SCXML application for the XPath example. @@ -51,9 +51,9 @@ public class XPathExampleTest extends Te @Override public void setUp() { example01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/xpath/example-01.xml"); + getResource("org/apache/commons/scxml2/env/xpath/example-01.xml"); example02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/xpath/example-02.xml"); + getResource("org/apache/commons/scxml2/env/xpath/example-02.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.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.invoke; +package org.apache.commons.scxml2.invoke; import java.net.URL; import java.util.Map; import junit.framework.TestCase; -import org.apache.commons.scxml.SCInstance; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -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.model.ModelException; +import org.apache.commons.scxml2.SCInstance; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +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.model.ModelException; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -47,7 +47,7 @@ public class InvokeParamNameTest extends @Override public void setUp() throws Exception { invoker04 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/invoke/invoker-04.xml"); + getResource("org/apache/commons/scxml2/invoke/invoker-04.xml"); exec = SCXMLTestHelper.getExecutor(invoker04, new JexlContext(), new JexlEvaluator()); exec.registerInvokerClass("x-test", DummyInvoker.class); Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java Tue Oct 15 14:59:18 2013 @@ -14,25 +14,25 @@ * 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.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.env.SimpleDispatcher; -import org.apache.commons.scxml.env.SimpleErrorReporter; -import org.apache.commons.scxml.env.jexl.JexlContext; -import org.apache.commons.scxml.env.jexl.JexlEvaluator; -import org.apache.commons.scxml.io.SCXMLReader; -import org.apache.commons.scxml.model.SCXML; -import org.apache.commons.scxml.model.TransitionTarget; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.env.SimpleDispatcher; +import org.apache.commons.scxml2.env.SimpleErrorReporter; +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.SCXML; +import org.apache.commons.scxml2.model.TransitionTarget; /** - * Unit tests {@link org.apache.commons.scxml.SCXMLExecutor}. + * Unit tests {@link org.apache.commons.scxml2.SCXMLExecutor}. * Testing <invoke> */ public class InvokeTest extends TestCase { @@ -54,11 +54,11 @@ public class InvokeTest extends TestCase @Override public void setUp() { invoke01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/invoke/invoker-01.xml"); + getResource("org/apache/commons/scxml2/invoke/invoker-01.xml"); invoke02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/invoke/invoker-02.xml"); + getResource("org/apache/commons/scxml2/invoke/invoker-02.xml"); invoke03 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/invoke/invoker-03.xml"); + getResource("org/apache/commons/scxml2/invoke/invoker-03.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java 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; @@ -26,24 +26,24 @@ import javax.xml.stream.XMLStreamExcepti import junit.framework.TestCase; 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.SCXMLTestHelper; -import org.apache.commons.scxml.TriggerEvent; -import org.apache.commons.scxml.model.Action; -import org.apache.commons.scxml.model.CustomAction; -import org.apache.commons.scxml.model.ExternalContent; -import org.apache.commons.scxml.model.Final; -import org.apache.commons.scxml.model.ModelException; -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.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.SCXMLTestHelper; +import org.apache.commons.scxml2.TriggerEvent; +import org.apache.commons.scxml2.model.Action; +import org.apache.commons.scxml2.model.CustomAction; +import org.apache.commons.scxml2.model.ExternalContent; +import org.apache.commons.scxml2.model.Final; +import org.apache.commons.scxml2.model.ModelException; +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.w3c.dom.Node; /** - * Unit tests {@link org.apache.commons.scxml.io.SCXMLReader}. + * Unit tests {@link org.apache.commons.scxml2.io.SCXMLReader}. */ public class SCXMLReaderTest extends TestCase { /** @@ -66,23 +66,23 @@ public class SCXMLReaderTest extends Tes @Override public void setUp() { microwave01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jsp/microwave-01.xml"); + getResource("org/apache/commons/scxml2/env/jsp/microwave-01.xml"); microwave02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jsp/microwave-02.xml"); + getResource("org/apache/commons/scxml2/env/jsp/microwave-02.xml"); microwave03 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/microwave-03.xml"); + getResource("org/apache/commons/scxml2/env/jexl/microwave-03.xml"); microwave04 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/microwave-04.xml"); + getResource("org/apache/commons/scxml2/env/jexl/microwave-04.xml"); transitions01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/transitions-01.xml"); + getResource("org/apache/commons/scxml2/transitions-01.xml"); send01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/send-01.xml"); + getResource("org/apache/commons/scxml2/send-01.xml"); prefix01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/prefix-01.xml"); + getResource("org/apache/commons/scxml2/prefix-01.xml"); scxmlinitialattr = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/io/scxml-initial-attr.xml"); + getResource("org/apache/commons/scxml2/io/scxml-initial-attr.xml"); action01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/io/custom-action-body-test-1.xml"); + getResource("org/apache/commons/scxml2/io/custom-action-body-test-1.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLSerializerTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLSerializerTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLSerializerTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLSerializerTest.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.util.ArrayList; import java.util.LinkedHashMap; @@ -23,23 +23,23 @@ import java.util.Map; import junit.framework.TestCase; -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.Else; -import org.apache.commons.scxml.model.ElseIf; -import org.apache.commons.scxml.model.Exit; -import org.apache.commons.scxml.model.If; -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.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.model.Action; +import org.apache.commons.scxml2.model.Assign; +import org.apache.commons.scxml2.model.Cancel; +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.If; +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.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; public class SCXMLSerializerTest extends TestCase { Copied: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java (from r1532071, commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java) URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java?p2=commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java&p1=commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java&r1=1532071&r2=1532375&rev=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.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.util.LinkedHashMap; @@ -24,9 +24,9 @@ import javax.xml.stream.XMLStreamExcepti import junit.framework.TestCase; -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.scxml2.model.Parallel; +import org.apache.commons.scxml2.model.SCXML; +import org.apache.commons.scxml2.model.State; public class SCXMLWriterTest extends TestCase { Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.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.io; +package org.apache.commons.scxml2.io; import java.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -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.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.model.ModelException; +import org.apache.commons.scxml2.model.SCXML; +import org.apache.commons.scxml2.model.TransitionTarget; /** - * Unit tests {@link org.apache.commons.scxml.io.SCXMLDigester} + * Unit tests {@link org.apache.commons.scxml2.io.SCXMLDigester} * Test white box nature of <state> element "src" attribute. */ public class StateSrcTest extends TestCase { @@ -50,11 +50,11 @@ public class StateSrcTest extends TestCa @Override public void setUp() { src01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/io/src-test-1.xml"); + getResource("org/apache/commons/scxml2/io/src-test-1.xml"); src04 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/io/src-test-4.xml"); + getResource("org/apache/commons/scxml2/io/src-test-4.xml"); src05 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/io/src-test-5.xml"); + getResource("org/apache/commons/scxml2/io/src-test-5.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.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.issues; +package org.apache.commons.scxml2.issues; import java.net.URL; import java.util.ArrayList; @@ -26,18 +26,18 @@ import java.util.Queue; import junit.framework.TestCase; 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.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLExpressionException; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.TriggerEvent; -import org.apache.commons.scxml.model.Action; -import org.apache.commons.scxml.model.CustomAction; -import org.apache.commons.scxml.model.ModelException; -import org.apache.commons.scxml.model.SCXML; -import org.apache.commons.scxml.model.State; +import org.apache.commons.scxml2.ErrorReporter; +import org.apache.commons.scxml2.EventDispatcher; +import org.apache.commons.scxml2.SCInstance; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLExpressionException; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.TriggerEvent; +import org.apache.commons.scxml2.model.Action; +import org.apache.commons.scxml2.model.CustomAction; +import org.apache.commons.scxml2.model.ModelException; +import org.apache.commons.scxml2.model.SCXML; +import org.apache.commons.scxml2.model.State; /** * Test cases for issue 112. @@ -58,7 +58,7 @@ public class Issue112Test extends TestCa @Override public void setUp() { queue01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/issues/queue-01.xml"); + getResource("org/apache/commons/scxml2/issues/queue-01.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.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.issues; +package org.apache.commons.scxml2.issues; import java.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.model.TransitionTarget; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.model.TransitionTarget; /** * Test cases for issue 62. @@ -44,11 +44,11 @@ public class Issue62Test extends TestCas @Override public void setUp() { test01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/issues/issue62-01.xml"); + getResource("org/apache/commons/scxml2/issues/issue62-01.xml"); test02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/issues/issue62-02.xml"); + getResource("org/apache/commons/scxml2/issues/issue62-02.xml"); test03 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/issues/issue62-03.xml"); + getResource("org/apache/commons/scxml2/issues/issue62-03.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.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.issues; +package org.apache.commons.scxml2.issues; import java.net.URL; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; /** * Test cases for issue 64. @@ -42,9 +42,9 @@ public class Issue64Test extends TestCas @Override public void setUp() { works = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/issues/issue64-01.xml"); + getResource("org/apache/commons/scxml2/issues/issue64-01.xml"); fails = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/issues/issue64-02.xml"); + getResource("org/apache/commons/scxml2/issues/issue64-02.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionTest.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 junit.framework.TestCase; Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java Tue Oct 15 14:59:18 2013 @@ -14,26 +14,26 @@ * 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.net.URL; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.env.jsp.ELContext; -import org.apache.commons.scxml.env.jsp.ELEvaluator; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.env.jsp.ELContext; +import org.apache.commons.scxml2.env.jsp.ELEvaluator; /** - * Unit tests {@link org.apache.commons.scxml.model.Assign}. - * Unit tests {@link org.apache.commons.scxml.model.Cancel}. - * Unit tests {@link org.apache.commons.scxml.model.Else}. - * Unit tests {@link org.apache.commons.scxml.model.ElseIf}. - * Unit tests {@link org.apache.commons.scxml.model.Exit}. - * Unit tests {@link org.apache.commons.scxml.model.If}. - * Unit tests {@link org.apache.commons.scxml.model.Log}. - * Unit tests {@link org.apache.commons.scxml.model.Send}. - * Unit tests {@link org.apache.commons.scxml.model.Var}. + * Unit tests {@link org.apache.commons.scxml2.model.Assign}. + * Unit tests {@link org.apache.commons.scxml2.model.Cancel}. + * Unit tests {@link org.apache.commons.scxml2.model.Else}. + * Unit tests {@link org.apache.commons.scxml2.model.ElseIf}. + * Unit tests {@link org.apache.commons.scxml2.model.Exit}. + * Unit tests {@link org.apache.commons.scxml2.model.If}. + * Unit tests {@link org.apache.commons.scxml2.model.Log}. + * Unit tests {@link org.apache.commons.scxml2.model.Send}. + * Unit tests {@link org.apache.commons.scxml2.model.Var}. */ public class ActionsTest extends TestCase { /** @@ -56,11 +56,11 @@ public class ActionsTest extends TestCas @Override public void setUp() { actionsSample01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/actions-state-test.xml"); + getResource("org/apache/commons/scxml2/model/actions-state-test.xml"); actionsSample02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/actions-parallel-test.xml"); + getResource("org/apache/commons/scxml2/model/actions-parallel-test.xml"); actionsSample03 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/actions-initial-test.xml"); + getResource("org/apache/commons/scxml2/model/actions-initial-test.xml"); evaluator = new ELEvaluator(); ctx = new ELContext(); } Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.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.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; /** * Unit tests for <assign> element, particular the "src" attribute. */ @@ -44,9 +44,9 @@ public class AssignTest extends TestCase @Override public void setUp() { assign01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/assign-test-01.xml"); + getResource("org/apache/commons/scxml2/model/assign-test-01.xml"); assign02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/assign-test-02.xml"); + getResource("org/apache/commons/scxml2/model/assign-test-02.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java 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.net.URL; import java.util.ArrayList; import java.util.List; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.env.jsp.ELEvaluator; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.env.jsp.ELEvaluator; public class CustomActionTest extends TestCase { @@ -40,17 +40,17 @@ public class CustomActionTest extends Te @Override public void setUp() { hello01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/hello-world.xml"); + getResource("org/apache/commons/scxml2/hello-world.xml"); custom01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/custom-hello-world-01.xml"); + getResource("org/apache/commons/scxml2/custom-hello-world-01.xml"); external01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/external-hello-world.xml"); + getResource("org/apache/commons/scxml2/external-hello-world.xml"); override01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/custom-hello-world-03.xml"); + getResource("org/apache/commons/scxml2/custom-hello-world-03.xml"); payload01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/custom-hello-world-04-jexl.xml"); + getResource("org/apache/commons/scxml2/custom-hello-world-04-jexl.xml"); payload02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/custom-hello-world-04-el.xml"); + getResource("org/apache/commons/scxml2/custom-hello-world-04-el.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java 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.net.URL; import java.util.HashMap; @@ -22,15 +22,15 @@ import java.util.Map; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -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.env.jsp.ELContext; -import org.apache.commons.scxml.env.jsp.ELEvaluator; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.TriggerEvent; +import org.apache.commons.scxml2.env.jexl.JexlContext; +import org.apache.commons.scxml2.env.jexl.JexlEvaluator; +import org.apache.commons.scxml2.env.jsp.ELContext; +import org.apache.commons.scxml2.env.jsp.ELEvaluator; /** - * Unit tests {@link org.apache.commons.scxml.SCXMLExecutor}. + * Unit tests {@link org.apache.commons.scxml2.SCXMLExecutor}. */ public class DatamodelTest extends TestCase { /** @@ -51,17 +51,17 @@ public class DatamodelTest extends TestC @Override public void setUp() { datamodel01jexl = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/datamodel-01.xml"); + getResource("org/apache/commons/scxml2/env/jexl/datamodel-01.xml"); datamodel02jexl = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/datamodel-02.xml"); + getResource("org/apache/commons/scxml2/env/jexl/datamodel-02.xml"); datamodel04jexl = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/datamodel-04.xml"); + getResource("org/apache/commons/scxml2/env/jexl/datamodel-04.xml"); datamodel05jexl = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/datamodel-05.xml"); + getResource("org/apache/commons/scxml2/env/jexl/datamodel-05.xml"); datamodel01jsp = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jsp/datamodel-01.xml"); + getResource("org/apache/commons/scxml2/env/jsp/datamodel-01.xml"); datamodel02jsp = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jsp/datamodel-02.xml"); + getResource("org/apache/commons/scxml2/env/jsp/datamodel-02.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.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; /** * Our custom "hello world" action. Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.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.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; public class HistoryTest extends TestCase { /** @@ -44,13 +44,13 @@ public class HistoryTest extends TestCas public void setUp() { history = new History(); shallow01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/history-shallow-01.xml"); + getResource("org/apache/commons/scxml2/history-shallow-01.xml"); deep01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/history-deep-01.xml"); + getResource("org/apache/commons/scxml2/history-deep-01.xml"); defaults01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/history-default-01.xml"); + getResource("org/apache/commons/scxml2/history-default-01.xml"); parallel01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/history-parallel-01.xml"); + getResource("org/apache/commons/scxml2/history-parallel-01.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.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.net.URL; import java.util.HashMap; import java.util.Map; import junit.framework.TestCase; -import org.apache.commons.scxml.Builtin; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; +import org.apache.commons.scxml2.Builtin; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; import org.w3c.dom.Node; public class ParallelTest extends TestCase { @@ -39,11 +39,11 @@ public class ParallelTest extends TestCa @Override public void setUp() { parallel01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/parallel-01.xml"); + getResource("org/apache/commons/scxml2/model/parallel-01.xml"); parallel02 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/parallel-02.xml"); + getResource("org/apache/commons/scxml2/model/parallel-02.xml"); parallel03 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/parallel-03.xml"); + getResource("org/apache/commons/scxml2/model/parallel-03.xml"); } @Override Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/PathTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/PathTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/PathTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/PathTest.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 junit.framework.TestCase; Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java Tue Oct 15 14:59:18 2013 @@ -14,16 +14,15 @@ * 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.net.URL; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.env.javascript.JSEvaluator; -import org.apache.commons.scxml.model.TransitionTarget; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.env.javascript.JSEvaluator; public class ScriptTest extends TestCase { @@ -39,9 +38,9 @@ public class ScriptTest extends TestCase @Override public void setUp() { script01jexl = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/script-01.xml"); + getResource("org/apache/commons/scxml2/env/jexl/script-01.xml"); script01js = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/javascript/script-01.xml"); + getResource("org/apache/commons/scxml2/env/javascript/script-01.xml"); } /** Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.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.model; +package org.apache.commons.scxml2.model; import java.net.URL; import java.util.List; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; import junit.framework.TestCase; @@ -39,7 +39,7 @@ public class StateTest extends TestCase public void setUp() { state = new State(); state01 = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/state-01.xml"); + getResource("org/apache/commons/scxml2/model/state-01.xml"); } @Override Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java Tue Oct 15 14:59:18 2013 @@ -14,21 +14,21 @@ * 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.net.URL; import java.util.Iterator; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.scxml.SCXMLExecutor; -import org.apache.commons.scxml.SCXMLTestHelper; -import org.apache.commons.scxml.TriggerEvent; -import org.apache.commons.scxml.env.SimpleSCXMLListener; -import org.apache.commons.scxml.env.jsp.ELContext; -import org.apache.commons.scxml.env.jsp.ELEvaluator; +import org.apache.commons.scxml2.SCXMLExecutor; +import org.apache.commons.scxml2.SCXMLTestHelper; +import org.apache.commons.scxml2.TriggerEvent; +import org.apache.commons.scxml2.env.SimpleSCXMLListener; +import org.apache.commons.scxml2.env.jsp.ELContext; +import org.apache.commons.scxml2.env.jsp.ELEvaluator; /** - * Unit tests {@link org.apache.commons.scxml.SCXMLExecutor}. + * Unit tests {@link org.apache.commons.scxml2.SCXMLExecutor}. */ public class StatelessModelTest extends TestCase { /** @@ -50,11 +50,11 @@ public class StatelessModelTest extends @Override public void setUp() throws Exception { stateless01jexl = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jexl/stateless-01.xml"); + getResource("org/apache/commons/scxml2/env/jexl/stateless-01.xml"); stateless01jsp = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/env/jsp/stateless-01.xml"); + getResource("org/apache/commons/scxml2/env/jsp/stateless-01.xml"); stateless01par = this.getClass().getClassLoader(). - getResource("org/apache/commons/scxml/model/stateless-parallel-01.xml"); + getResource("org/apache/commons/scxml2/model/stateless-parallel-01.xml"); scxml01jexl = SCXMLTestHelper.parse(stateless01jexl); scxml01jsp = SCXMLTestHelper.parse(stateless01jsp); scxml01par = SCXMLTestHelper.parse(stateless01par); Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/TransitionTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/TransitionTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/TransitionTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/TransitionTest.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 junit.framework.TestCase; Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/TransitionTargetComparatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/TransitionTargetComparatorTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/TransitionTargetComparatorTest.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/TransitionTargetComparatorTest.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.semantics; +package org.apache.commons.scxml2.semantics; import java.util.Comparator; import junit.framework.TestCase; -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.model.Parallel; +import org.apache.commons.scxml2.model.State; +import org.apache.commons.scxml2.model.TransitionTarget; public class TransitionTargetComparatorTest extends TestCase {
