Index: build.xml
===================================================================
retrieving revision 1.126
diff -u -r1.126 build.xml
--- build.xml	15 Feb 2004 02:53:30 -0000	1.126
+++ build.xml	21 Feb 2004 03:58:24 -0000
@@ -552,11 +552,25 @@
 		 excludes="*.bak">
 		<fileset dir="tests/level${level}/${module}/files" excludes="*.bak"/>
 		<fileset dir="java" includes="org/w3c/domts/*.java"/>
-        <fileset dir="${lib.dir}/xhtml1-dtd"/>
         <fileset dir="java" includes="org/**/*.java"/>
 	</jar>
 </target>
 
+<target name="html-jar">
+	<property name="level" value="1"/>
+	<property name="module" value="core"/>
+	<property name="jarfile" value="dom${level}-${module}.jar"/>
+	<jar jarfile="${build.dir}/${jarfile}"  
+		 manifest="java/dom${level}-${module}.mf"
+		 basedir="${java.build.dir}"
+		 includes="org/w3c/domts/* org/w3c/domts/level${level}/${module}/* org/w3c/dom/* org/w3c/dom/${module}/*"
+		 excludes="*.bak">
+		<fileset dir="tests/level${level}/${module}/files" excludes="*.bak"/>
+		<fileset dir="java" includes="org/w3c/domts/*.java"/>
+        <fileset dir="java" includes="org/**/*.java"/>
+        <fileset dir="${lib.dir}/xhtml1-dtd"/>
+	</jar>
+</target>
 
 
 <target name="checkstyle-available">
@@ -856,7 +870,7 @@
 	</antcall>
 </target>
 
-<target name="dom1-core-gen-jsunit" depends="jsunit-get,dom1-interfaces,dom1-dtd,get-xhtml1-dtd">
+<target name="dom1-core-gen-jsunit" depends="jsunit-get,dom1-interfaces,dom1-dtd">
     <antcall target="gen-jsunit">
     	<param name="level" value="1"/>
     	<param name="module" value="core"/>
@@ -879,11 +893,7 @@
 </target>
 
 
-<target name="dom1-core-validate-files" depends="get-xhtml1-dtd">
-    <copy todir="${tests.dir}/level1/core/files">
-		<fileset dir="${lib.dir}/xhtml1-dtd"/>
-    </copy>
-
+<target name="dom1-core-validate-files" depends="init">
 	<xmlvalidate lenient="no" failonerror="yes"
 	             classname="org.apache.xerces.parsers.SAXParser">
 		<fileset dir="${tests.dir}/level1/core/files" includes="*.xml *.svg" excludes="hc_nodtdstaff.*"/>  
@@ -1105,7 +1115,7 @@
 
 
 <target name="dom1-html-jar" depends="dom1-html-javac,dom1-html-validate-files">
-	<antcall target="jar">
+	<antcall target="html-jar">
 		<param name="level" value="1"/>
 		<param name="module" value="html"/>
 	</antcall>
@@ -1397,11 +1407,7 @@
     </style>
 </target>
 
-<target name="dom2-core-validate-files" depends="get-xhtml1-dtd">
-    <copy todir="${tests.dir}/level2/core/files">
-		<fileset dir="${lib.dir}/xhtml1-dtd"/>
-    </copy>
-
+<target name="dom2-core-validate-files" depends="init">
 	<xmlvalidate lenient="no" failonerror="yes"
 	             classname="org.apache.xerces.parsers.SAXParser">
 		<fileset dir="${tests.dir}/level2/core/files" includes="*.xml *.svg" excludes="nodtdstaff.*"/>  
@@ -1604,7 +1610,7 @@
 
 
 <target name="dom2-html-jar" depends="dom2-html-javac,dom2-html-validate-files">
-	<antcall target="jar">
+	<antcall target="html-jar">
 		<param name="level" value="2"/>
 		<param name="module" value="html"/>
 	</antcall>
@@ -1660,11 +1666,7 @@
 
 <!--   DOM Level 2 Events   -->
 
-<target name="dom2-events-validate-files" depends="get-xhtml1-dtd">
-    <copy todir="${tests.dir}/level2/events/files">
-		<fileset dir="${lib.dir}/xhtml1-dtd"/>
-    </copy>
-    
+<target name="dom2-events-validate-files" depends="init">
 	<xmlvalidate lenient="no" failonerror="yes"
 	             classname="org.apache.xerces.parsers.SAXParser">
 		<fileset dir="${tests.dir}/level2/events/files" includes="*.xml *.svg" excludes="nodtdstaff.*"/>  
@@ -1731,7 +1733,7 @@
 	</antcall>
 </target>
 
-<target name="dom2-events-gen-jsunit" depends="jsunit-get,dom2-interfaces,dom2-dtd,get-xhtml1-dtd">
+<target name="dom2-events-gen-jsunit" depends="jsunit-get,dom2-interfaces,dom2-dtd">
     <antcall target="gen-jsunit">
     	<param name="level" value="2"/>
     	<param name="module" value="events"/>
@@ -1880,7 +1882,7 @@
 	
 	
 
-<target name="dom3-init" depends="init,get-dom3,get-xhtml1-dtd, dom2-traversal-init">
+<target name="dom3-init" depends="init,get-dom3,dom2-traversal-init">
 	<mkdir dir="${specs.dir}"/>
 	<mkdir dir="${specs.dir}/Level-3"/>
 
@@ -2030,11 +2032,7 @@
 	</antcall>
 </target>
 
-<target name="dom3-core-validate-files" depends="get-xhtml1-dtd">
-    <copy todir="${tests.dir}/level3/core/files">
-		<fileset dir="${lib.dir}/xhtml1-dtd"/>
-    </copy>
-
+<target name="dom3-core-validate-files" depends="init">
 	<xmlvalidate lenient="no" failonerror="no"
 	             classname="org.apache.xerces.parsers.SAXParser">
 		<fileset dir="${tests.dir}/level3/core/files" includes="*.xml *.svg" excludes="hc_nodtdstaff.* datatype_normalization.*"/>  
@@ -2335,7 +2333,7 @@
     </javac>
 </target>
 
-<target name="dom3-events-jar" depends="dom3-events-javac,get-xhtml1-dtd">
+<target name="dom3-events-jar" depends="dom3-events-javac">
 	<antcall target="jar">
 		<param name="level" value="3"/>
 		<param name="module" value="events"/>
@@ -2447,7 +2445,7 @@
 </target>
 
 
-<target name="dom3-ls-jar" depends="dom3-ls-javac,get-xhtml1-dtd">
+<target name="dom3-ls-jar" depends="dom3-ls-javac">
 	<antcall target="jar">
 		<param name="level" value="3"/>
 		<param name="module" value="ls"/>
@@ -2628,7 +2626,7 @@
     </javac>
 </target>
 
-<target name="dom3-xpath-jar" depends="dom3-xpath-javac,get-xhtml1-dtd">
+<target name="dom3-xpath-jar" depends="dom3-xpath-javac">
 	<antcall target="jar">
 		<param name="level" value="3"/>
 		<param name="module" value="xpath"/>
@@ -2738,7 +2736,7 @@
 
 
 
-<target name="dom3-val-jar" depends="dom3-val-javac,get-xhtml1-dtd">
+<target name="dom3-val-jar" depends="dom3-val-javac">
 	<antcall target="jar">
 		<param name="level" value="3"/>
 		<param name="module" value="validation"/>
Index: tests/level1/core/files/.cvsignore
===================================================================
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- tests/level1/core/files/.cvsignore	2 Jan 2004 05:47:28 -0000	1.1
+++ tests/level1/core/files/.cvsignore	21 Feb 2004 03:58:25 -0000
@@ -1,6 +0,0 @@
-xhtml1-frameset.dtd
-xhtml1-strict.dtd
-xhtml1-transitional.dtd
-xhtml-lat1.ent
-xhtml-special.ent
-xhtml-symbol.ent
Index: tests/level2/core/files/.cvsignore
===================================================================
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- tests/level2/core/files/.cvsignore	2 Jan 2004 05:52:45 -0000	1.1
+++ tests/level2/core/files/.cvsignore	21 Feb 2004 03:58:26 -0000
@@ -1,6 +0,0 @@
-xhtml1-frameset.dtd
-xhtml1-strict.dtd
-xhtml1-transitional.dtd
-xhtml-lat1.ent
-xhtml-special.ent
-xhtml-symbol.ent
Index: tests/level2/events/files/.cvsignore
===================================================================
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- tests/level2/events/files/.cvsignore	5 Jan 2004 08:27:14 -0000	1.1
+++ tests/level2/events/files/.cvsignore	21 Feb 2004 03:58:26 -0000
@@ -1,6 +0,0 @@
-xhtml1-frameset.dtd
-xhtml1-strict.dtd
-xhtml1-transitional.dtd
-xhtml-lat1.ent
-xhtml-special.ent
-xhtml-symbol.ent
Index: tests/level3/core/files/.cvsignore
===================================================================
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- tests/level3/core/files/.cvsignore	5 Jan 2004 08:27:14 -0000	1.1
+++ tests/level3/core/files/.cvsignore	21 Feb 2004 03:58:26 -0000
@@ -1,6 +0,0 @@
-xhtml1-frameset.dtd
-xhtml1-strict.dtd
-xhtml1-transitional.dtd
-xhtml-lat1.ent
-xhtml-special.ent
-xhtml-symbol.ent
Index: tests/level1/core/files/xhtml1-strict.dtd
===================================================================
RCS file: tests/level1/core/files/xhtml1-strict.dtd
diff -N tests/level1/core/files/xhtml1-strict.dtd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level1/core/files/xhtml1-strict.dtd	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,57 @@
+<!--
+
+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.
+
+-->
+
+<!--
+
+This is a radically simplified DTD for use in the DOM Test Suites
+due to a XML non-conformance of one implementation in processing
+parameter entities.  When that non-conformance is resolved,
+this DTD can be replaced by the normal DTD for XHTML.
+
+-->
+
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html xmlns CDATA #IMPLIED>
+<!ELEMENT head (title)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT body (p*)>
+<!ELEMENT p (#PCDATA|em|strong|code|sup|var|acronym|abbr)*>
+<!ATTLIST p 
+  xmlns:dmstc CDATA #IMPLIED
+  xmlns:nm CDATA #IMPLIED
+  xmlns:emp2 CDATA #IMPLIED
+  id ID #IMPLIED  
+>
+<!ELEMENT em (#PCDATA)>
+<!ELEMENT span (#PCDATA)>
+<!ELEMENT strong (#PCDATA)>
+<!ELEMENT code (#PCDATA)>
+<!ELEMENT sup (#PCDATA)>
+<!ELEMENT var (#PCDATA|span)*>
+<!ELEMENT acronym (#PCDATA)>
+<!ATTLIST acronym
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT abbr (#PCDATA)>
+<!ATTLIST abbr
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script type CDATA #IMPLIED>          
Index: tests/level2/core/files/xhtml1-strict.dtd
===================================================================
RCS file: tests/level2/core/files/xhtml1-strict.dtd
diff -N tests/level2/core/files/xhtml1-strict.dtd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level2/core/files/xhtml1-strict.dtd	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,57 @@
+<!--
+
+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.
+
+-->
+
+<!--
+
+This is a radically simplified DTD for use in the DOM Test Suites
+due to a XML non-conformance of one implementation in processing
+parameter entities.  When that non-conformance is resolved,
+this DTD can be replaced by the normal DTD for XHTML.
+
+-->
+
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html xmlns CDATA #IMPLIED>
+<!ELEMENT head (title)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT body (p*)>
+<!ELEMENT p (#PCDATA|em|strong|code|sup|var|acronym|abbr)*>
+<!ATTLIST p 
+  xmlns:dmstc CDATA #IMPLIED
+  xmlns:nm CDATA #IMPLIED
+  xmlns:emp2 CDATA #IMPLIED
+  id ID #IMPLIED  
+>
+<!ELEMENT em (#PCDATA)>
+<!ELEMENT span (#PCDATA)>
+<!ELEMENT strong (#PCDATA)>
+<!ELEMENT code (#PCDATA)>
+<!ELEMENT sup (#PCDATA)>
+<!ELEMENT var (#PCDATA|span)*>
+<!ELEMENT acronym (#PCDATA)>
+<!ATTLIST acronym
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT abbr (#PCDATA)>
+<!ATTLIST abbr
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script type CDATA #IMPLIED>          
Index: tests/level2/events/files/hc_staff.xhtml
===================================================================
RCS file: tests/level2/events/files/hc_staff.xhtml
diff -N tests/level2/events/files/hc_staff.xhtml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level2/events/files/hc_staff.xhtml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,60 @@
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE html
+   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "xhtml1-strict.dtd" [
+   <!ENTITY alpha "&#945;">
+   <!ENTITY beta "&#946;">
+   <!ENTITY gamma "&#947;">
+   <!ENTITY delta "&#948;">
+   <!ENTITY epsilon "&#949;">
+   <!ENTITY alpha "&#950;">
+   <!NOTATION notation1 PUBLIC "notation1File">
+   <!NOTATION notation2 SYSTEM "notation2File">
+   <!ATTLIST address street CDATA "Yes">
+]>
+<!-- This is comment number 1.-->
+<html xmlns='http://www.w3.org/1999/xhtml'><head><title>hc_staff</title></head><body>
+ <p>
+  <em>EMP0001</em>
+  <strong>Margaret Martin</strong>
+  <code>Accountant</code>           
+  <sup>56,000</sup>
+  <var>Female</var>
+  <abbr title="Yes">1230 North Ave. Dallas, Texas 98551</abbr>
+ </p>
+ <p>
+  <em>EMP0002</em>
+  <strong>Martha RaynoldsThis is a CDATASection with EntityReference number 2 &amp;ent2;
+This is an adjacent CDATASection with a reference to a tab &amp;tab;</strong>
+  <code>Secretary</code>
+  <sup>35,000</sup>
+  <var>Female</var>
+  <abbr title="Yes" class="Yes">&beta; Dallas, &gamma;
+ 98554</abbr>
+ </p>
+ <p>
+  <em>EMP0003</em>
+  <strong>Roger
+ Jones</strong>
+  <code>Department Manager</code>
+  <sup>100,000</sup>
+  <var>&delta;</var>
+  <abbr title="Yes" class="No">PO Box 27 Irving, texas 98553</abbr>
+ </p>
+ <p>
+  <em>EMP0004</em>
+  <strong>Jeny Oconnor</strong>
+  <code>Personnel Director</code>
+  <sup>95,000</sup>
+  <var>Female</var>
+  <abbr title="Yes" class="Y&alpha;">27 South Road. Dallas, Texas 98556</abbr>
+ </p>
+ <p>
+  <em>EMP0005</em>
+  <strong>Robert Myers</strong>
+  <code>Computer Specialist</code>
+  <sup>90,000</sup>
+  <var>male</var>
+  <abbr title="Yes">1821 Nordic. Road, Irving Texas 98558</abbr>
+ </p>
+</body></html>
Index: tests/level2/events/files/xhtml1-strict.dtd
===================================================================
RCS file: tests/level2/events/files/xhtml1-strict.dtd
diff -N tests/level2/events/files/xhtml1-strict.dtd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level2/events/files/xhtml1-strict.dtd	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,57 @@
+<!--
+
+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.
+
+-->
+
+<!--
+
+This is a radically simplified DTD for use in the DOM Test Suites
+due to a XML non-conformance of one implementation in processing
+parameter entities.  When that non-conformance is resolved,
+this DTD can be replaced by the normal DTD for XHTML.
+
+-->
+
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html xmlns CDATA #IMPLIED>
+<!ELEMENT head (title)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT body (p*)>
+<!ELEMENT p (#PCDATA|em|strong|code|sup|var|acronym|abbr)*>
+<!ATTLIST p 
+  xmlns:dmstc CDATA #IMPLIED
+  xmlns:nm CDATA #IMPLIED
+  xmlns:emp2 CDATA #IMPLIED
+  id ID #IMPLIED  
+>
+<!ELEMENT em (#PCDATA)>
+<!ELEMENT span (#PCDATA)>
+<!ELEMENT strong (#PCDATA)>
+<!ELEMENT code (#PCDATA)>
+<!ELEMENT sup (#PCDATA)>
+<!ELEMENT var (#PCDATA|span)*>
+<!ELEMENT acronym (#PCDATA)>
+<!ATTLIST acronym
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT abbr (#PCDATA)>
+<!ATTLIST abbr
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script type CDATA #IMPLIED>          
Index: tests/level3/core/files/xhtml1-strict.dtd
===================================================================
RCS file: tests/level3/core/files/xhtml1-strict.dtd
diff -N tests/level3/core/files/xhtml1-strict.dtd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level3/core/files/xhtml1-strict.dtd	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,57 @@
+<!--
+
+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.
+
+-->
+
+<!--
+
+This is a radically simplified DTD for use in the DOM Test Suites
+due to a XML non-conformance of one implementation in processing
+parameter entities.  When that non-conformance is resolved,
+this DTD can be replaced by the normal DTD for XHTML.
+
+-->
+
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html xmlns CDATA #IMPLIED>
+<!ELEMENT head (title)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT body (p*)>
+<!ELEMENT p (#PCDATA|em|strong|code|sup|var|acronym|abbr)*>
+<!ATTLIST p 
+  xmlns:dmstc CDATA #IMPLIED
+  xmlns:nm CDATA #IMPLIED
+  xmlns:emp2 CDATA #IMPLIED
+  id ID #IMPLIED  
+>
+<!ELEMENT em (#PCDATA)>
+<!ELEMENT span (#PCDATA)>
+<!ELEMENT strong (#PCDATA)>
+<!ELEMENT code (#PCDATA)>
+<!ELEMENT sup (#PCDATA)>
+<!ELEMENT var (#PCDATA|span)*>
+<!ELEMENT acronym (#PCDATA)>
+<!ATTLIST acronym
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT abbr (#PCDATA)>
+<!ATTLIST abbr
+    title CDATA #IMPLIED
+    class CDATA #IMPLIED
+    id ID #IMPLIED
+>
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script type CDATA #IMPLIED>