Support for xinclude

13 files changed, 28 insertions, 28 deletions

diff --git a/embedding/csharp/uSCXMLEmbedding/RunTests.cs b/embedding/csharp/uSCXMLEmbedding/RunTests.cs
index d2b188d..5b39c9f 100644
--- a/embedding/csharp/uSCXMLEmbedding/RunTests.cs
+++ b/embedding/csharp/uSCXMLEmbedding/RunTests.cs
@@ -98,7 +98,7 @@ namespace embedding
             "</scxml>";

 

             // parse and interpret

-            Interpreter interpreter = Interpreter.fromXML(xml);

+            Interpreter interpreter = Interpreter.fromXML(xml, "");

             interpreter.interpret();

 

         }

@@ -142,7 +142,7 @@ namespace embedding
             "</scxml>";

 

             // parse and interpret

-            Interpreter interpreter = Interpreter.fromXML(xml);

+            Interpreter interpreter = Interpreter.fromXML(xml, "");

             interpreter.interpret();

 

         }

@@ -167,7 +167,7 @@ namespace embedding
                             "    <transition target=\"exit\" />" +

                             "  </state>\n" +

                             "  <final id=\"exit\" />" +

-                            "</scxml>\n"

+                            "</scxml>\n", ""

                     );

             interpreter.interpret();

             interpreter.Dispose();

@@ -180,7 +180,7 @@ namespace embedding
             try

             {

                 String xml = "<invalid";

-                Interpreter interpreter = Interpreter.fromXML(xml);

+                Interpreter interpreter = Interpreter.fromXML(xml, "");

                 Debug.Assert(false);

             }

             catch (InterpreterException e)

@@ -192,7 +192,7 @@ namespace embedding
             try

             {

                 String xml = "<invalid />";

-                Interpreter interpreter = Interpreter.fromXML(xml);

+                Interpreter interpreter = Interpreter.fromXML(xml, "");

                 Debug.Assert(interpreter.getState() == InterpreterState.USCXML_INSTANTIATED);

                 interpreter.step();

                 Debug.Assert(false);

@@ -212,7 +212,7 @@ namespace embedding
                 " </state>" +

                 " <final id=\"done\" />" +

                 "</scxml>";

-                Interpreter interpreter = Interpreter.fromXML(xml);

+                Interpreter interpreter = Interpreter.fromXML(xml, "");

                 Debug.Assert(interpreter.getState() == InterpreterState.USCXML_INSTANTIATED);

                 interpreter.step();

                 Debug.Assert(false);

@@ -237,7 +237,7 @@ namespace embedding
                 " <final id=\"done\" />" +

                 "</scxml>";

 

-                Interpreter interpreter = Interpreter.fromXML(xml);

+                Interpreter interpreter = Interpreter.fromXML(xml, "");

 

                 Debug.Assert(interpreter.getState() == InterpreterState.USCXML_INSTANTIATED);

                 Debug.Assert(interpreter.step() == InterpreterState.USCXML_MICROSTEPPED);

@@ -262,7 +262,7 @@ namespace embedding
                 " <final id=\"done\" />" +

                 "</scxml>";

 

-                Interpreter interpreter = Interpreter.fromXML(xml);

+                Interpreter interpreter = Interpreter.fromXML(xml, "");

                 Debug.Assert(interpreter.getState() == InterpreterState.USCXML_INSTANTIATED);

                 Debug.Assert(interpreter.step() == InterpreterState.USCXML_MICROSTEPPED);

                 Debug.Assert(interpreter.step() == InterpreterState.USCXML_FINISHED);

@@ -296,7 +296,7 @@ namespace embedding
                 " <final id=\"done\" />" +

                 "</scxml>";

 

-                Interpreter interpreter = Interpreter.fromXML(xml);

+                Interpreter interpreter = Interpreter.fromXML(xml, "");

                 Debug.Assert(interpreter.getState() == InterpreterState.USCXML_INSTANTIATED);

                 Debug.Assert(interpreter.step() == InterpreterState.USCXML_IDLE);

                 Debug.Assert(interpreter.step(true) == InterpreterState.USCXML_MACROSTEPPED);

diff --git a/embedding/java/src/org/uscxml/tests/TestExceptions.java b/embedding/java/src/org/uscxml/tests/TestExceptions.java
index 95242b8..b64d9e8 100644
--- a/embedding/java/src/org/uscxml/tests/TestExceptions.java
+++ b/embedding/java/src/org/uscxml/tests/TestExceptions.java
@@ -18,13 +18,13 @@ public class TestExceptions {
 
 		if (false) {
 			// datamodel not available before first step -> dies with segfault
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			System.out.println(interpreter.getDataModel().evalAsString("'FOO'"));
 		}
 
 		if (false) {
 			// datamodel is available but syntactic ecmascript exception is not propagated
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			interpreter.step();
 			System.out.println(interpreter.getDataModel().evalAsString("'FOO' / qwer"));
 		}
diff --git a/embedding/java/src/org/uscxml/tests/TestLifecycle.java b/embedding/java/src/org/uscxml/tests/TestLifecycle.java
index 9278cbe..7fd168f 100644
--- a/embedding/java/src/org/uscxml/tests/TestLifecycle.java
+++ b/embedding/java/src/org/uscxml/tests/TestLifecycle.java
@@ -11,7 +11,7 @@ public class TestLifecycle {
 		// syntactic xml parse error -> throws
 		try {
 			String xml = "<invalid";
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			throw new RuntimeException("");
 		} catch (InterpreterException e) {
 			System.err.println(e);
@@ -20,7 +20,7 @@ public class TestLifecycle {
 		// semantic xml parse error -> throws
 		try {
 			String xml = "<invalid />";
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
 			interpreter.step();
 			throw new RuntimeException("");
@@ -37,7 +37,7 @@ public class TestLifecycle {
 			" </state>" +
 			" <final id=\"done\" />" +
 			"</scxml>"; 
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED)  throw new RuntimeException("");
 			interpreter.step();
 			throw new RuntimeException("");
@@ -59,7 +59,7 @@ public class TestLifecycle {
 			" <final id=\"done\" />" +
 			"</scxml>";
 			
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 
 			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
 			if (interpreter.step() != InterpreterState.USCXML_MICROSTEPPED) throw new RuntimeException("");
@@ -80,7 +80,7 @@ public class TestLifecycle {
 			" <final id=\"done\" />" +
 			"</scxml>";
 			
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
 			if (interpreter.step() != InterpreterState.USCXML_MICROSTEPPED) throw new RuntimeException("");
 			if (interpreter.step() != InterpreterState.USCXML_FINISHED) throw new RuntimeException("");
@@ -110,7 +110,7 @@ public class TestLifecycle {
 			" <final id=\"done\" />" +
 			"</scxml>";
 			
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
 			if (interpreter.step() != InterpreterState.USCXML_IDLE) throw new RuntimeException("");
 			if (interpreter.step(true) != InterpreterState.USCXML_MACROSTEPPED) throw new RuntimeException("");
diff --git a/embedding/java/src/org/uscxml/tests/TestValidation.java b/embedding/java/src/org/uscxml/tests/TestValidation.java
index 2177214..d42b47d 100644
--- a/embedding/java/src/org/uscxml/tests/TestValidation.java
+++ b/embedding/java/src/org/uscxml/tests/TestValidation.java
@@ -18,7 +18,7 @@ public class TestValidation {
 			" </state>" +
 			" <final />" +
 			"</scxml>"; 
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			IssueList issues = interpreter.validate();
 			for (int i = 0; i < issues.size(); i++) {
 				System.out.println(issues.get(i));
diff --git a/embedding/java/src/org/uscxml/tests/datamodel/TestDataModelAccess.java b/embedding/java/src/org/uscxml/tests/datamodel/TestDataModelAccess.java
index 892f56d..656bdbf 100644
--- a/embedding/java/src/org/uscxml/tests/datamodel/TestDataModelAccess.java
+++ b/embedding/java/src/org/uscxml/tests/datamodel/TestDataModelAccess.java
@@ -35,7 +35,7 @@ public class TestDataModelAccess {
 			"  <final id=\"done\" />" +
 			"</scxml>";
 				
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			InterpreterState state;
 			do {
 				state = interpreter.step();
@@ -71,7 +71,7 @@ public class TestDataModelAccess {
 			"  <final id=\"done\" />" +
 			"</scxml>";
 				
-			Interpreter interpreter = Interpreter.fromXML(xml);
+			Interpreter interpreter = Interpreter.fromXML(xml, "");
 			interpreter.setSourceURI(TestDataModelAccess.class.getResource("").toString());
 			InterpreterState state;
 			do {
diff --git a/embedding/java/src/org/uscxml/tests/datamodel/TestPlatformExtensions.java b/embedding/java/src/org/uscxml/tests/datamodel/TestPlatformExtensions.java
index 4b2a59e..34569e4 100644
--- a/embedding/java/src/org/uscxml/tests/datamodel/TestPlatformExtensions.java
+++ b/embedding/java/src/org/uscxml/tests/datamodel/TestPlatformExtensions.java
@@ -44,7 +44,7 @@ public class TestPlatformExtensions extends DataModelExtension {
 		"  <final id=\"done\" />" +
 		"</scxml>";
 
-		Interpreter interpreter = Interpreter.fromXML(xml);
+		Interpreter interpreter = Interpreter.fromXML(xml, "");
 		interpreter.addDataModelExtension(ext);
 
 		InterpreterState state;
diff --git a/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java b/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
index 805e6f7..4b2328a 100644
--- a/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
+++ b/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
@@ -72,7 +72,7 @@ public class TestCustomExecContent extends ExecutableContent {
 						"    <transition target=\"exit\" />" +
 						"  </state>\n" +
 						"  <final id=\"exit\" />" +
-						"</scxml>\n"
+						"</scxml>\n", ""
 				);
 		interpreter.interpret();
 		Thread.sleep(1000);
diff --git a/embedding/java/src/org/uscxml/tests/invoker/adhoc/TestAdhocInvoker.java b/embedding/java/src/org/uscxml/tests/invoker/adhoc/TestAdhocInvoker.java
index b0382fa..3714a53 100644
--- a/embedding/java/src/org/uscxml/tests/invoker/adhoc/TestAdhocInvoker.java
+++ b/embedding/java/src/org/uscxml/tests/invoker/adhoc/TestAdhocInvoker.java
@@ -76,7 +76,7 @@ public class TestAdhocInvoker extends Invoker {
 		TestAdhocInvoker javainvoker2 = new TestAdhocInvoker();
 
 		// parse and interpret
-		Interpreter interpreter = Interpreter.fromXML(xml);
+		Interpreter interpreter = Interpreter.fromXML(xml, "");
 		interpreter.setInvoker("javainvoker1", javainvoker1);
 		interpreter.setInvoker("javainvoker2", javainvoker2);
 		interpreter.interpret();
diff --git a/embedding/java/src/org/uscxml/tests/invoker/factory/TestCustomInvoker.java b/embedding/java/src/org/uscxml/tests/invoker/factory/TestCustomInvoker.java
index 637a656..b883125 100644
--- a/embedding/java/src/org/uscxml/tests/invoker/factory/TestCustomInvoker.java
+++ b/embedding/java/src/org/uscxml/tests/invoker/factory/TestCustomInvoker.java
@@ -85,7 +85,7 @@ public class TestCustomInvoker extends Invoker {
 		"</scxml>";
 
 		// parse and interpret
-		Interpreter interpreter = Interpreter.fromXML(xml);
+		Interpreter interpreter = Interpreter.fromXML(xml, "");
 		interpreter.interpret();
 	}
 
diff --git a/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/TestAdhocIOProc.java b/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/TestAdhocIOProc.java
index fcb9688..f816d0a 100644
--- a/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/TestAdhocIOProc.java
+++ b/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/TestAdhocIOProc.java
@@ -134,7 +134,7 @@ public class TestAdhocIOProc extends IOProcessor {
 		TestAdhocIOProc ioProc = new TestAdhocIOProc();
 
 		// parse and interpret
-		Interpreter interpreter = Interpreter.fromXML(xml);
+		Interpreter interpreter = Interpreter.fromXML(xml, "");
 		interpreter.addIOProcessor(ioProc);
 		interpreter.interpret();
 	}
diff --git a/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/console/ConsoleFrame.java b/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/console/ConsoleFrame.java
index aced20e..332151c 100644
--- a/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/console/ConsoleFrame.java
+++ b/embedding/java/src/org/uscxml/tests/ioprocessor/adhoc/console/ConsoleFrame.java
@@ -43,7 +43,7 @@ public class ConsoleFrame extends Frame {
 						+ "   </transition>"
 						+ "	</state>"
 						+ " <final id=\"quit\" />"
-						+ "</scxml>");
+						+ "</scxml>", "");
 
 		/**
 		 *  ConsoleIOProc will register as a keyboard listener and send events to the interpreter.
diff --git a/embedding/java/src/org/uscxml/tests/ioprocessor/factory/TestCustomIOProc.java b/embedding/java/src/org/uscxml/tests/ioprocessor/factory/TestCustomIOProc.java
index c37cdb4..80e2e13 100644
--- a/embedding/java/src/org/uscxml/tests/ioprocessor/factory/TestCustomIOProc.java
+++ b/embedding/java/src/org/uscxml/tests/ioprocessor/factory/TestCustomIOProc.java
@@ -136,7 +136,7 @@ public class TestCustomIOProc extends IOProcessor {
 		"</scxml>";
 
 		// parse and interpret
-		Interpreter interpreter = Interpreter.fromXML(xml);
+		Interpreter interpreter = Interpreter.fromXML(xml, "");
 		interpreter.interpret();
 	}
 
diff --git a/embedding/java/src/org/uscxml/tests/monitor/TestCustomMonitor.java b/embedding/java/src/org/uscxml/tests/monitor/TestCustomMonitor.java
index c748f50..5db4ad4 100644
--- a/embedding/java/src/org/uscxml/tests/monitor/TestCustomMonitor.java
+++ b/embedding/java/src/org/uscxml/tests/monitor/TestCustomMonitor.java
@@ -40,7 +40,7 @@ public class TestCustomMonitor extends InterpreterMonitor {
 		"</scxml>";
 
 		// parse and interpret
-		Interpreter interpreter = Interpreter.fromXML(xml);
+		Interpreter interpreter = Interpreter.fromXML(xml, "");
 		
 		TestCustomMonitor monitor = new TestCustomMonitor();
 		interpreter.addMonitor(monitor);