Renamed URI to URL

Some fixes for Xincludes

18 files changed, 146 insertions, 175 deletions

diff --git a/test/w3c/promela/test150.scxml b/test/w3c/promela/test150.scxml
index 7e4ca52..6e97c46 100644
--- a/test/w3c/promela/test150.scxml
+++ b/test/w3c/promela/test150.scxml
@@ -1,49 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- test that foreach causes a new variable to be declared if 'item' doesn't already exist.  Also
-test that it will use an existing var if it does exist. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
-  <datamodel>
-    <data id="Var1" type="int"/>
-    <data id="Var2" type="int"/>
-    <data id="Var3" type="int[3]">
-    
-  Var3[0] = 1;
-  Var3[1] = 2;
-  Var3[2] = 3;
-
+<?xml version="1.0" encoding="UTF-8"?><!-- test that foreach causes a new variable to be declared if 'item' doesn't already exist.  Also
+test that it will use an existing var if it does exist. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
+<datamodel>
+  <data id="Var1" type="int"/>
+  <data id="Var2" type="int"/>
+  <data id="Var3" type="int[3]">
+    [1,2,3]
     </data>
   </datamodel>
-  <state id="s0">
-    <onentry>
-      <!-- first use declared variables -->
-      <foreach item="Var1" index="Var2" array="Var3"/>
-      <raise event="foo"/>
-    </onentry>
-    <transition event="error" target="fail"/>
-    <transition event="*" target="s1"/>
-  </state>
-  <state id="s1">
-    <onentry>
-      <!-- now use undeclared variables -->
-      <foreach item="Var4" index="Var5" array="Var3"/>
-      <raise event="bar"/>
-    </onentry>
-    <transition event="error" target="fail"/>
-    <transition event="*" target="s2"/>
-  </state>
-  <state id="s2">
-    <!-- check that var4 is bound -->
-    <transition cond="Var4" target="pass"/>
-    <transition 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>
+  
+   <state id="s0">
+      <onentry>
+<!-- first use declared variables -->
+        <foreach item="Var1" index="Var2" array="Var3"/>
+        <raise event="foo"/>
+        </onentry>
+   <transition event="error" target="fail"/>
+   <transition event="*" target="s1"/> 
+   </state>
+   
+<state id="s1">
+     <onentry>
+<!-- now use undeclared variables -->
+        <foreach item="Var4" index="Var5" array="Var3"/>
+        <raise event="bar"/>
+        </onentry>
+   <transition event="error" target="fail"/>
+   <transition event="*" target="s2"/> 
+   </state>
+
+<state id="s2">
+  <!-- check that var4 is bound -->
+  <transition cond="Var4" target="pass"/>
+  <transition 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
diff --git a/test/w3c/promela/test151.scxml b/test/w3c/promela/test151.scxml
index ef380c9..bb50570 100644
--- a/test/w3c/promela/test151.scxml
+++ b/test/w3c/promela/test151.scxml
@@ -6,11 +6,7 @@ test that it will use an existing var if it does exist. -->
     <data id="Var1" type="int"/>
     <data id="Var2" type="int"/>
     <data id="Var3" type="int[3]">
-    
-  Var3[0] = 1;
-  Var3[1] = 2;
-  Var3[2] = 3;
-
+    [1,2,3]
     </data>
   </datamodel>
   <state id="s0">
diff --git a/test/w3c/promela/test152.scxml b/test/w3c/promela/test152.scxml
index 2fd3abe..71f0011 100644
--- a/test/w3c/promela/test152.scxml
+++ b/test/w3c/promela/test152.scxml
@@ -8,11 +8,7 @@ not being executed. -->
     <data id="Var3" type="int"/>
     <data id="Var4" type="int" expr="7"/>
     <data id="Var5" type="int[3]">
-    
-  Var5[0] = 1;
-  Var5[1] = 2;
-  Var5[2] = 3;
-
+    [1,2,3]
     </data>
   </datamodel>
   <state id="s0">
diff --git a/test/w3c/promela/test153.scxml b/test/w3c/promela/test153.scxml
index 4721606..9890b47 100644
--- a/test/w3c/promela/test153.scxml
+++ b/test/w3c/promela/test153.scxml
@@ -9,11 +9,7 @@ it ever isn't, set Var4 to 0, indicating failure -->
     <data id="Var2" type="int"/>
     <!-- the item which will contain the current value -->
     <data id="Var3" type="int[3]">
-    
-  Var3[0] = 1;
-  Var3[1] = 2;
-  Var3[2] = 3;
-
+    [1,2,3]
     </data>
     <data id="Var4" type="int" expr="1"/>
     <!-- 1 if success, 0 if failure -->
diff --git a/test/w3c/promela/test155.scxml b/test/w3c/promela/test155.scxml
index ec76992..27fd196 100644
--- a/test/w3c/promela/test155.scxml
+++ b/test/w3c/promela/test155.scxml
@@ -6,11 +6,7 @@ content sums the items into var1 so it should be 6 at the end -->
     <data id="Var1" type="int" expr="0"/>
     <data id="Var2" type="int"/>
     <data id="Var3" type="int[3]">
-    
-  Var3[0] = 1;
-  Var3[1] = 2;
-  Var3[2] = 3;
-
+    [1,2,3]
     </data>
   </datamodel>
   <state id="s0">
diff --git a/test/w3c/promela/test156.scxml b/test/w3c/promela/test156.scxml
index b07d289..d81a2a2 100644
--- a/test/w3c/promela/test156.scxml
+++ b/test/w3c/promela/test156.scxml
@@ -6,11 +6,7 @@ should cause an error, so var1 should be incremented only once -->
     <data id="Var1" type="int" expr="0"/>
     <data id="Var2" type="int"/>
     <data id="Var3" type="int[3]">
-  
-  Var3[0] = 1;
-  Var3[1] = 2;
-  Var3[2] = 3;
-
+  [1,2,3]
   </data>
   </datamodel>
   <state id="s0">
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>
diff --git a/test/w3c/promela/test252.scxml b/test/w3c/promela/test252.scxml
index 3a4a982..4e61863 100644
--- a/test/w3c/promela/test252.scxml
+++ b/test/w3c/promela/test252.scxml
@@ -5,7 +5,7 @@ timeout indicates success.   -->
 <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" initial="s01">
     <onentry>
-      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/>
     </onentry>
     <transition event="timeout" target="pass"/>
     <transition event="childToParent" target="fail"/>
diff --git a/test/w3c/promela/test347.scxml b/test/w3c/promela/test347.scxml
index 4b70bcf..a08590e 100644
--- a/test/w3c/promela/test347.scxml
+++ b/test/w3c/promela/test347.scxml
@@ -1,40 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- test that the scxml event I/O processor works by sending events back and forth between an invoked child
-and its parent process --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
-
-  
-<state id="s0" initial="s01">
-     <invoke id="child" type="scxml">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that the scxml event I/O processor works by sending events back and forth between an invoked child
+and its parent process -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
+  <state id="s0" initial="s01">
+    <invoke id="child" type="scxml">
       <content>
-      <scxml initial="sub0" version="1.0" datamodel="promela" name="machineName">  
-         <state id="sub0">
-           <onentry>
-             <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_parent" event="childToParent"/>
-         </onentry>
-      <transition event="parentToChild" target="subFinal"/>
-     </state>
-     <final id="subFinal"/>
-       </scxml>
-     </content>
-        </invoke>
-   <onentry>
-     <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="20000" event="timeout"/>
-     </onentry>
-  <transition event="timeout" target="fail"/>
-        
-  <state id="s01">
+        <scxml initial="sub0" version="1.0" datamodel="promela" name="machineName">
+          <state id="sub0">
+            <onentry>
+              <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_parent" event="childToParent"/>
+            </onentry>
+            <transition event="parentToChild" target="subFinal"/>
+          </state>
+          <final id="subFinal"/>
+        </scxml>
+      </content>
+    </invoke>
+    <onentry>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="20000" event="timeout"/>
+    </onentry>
+    <transition event="timeout" target="fail"/>
+    <state id="s01">
       <transition event="childToParent" target="s02"/>
-      </state>
-    
-   <state id="s02">
-     <onentry>
-       <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_child" event="parentToChild"/>
-       </onentry>
-   <transition event="done.invoke" target="pass"/>
-   <transition event="error" target="fail"/>
-   </state>
-</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
+    </state>
+    <state id="s02">
+      <onentry>
+        <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_child" event="parentToChild"/>
+      </onentry>
+      <transition event="done.invoke" target="pass"/>
+      <transition event="error" target="fail"/>
+    </state>
+  </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>
diff --git a/test/w3c/promela/test509.scxml b/test/w3c/promela/test509.scxml
index 4b7f540..009a1bc 100644
--- a/test/w3c/promela/test509.scxml
+++ b/test/w3c/promela/test509.scxml
@@ -4,7 +4,7 @@ at the accessURI -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="30s"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/>
       <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
     </onentry>
     <!-- if the event was send by http and we get it, we succeed -->
diff --git a/test/w3c/promela/test510.scxml b/test/w3c/promela/test510.scxml
index 3ddda76..11901fa 100644
--- a/test/w3c/promela/test510.scxml
+++ b/test/w3c/promela/test510.scxml
@@ -3,7 +3,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="30000"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/>
       <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
       <!-- this creates an internal event -->
       <raise event="internal"/>
diff --git a/test/w3c/promela/test518.scxml b/test/w3c/promela/test518.scxml
index d6f88d3..0962b3c 100644
--- a/test/w3c/promela/test518.scxml
+++ b/test/w3c/promela/test518.scxml
@@ -6,7 +6,7 @@
   </datamodel>
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="30s"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/>
       <send event="test" targetexpr="_ioprocessors.basichttp.location" namelist="Var1" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
     </onentry>
     <transition event="test" cond="_event.raw.search(/Var1=2/) !== -1" target="pass"/>
diff --git a/test/w3c/promela/test519.scxml b/test/w3c/promela/test519.scxml
index f3645c0..f4c5e39 100644
--- a/test/w3c/promela/test519.scxml
+++ b/test/w3c/promela/test519.scxml
@@ -3,7 +3,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="30s"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/>
       <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
         <param name="param1" expr="1"/>
       </send>
diff --git a/test/w3c/promela/test520.scxml b/test/w3c/promela/test520.scxml
index f25f8d3..fba68fe 100644
--- a/test/w3c/promela/test520.scxml
+++ b/test/w3c/promela/test520.scxml
@@ -3,7 +3,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="30s"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/>
       <send targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
         <content>this is some content</content>
       </send>
diff --git a/test/w3c/promela/test522.scxml b/test/w3c/promela/test522.scxml
index d56f257..e98e1c9 100644
--- a/test/w3c/promela/test522.scxml
+++ b/test/w3c/promela/test522.scxml
@@ -4,7 +4,7 @@ to send a message to the processor -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="30000"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/>
       <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location"/>
     </onentry>
     <!-- the event we receive should be called 'test', but that's not actually
diff --git a/test/w3c/promela/test525.scxml b/test/w3c/promela/test525.scxml
index 5df4afa..e2ec38b 100644
--- a/test/w3c/promela/test525.scxml
+++ b/test/w3c/promela/test525.scxml
@@ -4,11 +4,7 @@ the iteration behavior. -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="promela" version="1.0">
   <datamodel>
     <data id="Var1" type="int[3]">
-      
-  Var1[0] = 1;
-  Var1[1] = 2;
-  Var1[2] = 3;
-
+      [1,2,3]
       </data>
     <data id="Var2" type="int" expr="0"/>
     <!-- counts the number of iterations -->
diff --git a/test/w3c/promela/test534.scxml b/test/w3c/promela/test534.scxml
index 65b03e4..ec9dfc0 100644
--- a/test/w3c/promela/test534.scxml
+++ b/test/w3c/promela/test534.scxml
@@ -3,7 +3,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0">
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="30s"/>
+      <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/>
       <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
         </send>
     </onentry>
diff --git a/test/w3c/promela/test551.scxml b/test/w3c/promela/test551.scxml
index cdc185e..9ef6405 100644
--- a/test/w3c/promela/test551.scxml
+++ b/test/w3c/promela/test551.scxml
@@ -8,11 +8,7 @@
   <state id="s1">
     <datamodel>
       <data id="Var1" type="int[3]">
-     
-  Var1[0] = 1;
-  Var1[1] = 2;
-  Var1[2] = 3;
-
+     [1,2,3]
      </data>
     </datamodel>
   </state>