Index: .project
===================================================================
RCS file: .project
diff -N .project
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .project	11 Jun 2003 03:18:31 -0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>DOM-Test-Suite</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
Index: build.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/build.xml,v
retrieving revision 1.94
diff -u -r1.94 build.xml
--- build.xml	21 May 2003 05:00:32 -0000	1.94
+++ build.xml	11 Jun 2003 03:18:33 -0000
@@ -1708,7 +1708,7 @@
 
 <target name="get-dom3-core" depends="dom3-available"><!-- unless="dom3-core-available" -->
 	<!--   download DOM 3 Core spec to specs directory   -->
-	<get src="http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.zip"
+	<get src="http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030609/DOM3-Core.zip"
 		dest="${specs.dir}/DOM3-Core.zip"
 		usetimestamp="yes"/>
 </target>
@@ -1763,21 +1763,10 @@
 
 	<unzip src="${specs.dir}/DOM3-XPath.zip"
 	       dest="${specs.dir}/Level-3/XPath"/>
-	<!--  XML source has unusual ../../whatever paths,
-	        must put in several layers deep to prevent writing out
-			of build tree   -->
-	<unzip src="${specs.dir}/Level-3/XPath/xml-source.zip"
-	       dest="${specs.dir}/Level-3/xml/xpath"/>
-
 
 
 	<unzip src="${specs.dir}/DOM3-Events.zip"
 	       dest="${specs.dir}/Level-3/Events"/>
-	<!--  XML source has unusual ../../whatever paths,
-	        must put in several layers deep to prevent writing out
-			of build tree   -->
-	<unzip src="${specs.dir}/Level-3/Events/xml-source.zip"
-	       dest="${specs.dir}/Level-3/xml/events"/>
 
 
 	<unzip src="${specs.dir}/DOM3-Core.zip"
@@ -1793,21 +1782,6 @@
     <replace file="${specs.dir}/Level-3/Val/xml-source.xml"
         token='http://www.w3.org/2002/08/xmlspec-v22-dom.dtd'
             value='../../pubtext/xmlspec-v22-dom.dtd'/>
-
-
-    <!--   These files are missing   -->
-	<echo file="${specs.dir}/Level-3/xml/status.xml"
-	      message="&lt;?xml version='1.0'  encoding='UTF-8'?&gt;"/>
-
-	<echo file="${specs.dir}/Level-3/xml/toc.xml"
-	      message="&lt;?xml version='1.0'  encoding='UTF-8'?&gt;"/>
-
-	<echo file="${specs.dir}/Level-3/xml/events/definitions/textevent.xml"
-	      message="&lt;?xml version='1.0'  encoding='UTF-8'?&gt;"/>
-
-	<echo file="${specs.dir}/Level-3/xml/events/definitions/mutationnameevent.xml"
-	      message="&lt;?xml version='1.0'  encoding='UTF-8'?&gt;"/>
-
 
 
     <mkdir dir="${specs.dir}/Level-3/Core/java"/>
Index: transforms/dom3-combine.xsl
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/transforms/dom3-combine.xsl,v
retrieving revision 1.7
diff -u -r1.7 dom3-combine.xsl
--- transforms/dom3-combine.xsl	28 Feb 2003 06:26:49 -0000	1.7
+++ transforms/dom3-combine.xsl	11 Jun 2003 03:18:38 -0000
@@ -54,7 +54,9 @@
 All implementation conditions combined into implementationAttribute element
 
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xlink="http://www.w3.org/1999/xlink">
 	<xsl:output method="xml" indent="yes"/>
 	<xsl:variable name="specTitle" select="/spec/header/title"/>
 
@@ -83,10 +85,10 @@
                     skipping it for now
 			<xsl:apply-templates select="document('../xml/views/dom-spec.xml',.)/spec/*"/>
             -->
-			<xsl:apply-templates select="document('../xml/events/dom-spec.xml',.)/spec/*"/>
+			<xsl:apply-templates select="document('../Events/xml-source.xml',.)/spec/*"/>
 			<xsl:apply-templates select="document('../LS/xml-source.xml',.)/spec/*"/>
 			<xsl:apply-templates select="document('../Val/xml-source.xml',.)/spec/*"/>
-			<xsl:apply-templates select="document('../xml/xpath/dom-spec.xml',.)/spec/*"/>
+			<xsl:apply-templates select="document('../XPath/xml-source.xml',.)/spec/*"/>
             <!--  traversal range from DOM 2   -->
 			<xsl:apply-templates select="document('../../Level-2/xml/traversal-range/dom-spec.xml',.)/spec/*"/>