Index: ant/build.xml
===================================================================
RCS file: /cvs/ant/build.xml,v
retrieving revision 1.50
diff -u -r1.50 build.xml
--- ant/build.xml	22 Mar 2002 18:47:13 -0000	1.50
+++ ant/build.xml	13 May 2002 15:10:52 -0000
@@ -38,6 +38,7 @@
           <include name="ant.jar"/>
           <include name="ant-1.*.jar"/>
         </fileset>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
 	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
         <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
       </classpath>
@@ -182,6 +183,7 @@
         <pathelement location="${useful-sources}"/>
       </sourcepath>
       <classpath>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javadoc>
Index: antlr/build.xml
===================================================================
RCS file: /cvs/antlr/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- antlr/build.xml	30 Oct 2001 03:16:07 -0000	1.4
+++ antlr/build.xml	13 May 2002 15:10:52 -0000
@@ -48,7 +48,7 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../java/netbeans/modules/java.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: apisupport/build.xml
===================================================================
RCS file: /cvs/apisupport/build.xml,v
retrieving revision 1.55
diff -u -r1.55 build.xml
--- apisupport/build.xml	11 Feb 2002 12:00:06 -0000	1.55
+++ apisupport/build.xml	13 May 2002 15:10:53 -0000
@@ -37,7 +37,7 @@
         </fileset>
 	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->
         <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
       <exclude name="org/netbeans/modules/apisupport/ant/"/>
       <exclude name="org/netbeans/modules/apisupport/lite/"/>
Index: apisupport/lite/build.xml
===================================================================
RCS file: /cvs/apisupport/lite/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- apisupport/lite/build.xml	14 Jan 2002 08:12:09 -0000	1.12
+++ apisupport/lite/build.xml	13 May 2002 15:10:53 -0000
@@ -36,7 +36,7 @@
         <!-- Included by jarpackager, Jikes seems to want it: -->
         <pathelement location="../../openidex/netbeans/modules/autoload/openidex.jar"/>
 	<pathelement location="../../core/netbeans/lib/core.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
       <include name="org/netbeans/modules/apisupport/lite/"/>
     </javac>
Index: autoupdate/build.xml
===================================================================
RCS file: /cvs/autoupdate/build.xml,v
retrieving revision 1.29
diff -u -r1.29 build.xml
--- autoupdate/build.xml	28 Feb 2002 07:42:35 -0000	1.29
+++ autoupdate/build.xml	13 May 2002 15:10:53 -0000
@@ -27,7 +27,7 @@
   <target name="compile">
     <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -38,7 +38,7 @@
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>        
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
     <!-- Now just this class can refer to core: -->
@@ -49,7 +49,7 @@
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
 	<pathelement location="../core/netbeans/lib/core.jar"/>
       </classpath>
     </javac>
Index: corba/build.xml
===================================================================
RCS file: /cvs/corba/build.xml,v
retrieving revision 1.42
diff -u -r1.42 build.xml
--- corba/build.xml	5 Dec 2001 19:16:31 -0000	1.42
+++ corba/build.xml	13 May 2002 15:10:53 -0000
@@ -63,7 +63,7 @@
 	<!-- Hopefully set up by nbbuild/build.xml: -->
 	<pathelement location="${jdkhome}/lib/tools.jar"/>
 	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
-	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Index: core/build.xml
===================================================================
RCS file: /cvs/core/build.xml,v
retrieving revision 1.50
diff -u -r1.50 build.xml
--- core/build.xml	25 Feb 2002 12:16:28 -0000	1.50
+++ core/build.xml	13 May 2002 15:11:00 -0000
@@ -16,7 +16,7 @@
 
   <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
   <property name="binroot" location="../../nbextra"/>
-  <property name="xmlparser" value="xerces.jar"/>
+  <property name="xml-apis" value="xml-apis.jar"/>
 
   <target name="compile">
     <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">    
@@ -27,7 +27,7 @@
         </fileset>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+        <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
       </classpath>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -38,7 +38,7 @@
         </fileset>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+        <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
         <pathelement location="libsrc"/>
       </classpath>
     </javac>
Index: core/compiler/build.xml
===================================================================
RCS file: /cvs/core/compiler/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- core/compiler/build.xml	24 Apr 2002 14:27:22 -0000	1.5
+++ core/compiler/build.xml	13 May 2002 15:11:00 -0000
@@ -23,7 +23,7 @@
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     <property name="binroot" location="../../../nbextra"/>
-    <property name="xmlparser" value="xerces.jar"/>
+    <property name="xml-apis" value="xml-apis.jar"/>
 
     <target name="compile">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -33,7 +33,7 @@
                     <include name="openide*.jar" />
                 </fileset>
                 <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-                <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+                <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
                 <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
                 <pathelement location="../src"/>
             </classpath>
Index: core/execution/build.xml
===================================================================
RCS file: /cvs/core/execution/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- core/execution/build.xml	19 Feb 2002 12:30:03 -0000	1.3
+++ core/execution/build.xml	13 May 2002 15:11:00 -0000
@@ -23,7 +23,7 @@
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     <property name="binroot" location="../../../nbextra"/>
-    <property name="xmlparser" value="xerces.jar"/>
+    <property name="xml-apis" value="xml-apis.jar"/>
 
     <target name="compile">
     <!--
@@ -34,7 +34,7 @@
                     <include name="openide*.jar" />
                 </fileset>
                 <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-                <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+                <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
                 <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
             </classpath>
         </javac>
Index: core/ide/build.xml
===================================================================
RCS file: /cvs/core/ide/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- core/ide/build.xml	7 May 2002 20:52:18 -0000	1.6
+++ core/ide/build.xml	13 May 2002 15:11:00 -0000
@@ -24,7 +24,7 @@
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     <property name="binroot" location="../../../nbextra"/>
-    <property name="xmlparser" value="xerces.jar"/>
+    <property name="xml-apis" value="xml-apis.jar"/>
 
     <target name="compile">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -35,7 +35,7 @@
                 </fileset>
 				<pathelement location="../netbeans/lib/core.jar"/>
                 <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-                <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+                <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
 <!--                <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/> -->
             </classpath>
         </javac>
Index: core/javahelp/build.xml
===================================================================
RCS file: /cvs/core/javahelp/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- core/javahelp/build.xml	24 Jan 2002 18:02:40 -0000	1.3
+++ core/javahelp/build.xml	13 May 2002 15:11:00 -0000
@@ -23,7 +23,7 @@
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     <property name="binroot" location="../../../nbextra"/>
-    <property name="xmlparser" value="xerces.jar"/>
+    <property name="xml-apis" value="xml-apis.jar"/>
 
     <target name="compile">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -33,7 +33,7 @@
                     <include name="openide*.jar" />
                 </fileset>
                 <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-                <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+                <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
                 <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
             </classpath>
         </javac>
Index: core/naming/build.xml
===================================================================
RCS file: /cvs/core/naming/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- core/naming/build.xml	6 Mar 2002 15:17:00 -0000	1.1
+++ core/naming/build.xml	13 May 2002 15:11:00 -0000
@@ -23,7 +23,6 @@
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     <property name="binroot" location="../../../nbextra"/>
-    <property name="xmlparser" value="xerces.jar"/>
 
     <target name="compile">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Index: core/ui/build.xml
===================================================================
RCS file: /cvs/core/ui/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- core/ui/build.xml	3 May 2002 14:42:47 -0000	1.5
+++ core/ui/build.xml	13 May 2002 15:11:01 -0000
@@ -23,7 +23,7 @@
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     <property name="binroot" location="../../../nbextra"/>
-    <property name="xmlparser" value="xerces.jar"/>
+    <property name="xml-apis" value="xml-apis.jar"/>
 
     <target name="compile">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -35,7 +35,7 @@
                 </fileset>
 				<!--
                 <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-                <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+                <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
                 <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
 				-->
             </classpath>
Index: core/windows/build.xml
===================================================================
RCS file: /cvs/core/windows/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- core/windows/build.xml	19 Feb 2002 12:30:04 -0000	1.3
+++ core/windows/build.xml	13 May 2002 15:11:01 -0000
@@ -23,7 +23,7 @@
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     <property name="binroot" location="../../../nbextra"/>
-    <property name="xmlparser" value="xerces.jar"/>
+    <property name="xml-apis" value="xml-apis.jar"/>
 
     <target name="compile">
     <!--
@@ -34,7 +34,7 @@
                     <include name="openide*.jar" />
                 </fileset>
                 <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-                <pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>
+                <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
                 <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
             </classpath>
         </javac>
Index: cpplite/build.xml
===================================================================
RCS file: /cvs/cpplite/build.xml,v
retrieving revision 1.28
diff -u -r1.28 build.xml
--- cpplite/build.xml	23 Jan 2002 20:59:22 -0000	1.28
+++ cpplite/build.xml	13 May 2002 15:11:09 -0000
@@ -80,7 +80,7 @@
           <include name="openide*.jar" />
         </fileset>
 
-	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar" />
+	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar" />
       </classpath>
     </javac>
   </target>
@@ -98,7 +98,7 @@
           <include name="openide*.jar" />
         </fileset>
 	
-	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar" />
+	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar" />
       </classpath>
     </javac>
   </target>
Index: editor/build.xml
===================================================================
RCS file: /cvs/editor/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- editor/build.xml	17 Dec 2001 13:33:43 -0000	1.25
+++ editor/build.xml	13 May 2002 15:11:10 -0000
@@ -38,7 +38,7 @@
           <include name="openide*.jar" />
         </fileset>
        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
-       <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+       <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: form/build.xml
===================================================================
RCS file: /cvs/form/build.xml,v
retrieving revision 1.33
diff -u -r1.33 build.xml
--- form/build.xml	8 Apr 2002 16:15:17 -0000	1.33
+++ form/build.xml	13 May 2002 15:11:20 -0000
@@ -36,7 +36,7 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../java/netbeans/modules/java.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="tmp"/>
       </classpath>
     </javac>
Index: i18n/build.xml
===================================================================
RCS file: /cvs/i18n/build.xml,v
retrieving revision 1.33
diff -u -r1.33 build.xml
--- i18n/build.xml	29 Jan 2002 14:38:16 -0000	1.33
+++ i18n/build.xml	13 May 2002 15:11:21 -0000
@@ -35,7 +35,7 @@
         <pathelement location="../core/netbeans/lib/core.jar"/>
         <pathelement location="../properties/netbeans/modules/properties.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
      </classpath>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -48,7 +48,7 @@
         <pathelement location="../properties/netbeans/modules/properties.jar"/>
         <pathelement location="../form/netbeans/modules/form.jar"/>
         <pathelement location="../java/netbeans/modules/java.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
 
Index: java/build.xml
===================================================================
RCS file: /cvs/java/build.xml,v
retrieving revision 1.33
diff -u -r1.33 build.xml
--- java/build.xml	13 May 2002 11:32:55 -0000	1.33
+++ java/build.xml	13 May 2002 15:11:30 -0000
@@ -51,7 +51,7 @@
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
         <pathelement location="${binroot}/java/release/modules/ext/javac.jar"/>
         <pathelement location="${binroot}/java/release/modules/ext/java-gj.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>      
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <!-- Hopefully set up by nbbuild/build.xml: -->
         <pathelement location="${jdkhome}/lib/tools.jar"/>
 	<!-- JavaMake build tool -->
Index: javacvs/build.xml
===================================================================
RCS file: /cvs/javacvs/build.xml,v
retrieving revision 1.23
diff -u -r1.23 build.xml
--- javacvs/build.xml	6 Mar 2002 22:01:03 -0000	1.23
+++ javacvs/build.xml	13 May 2002 15:11:30 -0000
@@ -38,7 +38,7 @@
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar"/>
         </fileset>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
       
Index: javadoc/build.xml
===================================================================
RCS file: /cvs/javadoc/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- javadoc/build.xml	27 Mar 2002 10:50:07 -0000	1.25
+++ javadoc/build.xml	13 May 2002 15:11:30 -0000
@@ -49,7 +49,7 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../java/netbeans/modules/java.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>      
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: lexer/libsrc/org/netbeans/modules/lexer/javacc/javaccLangBuild.xml
===================================================================
RCS file: /cvs/lexer/libsrc/org/netbeans/modules/lexer/javacc/javaccLangBuild.xml,v
retrieving revision 1.1
diff -u -r1.1 javaccLangBuild.xml
--- lexer/libsrc/org/netbeans/modules/lexer/javacc/javaccLangBuild.xml	3 Apr 2002 15:43:01 -0000	1.1
+++ lexer/libsrc/org/netbeans/modules/lexer/javacc/javaccLangBuild.xml	13 May 2002 15:11:39 -0000
@@ -26,7 +26,7 @@
 
     <property name="binroot" location="${lexer.module.root}/../../nbextra"/>
     <property name="javacchome" location="${binroot}/lexer/compiletime"/>
-    <property name="xmlparser" location="${binroot}/core/release/lib/ext/xerces.jar"/>
+    <property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
     <property name="build.compiler.debug" value="on"/>
 
     <property name="lexer.name" value="${g.name}Lexer"/>
@@ -119,7 +119,7 @@
              <arg value="${lexer.class}"/>
              <arg value="${constants.class}"/>
              <classpath>
-               <pathelement location="${xmlparser}"/>
+               <pathelement location="${xml-apis}"/>
                <pathelement location="${lexer.module.root}/libsrc"/>
                <pathelement location="${g.root}"/>
              </classpath>
@@ -136,7 +136,7 @@
                deprecation="${build.compiler.deprecation}"
                debug="${build.compiler.debug}">
           <classpath>
-               <pathelement location="${xmlparser}"/>
+               <pathelement location="${xml-apis}"/>
                <pathelement location="${lexer.module.root}/libsrc"/>
                <pathelement location="${g.root}"/>
           </classpath>
Index: mdr/build.xml
===================================================================
RCS file: /cvs/mdr/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- mdr/build.xml	29 Apr 2002 11:27:17 -0000	1.5
+++ mdr/build.xml	13 May 2002 15:11:40 -0000
@@ -38,7 +38,7 @@
     <fileset dir="${nbroot}/openide/netbeans/lib">
        <include name="openide*.jar"/>
     </fileset>        
-    <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+    <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
     <pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>
     <pathelement location="jmi/"/>
     <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
@@ -52,7 +52,7 @@
     <fileset dir="${nbroot}/openide/netbeans/lib">
        <include name="openide*.jar"/>
     </fileset>        
-    <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+    <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
     <pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>
     <pathelement location="jmi/"/>
     <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
Index: mdr/samples/xml/build.xml
===================================================================
RCS file: /cvs/mdr/samples/xml/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- mdr/samples/xml/build.xml	24 Apr 2002 17:45:40 -0000	1.3
+++ mdr/samples/xml/build.xml	13 May 2002 15:11:40 -0000
@@ -32,7 +32,7 @@
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
-	<pathelement location="../../../core/netbeans/lib/ext/xerces.jar"/>
+	<pathelement location="../../../core/netbeans/lib/ext/xml-apis.jar"/>
 	<pathelement location="../../../openide/openide-13javac-workaround.jar"/>
         <pathelement location="../../../openidex/netbeans/modules/autoload/openidex.jar"/>
 	<pathelement location="../../../openidex/looks/netbeans/modules/autoload/looks.jar"/>
Index: monitor/build.xml
===================================================================
RCS file: /cvs/monitor/build.xml,v
retrieving revision 1.19
diff -u -r1.19 build.xml
--- monitor/build.xml	23 Apr 2002 00:08:16 -0000	1.19
+++ monitor/build.xml	13 May 2002 15:11:40 -0000
@@ -130,7 +130,7 @@
          <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
          <pathelement location="${nb_root}/httpserver/netbeans/modules/httpserver.jar"/>
          <pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>
-         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+         <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
          <pathelement location="${servlet22}"/>
        </classpath>
      </javac>
@@ -144,7 +144,7 @@
        excludes="**/SCCS/**, **/CVS/**">
 
        <classpath>
-         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+         <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
          <pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>
          <pathelement location="${servlet23}"/>	
        </classpath>
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.198
diff -u -r1.198 build.xml
--- nbbuild/build.xml	29 Apr 2002 13:45:35 -0000	1.198
+++ nbbuild/build.xml	13 May 2002 15:11:52 -0000
@@ -42,6 +42,7 @@
         <pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/dom.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/> <!-- XML serializer -->
         <pathelement location="${binroot}/nbbuild/lib/jhall.jar"/>
         <pathelement location="${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>
@@ -1103,6 +1104,7 @@
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
         <!-- For running inside IDE, to pick up ant.jar -->
         <pathelement location="${binroot}/nbbuild/lib/ant.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
         <pathelement location="${binroot}/nbbuild/lib/jhall.jar"/>
       </classpath>
Index: openide/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
retrieving revision 1.89
diff -u -r1.89 build.xml
--- openide/build.xml	22 Apr 2002 10:38:30 -0000	1.89
+++ openide/build.xml	13 May 2002 15:11:53 -0000
@@ -45,7 +45,7 @@
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>        
 	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
 <!--    <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
     <!-- Hack. Deprecated class. -->
@@ -75,7 +75,7 @@
       <classpath>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>        
 	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
 -->      
     </javac>
@@ -96,7 +96,7 @@
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
 <!--    <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
     <postprocess file="compatkit-work/org/openide/util/actions/SystemAction.class"
@@ -510,7 +510,7 @@
         <pathelement location="src"/>
       </sourcepath>
       <classpath>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
       </classpath>
       <link href="${jdk-docs-location}"
@@ -818,18 +818,19 @@
     <delete dir="examplemodulereload"/>
   </target>
 
-    <target  name="standalone-fs" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary + xerces.jar for using standalone filesystems.">
+    <target  name="standalone-fs" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary + xml-apis.jar and xerces.jarjar for using standalone filesystems.">
         <zip compress="true" zipfile="standalone/nbfilesystems.zip">
             <fileset dir="standalone">
                 <include name="openide-fs.jar"/>
                 <include name="openide-util.jar"/>
                 <include name="README-FS.txt"/>
             </fileset>
-            <fileset dir="${binroot}/core/release/lib/ext" includes="xerces.jar"/>                      
+            <fileset dir="${binroot}/core/release/lib/ext" includes="xml-apis.jar"/>
+            <fileset dir="${binroot}/core/release/lib/ext" includes="xerces.jar"/>
         </zip>
     </target>
 
-    <target  name="standalone-fs-light" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary for using standalone filesystems. Without xerces.jar.">
+    <target  name="standalone-fs-light" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary for using standalone filesystems. Without xml-apis.jar and xerces.jar.">
         <zip compress="true" zipfile="standalone/nbfilesystems-light.zip">
             <fileset dir="standalone">
                 <include name="openide-fs.jar"/>
Index: openidex/build.xml
===================================================================
RCS file: /cvs/openidex/build.xml,v
retrieving revision 1.24
diff -u -r1.24 build.xml
--- openidex/build.xml	9 Oct 2001 08:56:32 -0000	1.24
+++ openidex/build.xml	13 May 2002 15:12:04 -0000
@@ -33,7 +33,7 @@
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: openidex/looks/build.xml
===================================================================
RCS file: /cvs/openidex/looks/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- openidex/looks/build.xml	15 Feb 2002 04:45:20 -0000	1.4
+++ openidex/looks/build.xml	13 May 2002 15:12:04 -0000
@@ -33,7 +33,7 @@
         <fileset dir="../../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: projects/build.xml
===================================================================
RCS file: /cvs/projects/build.xml,v
retrieving revision 1.24
diff -u -r1.24 build.xml
--- projects/build.xml	7 May 2002 20:35:44 -0000	1.24
+++ projects/build.xml	13 May 2002 15:12:05 -0000
@@ -35,7 +35,7 @@
 	      <pathelement location="../core/netbeans/lib/core.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
 <!--    <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/>-->
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: tomcatint/tomcat32/build.xml
===================================================================
RCS file: /cvs/tomcatint/tomcat32/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- tomcatint/tomcat32/build.xml	10 Jan 2002 14:38:20 -0000	1.6
+++ tomcatint/tomcat32/build.xml	13 May 2002 15:12:17 -0000
@@ -39,7 +39,7 @@
         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
         <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <fileset dir="${nb_root}/openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
Index: tomcatint/tomcat40/build.xml
===================================================================
RCS file: /cvs/tomcatint/tomcat40/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- tomcatint/tomcat40/build.xml	10 May 2002 11:25:51 -0000	1.25
+++ tomcatint/tomcat40/build.xml	13 May 2002 15:12:17 -0000
@@ -46,7 +46,7 @@
      <java classname="org.netbeans.modules.schema2beans.GenBeans" fork="yes">	
      	<classpath>
 	  <pathelement path="${binroot}/core/release/lib/ext/crimson.jar" />
-          <pathelement path="${binroot}/core/release/lib/ext/xerces.jar" />
+          <pathelement path="${binroot}/core/release/lib/ext/xml-apis.jar" />
 	  <pathelement path="${nb_root}/logger/netbeans/lib/ext/logger.jar" />
 	  <pathelement path="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar" />
 	  <fileset dir = "${nb_root}/openide">
@@ -75,7 +75,7 @@
         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
         <pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <fileset dir="${nb_root}/openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
@@ -88,7 +88,7 @@
         <pathelement location="${binroot}/web/servletapi23/release/modules/ext/servlet-2.3.jar"/>
         <pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-compiler.jar"/>
         <pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-runtime.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Index: translatedfiles/build.xml
===================================================================
RCS file: /cvs/translatedfiles/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- translatedfiles/build.xml	11 May 2002 21:29:44 -0000	1.2
+++ translatedfiles/build.xml	13 May 2002 15:12:17 -0000
@@ -18,7 +18,6 @@
 
   <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar" name="locjar"/>
   <property location="../../nbextra" name="binroot"/>
-  <property name="xmlparser" value="xerces.jar"/>
 
   <target name="clean">
     <delete dir="netbeans"/>
Index: utilities/build.xml
===================================================================
RCS file: /cvs/utilities/build.xml,v
retrieving revision 1.26
diff -u -r1.26 build.xml
--- utilities/build.xml	11 Jan 2002 16:24:14 -0000	1.26
+++ utilities/build.xml	13 May 2002 15:12:36 -0000
@@ -34,7 +34,7 @@
         </fileset>
         <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: vcscore/build.xml
===================================================================
RCS file: /cvs/vcscore/build.xml,v
retrieving revision 1.26
diff -u -r1.26 build.xml
--- vcscore/build.xml	18 Apr 2002 09:33:17 -0000	1.26
+++ vcscore/build.xml	13 May 2002 15:12:37 -0000
@@ -37,7 +37,7 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
   </target>
Index: vcsgeneric/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/build.xml,v
retrieving revision 1.46
diff -u -r1.46 build.xml
--- vcsgeneric/build.xml	29 Apr 2002 18:54:32 -0000	1.46
+++ vcsgeneric/build.xml	13 May 2002 15:12:37 -0000
@@ -49,7 +49,7 @@
 	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
 	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
         <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
       </classpath>
     </javac>
     <!-- <ant dir="profiles/pvcs" inheritAll="false" target="compile"/> -->
Index: vcsgeneric/profiles/clearcase/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/profiles/clearcase/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- vcsgeneric/profiles/clearcase/build.xml	11 Mar 2002 19:22:00 -0000	1.2
+++ vcsgeneric/profiles/clearcase/build.xml	13 May 2002 15:12:37 -0000
@@ -46,7 +46,7 @@
 	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>
 	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
 	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
       </classpath>
     </javac>
Index: vcsgeneric/profiles/cvsprofiles/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/profiles/cvsprofiles/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- vcsgeneric/profiles/cvsprofiles/build.xml	12 Apr 2002 15:19:05 -0000	1.4
+++ vcsgeneric/profiles/cvsprofiles/build.xml	13 May 2002 15:12:37 -0000
@@ -47,7 +47,7 @@
 	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
 	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
         <pathelement location="${nbroot1}/diff/netbeans/modules/diff.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
       </classpath>
     </javac>
Index: vcsgeneric/profiles/pvcs/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/profiles/pvcs/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- vcsgeneric/profiles/pvcs/build.xml	11 Mar 2002 19:22:00 -0000	1.4
+++ vcsgeneric/profiles/pvcs/build.xml	13 May 2002 15:12:37 -0000
@@ -46,7 +46,7 @@
 	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>
 	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
 	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
       </classpath>
     </javac>
Index: vcsgeneric/profiles/vss/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/profiles/vss/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- vcsgeneric/profiles/vss/build.xml	11 Mar 2002 19:22:00 -0000	1.3
+++ vcsgeneric/profiles/vss/build.xml	13 May 2002 15:12:37 -0000
@@ -46,7 +46,7 @@
 	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>
 	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
 	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
       </classpath>
     </javac>
Index: web/advanced/build.xml
===================================================================
RCS file: /cvs/web/advanced/build.xml,v
retrieving revision 1.7
diff -u -r1.7 build.xml
--- web/advanced/build.xml	24 Apr 2002 09:06:59 -0000	1.7
+++ web/advanced/build.xml	13 May 2002 15:12:38 -0000
@@ -67,7 +67,7 @@
          <pathelement location="${nb_root}/web/jspsyntax/netbeans/modules/eager/jsp-syntax.jar"/>
          <pathelement location="extra/servlet-2.3-filters-api.jar"/>
          <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
-         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+         <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
          <fileset dir="${nb_root}/openide">
            <include name="netbeans/lib/openide*.jar"/>
          </fileset>
Index: web/core/build.xml
===================================================================
RCS file: /cvs/web/core/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- web/core/build.xml	24 Apr 2002 09:07:23 -0000	1.5
+++ web/core/build.xml	13 May 2002 15:12:38 -0000
@@ -61,7 +61,7 @@
      <java classname="org.netbeans.modules.schema2beans.GenBeans" fork="yes">
      	<classpath>
 	  <pathelement path="${binroot}/core/release/lib/ext/crimson.jar" />
-          <pathelement path="${binroot}/core/release/lib/ext/xerces.jar" />
+          <pathelement path="${binroot}/core/release/lib/ext/xml-apis.jar" />
 	  <pathelement path="${nb_root}/logger/netbeans/lib/ext/logger.jar" />
 	  <pathelement path="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar" />
 	  <fileset dir = "${nb_root}/openide">
@@ -80,7 +80,7 @@
       <classpath>
         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
         <pathelement location="${nb_root}/html/netbeans/modules/html.jar"/>
         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
Index: web/jspparser/build.xml
===================================================================
RCS file: /cvs/web/jspparser/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- web/jspparser/build.xml	10 Jan 2002 14:38:18 -0000	1.2
+++ web/jspparser/build.xml	13 May 2002 15:12:46 -0000
@@ -37,7 +37,7 @@
       <classpath>
         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
         <pathelement location="${core_root}/src/"/>
         <pathelement location="${binroot}/web/servletapi23/release/modules/ext/servlet-2.3.jar"/>
         <pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-runtime.jar"/>
Index: web/taglibed/build.xml
===================================================================
RCS file: /cvs/web/taglibed/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- web/taglibed/build.xml	23 Apr 2002 11:26:36 -0000	1.12
+++ web/taglibed/build.xml	13 May 2002 15:12:47 -0000
@@ -117,7 +117,7 @@
          <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
          <pathelement location="${nb_root}/httpserver/servletapi/netbeans/modules/ext/servlet-2.2.jar"/>
          <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
-         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+         <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
 	 <pathelement location="${f4jroot}/core/release/lib/ext/parser.jar"/>
          <fileset dir="${nb_root}/openide">
            <include name="netbeans/lib/openide*.jar"/>
Index: xml/spec-vers.properties
===================================================================
RCS file: /cvs/xml/spec-vers.properties,v
retrieving revision 1.8
diff -u -r1.8 spec-vers.properties
--- xml/spec-vers.properties	6 May 2002 07:28:18 -0000	1.8
+++ xml/spec-vers.properties	13 May 2002 15:12:47 -0000
@@ -14,6 +14,18 @@
 # Must always be numeric (numbers separated by '.', e.g. 1.11.3).
 # See http://openide.netbeans.org/versioning-policy.html for more.
 
+
+## libs
+
+# JAXP
+libs.jaxp.specification.version=1.1
+libs.jaxp.implementation.version=1.1.2
+
+# Apache Xalan
+libs.xalan.specification.version=${libs.jaxp.specification.version}
+libs.xalan.implementation.version=2.3.1
+
+
 # common module spec.version
 xml.common=0.6
 
@@ -28,14 +40,6 @@
 
 # XML Core
 xml.core.specification.version=${xml.common}
-
-# JAXP
-xml.jaxp.specification.version=1.1
-xml.jaxp.implementation.version=1.1.2
-
-# Apache Xalan
-xml.xalan.specification.version=${xml.jaxp.specification.version}
-xml.xalan.implementation.version=2.3.1
 
 # CSS Support
 xml.css.specification.version=${xml.common}
Index: xml/api/build.xml
===================================================================
RCS file: /cvs/xml/api/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- xml/api/build.xml	6 May 2002 07:28:18 -0000	1.9
+++ xml/api/build.xml	13 May 2002 15:12:47 -0000
@@ -20,7 +20,7 @@
     <property name="binroot" location="${nbroot}/../nbextra"/>
     <property name="nbext_root" location="${nbroot}/nbbuild"/>
 
-    <property name="parserimpl" location="${binroot}/core/release/lib/ext/xerces.jar" />
+    <property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar" />
 
     <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
     <property name="homepage.base" value="xml.netbeans.org"/>
@@ -28,7 +28,6 @@
     <property name="storepass" value="?"/>
     <property name="nbm_alias" value="nb_ide"/>
     <property name="release" value="dev"/>
-    <property name="jaxp-transform" value="${binroot}/xml/libs/xalan/release/modules/autoload/ext/jaxp-transform-1.1.2.jar"/>
     <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
     <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
     <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
@@ -55,8 +54,7 @@
                 <fileset dir="${nbroot}/openide/netbeans/lib">
                     <include name="openide*.jar"/>
                 </fileset>
-                <pathelement location="${parserimpl}"/> <!-- JAXP and SAX dependency -->
-                <pathelement location="${jaxp-transform}"/>
+                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
             </classpath>
         </javac>
     </target>
@@ -142,8 +140,7 @@
                 <fileset dir="${nbroot}/openide/netbeans/lib">
                     <include name="openide*.jar"/>
                 </fileset>
-                <pathelement location="${parserimpl}"/> <!-- JAXP and SAX dependency -->
-                <pathelement location="${jaxp-transform}"/>
+                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
             </classpath>                       
             
           <link href="${jdk-docs-location}"
Index: xml/catalog/build.xml
===================================================================
RCS file: /cvs/xml/catalog/build.xml,v
retrieving revision 1.28
diff -u -r1.28 build.xml
--- xml/catalog/build.xml	6 May 2002 07:28:21 -0000	1.28
+++ xml/catalog/build.xml	13 May 2002 15:12:47 -0000
@@ -64,7 +64,7 @@
                 </fileset>
                 <pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>
                 <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/> <!-- actually needed by dead code -->
-                <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/> <!-- is covered by above -->
+                <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/> <!-- is covered by above -->
                 <pathelement location="${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>
                 <pathelement location="${core_root}/src/"/>
                 <pathelement location="${api_root}/src/"/>
Index: xml/libs/jaxp/build.xml
===================================================================
RCS file: /cvs/xml/libs/jaxp/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- xml/libs/jaxp/build.xml	29 Apr 2002 13:45:44 -0000	1.1
+++ xml/libs/jaxp/build.xml	13 May 2002 15:12:52 -0000
@@ -12,17 +12,17 @@
 Microsystems, Inc. All Rights Reserved.
 -->
 
-<project name="xml/libs/jaxp" default="netbeans" basedir=".">
+<project name="libs/jaxp" default="netbeans" basedir=".">
 
-    <property name="xml_root" location="../.."/>
+    <property name="libs_root" location="../.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
+    <property name="nbroot" location="${libs_root}/.."/>
     <property name="binroot" location="${nbroot}/../nbextra"/>
     <property name="nbext_root" location="${nbroot}/nbbuild"/>
 
     <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="xml.netbeans.org"/>
-    <property name="dist.base" value="http://www.netbeans.org/download/nbms/40/xml"/>
+    <property name="homepage.base" value="libs.netbeans.org"/>
+    <property name="dist.base" value="http://www.netbeans.org/download/nbms/"/>
     <property name="storepass" value="?"/>
     <property name="nbm_alias" value="nb_ide"/>
     <property name="release" value="dev"/>
@@ -39,9 +39,9 @@
         <property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>
         <echo message="buildnumber = ${buildnumber}"/>
 
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter token="JAXP_SPEC_VERS_SUBST" value="${xml.jaxp.specification.version}"/>
-        <filter token="JAXP_IMPL_VERS_SUBST" value="${xml.jaxp.implementation.version}"/>
+        <property file="${libs_root}/spec-vers.properties"/>
+        <filter token="JAXP_SPEC_VERS_SUBST" value="${libs.jaxp.specification.version}"/>
+        <filter token="JAXP_IMPL_VERS_SUBST" value="${libs.jaxp.implementation.version}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     </target>
 
@@ -67,7 +67,7 @@
     </target>
 
     <target name="netbeans" depends="jars,release">
-        <copy todir="${xml_root}/netbeans">
+        <copy todir="${libs_root}/netbeans">
             <fileset dir="netbeans"/>
         </copy>
         <genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>
@@ -75,10 +75,10 @@
 
     <target name="nbm" depends="netbeans">
         <delete dir="Info"/>
-        <makenbm file="${xml_root}/jaxp-${release}.nbm"
+        <makenbm file="${libs_root}/jaxp-${release}.nbm"
                  topdir="."
                  module="netbeans/modules/autoload/jaxp.jar"
-                 homepage="http://${homepage.base}/libs/jaxp/"
+                 homepage="http://${homepage.base}/jaxp/"
                  distribution="${dist.base}/jaxp-${release}.nbm">
             <license file="${license.file}"/>
             <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
@@ -92,7 +92,7 @@
             </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="${xml_root}/jaxp-${release}.nbm"/>
+        <delete file="${libs_root}/jaxp-${release}.nbm"/>
         <delete dir="netbeans"/>
         <delete dir="Info"/>
     </target>
Index: xml/libs/jaxp/manifest.mf
===================================================================
RCS file: /cvs/xml/libs/jaxp/manifest.mf,v
retrieving revision 1.1
diff -u -r1.1 manifest.mf
--- xml/libs/jaxp/manifest.mf	29 Apr 2002 13:45:45 -0000	1.1
+++ xml/libs/jaxp/manifest.mf	13 May 2002 15:12:52 -0000
@@ -3,4 +3,4 @@
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
 OpenIDE-Module-Specification-Version: @JAXP_SPEC_VERS_SUBST@
 OpenIDE-Module-Implementation-Version: @JAXP_IMPL_VERS_SUBST@
-OpenIDE-Module-Module-Dependencies: org.netbeans.libs.xalan/1
+OpenIDE-Module-Requires: javax.xml.transform.TransformerFactory
Index: xml/libs/jaxp/src/org/netbeans/libs/jaxp/Bundle.properties
===================================================================
RCS file: /cvs/xml/libs/jaxp/src/org/netbeans/libs/jaxp/Bundle.properties,v
retrieving revision 1.1
diff -u -r1.1 Bundle.properties
--- xml/libs/jaxp/src/org/netbeans/libs/jaxp/Bundle.properties	29 Apr 2002 13:45:45 -0000	1.1
+++ xml/libs/jaxp/src/org/netbeans/libs/jaxp/Bundle.properties	13 May 2002 15:12:52 -0000
@@ -11,6 +11,6 @@
 
 ## xml/core/jaxp/manifest.mf
 OpenIDE-Module-Name=Full JAXP API
-OpenIDE-Module-Display-Category=XML
+OpenIDE-Module-Display-Category=Libraries
 OpenIDE-Module-Short-Description=The module ensure full JAXP 1.1 implementation will be available.
 OpenIDE-Module-Long-Description=The module ensure full JAXP 1.1 implementation will be available. Extends NetBeans JAXP/parsers support and JAXP/transform is accessible.
Index: xml/libs/xalan/build.xml
===================================================================
RCS file: /cvs/xml/libs/xalan/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- xml/libs/xalan/build.xml	29 Apr 2002 13:45:46 -0000	1.1
+++ xml/libs/xalan/build.xml	13 May 2002 15:12:52 -0000
@@ -12,17 +12,17 @@
 Microsystems, Inc. All Rights Reserved.
 -->
 
-<project name="xml/libs/xalan" default="netbeans" basedir=".">
+<project name="libs/xalan" default="netbeans" basedir=".">
 
-    <property name="xml_root" location="../.."/>
+    <property name="libs_root" location="../.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
+    <property name="nbroot" location="${libs_root}/.."/>
     <property name="binroot" location="${nbroot}/../nbextra"/>
     <property name="nbext_root" location="${nbroot}/nbbuild"/>
 
     <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="xml.netbeans.org"/>
-    <property name="dist.base" value="http://www.netbeans.org/download/nbms/40/xml"/>
+    <property name="homepage.base" value="libs.netbeans.org"/>
+    <property name="dist.base" value="http://www.netbeans.org/download/nbms/"/>
     <property name="storepass" value="?"/>
     <property name="nbm_alias" value="nb_ide"/>
     <property name="release" value="dev"/>
@@ -39,9 +39,9 @@
         <property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>
         <echo message="buildnumber = ${buildnumber}"/>
 
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter token="XALAN_SPEC_VERS_SUBST" value="${xml.xalan.specification.version}"/>
-        <filter token="XALAN_IMPL_VERS_SUBST" value="${xml.xalan.implementation.version}"/>
+        <property file="${libs_root}/spec-vers.properties"/>
+        <filter token="XALAN_SPEC_VERS_SUBST" value="${libs.xalan.specification.version}"/>
+        <filter token="XALAN_IMPL_VERS_SUBST" value="${libs.xalan.implementation.version}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     </target>
 
@@ -65,12 +65,12 @@
 
     <target name="release">
         <copy todir="netbeans">
-            <fileset dir="${binroot}/xml/libs/xalan/release"/>
+            <fileset dir="${binroot}/libs/xalan/release"/>
         </copy>
     </target>
 
     <target name="netbeans" depends="jars,release">
-        <copy todir="${xml_root}/netbeans">
+        <copy todir="${libs_root}/netbeans">
             <fileset dir="netbeans"/>
         </copy>
         <genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>
@@ -78,10 +78,10 @@
 
     <target name="nbm" depends="netbeans">
         <delete dir="Info"/>
-        <makenbm file="${xml_root}/xalan-${release}.nbm"
+        <makenbm file="${libs_root}/xalan-${release}.nbm"
                  topdir="."
                  module="netbeans/modules/autoload/xalan.jar"
-                 homepage="http://${homepage.base}/libs/xalan/"
+                 homepage="http://${homepage.base}/xalan/"
                  distribution="${dist.base}/xalan-${release}.nbm">
             <license file="${license.file}"/>
             <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
@@ -95,7 +95,7 @@
             </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="${xml_root}/xalan-${release}.nbm"/>
+        <delete file="${libs_root}/xalan-${release}.nbm"/>
         <delete dir="netbeans"/>
         <delete dir="Info"/>
     </target>
Index: xml/libs/xalan/manifest.mf
===================================================================
RCS file: /cvs/xml/libs/xalan/manifest.mf,v
retrieving revision 1.1
diff -u -r1.1 manifest.mf
--- xml/libs/xalan/manifest.mf	29 Apr 2002 13:45:47 -0000	1.1
+++ xml/libs/xalan/manifest.mf	13 May 2002 15:12:52 -0000
@@ -3,4 +3,5 @@
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
 OpenIDE-Module-Specification-Version: @XALAN_SPEC_VERS_SUBST@
 OpenIDE-Module-Implementation-Version: @XALAN_IMPL_VERS_SUBST@
-Class-Path: ext/jaxp-transform-1.1.2.jar ext/xalan-2.3.1.jar
+OpenIDE-Module-Provides: javax.xml.transform.TransformerFactory
+Class-Path: ext/xalan-2.3.1.jar
Index: xml/libs/xalan/src/org/netbeans/libs/xalan/Bundle.properties
===================================================================
RCS file: /cvs/xml/libs/xalan/src/org/netbeans/libs/xalan/Bundle.properties,v
retrieving revision 1.1
diff -u -r1.1 Bundle.properties
--- xml/libs/xalan/src/org/netbeans/libs/xalan/Bundle.properties	29 Apr 2002 13:45:48 -0000	1.1
+++ xml/libs/xalan/src/org/netbeans/libs/xalan/Bundle.properties	13 May 2002 15:12:52 -0000
@@ -11,6 +11,6 @@
 
 ## xml/core/xalan/manifest.mf
 OpenIDE-Module-Name=Xalan Integration
-OpenIDE-Module-Display-Category=XML
+OpenIDE-Module-Display-Category=Libraries
 OpenIDE-Module-Short-Description=The module bundles Apache Xalan 2.3.1 (XSLT stylesheet processor).
 OpenIDE-Module-Long-Description=The module bundles Apache Xalan 2.3.1 (XSLT stylesheet processor), i.e. JAXP/transform 1.1 API implementation.
Index: xml/text-edit/build.xml
===================================================================
RCS file: /cvs/xml/text-edit/build.xml,v
retrieving revision 1.31
diff -u -r1.31 build.xml
--- xml/text-edit/build.xml	6 May 2002 07:28:41 -0000	1.31
+++ xml/text-edit/build.xml	13 May 2002 15:12:52 -0000
@@ -69,7 +69,7 @@
                 <pathelement location="${nbroot}/editor/netbeans/modules/editor.jar"/>
         	<pathelement location="${binroot}/core/release/lib/ext/dom.jar"/>
         	<pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>
-        	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>  <!-- same as above -->
+        	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>  <!-- same as above -->
                 <pathelement location="${tax_lib_root}/src/"/>
                 <pathelement location="${core_root}/src/"/>
                 <pathelement location="${api_root}/src/"/>
Index: xml/tools/build.xml
===================================================================
RCS file: /cvs/xml/tools/build.xml,v
retrieving revision 1.33
diff -u -r1.33 build.xml
--- xml/tools/build.xml	6 May 2002 07:28:43 -0000	1.33
+++ xml/tools/build.xml	13 May 2002 15:12:52 -0000
@@ -24,8 +24,7 @@
     <property name="binroot" location="${nbroot}/../nbextra"/>
     <property name="nbext_root" location="${nbroot}/nbbuild"/>
 
-    <property name="parserimpl" value="${binroot}/xml/tax/release/modules/ext/xerces2.jar"/> <!-- parser implementation used internally by module -->
-    <property name="jaxp-transform" value="${binroot}/xml/libs/xalan/release/modules/autoload/ext/jaxp-transform-1.1.2.jar"/>
+    <property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar" />
 
     <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
     <property name="homepage.base" value="xml.netbeans.org"/>
@@ -52,7 +51,6 @@
         <filter   token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
         <filter token="TOOLS_SPEC_VERS_SUBST" value="${xml.tools.specification.version}"/>
         <filter  token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter  token="JAXP_SPEC_VERS_SUBST" value="${xml.jaxp.specification.version}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     </target>
 
@@ -67,15 +65,12 @@
                 <fileset dir="${nbroot}/openide/netbeans/lib">
                     <include name="openide*.jar"/>
                 </fileset>
-                <pathelement location="${parserimpl}"/> <!-- JAXP and SAX dependency -->
+                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
                 <pathelement location="${core_root}/src/"/>
                 <pathelement location="${tax_lib_root}/src/"/>
-                <pathelement location="${jaxp-transform}"/> <!-- JAXP/transform API -->
                 <pathelement location="${api_root}/src/"/>
                 <!--Servlet API-->
                 <pathelement location="${binroot}/httpserver/servletapi/release/modules/ext/servlet-2.2.jar" />
-                <!--TransformServlet: HttpServerSettings-->
-<!--                <pathelement location="${nbroot}/httpserver/netbeans/modules/httpserver.jar" />-->
             </classpath>
         </javac>
     </target>
Index: xml/tools/manifest.mf
===================================================================
RCS file: /cvs/xml/tools/manifest.mf,v
retrieving revision 1.14
diff -u -r1.14 manifest.mf
--- xml/tools/manifest.mf	6 May 2002 07:28:43 -0000	1.14
+++ xml/tools/manifest.mf	13 May 2002 15:12:52 -0000
@@ -8,7 +8,7 @@
 OpenIDE-Module-Module-Dependencies: 
  org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
  org.netbeans.modules.xml.core/1 > @CORE_SPEC_VERS_SUBST@,
- org.netbeans.libs.jaxp/1 > @JAXP_SPEC_VERS_SUBST@,
+ org.netbeans.libs.jaxp/1,
  org.netbeans.modules.servletapi/1
 OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
 Class-Path: docs/xml-tools.jar
Index: xml/tools/src/org/netbeans/modules/xml/tools/resources/Bundle.properties
===================================================================
RCS file: /cvs/xml/tools/src/org/netbeans/modules/xml/tools/resources/Bundle.properties,v
retrieving revision 1.4
diff -u -r1.4 Bundle.properties
--- xml/tools/src/org/netbeans/modules/xml/tools/resources/Bundle.properties	12 Mar 2002 14:39:16 -0000	1.4
+++ xml/tools/src/org/netbeans/modules/xml/tools/resources/Bundle.properties	13 May 2002 15:12:53 -0000
@@ -14,3 +14,6 @@
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Short-Description=The module contains various actions, generators and tools.
 OpenIDE-Module-Long-Description=The module contains various actions, generators and tools. Especially action to generate simple DTD from XML document, or wizard which generate SAX handler implementation according to selected DTD document.
+
+## mf-layer.xml
+Mount/java/org-netbeans-modules-xml-tools-resources-xml_apis.xml=Standard XML APIs (JAXP, DOM, SAX) Library
Index: xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml
===================================================================
RCS file: /cvs/xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml,v
retrieving revision 1.11
diff -u -r1.11 mf-layer.xml
--- xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml	13 May 2002 09:39:07 -0000	1.11
+++ xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml	13 May 2002 15:12:53 -0000
@@ -130,8 +130,23 @@
                     <attr name="hint.originalPublicID" stringvalue="-//XML Module//DTD SAX Bindings 1.0//EN"/>
                 </file>
             </folder>
-        </folder>
-    </folder>
+        </folder> <!-- entities -->
+    </folder> <!-- xml -->
+
+    <folder name="Mount">
+        <folder name="java">
+            <file name="org-netbeans-modules-xml-tools-resources-xml_apis.xml">
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.tools.resources.Bundle" />
+                <![CDATA[
+                    <!DOCTYPE Library PUBLIC "-//NetBeans IDE//DTD JavaLibrary//EN" "http://www.netbeans.org/dtds/JavaLibrary-1_0.dtd">
+
+                    <Library>
+                        <Archive name="lib/ext/xml-apis.jar"/>
+                    </Library>
+                ]]>
+              </file>
+          </folder> <!-- java -->
+    </folder> <!-- Mount -->
 
     <folder name="Shortcuts">
         <file name="F6.instance">
Index: xml/tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractParentNode.java
===================================================================
RCS file: /cvs/xml/tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractParentNode.java,v
retrieving revision 1.11
diff -u -r1.11 AbstractParentNode.java
--- xml/tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractParentNode.java	13 May 2002 09:39:11 -0000	1.11
+++ xml/tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractParentNode.java	13 May 2002 15:12:53 -0000
@@ -127,6 +127,7 @@
             property = new NVTProperty (this);
             property.setValue ("superClass", NodeViewType.class); // NOI18N
             property.setValue ("noneServiceClass", NO_NODE_VIEW_TYPE); // NOI18N
+            property.setValue ("helpID", AbstractParentNode.class.getName() + "[NodeViewType]");
 
             property.setName ("nodeViewType"); // NOI18N
             property.setDisplayName (Util.THIS.getString ("PROP_Node_View_Type"));
Index: xtest/build.xml
===================================================================
RCS file: /cvs/xtest/build.xml,v
retrieving revision 1.32
diff -u -r1.32 build.xml
--- xtest/build.xml	19 Apr 2002 16:31:31 -0000	1.32
+++ xtest/build.xml	13 May 2002 15:12:59 -0000
@@ -45,7 +45,7 @@
         <!-- use junit with already compiled extensions -->
 	<pathelement location="src"/>
 	<pathelement location="${xtest.extra.home}/lib/junit.jar"/>
-	<pathelement location="${xtest.extra.home}/lib/xerces.jar"/>
+	<pathelement location="${xtest.extra.home}/lib/xml-apis.jar"/>
 	<pathelement location="${xtest.extra.home}/lib/xalan.jar"/>
 	<pathelement location="${xtest.extra.home}/lib/junit-ext.jar"/>
       </classpath>
@@ -73,6 +73,7 @@
         <include name="org/netbeans/core/modules/"/>
     </jar>        
     <copy file="${xtest.extra.home}/lib/junit.jar" todir="lib"/>
+    <copy file="${xtest.extra.home}/lib/xml-apis.jar" todir="lib"/>
     <copy file="${xtest.extra.home}/lib/xerces.jar" todir="lib"/>
     <copy file="${xtest.extra.home}/lib/xalan.jar" todir="lib"/>
     <copy file="${xtest.extra.home}/lib/xtest-ext.jar" todir="lib"/>
@@ -105,6 +106,7 @@
     <delete file="lib/xtest.jar"/>
     <delete file="lib/junit-ext.jar"/>
     <delete file="lib/junit.jar"/>
+    <delete file="lib/xml-apis.jar"/>
     <delete file="lib/xerces.jar"/>
     <delete file="lib/xalan.jar"/>
     <delete file="lib/xtest-ext.jar"/>
Index: xtest/dist_build.xml
===================================================================
RCS file: /cvs/xtest/dist_build.xml,v
retrieving revision 1.1
diff -u -r1.1 dist_build.xml
--- xtest/dist_build.xml	29 Nov 2001 12:34:34 -0000	1.1
+++ xtest/dist_build.xml	13 May 2002 15:12:59 -0000
@@ -27,6 +27,7 @@
     	   <available file="lib/xtest.jar"/>
     	   <available file="lib/junit-ext.jar"/>
     	   <available file="lib/junit.jar"/>
+    	   <available file="lib/xml-apis.jar"/>
     	   <available file="lib/xerces.jar"/>
     	   <available file="lib/xalan.jar"/>
     	   <available file="lib/xtest-ext.jar"/>