Index: runtests.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/runtests.xml,v
retrieving revision 1.12
diff -u -r1.12 runtests.xml
--- runtests.xml	28 Mar 2004 07:12:33 -0000	1.12
+++ runtests.xml	6 May 2004 19:32:18 -0000
@@ -67,6 +67,7 @@
     <property name="crimson.lib.dir" location="${implbase.dir}/crimson-1.1.3"/>
     <property name="dom4j.lib.dir" location="${implbase.dir}/dom4j-1.4"/>
     <property name="gnujaxp.lib.dir" location="${implbase.dir}/gnujaxp-1.0beta1"/>
+    <property name="jtidy.lib.dir" location="${implbase.dir}/jtidy-04aug2000r7-dev"/>
     <property name="testsrc.dir" location="tests"/>
     <property name="doxygensrc.dir" location="build"/>
 
@@ -839,10 +840,11 @@
 	         dom2-core-batik,
 	         dom2-core-xerces2_svg,
 	         dom2-core-xerces2_svg-alt,
+	         dom2-core-xerces2_xhtml,
+	         dom2-core-xerces2_xhtml-alt,
 	         dom2-core-gnujaxp,
 	         dom2-core-gnujaxp-alt,
-	         dom2-core-dom4j,
-	         dom2-core-jtidy"/>
+	         dom2-core-dom4j"/>
 	         
 <target name="dom2-core-results" depends="dom2-core-all">	         
 	<copy file="${transforms.dir}/dom2-core-results.xml" todir="${results.dir}"/>
Index: tests/level2/core/getElementsByTagNameNS01.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/getElementsByTagNameNS01.xml,v
retrieving revision 1.4
diff -u -r1.4 getElementsByTagNameNS01.xml
--- tests/level2/core/getElementsByTagNameNS01.xml	4 Dec 2002 00:42:46 -0000	1.4
+++ tests/level2/core/getElementsByTagNameNS01.xml	6 May 2004 19:32:19 -0000
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
-
-<!--
-
-Copyright (c) 2001 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 "dom2.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="getElementsByTagNameNS01">
-<metadata>
-<title>getElementsByTagNameNS01</title>
-<creator>NIST</creator>
-<description>
-    The "getElementsByTagNameNS(namespaceURI,localName)" method for a 
-   Document should return a new NodeList of all Elements that have a namespace
-   when local name is specified as ' '.
-   
-   Invoke method getElementsByTagNameNS(namespaceURI,localName) on this document
-   with namespaceURI and localName as " ".
-   Method should return a new NodeList of 37 elements.
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2001-08-17</date>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS"/>
-</metadata>
-<var name="namespaceURI" type="DOMString" value="&quot;*&quot;"/>
-<var name="localName" type="DOMString" value="&quot;*&quot;"/>
-<var name="doc" type="Document"/>
-<var name="newList" type="NodeList"/>
-<load var="doc" href="staffNS" willBeModified="false"/>
-<getElementsByTagNameNS interface="Document" obj="doc" var="newList" namespaceURI="namespaceURI" localName="localName"/>
-<assertSize collection="newList" size="37" id="throw_Size"/>
-</test>
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
+
+<!--
+
+Copyright (c) 2001-2004 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 "dom2.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="getElementsByTagNameNS01">
+<metadata>
+<title>getElementsByTagNameNS01</title>
+<creator>NIST</creator>
+<description>
+   Invoke method getElementsByTagNameNS(namespaceURI,localName) on this document
+   with namespaceURI and localName as "*" and check size of returned node list.
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2001-08-17</date>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS"/>
+</metadata>
+<var name="namespaceURI" type="DOMString" value="&quot;*&quot;"/>
+<var name="localName" type="DOMString" value="&quot;*&quot;"/>
+<var name="doc" type="Document"/>
+<var name="newList" type="NodeList"/>
+<load var="doc" href="staffNS" willBeModified="false"/>
+<getElementsByTagNameNS interface="Document" obj="doc" var="newList" namespaceURI="namespaceURI" localName="localName"/>
+<if><contentType type="image/svg+xml"/>
+<assertSize collection="newList" size="39" id="listLength_svg"/>
+<else>
+<assertSize collection="newList" size="37" id="listLength"/>
+</else>
+</if>
+</test>
Index: tests/level2/core/getElementsByTagNameNS08.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/getElementsByTagNameNS08.xml,v
retrieving revision 1.1
diff -u -r1.1 getElementsByTagNameNS08.xml
--- tests/level2/core/getElementsByTagNameNS08.xml	1 Mar 2002 07:01:54 -0000	1.1
+++ tests/level2/core/getElementsByTagNameNS08.xml	6 May 2004 19:32:19 -0000
@@ -3,7 +3,7 @@
 
 <!--
 
-Copyright (c) 2001 World Wide Web Consortium, 
+Copyright (c) 2001-2004 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
@@ -38,5 +38,10 @@
 <load var="doc" href="staffNS" willBeModified="false"/>
 <documentElement var="docElem" obj="doc"/>
 <getElementsByTagNameNS interface="Element" obj="docElem" var="newList" namespaceURI='"*"' localName='"*"'/>
+<if><contentType type="image/svg+xml"/>
+<assertSize collection="newList" size="38" id="listSize_svg"/>
+<else>
 <assertSize collection="newList" size="36" id="listSize"/>
+</else>
+</if>
 </test>
Index: tests/level2/core/getNamedItemNS03.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/getNamedItemNS03.xml,v
retrieving revision 1.2
diff -u -r1.2 getNamedItemNS03.xml
--- tests/level2/core/getNamedItemNS03.xml	3 Apr 2004 00:30:59 -0000	1.2
+++ tests/level2/core/getNamedItemNS03.xml	6 May 2004 19:32:19 -0000
@@ -3,7 +3,7 @@
 
 <!--
 
-Copyright (c) 2003 World Wide Web Consortium, 
+Copyright (c) 2003-2004 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
Index: tests/level2/core/namespaceURI04.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/namespaceURI04.xml,v
retrieving revision 1.4
diff -u -r1.4 namespaceURI04.xml
--- tests/level2/core/namespaceURI04.xml	4 Dec 2002 00:42:47 -0000	1.4
+++ tests/level2/core/namespaceURI04.xml	6 May 2004 19:32:19 -0000
@@ -1,42 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
-
-<!--
-
-Copyright (c) 2001 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 "dom2.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="namespaceURI04">
-<metadata>
-<title>namespaceURI04</title>
-<creator>NIST</creator>
-<description>
-    The "getNamespaceURI()" method for a Node
-    returns the namespace URI of this node, or null if unspecified.
-    
-    Retrieve the second employee node and invoke the "getNamespaceURI()"   
-    method.   The method should return "null". 
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2001-08-17</date>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSname"/>
-</metadata>
-<var name="doc" type="Document"/>
-<var name="elementList" type="NodeList"/>
-<var name="testEmployee" type="Node"/>
-<var name="employeeNamespace" type="DOMString"/>
-<load var="doc" href="staffNS" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" tagname="&quot;employee&quot;" var="elementList"/>
-<item interface="NodeList" obj="elementList" index="1" var="testEmployee"/>
-<namespaceURI obj="testEmployee" var="employeeNamespace"/>
-<assertNull actual="employeeNamespace" id="throw_Null"/>
-</test>
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
+
+<!--
+
+Copyright (c) 2001-2004 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 "dom2.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="namespaceURI04">
+<metadata>
+<title>namespaceURI04</title>
+<creator>NIST</creator>
+<description>
+    Retrieve the second employee node and invoke the "getNamespaceURI()"   
+    method.   The method should return "null". 
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2001-08-17</date>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSname"/>
+</metadata>
+<var name="doc" type="Document"/>
+<var name="elementList" type="NodeList"/>
+<var name="testEmployee" type="Node"/>
+<var name="employeeNamespace" type="DOMString"/>
+<load var="doc" href="staffNS" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/>
+<item interface="NodeList" obj="elementList" index="1" var="testEmployee"/>
+<namespaceURI obj="testEmployee" var="employeeNamespace"/>
+<if><contentType type="image/svg+xml"/>
+<!--  the element is staffNS.svg has a non-null namespace
+         but since namespace awareness is not asserted,
+         the namespaceURI may be null   -->
+<assertTrue id="employeeNS_svg">
+	<or>
+    	<isNull obj="employeeNamespace"/>
+    	<equals actual="employeeNamespace" 
+                expected='"http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files"'
+                ignoreCase="false"/>
+    </or>
+</assertTrue>    
+<else>              
+<assertNull actual="employeeNamespace" id="employeeNS_null"/>
+</else>
+</if>
+</test>
Index: tests/level2/core/nodehasattributes01.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/nodehasattributes01.xml,v
retrieving revision 1.2
diff -u -r1.2 nodehasattributes01.xml
--- tests/level2/core/nodehasattributes01.xml	4 Dec 2002 00:42:47 -0000	1.2
+++ tests/level2/core/nodehasattributes01.xml	6 May 2004 19:32:19 -0000
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 2001 World Wide Web Consortium, 
+Copyright (c) 2001-2004 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
@@ -34,12 +34,12 @@
 <var name="elementList" type="NodeList"/>
 <var name="hasAttributes" type="boolean"/>
 <load var="doc" href="staff" willBeModified="false"/>
-<getElementsByTagName var="elementList" obj="doc" tagname='"employee"' interface="Document"/>
+<getElementsByTagName var="elementList" obj="doc" tagname='"employeeId"' interface="Document"/>
 <item var="element" obj="elementList" index="0" interface="NodeList"/>
 <hasAttributes var="hasAttributes" obj="element"/>
-<assertFalse actual="hasAttributes" id="nodehasattributes01_1"/>
+<assertFalse actual="hasAttributes" id="employeeIdHasAttributesFalse"/>
 <getElementsByTagName var="elementList" obj="doc" tagname='"address"'  interface="Document"/>
 <item var="element" obj="elementList" index="0" interface="NodeList"/>
 <hasAttributes var="hasAttributes" obj="element"/>
-<assertTrue actual="hasAttributes" id="nodehasattributes01_2"/>
+<assertTrue actual="hasAttributes" id="addressHasAttributesTrue"/>
 </test>
Index: tests/level2/core/ownerDocument01.java
===================================================================
RCS file: tests/level2/core/ownerDocument01.java
diff -N tests/level2/core/ownerDocument01.java
--- tests/level2/core/ownerDocument01.java	28 Feb 2002 06:39:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-
-/*
-This Java source file was generated by test-to-java.xsl
-and is a derived work from the source document.
-The source document contained the following notice:
-
-
-
-Copyright (c) 2001 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.
-
-
-*/
-
-package org.w3c.domts.level2.core;
-
-import org.w3c.dom.*;
-import org.w3c.dom.html.*;
-import org.w3c.dom.events.*;
-import org.w3c.domts.*;
-import javax.xml.parsers.*;
-import java.util.*;
-
-
-
-/**
-* 
-    The "getOwnerDocument()" method returns null if the target
-    node itself is a DocumentType which is not used with any document yet.
-    
-    Invoke the "getOwnerDocument()" method on the master 
-    document.   The DocumentType returned should be null.
-
-* @author NIST
-* @author Mary Brady
-* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc">http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc</a>
-*/
-public class ownerDocument01 extends DOMTestCase {
-
-   public ownerDocument01(DOMTestDocumentBuilderFactory factory) 
- {
-      super(factory);
-
-   }
-
-   public void runTest() throws java.lang.Throwable {
-      Document doc;
-      DocumentType ownerDocument;
-      doc = load("staff");
-      ownerDocument = (DocumentType)doc.getOwnerDocument();
-      assertNull("throw_Null",ownerDocument);
-      
-   }
-   public String getTargetURI() {
-      return "http://www.w3.org/2001/DOM-Test-Suite/level2/core/ownerDocument01";
-   }
-   public static void main(String[] args) {
-        DOMTestCase.doMain(ownerDocument01.class,args);
-   }
-}
Index: tests/level2/core/prefix11.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/prefix11.xml,v
retrieving revision 1.4
diff -u -r1.4 prefix11.xml
--- tests/level2/core/prefix11.xml	4 Dec 2002 00:42:47 -0000	1.4
+++ tests/level2/core/prefix11.xml	6 May 2004 19:32:19 -0000
@@ -1,50 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
-
-<!--
-
-Copyright (c) 2001 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 "dom2.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="prefix11">
-<metadata>
-<title>prefix11</title>
-<creator>NIST</creator>
-<description>
-    The "setPrefix(prefix)" method raises a 
-    NAMESPACE_ERR DOMException if the specified
-    prefix is set on a node with a namespaceURI that is null.
-    
-    Attempt to insert a new namespace prefix on the second employee node.
-    An exception should be raised since the namespace prefix is set
-    on a node whose namespaceURI is null. 
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2001-08-17</date>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-258A00AF')/constant[@name='NAMESPACE_ERR'])"/>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#"/>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])"/>
-</metadata>
-<var name="doc" type="Document"/>
-<var name="elementList" type="NodeList"/>
-<var name="employeeNode" type="Node"/>
-<var name="namespaceURI" type="DOMString"/>
-<load var="doc" href="staffNS" willBeModified="true"/>
-<getElementsByTagName interface="Document" obj="doc" tagname="&quot;employee&quot;" var="elementList"/>
-<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/>
-<namespaceURI obj="employeeNode" var="namespaceURI"/>
-<assertDOMException id="throw_NAMESPACE_ERR">
-<NAMESPACE_ERR>
-<prefix obj="employeeNode" value="&quot;employee1&quot;"/>
-</NAMESPACE_ERR>
-</assertDOMException>
-</test>
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
+
+<!--
+
+Copyright (c) 2001-2004 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 "dom2.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="prefix11">
+<metadata>
+<title>prefix11</title>
+<creator>NIST</creator>
+<description>
+    The "setPrefix(prefix)" method raises a 
+    NAMESPACE_ERR DOMException if the specified
+    prefix is set on a node with a namespaceURI that is null.
+    
+    Attempt to insert a new namespace prefix on the second employee node.
+    An exception should be raised since the namespace prefix is set
+    on a node whose namespaceURI is null. 
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2001-08-17</date>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-258A00AF')/constant[@name='NAMESPACE_ERR'])"/>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#"/>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])"/>
+</metadata>
+<var name="doc" type="Document"/>
+<var name="elementList" type="NodeList"/>
+<var name="employeeNode" type="Node"/>
+<var name="namespaceURI" type="DOMString"/>
+<var name="nullNS" type="DOMString" isNull="true"/>
+<load var="doc" href="staffNS" willBeModified="true"/>
+<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/>
+<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/>
+<!--   element has a NS in staffNS.svg, create an null NS'd element  -->
+<if><contentType type="image/svg+xml"/>
+<createElementNS var="employeeNode" obj="doc"
+     namespaceURI="nullNS" qualifiedName='"employee"'/>
+</if>
+<namespaceURI obj="employeeNode" var="namespaceURI"/>
+<assertDOMException id="throw_NAMESPACE_ERR">
+<NAMESPACE_ERR>
+<prefix obj="employeeNode" value='"employee1"'/>
+</NAMESPACE_ERR>
+</assertDOMException>
+<assertNull actual="namespaceURI" id="employeeNS"/>
+</test>
Index: transforms/dom2-core-results.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/transforms/dom2-core-results.xml,v
retrieving revision 1.3
diff -u -r1.3 dom2-core-results.xml
--- transforms/dom2-core-results.xml	9 Feb 2004 19:09:46 -0000	1.3
+++ transforms/dom2-core-results.xml	6 May 2004 19:32:20 -0000
@@ -17,7 +17,6 @@
 <!ENTITY dom2-core-gnujaxp-alt SYSTEM 'dom2-core-gnujaxpAltConfig.xml'>
 <!ENTITY dom2-core-dom4j SYSTEM 'dom2-core-dom4j.xml'>
 <!ENTITY dom2-core-batik SYSTEM 'dom2-core-batik.xml'>
-<!ENTITY dom2-core-jtidy SYSTEM 'dom2-core-jtidy.xml'>
 ]>
 <results>
 <implementation name="Xerces-J 2.6.0">
@@ -56,6 +55,9 @@
 <implementation name="Xerces-J 2.6.0 SVG Alt">
 &dom2-core-xerces2_svg-alt;
 </implementation>
+<implementation name="Batik">
+&dom2-core-batik;
+</implementation>
 <implementation name="Xerces-J 2.6.0 XHTML">
 &dom2-core-xerces2_xhtml;
 </implementation>
@@ -74,7 +76,4 @@
 <implementation name="Xerces-J CVS DOM3">
 &dom2-core-xerces_dom3-alt;
 </implementation>
-<implementation name="JTidy2 CVS">
-&dom2-core-jtidy;
-</implementation>
 </results>
\ No newline at end of file