Index: xml-xerces/java/tests/dom/dom3/Test.java
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/tests/dom/dom3/Test.java,v
retrieving revision 1.9
diff -u -w -r1.9 Test.java
--- xml-xerces/java/tests/dom/dom3/Test.java	24 Mar 2003 20:11:05 -0000	1.9
+++ xml-xerces/java/tests/dom/dom3/Test.java	29 Jul 2003 12:52:33 -0000
@@ -79,22 +79,22 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
-import org.w3c.dom.ls.DOMBuilder;
-import org.w3c.dom.ls.DOMEntityResolver;
+import org.w3c.dom.ls.DOMParser;
+import org.w3c.dom.ls.DOMResourceResolver;
 import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.DOMInputSource;
-import org.w3c.dom.ls.DOMWriter;
+import org.w3c.dom.ls.DOMInput;
+import org.w3c.dom.ls.DOMSerializer;
 
 import dom.util.Assertion;
 
 /**
  * The program tests vacarious DOM Level 3 functionality
  */
-public class Test implements DOMErrorHandler, DOMEntityResolver{
+public class Test implements DOMErrorHandler, DOMResourceResolver{
     
     static int errorCounter = 0;
     static DOMErrorHandler errorHandler = new Test();
-    static DOMEntityResolver resolver = new Test();
+    static DOMResourceResolver resolver = new Test();
     
     public static void main( String[] argv) {
         try {
@@ -103,14 +103,14 @@
             System.setProperty(DOMImplementationRegistry.PROPERTY,"org.apache.xerces.dom.DOMImplementationSourceImpl");
 
             
-            DOMImplementationLS impl = (DOMImplementationLS)DOMImplementationRegistry.newInstance().getDOMImplementation("LS-Load");
+            DOMImplementationLS impl = (DOMImplementationLS)DOMImplementationRegistry.newInstance().getDOMImplementation("LS");
 
             Assertion.verify(impl!=null, "domImplementation != null");
 
-            DOMBuilder builder = impl.createDOMBuilder(DOMImplementationLS.MODE_SYNCHRONOUS, 
+            DOMParser builder = impl.createDOMParser(DOMImplementationLS.MODE_SYNCHRONOUS,
                                                        null);
 
-            DOMWriter writer = impl.createDOMWriter();
+            DOMSerializer writer = impl.createDOMSerializer();
             DOMConfiguration config = writer.getConfig();
             config.setParameter("namespaces",(namespaces)?Boolean.TRUE:Boolean.FALSE);
             config.setParameter("validate",Boolean.FALSE);
@@ -421,7 +421,7 @@
                 writer.getConfig().setParameter("namespaces", Boolean.TRUE);
                 String xmlData = writer.writeToString(doc);
                 Reader r = new StringReader(xmlData);
-                DOMInputSource in = impl.createDOMInputSource();
+                DOMInput in = impl.createDOMInput();
                 in.setCharacterStream(r);
                 doc = builder.parse(in);
 
@@ -675,12 +675,12 @@
 	/**
 	 * @see org.w3c.dom.ls.DOMEntityResolver#resolveEntity(String, String, String)
 	 */
-	public DOMInputSource resolveEntity(String publicId, String systemId, String baseURI) {
+	public DOMInput resolveResource(String publicId, String systemId, String baseURI) {
 		try {
 			DOMImplementationLS impl =
 				(DOMImplementationLS) DOMImplementationRegistry.newInstance().getDOMImplementation(
-					"LS-Load");
-			DOMInputSource source = impl.createDOMInputSource();
+					"LS");
+			DOMInput source = impl.createDOMInput();
 			if (systemId.equals("personal.xsd")) {
 				source.setSystemId("data/personal.xsd");
 			}
Index: xml-xerces/java/tests/dom/serialize/TestNS.java
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/tests/dom/serialize/TestNS.java,v
retrieving revision 1.10
diff -u -w -r1.10 TestNS.java
--- xml-xerces/java/tests/dom/serialize/TestNS.java	17 Feb 2003 22:14:38 -0000	1.10
+++ xml-xerces/java/tests/dom/serialize/TestNS.java	29 Jul 2003 12:52:34 -0000
@@ -59,7 +59,8 @@
 import  org.w3c.dom.*;
 
 import org.apache.xerces.dom.*;
-import org.w3c.dom.ls.DOMWriter;
+import org.w3c.dom.ls.DOMSerializer;
+import org.w3c.dom.ls.DOMOutput;
 import org.w3c.dom.ls.DOMImplementationLS;
 import org.apache.xerces.parsers.*;
 import org.apache.xml.serialize.*;
@@ -70,7 +71,7 @@
  * This class is testing namespace algorithm during serialization.
  * The class takes as a parameter xml document, parses it using the DOM parser.
  * By default it will perform modifications to the tree, and then serialize
- * the document using DOMWriter.
+ * the document using DOMSerializer.
  * 
  * @author Elena Litani, IBM
  * @version $Id: TestNS.java,v 1.10 2003/02/17 22:14:38 neilg Exp $
@@ -81,6 +82,7 @@
 
             System.out.println("DOM Serializer test for namespace algorithm.");
             DOMParser parser = new DOMParser();
+            DOMOutput dOut = new DOMOutputImpl();
 
             if (argv.length == 0) {
                 printUsage();
@@ -364,7 +366,7 @@
 
                 
                 // create DOM Serializer
-                DOMWriter writer = ((DOMImplementationLS)DOMImplementationImpl.getDOMImplementation()).createDOMWriter();
+                DOMSerializer writer = ((DOMImplementationLS)DOMImplementationImpl.getDOMImplementation()).createDOMSerializer();
                 
 
                 // Serializer that ouputs tree in not pretty print format
@@ -374,14 +376,16 @@
                     //serializer.asDOMSerializer();
                     //serializer.serialize((Document)core);
                     //writer.setFeature("entities",true);
-                    writer.writeNode(System.out, core);
+                    //writer.writeNode(System.out, core);
+                      writer.write(core,dOut);
                 } else {
 
                     System.out.println("Serializing output to output.xml...");
                     //XMLSerializer toFile = new XMLSerializer (new FileWriter("output.xml"), format);
                     //toFile.asDOMSerializer();
                     //toFile.serialize((Document)core);
-                    writer.writeNode(new FileOutputStream("output.xml"), core);
+                    //writer.writeNode(new FileOutputStream("output.xml"), core);
+                    writer.write(core,dOut);
                 }
 
                 /** Test SAX Serializer 
Index: xml-xerces/java/tests/dom/serialize/TestXmlns.java
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/tests/dom/serialize/TestXmlns.java,v
retrieving revision 1.3
diff -u -w -r1.3 TestXmlns.java
--- xml-xerces/java/tests/dom/serialize/TestXmlns.java	10 Jun 2003 18:21:48 -0000	1.3
+++ xml-xerces/java/tests/dom/serialize/TestXmlns.java	29 Jul 2003 12:52:34 -0000
@@ -61,7 +61,7 @@
 import java.io.Writer;
 
 import org.apache.xerces.dom.DocumentImpl;
-import org.w3c.dom.ls.DOMWriter;
+import org.w3c.dom.ls.DOMSerializer;
 import org.w3c.dom.ls.DOMImplementationLS;
 import org.apache.xerces.dom.DOMImplementationImpl;
 import org.apache.xml.serialize.OutputFormat;
@@ -69,6 +69,8 @@
 import org.apache.xml.serialize.SerializerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.ls.DOMOutput;
+import org.apache.xerces.dom.DOMOutputImpl;
 
 /**
  * Tests that original behavior of XMLSerializer is not broken.
@@ -112,10 +114,12 @@
             // create DOM Serializer
 
             System.out.println("\n---DOMWriter output---");
-            DOMWriter domWriter = ((DOMImplementationLS)DOMImplementationImpl.getDOMImplementation()).createDOMWriter();
+            DOMSerializer domWriter = ((DOMImplementationLS)DOMImplementationImpl.getDOMImplementation()).createDOMSerializer();
             
             try {
-                domWriter.writeNode(System.out, document);
+                //domWriter.writeNode(System.out, document);
+                DOMOutput dOut = new DOMOutputImpl();
+                domWriter.write(document,dOut);
             } catch (Exception e){
                 e.printStackTrace();
             }
