Index: java/org/w3c/domts/DOMTest.java
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/java/org/w3c/domts/DOMTest.java,v
retrieving revision 1.10
diff -u -r1.10 DOMTest.java
--- java/org/w3c/domts/DOMTest.java	19 Dec 2003 22:21:04 -0000	1.10
+++ java/org/w3c/domts/DOMTest.java	30 Dec 2003 05:52:42 -0000
@@ -46,6 +46,8 @@
 
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
+import java.io.File;
+import java.lang.reflect.*;
 
 /**
  * This is an abstract base class for generated DOM tests
@@ -151,27 +153,56 @@
 		return resolvedURI;
 	}
 
-	public String getResourceURI(String href) throws DOMTestLoadException {
-		return resolveURI(href).toString();
-	}
-
-	public String createTempFileURI() throws DOMTestLoadException {
-		try {
-			return java
-				.io
-				.File
-				.createTempFile("domts", ".xml")
-				.toURL()
-				.toExternalForm();
-		} catch (IOException ex) {
-			throw new DOMTestLoadException(ex);
+	public String getResourceURI(String href, String scheme) throws DOMTestLoadException {
+		if (scheme == null) {
+			throw new NullPointerException("scheme");
+		}
+		if ("file".equals(scheme)) {
+			return resolveURI(href).toString();
+		}
+		if ("http".equals(scheme)) {
+			String httpBase = System.getProperty("org.w3c.domts.httpbase", 
+						"http://localhost:8080/webdav/");
+			return httpBase + href;
+		}
+		throw new DOMTestLoadException(new Exception("Unrecognized URI scheme " + scheme));
+	}
+	
+	public String createTempURI(String scheme) throws DOMTestLoadException {
+		if (scheme == null) {
+			throw new NullPointerException("scheme");
 		}
-	}
-
-	public String createTempHttpURI() throws DOMTestLoadException {
-		return "http://localhost:8080/domts/temp/"
-			+ Integer.toString(new java.util.Random().nextInt())
-			+ ".xml";
+		if ("file".equals(scheme)) {
+			try {
+				File tempFile = File.createTempFile("domts", ".xml");
+				try {
+					//
+					//   if available use JDK 1.4's File.toURI().toString()
+					//
+					Method method = File.class.getMethod("toURI", null);
+					Object uri = method.invoke(tempFile, null);
+					return uri.toString();
+				} catch (NoSuchMethodException ex) {
+					//
+					//   File.toURL is not as robust
+					//
+					URL url = tempFile.toURL();
+					return url.toString();
+				}
+			} catch (Exception ex) {
+				throw new DOMTestLoadException(ex);
+			}
+		}
+		if ("http".equals(scheme)) {
+			String httpBase = System.getProperty("org.w3c.domts.httpbase", 
+						"http://localhost:8080/webdav/");
+			java.lang.StringBuffer buf = new StringBuffer(httpBase);
+			buf.append("/tmp");
+			buf.append((new java.util.Random()).nextInt(Integer.MAX_VALUE));
+			buf.append(".xml");
+			return buf.toString();
+		}
+		throw new DOMTestLoadException(new Exception("Unrecognized URI scheme " + scheme));
 	}
 
 	public Document load(String docURI, boolean willBeModified)
Index: tests/level3/ls/DOMBuilderTest5.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMBuilderTest5.xml,v
retrieving revision 1.7
diff -u -r1.7 DOMBuilderTest5.xml
--- tests/level3/ls/DOMBuilderTest5.xml	18 Dec 2003 21:05:46 -0000	1.7
+++ tests/level3/ls/DOMBuilderTest5.xml	30 Dec 2003 05:52:42 -0000
@@ -35,13 +35,12 @@
   <var name="ERROR_HANDLER" type="DOMString" value='"error-handler"'/>
   <var name="SUPPORTED_MEDIATYPES_ONLY" type="DOMString" value='"supported-media-types-only"'/>
   <var name="mediaTypesSupported" type="boolean"/>
+  <var name="resourceURI" type="DOMString"/>
 
   <var name="errorHandler" type="DOMErrorHandler"> 
-     &errorHandlerVars;
-
      <handleError>
-        &assignErrorHandlerVars;
-
+        <var name="type" type="DOMString"/>
+        <type var="type" obj="error" interface="DOMError"/>
         <assertEquals id="handler_1" actual="type" expected='"unsupported-media-type"' ignoreCase="false"/> 
         <return value="false"/>
      </handleError>
@@ -52,14 +51,23 @@
 
   <config var="configuration" obj="builder" interface="LSParser"/> 
 
-  <setParameter obj="configuration" name="ERROR_HANDLER"             value="errorHandler"/>
-
   <canSetParameter var="mediaTypesSupported" obj="configuration" name="SUPPORTED_MEDIATYPES_ONLY" value="true"/>
   <if>
   	 <isTrue value="mediaTypesSupported"/>
+     <getResourceURI var="resourceURI" href="TESTPDF" scheme="http"/>
+	 <parseURI var="document" obj="builder" uri="resourceURI"/>
+	 <!--  
+	 	document should successfully parse since, properly configured,
+	 	testpdf.pdf is a valid XML file on the http server. 
+	 --> 
+	 <assertNotNull actual="document" id="testpdf_parsed"/>  	 
+  	 
+  	 
   	 <setParameter obj="configuration" name="SUPPORTED_MEDIATYPES_ONLY" value="true"/>
-	 <parseURI var="document" obj="builder" uri="TESTPDF"/>
-	 <assertNull actual="document" id="docNull"/>
+  	 <setParameter obj="configuration" name="ERROR_HANDLER" value="errorHandler"/>
+	 <parseURI var="document" obj="builder" uri="resourceURI"/>
+	 <!--  document should fail to parse due to unsupported media type  -->
+	 <assertNull actual="document" id="testpdf_failed"/>
   </if>
   
 </test>
Index: tests/level3/ls/DOMBuilderTest7.xml
===================================================================
RCS file: tests/level3/ls/DOMBuilderTest7.xml
diff -N tests/level3/ls/DOMBuilderTest7.xml
--- tests/level3/ls/DOMBuilderTest7.xml	18 Dec 2003 21:05:46 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
-<!--
-
-Copyright (c) 2003 World Wide Web Consortium, 
-(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University).  All 
-Rights Reserved.  This program is distributed under the W3C's Software
-Intellectual Property License.  This program is distributed in the 
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-PURPOSE.  
-
-See W3C License http://www.w3.org/Consortium/Legal/ for more details.
-
--->
-<!DOCTYPE test SYSTEM "dom3.dtd">
-
-
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-3" name="DOMBuilderTest7">
-  <metadata>
-    <title>DOMBuilderTest7</title>
-    <creator>Curt Arnold</creator>
-    <description>Parses from an null LSInput.</description>
-	<date qualifier="created">2003-12-08</date>
-	<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-LS-20031107/load-save#LS-LSParser-parse"/>
-  </metadata>
-  <var name="domImpl" type="DOMImplementationLS"/>
-  <var name="parser" type="LSParser"/>
-  <var name="NULL_SCHEMA_TYPE" type="DOMString" isNull="true"/>
-  <var name="input" type="LSInput" isNull="true"/>
-  <var name="document" type="Document"/>
-  
-  <implementation var="domImpl"/>
-  <createLSParser var="parser" obj="domImpl" schemaType="NULL_SCHEMA_TYPE" mode="1"/>
-  <!--  should throw an appropriate implementation exception -->
-  <assertImplementationException id="throw_ImplementationException">
-  	<parse var="document" obj="parser" input="input"/>
-  </assertImplementationException>
-</test>
-
-
-
-
-
Index: tests/level3/ls/DOMImplementationLSTest1.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMImplementationLSTest1.xml,v
retrieving revision 1.3
diff -u -r1.3 DOMImplementationLSTest1.xml
--- tests/level3/ls/DOMImplementationLSTest1.xml	9 Dec 2003 08:22:27 -0000	1.3
+++ tests/level3/ls/DOMImplementationLSTest1.xml	30 Dec 2003 05:52:42 -0000
@@ -27,8 +27,7 @@
     &contributor; &date;
     <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-LS-20031107/load-save#LS-DOMImplementationLS-createLSParser"/>    
   </metadata>
-  <!-- temporarily commented out    -->
-  <!-- hasFeature feature='"LS-Async"'/ -->
+  <hasFeature feature='"LS-Async"'/>
   <var name="isAsync" type="boolean"/>
   <var name="isBusy" type="boolean"/>
   <var name="filter" type="LSParserFilter"/>  
Index: tests/level3/ls/DOMInputSourceTest5.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMInputSourceTest5.xml,v
retrieving revision 1.6
diff -u -r1.6 DOMInputSourceTest5.xml
--- tests/level3/ls/DOMInputSourceTest5.xml	8 Dec 2003 07:50:50 -0000	1.6
+++ tests/level3/ls/DOMInputSourceTest5.xml	30 Dec 2003 05:52:42 -0000
@@ -22,7 +22,8 @@
   <metadata>
     <title>DOMInputSourceTest5</title>
     &creator; 
-    <description>Tests behaviour of the baseURI of DOMInput</description> 
+    <description>Parses a document containing an external entity and checks
+    that resource resolver is passed the baseURI value specified on LSInput.</description> 
     &contributor; &date;
 	<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-LS-20031107/load-save#LS-LSInput-systemId"/>
 	<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-LS-20031107/load-save#LS-LSInput-publicId"/>
@@ -32,35 +33,52 @@
 
 
   <var name="myentityresolver" type="LSResourceResolver"> 
-     <var name="erInputSource" type="LSInput"/>
      <resolveResource>
-		<var name="nullInput" type="LSInput" isNull="true"/>
-        <assertEquals actual="publicId"  expected='"new_public"' ignoreCase="false" id="er_public"/>
-        <assertEquals actual="systemId"  expected='"new_system"' ignoreCase="false" id="er_system"/>
-        <assertEquals actual="baseURI" expected='"new_base"'   ignoreCase="false" id="er_base"/>
+        <var name="domImplLS" type="DOMImplementationLS"/>
+		<var name="input" type="LSInput"/>
+        <assertEquals actual="baseURI" expected='"http://www.example.com/new_base"'   ignoreCase="false" id="er_base"/>
+        <assertEquals actual="publicId"  expected='"-//X-Hive//native xml storage//EN"' ignoreCase="false" id="er_public"/>
+        <assertURIEquals actual="systemId" isAbsolute="true" name='"test5"' id="er_system"/> 
         
-
-        <return value="nullInput"/>            
+        <!--  create an empty string input so we can detect
+                that resource resolver was used  -->
+        <implementation var="domImplLS"/>
+        <createLSInput var="input" obj="domImplLS"/>
+        <stringData obj="input" value='""' interface="LSInput"/>
+        <return value="input"/>            
      </resolveResource>
 
   </var>
 
   <var name="configuration" type="DOMConfiguration"/>
-
+  <var name="resourceURI" type="DOMString"/>
+  <var name="nodeList" type="NodeList"/>
   &vars;
   &init;
 
   <config var="configuration" obj="builder" interface="LSParser"/> 
 
   <setParameter obj="configuration" name='"resource-resolver"' value="myentityresolver"/>
+  <setParameter obj="configuration" name='"entities"' value="false"/>
+ 
+  <getResourceURI var="resourceURI" href="TEST4"/>
+  <systemId obj="inputSource" value="resourceURI" interface="LSInput"/>
+  <publicId obj="inputSource" value='"-//X-Hive//native xml storage//DE"' interface="LSInput"/>
+  <baseURI  obj="inputSource" value='"http://www.example.com/new_base"' interface="LSInput"/>
  
-  <systemId obj="inputSource" value='"new_system"' interface="LSInput"/>
-  <publicId obj="inputSource" value='"new_public"' interface="LSInput"/>
-  <baseURI  obj="inputSource" value='"new_base"' interface="LSInput"/>
  
   <parse var="document" obj="builder" input="inputSource"/>
-  <assertNull actual="document" id="nullDocument"/>
-
+  <!--  should parse successfully   -->
+  <assertNotNull actual="document" id="documentNotNull"/>
+  
+  <!--  resource resolver should have suppressed elt2 from the
+           external entity   -->
+  <getElementsByTagName var="nodeList" obj="document" tagname='"elt2"' interface="Document"/>
+  <assertSize size="0" collection="nodeList" id="noElt2"/>
+
+  <!--  check that there is an elt1    -->
+  <getElementsByTagName var="nodeList" obj="document" tagname='"elt1"' interface="Document"/>
+  <assertSize size="1" collection="nodeList" id="hasElt1"/>
 
 </test>
 
Index: tests/level3/ls/DOMInputSourceTest6.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMInputSourceTest6.xml,v
retrieving revision 1.1
diff -u -r1.1 DOMInputSourceTest6.xml
--- tests/level3/ls/DOMInputSourceTest6.xml	18 Dec 2003 21:05:46 -0000	1.1
+++ tests/level3/ls/DOMInputSourceTest6.xml	30 Dec 2003 05:52:42 -0000
@@ -39,9 +39,10 @@
 
   <!--  initialize an input source with a string and a misleading encoding  -->
   <encoding   obj="inputSource" value='"UTF-8"' interface="LSInput"/> 
-  <characterStream obj="inputSource" var="myReader" interface="LSInput"/> 
+  <characterStream obj="inputSource" value="myReader" interface="LSInput"/> 
   <!--  parse   -->
   <parse var="document" obj="builder" input="inputSource"/>
+  <assertNotNull actual="document" id="documentNotNull"/>
 
   <!--  check inputEncoding, should be UTF-16   -->
   <inputEncoding var="encodingString" obj="document" interface="Document"/> 
Index: tests/level3/ls/DOMWriterFilterTest1.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMWriterFilterTest1.xml,v
retrieving revision 1.5
diff -u -r1.5 DOMWriterFilterTest1.xml
--- tests/level3/ls/DOMWriterFilterTest1.xml	8 Dec 2003 07:50:50 -0000	1.5
+++ tests/level3/ls/DOMWriterFilterTest1.xml	30 Dec 2003 05:52:42 -0000
@@ -22,7 +22,7 @@
   <metadata>
     <title>DOMWriterFilterTest1</title>
     &creator; 
-    <description>Uses a serializer filter to eliminate attributes, parses the output and checks if the attribute is there.</description> 
+    <description>Uses a serializer filter to eliminate attributes, parses the output and checks if the attribute is not there.</description> 
     &contributor; &date;
     <subject resource="&spec;#LS-Interfaces-LSSerializerFilter"/>
 	<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-LS-20031107/load-save#LS-LSSerializerFilter-acceptNode"/>    
@@ -53,7 +53,7 @@
   <var name="length"          type="int"/>
   <var name="elementList"     type="NodeList"/>
   <var name="elt1"            type="Element"/>
-  <var name="attr1"           type="DOMString"/>
+  <var name="attrNode"           type="Attr"/>
 
   &vars;
   &init;
@@ -76,11 +76,10 @@
   <getElementsByTagName interface="Document" obj="document" tagname="&quot;elt1&quot;" var="elementList"/>
   <assertSize collection="elementList" size="1" id="count_elt2"/>
 
-  <!-- attr1 of elt1 should still be there !!-->
+  <!-- attr1 of elt1 should have been suppressed  -->
   <item interface="NodeList" obj="elementList" index="0" var="elt1"/>
-
-  <getAttribute obj="elt1" var="attr1" name="&quot;attr1&quot;"/>
-  <assertEquals actual="attr1" expected='"attr1"' ignoreCase="false" id="attrib1"/>
+  <getAttributeNode obj="elt1" var="attrNode" name="&quot;attr1&quot;"/>
+  <assertNull actual="attrNode" id="attrib1"/>
 
 
 </test>
Index: tests/level3/ls/DOMWriterFilterTest2.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMWriterFilterTest2.xml,v
retrieving revision 1.6
diff -u -r1.6 DOMWriterFilterTest2.xml
--- tests/level3/ls/DOMWriterFilterTest2.xml	8 Dec 2003 07:50:50 -0000	1.6
+++ tests/level3/ls/DOMWriterFilterTest2.xml	30 Dec 2003 05:52:42 -0000
@@ -55,6 +55,7 @@
   <var name="elementList"     type="NodeList"/>
   <var name="elt1"            type="Element"/>
   <var name="childs"          type="boolean"/>
+  <var name="attrNode"        type="Attr"/>
   <var name="attr1"           type="DOMString"/>
 
   &vars;
@@ -79,9 +80,12 @@
   <item interface="NodeList" obj="elementList" index="0" var="elt1"/>
 
   <!--  text content of attribute node (but not attribute) should have been stripped -->
-  <getAttribute var="attr1" obj="elt1" name='"attr1"'/>
-  <assertEquals actual="attr1"  expected='""' ignoreCase="false" id="attr1_value"/>
+  <getAttributeNode var="attrNode" obj="elt1" name='"attr1"'/>
+  <assertNotNull actual="attrNode" id="attrExists"/>
+  <nodeValue var="attr1" obj="attrNode"/>
+  <assertEquals actual="attr1"  expected='""' ignoreCase="false" id="attrIsBlank"/>
 
+  <!--  elt1 should be empty   -->
   <hasChildNodes obj="elt1" var="childs"/>
   <assertFalse actual="childs" id="nodeHasChilds_elt1"/>
 
Index: tests/level3/ls/DOMWriterTest5.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMWriterTest5.xml,v
retrieving revision 1.1
diff -u -r1.1 DOMWriterTest5.xml
--- tests/level3/ls/DOMWriterTest5.xml	22 Dec 2003 21:56:17 -0000	1.1
+++ tests/level3/ls/DOMWriterTest5.xml	30 Dec 2003 05:52:42 -0000
@@ -72,7 +72,7 @@
   <assertEquals actual="docElemLocalName" expected='"test"' ignoreCase="false" id="docElemLocalName"/>
 
   <!--   namespace of document element   -->
-  <namespaceURI var="docElemNS" obj="docElem"/>
+  <namespaceURI var="docElemNS" obj="docElem" interface="Node"/>
   <assertEquals actual="docElemNS" expected="namespaceURI" ignoreCase="false" id="docElemNS"/>
   
   <!--  attribute with namespaceURI namespace  -->
Index: tests/level3/ls/DOMWriterTest6.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMWriterTest6.xml,v
retrieving revision 1.1
diff -u -r1.1 DOMWriterTest6.xml
--- tests/level3/ls/DOMWriterTest6.xml	22 Dec 2003 21:56:17 -0000	1.1
+++ tests/level3/ls/DOMWriterTest6.xml	30 Dec 2003 05:52:42 -0000
@@ -72,7 +72,7 @@
   <assertEquals actual="docElemLocalName" expected='"test"' ignoreCase="false" id="docElemLocalName"/>
 
   <!--   namespace of document element   -->
-  <namespaceURI var="docElemNS" obj="docElem"/>
+  <namespaceURI var="docElemNS" obj="docElem" interface="Node"/>
   <assertEquals actual="docElemNS" expected="namespaceURI" ignoreCase="false" id="docElemNS"/>
   
   <!--  attribute with namespaceURI namespace  -->
Index: tests/level3/ls/LSSerializerConfig2.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/LSSerializerConfig2.xml,v
retrieving revision 1.3
diff -u -r1.3 LSSerializerConfig2.xml
--- tests/level3/ls/LSSerializerConfig2.xml	18 Dec 2003 21:05:46 -0000	1.3
+++ tests/level3/ls/LSSerializerConfig2.xml	30 Dec 2003 05:52:42 -0000
@@ -61,8 +61,6 @@
   				<equals actual="parameterName" expected='"namespaces"'/>
   				<equals actual="parameterName" expected='"namespace-declarations"'/>
   				<equals actual="parameterName" expected='"normalize-characters"'/>
-  				<equals actual="parameterName" expected='"schema-location"'/>
-  				<equals actual="parameterName" expected='"schema-type"'/>
   				<equals actual="parameterName" expected='"split-cdata-sections"'/>
   				<equals actual="parameterName" expected='"validate"'/>
   				<equals actual="parameterName" expected='"validate-if-schema"'/>
@@ -76,7 +74,7 @@
   			<increment var="matchCount" value="1"/>
   		</if>
   </for-each>
-  <assertEquals actual="matchCount" expected="22" id="definedParameterCount" ignoreCase="false"/>
+  <assertEquals actual="matchCount" expected="20" id="definedParameterCount" ignoreCase="false"/>
 </test>
 
 
Index: tests/level3/ls/LSSerializerConfig9.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/LSSerializerConfig9.xml,v
retrieving revision 1.2
diff -u -r1.2 LSSerializerConfig9.xml
--- tests/level3/ls/LSSerializerConfig9.xml	17 Dec 2003 19:32:53 -0000	1.2
+++ tests/level3/ls/LSSerializerConfig9.xml	30 Dec 2003 05:52:42 -0000
@@ -40,13 +40,25 @@
   <assertTrue actual="state" id="defaultValue"/>
   <canSetParameter var="canSet" obj="config" name="propertyName" value="true"/>
   <assertTrue actual="canSet" id="canSetTrue"/>
+  <!--  TODO: Changed in anticipation of forthcoming spec change
+            will need to review final wording   -->
   <canSetParameter var="canSet" obj="config" name="propertyName" value="false"/>
-  <assertFalse actual="canSet" id="canSetFalse"/>
-  <assertDOMException id="throw_NOT_SUPPORTED_EXCEPTION">
-  	  <NOT_SUPPORTED_ERR>
-  			<setParameter obj="config" name="propertyName" value="false"/>
-  	  </NOT_SUPPORTED_ERR>
-  </assertDOMException>
+  <if>
+  	  <isTrue value="canSet"/>
+  	  <setParameter obj="config" name="propertyName" value="false"/>
+  	  <getParameter var="state" obj="config" name="propertyName"/>
+  	  <assertFalse actual="state" id="setFalseIsEffective"/>
+  	  <setParameter obj="config" name="propertyName" value="true"/>
+  	  <getParameter var="state" obj="config" name="propertyName"/>
+  	  <assertTrue actual="state" id="setTrueIsEffective"/>
+  	  <else>
+  	  	<assertDOMException id="settingFalseWhenNotSupported">
+  	  		<NOT_SUPPORTED_ERR>
+  	  			<setParameter obj="config" name="propertyName" value="false"/>
+  	  		</NOT_SUPPORTED_ERR>
+  	  	</assertDOMException>
+  	  </else>
+  </if>
 </test>
 
 
Index: tests/level3/ls/SystemId1.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/SystemId1.xml,v
retrieving revision 1.1
diff -u -r1.1 SystemId1.xml
--- tests/level3/ls/SystemId1.xml	9 Dec 2003 08:22:27 -0000	1.1
+++ tests/level3/ls/SystemId1.xml	30 Dec 2003 05:52:42 -0000
@@ -50,7 +50,7 @@
   <!--   check that it was initially null    -->
   <systemId var="checkSystemId" obj="output" interface="LSOutput"/>
   <assertNull actual="checkSystemId" id="LSOutputSystemIdInitiallyNull"/>
-  <createTempFileURI var="systemId"/>
+  <createTempURI var="systemId" scheme="file"/>
   <systemId obj="output" value="systemId" interface="LSOutput"/>
   <systemId var="checkSystemId" obj="output" interface="LSOutput"/>
   <assertEquals expected="systemId" 
@@ -73,7 +73,7 @@
   	actual="checkSystemId" 
   	ignoreCase="false" 
   	id="LSInputSystemIdMatch"/>
-  <createLSParser var="parser" obj="domImpl" schemaType="NULL_SCHEMA_TYPE" mode="0"/>
+  <createLSParser var="parser" obj="domImpl" schemaType="NULL_SCHEMA_TYPE" mode="1"/>
   <parse var="checkDoc" obj="parser" input="input"/>
   <assertNotNull actual="checkDoc" id="checkNotNull"/>
   <documentElement var="docElem" obj="checkDoc"/>
Index: tests/level3/ls/SystemId2.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/SystemId2.xml,v
retrieving revision 1.1
diff -u -r1.1 SystemId2.xml
--- tests/level3/ls/SystemId2.xml	9 Dec 2003 08:22:27 -0000	1.1
+++ tests/level3/ls/SystemId2.xml	30 Dec 2003 05:52:42 -0000
@@ -50,7 +50,7 @@
   <!--   check that it was initially null    -->
   <systemId var="checkSystemId" obj="output" interface="LSOutput"/>
   <assertNull actual="checkSystemId" id="LSOutputSystemIdInitiallyNull"/>
-  <createTempHttpURI var="systemId"/>
+  <createTempURI var="systemId" scheme="http"/>
   <systemId obj="output" value="systemId" interface="LSOutput"/>
   <systemId var="checkSystemId" obj="output" interface="LSOutput"/>
   <assertEquals expected="systemId" 
@@ -73,7 +73,7 @@
   	actual="checkSystemId" 
   	ignoreCase="false" 
   	id="LSInputSystemIdMatch"/>
-  <createLSParser var="parser" obj="domImpl" schemaType="NULL_SCHEMA_TYPE" mode="0"/>
+  <createLSParser var="parser" obj="domImpl" schemaType="NULL_SCHEMA_TYPE" mode="1"/>
   <parse var="checkDoc" obj="parser" input="input"/>
   <assertNotNull actual="checkDoc" id="checkNotNull"/>
   <documentElement var="docElem" obj="checkDoc"/>
Index: tests/level3/ls/alltests.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/alltests.xml,v
retrieving revision 1.13
diff -u -r1.13 alltests.xml
--- tests/level3/ls/alltests.xml	22 Dec 2003 21:56:17 -0000	1.13
+++ tests/level3/ls/alltests.xml	30 Dec 2003 05:52:43 -0000
@@ -24,7 +24,6 @@
    <suite.member href="DOMBuilderTest4.xml"/>
    <suite.member href="DOMBuilderTest5.xml"/>
    <suite.member href="DOMBuilderTest6.xml"/>
-   <suite.member href="DOMBuilderTest7.xml"/>
    <suite.member href="DOMBuilderTest8.xml"/>
    <suite.member href="DOMEntityResolverTest0.xml"/>
    <suite.member href="DOMEntityResolverTest1.xml"/>
Index: tests/level3/ls/dom3tests.ent
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/dom3tests.ent,v
retrieving revision 1.10
diff -u -r1.10 dom3tests.ent
--- tests/level3/ls/dom3tests.ent	18 Dec 2003 21:05:46 -0000	1.10
+++ tests/level3/ls/dom3tests.ent	30 Dec 2003 05:52:43 -0000
@@ -36,7 +36,7 @@
                       <var name='TEST5'   type='DOMString' value='&quot;test5&quot;'/>
                       <var name='TEST6'   type='DOMString' value='&quot;test6&quot;'/>
                       <var name='TEST7'   type='DOMString' value='&quot;test7&quot;'/>
-                      <var name='TESTPDF' type='DOMString' value='&quot;http://localhost:8080/domts/testpdf.pdf&quot;'/>
+                      <var name='TESTPDF' type='DOMString' value='&quot;testpdf.pdf&quot;'/>
 
                       <implementation var='implementation'/> 
                       <assign var='lsImplementation' value='implementation'/> 
Index: tests/level3/ls/files/test7.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/files/test7.xml,v
retrieving revision 1.1
diff -u -r1.1 test7.xml
--- tests/level3/ls/files/test7.xml	24 Feb 2003 19:55:30 -0000	1.1
+++ tests/level3/ls/files/test7.xml	30 Dec 2003 05:52:43 -0000
@@ -9,7 +9,7 @@
   <!ELEMENT elt1 (#PCDATA)>
   <!ATTLIST elt1 source ENTITY #REQUIRED>
 
-  <!ENTITY ref PUBLIC "-//X-Hive//native xml storage//EN" "files/text5.xml">
+  <!ENTITY ref PUBLIC "-//X-Hive//native xml storage//EN" "test5.xml">
 ]>
    <elt0 base="base">
       <elt1 source="logo">first elt1</elt1>
Index: transforms/dom-to-dtd.xsl
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/transforms/dom-to-dtd.xsl,v
retrieving revision 1.43
diff -u -r1.43 dom-to-dtd.xsl
--- transforms/dom-to-dtd.xsl	23 Dec 2003 03:27:25 -0000	1.43
+++ transforms/dom-to-dtd.xsl	30 Dec 2003 05:52:43 -0000
@@ -78,7 +78,7 @@
 
 &lt;!ENTITY % framework-assertion "fail|assertTrue|assertFalse|assertNull|assertNotNull|assertEquals|assertNotEquals|assertSame|assertInstanceOf|assertSize|assertEventCount|assertURIEquals|assertImplementationException"&gt;
 
-&lt;!ENTITY % framework-statement "assign|increment|decrement|append|plus|subtract|mult|divide|load|implementation|hasFeature|implementationAttribute|if|while|try|for-each|comment|return|userObj|atEvents|capturedEvents|bubbledEvents|allEvents|createEventMonitor|createXPathEvaluator|getResourceURI|substring|createTempFileURI|createTempHttpURI"&gt;
+&lt;!ENTITY % framework-statement "assign|increment|decrement|append|plus|subtract|mult|divide|load|implementation|hasFeature|implementationAttribute|if|while|try|for-each|comment|return|userObj|atEvents|capturedEvents|bubbledEvents|allEvents|createEventMonitor|createXPathEvaluator|getResourceURI|substring|createTempURI"&gt;
 
 &lt;!ENTITY % implementation-condition "hasFeature | implementationAttribute"&gt;
 
@@ -982,8 +982,10 @@
 	id ID #IMPLIED
 	var CDATA #REQUIRED
     href CDATA #REQUIRED
+    scheme (file|http) #IMPLIED
 &gt;
 
+
 &lt;!ELEMENT substring EMPTY&gt;
 &lt;!ATTLIST substring
 	id ID #IMPLIED
@@ -993,16 +995,11 @@
 	endIndex CDATA #IMPLIED
 &gt;
 
-&lt;!ELEMENT createTempFileURI EMPTY&gt;
-&lt;!ATTLIST createTempFileURI
-	id ID #IMPLIED
-	var CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT createTempHttpURI EMPTY&gt;
-&lt;!ATTLIST createTempHttpURI
+&lt;!ELEMENT createTempURI EMPTY&gt;
+&lt;!ATTLIST createTempURI
 	id ID #IMPLIED
 	var CDATA #REQUIRED
+    scheme (file|http) #REQUIRED
 &gt;
 
 
Index: transforms/dom-to-xsd.xsl
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/transforms/dom-to-xsd.xsl,v
retrieving revision 1.52
diff -u -r1.52 dom-to-xsd.xsl
--- transforms/dom-to-xsd.xsl	23 Dec 2003 03:27:25 -0000	1.52
+++ transforms/dom-to-xsd.xsl	30 Dec 2003 05:52:43 -0000
@@ -1072,8 +1072,7 @@
 					<xs:element ref="createXPathEvaluator"/>
 					<xs:element ref="getResourceURI"/>
 					<xs:element ref="substring"/>
-					<xs:element ref="createTempFileURI"/>
-					<xs:element ref="createTempHttpURI"/>
+					<xs:element ref="createTempURI"/>
 				</xs:choice>
 			</xs:group>
 
@@ -1384,23 +1383,25 @@
 				    <xs:attribute name="document" type="variable" use="required"/>
 			    </xs:complexType>
             </xs:element>
+			<xs:simpleType name="uriScheme">
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="file"/>
+					<xs:enumeration value="http"/>
+				</xs:restriction>
+			</xs:simpleType>
             <xs:element name="getResourceURI">
             	<xs:complexType>
             		<xs:attribute name="id" type="xs:ID" use="optional"/>
             		<xs:attribute name="var" type="variable" use="required"/>
             		<xs:attribute name="href" type="variableOrStringLiteral" use="required"/>
+            		<xs:attribute name="scheme" type="uriScheme" use="optional"/>
             	</xs:complexType>
             </xs:element>
-            <xs:element name="createTempFileURI">
-            	<xs:complexType>
-            		<xs:attribute name="id" type="xs:ID" use="optional"/>
-            		<xs:attribute name="var" type="variable" use="required"/>
-            	</xs:complexType>
-            </xs:element>
-            <xs:element name="createTempHttpURI">
+            <xs:element name="createTempURI">
             	<xs:complexType>
             		<xs:attribute name="id" type="xs:ID" use="optional"/>
             		<xs:attribute name="var" type="variable" use="required"/>
+            		<xs:attribute name="scheme" type="uriScheme" use="required"/>
             	</xs:complexType>
             </xs:element>
             
Index: transforms/test-to-java.xsl
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/transforms/test-to-java.xsl,v
retrieving revision 1.56
diff -u -r1.56 test-to-java.xsl
--- transforms/test-to-java.xsl	23 Dec 2003 03:27:25 -0000	1.56
+++ transforms/test-to-java.xsl	30 Dec 2003 05:52:44 -0000
@@ -1752,19 +1752,31 @@
     <xsl:value-of select="@var"/>
     <xsl:text> = getResourceURI(</xsl:text>
     <xsl:value-of select="@href"/>
-    <xsl:text>);
-      </xsl:text>
-</xsl:template>
-
-<xsl:template match="*[local-name()='createTempFileURI']" mode="body">
-    <xsl:value-of select="@var"/>
-    <xsl:text> = createTempFileURI();
+    <xsl:text>,"</xsl:text>
+    <xsl:choose>
+    	<xsl:when test="@scheme">
+    		<xsl:value-of select="@scheme"/>
+    	</xsl:when>
+    	<xsl:otherwise>
+    		<xsl:text>file</xsl:text>
+    	</xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>");
       </xsl:text>
 </xsl:template>
 
-<xsl:template match="*[local-name()='createTempHttpURI']" mode="body">
+<xsl:template match="*[local-name()='createTempURI']" mode="body">
     <xsl:value-of select="@var"/>
-    <xsl:text> = createTempHttpURI();
+    <xsl:text> = createTempURI("</xsl:text>
+    <xsl:choose>
+    	<xsl:when test="@scheme">
+    		<xsl:value-of select="@scheme"/>
+    	</xsl:when>
+    	<xsl:otherwise>
+    		<xsl:text>file</xsl:text>
+    	</xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>");
       </xsl:text>
 </xsl:template>
 
Index: tests/level3/ls/files/testpdf.pdf
===================================================================
RCS file: tests/level3/ls/files/testpdf.pdf
diff -N tests/level3/ls/files/testpdf.pdf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level3/ls/files/testpdf.pdf	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+   <elt0>
+      <elt1>the first element elt1</elt1><elt1>the second element elt1</elt1>
+      <elt2/>
+   </elt0>