Renamed URI to URL

Some fixes for Xincludes

1 files changed, 50 insertions, 47 deletions

diff --git a/test/w3c/promela/test242.scxml b/test/w3c/promela/test242.scxml
index c887bcf..2184c54 100644
--- a/test/w3c/promela/test242.scxml
+++ b/test/w3c/promela/test242.scxml
@@ -1,53 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- test that markup specified  by 'src' and by <content> is treated the same way.  That means that
-either we get done.invoke in both cases or in neither case (in which case we timeout) --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela">
-
-     
-<state id="s0">
-  <onentry>
-    <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that markup specified  by 'src' and by <content> is treated the same way.  That means that
+either we get done.invoke in both cases or in neither case (in which case we timeout) -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela">
+  <state id="s0">
+    <onentry>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/>
     </onentry>
     <transition event="timeout" target="fail"/>
-
-     <invoke type="http://www.w3.org/TR/scxml/" src="file:test242sub1.scxml"/>
-     <transition event="done.invoke" target="s02"/>
-     <transition event="timeout1" target="s03"/>
-   </state>
-
-<state id="s02">
+    <invoke type="http://www.w3.org/TR/scxml/" src="file:test242sub1.scxml"/>
+    <transition event="done.invoke" target="s02"/>
+    <transition event="timeout1" target="s03"/>
+  </state>
+  <state id="s02">
+    <onentry>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/>
+    </onentry>
+    <invoke type="http://www.w3.org/TR/scxml/">
+      <!-- identical to test242sub1.scxml.  -->
+      <content>
+        <scxml version="1.0" initial="subFinal1" datamodel="promela">
+          <final id="subFinal1"/>
+        </scxml>
+      </content>
+    </invoke>
+    <!-- we got done.invoke last time, so we need it this time too -->
+    <transition event="done.invoke" target="pass"/>
+    <transition event="timeout2" target="fail"/>
+  </state>
+  <state id="s03">
+    <onentry>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/>
+    </onentry>
+    <invoke type="http://www.w3.org/TR/scxml/">
+      <!-- identical to test242sub1.scxml.  -->
+      <content>
+        <scxml version="1.0" initial="subFinal2" datamodel="promela">
+          <final id="subFinal2"/>
+        </scxml>
+      </content>
+    </invoke>
+    <!-- we got timeout last time, so we need it this time too -->
+    <transition event="timeout3" target="pass"/>
+    <transition event="done.invoke" target="fail"/>
+  </state>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass">
     <onentry>
-    <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/>
+      <log label="Outcome" expr="'pass'"/>
     </onentry>
-      <invoke type="http://www.w3.org/TR/scxml/">
-        <!-- identical to test242sub1.scxml.  -->
-          <content>
-            <scxml version="1.0" initial="subFinal1" datamodel="promela">
-             <final id="subFinal1"/>
-              </scxml>
-            </content>
-        </invoke>
- <!-- we got done.invoke last time, so we need it this time too -->
-  <transition event="done.invoke" target="pass"/>
-  <transition event="timeout2" target="fail"/>
- </state>
- 
-<state id="s03">
+  </final>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail">
     <onentry>
-    <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/>
+      <log label="Outcome" expr="'fail'"/>
     </onentry>
-      <invoke type="http://www.w3.org/TR/scxml/">
-        <!-- identical to test242sub1.scxml.  -->
-          <content>
-            <scxml version="1.0" initial="subFinal2" datamodel="promela">
-             <final id="subFinal2"/>
-              </scxml>
-            </content>
-        </invoke>
- <!-- we got timeout last time, so we need it this time too -->
-  <transition event="timeout3" target="pass"/>
-  <transition event="done.invoke" target="fail"/>
- </state>
-  
-
-<final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
-<final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
-</scxml>
\ No newline at end of file
+  </final>
+</scxml>