Index: ant/build.xml
===================================================================
RCS file: /cvs/ant/build.xml,v
retrieving revision 1.49
diff -u -r1.49 build.xml
--- ant/build.xml	28 Feb 2002 12:43:19 -0000	1.49
+++ ant/build.xml	1 Mar 2002 09:52:34 -0000
@@ -38,7 +38,7 @@
           <include name="ant.jar"/>
           <include name="ant-1.*.jar"/>
         </fileset>
-	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+	<pathelement location="../core/xerces13/netbeans/modules/autoload/ext/xerces-1.3.0.jar"/>
         <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
       </classpath>
     </javac>
Index: ant/manifest.mf
===================================================================
RCS file: /cvs/ant/manifest.mf,v
retrieving revision 1.42
diff -u -r1.42 manifest.mf
--- ant/manifest.mf	18 Feb 2002 13:49:54 -0000	1.42
+++ ant/manifest.mf	1 Mar 2002 09:52:34 -0000
@@ -5,9 +5,9 @@
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class
 OpenIDE-Module-Layer: org/apache/tools/ant/module/resources/AntModuleLayer.xml
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.javahelp/1 > 1.0
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.javahelp/1 > 1.0, org.apache.xerces.v13
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
-OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location], [org.apache.xerces.parsers.DOMParser], [org.apache.xml.serialize.EncodingInfo]
+OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location]
 Class-Path: ext/ant-1.4.1.jar ext/ant-optional-1.4.1.jar
 
 Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class
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	1 Mar 2002 09:52:35 -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="../core/xerces13/netbeans/modules/autoload/ext/xerces-1.3.0.jar"/>
       </classpath>
       <exclude name="org/netbeans/modules/apisupport/ant/"/>
       <exclude name="org/netbeans/modules/apisupport/lite/"/>
Index: apisupport/manifest.mf
===================================================================
RCS file: /cvs/apisupport/manifest.mf,v
retrieving revision 1.59
diff -u -r1.59 manifest.mf
--- apisupport/manifest.mf	18 Feb 2002 13:49:55 -0000	1.59
+++ apisupport/manifest.mf	1 Mar 2002 09:52:35 -0000
@@ -4,9 +4,8 @@
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/resources/mf-layer.xml
 OpenIDE-Module-Specification-Version: 2.11
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.apisupport.lite/1 > 0.1, org.netbeans.modules.jarpackager/2 > 1.8, org.netbeans.modules.javahelp/1 > 1.0
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.apisupport.lite/1 > 0.1, org.netbeans.modules.jarpackager/2 > 1.8, org.netbeans.modules.javahelp/1 > 1.0, org.apache.xerces.v13
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
-OpenIDE-Module-Package-Dependencies: [org.apache.xerces.parsers.DOMParser], [org.apache.xml.serialize.EncodingInfo]
 Class-Path: docs/apisupport-manual.zip
 
 Name: org/netbeans/modules/apisupport/ManifestDataLoader.class
Index: core/src/org/netbeans/core/modules/NbInstaller.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/NbInstaller.java,v
retrieving revision 1.28
diff -u -r1.28 NbInstaller.java
--- core/src/org/netbeans/core/modules/NbInstaller.java	25 Feb 2002 12:35:25 -0000	1.28
+++ core/src/org/netbeans/core/modules/NbInstaller.java	1 Mar 2002 09:52:36 -0000
@@ -739,6 +739,9 @@
         "org/apache/xerces/", // NOI18N
         // xerces.jar - serializer library
         "org/apache/xml/serialize/", // NOI18N
+        // xerces.jar - misc
+        "org/apache/html/", // NOI18N
+        "org/apache/wml/", // NOI18N
     };
     
     private Set/*<String>*/ findKosher(Module m) {
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.178
diff -u -r1.178 build.xml
--- nbbuild/build.xml	20 Feb 2002 17:01:52 -0000	1.178
+++ nbbuild/build.xml	1 Mar 2002 09:52:37 -0000
@@ -99,11 +99,11 @@
       <config name="superslim" modules="classfile,clazz,editor,html,image,java,openidex,projects,text,utilities"/>
       <config name="slim" modules="autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,editor,form,html,httpserver,image,java,openidex,projects,text,utilities"/>
       <!-- [PENDING] A poor name; 'standard' would be more in line with the CVS pseudomodule. -->
-      <config name="stable" modules="ant,ant/docs,apisupport/lite,applet,autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
-      <config name="stable-with-apisupport" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
-      <config name="bloated" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css,openidex/looks"/>
+      <config name="stable" modules="ant,ant/docs,apisupport/lite,applet,autoupdate,beans,classfile,clazz,core/xerces13,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
+      <config name="stable-with-apisupport" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,clazz,core/xerces13,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
+      <config name="bloated" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,core/xerces13,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css,openidex/looks"/>
       <!-- You are on your own for getting the binaries for some of these: -->
-      <config name="bloated-plus-extrabins" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,jini,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
+      <config name="bloated-plus-extrabins" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,core/xerces13,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,jini,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
     </configmods>
   </target>
 
@@ -146,7 +146,7 @@
   </target>
 
   <!-- And the modules: -->
-  <target name="all-ant" depends="all-openide,all-core/javahelp">
+  <target name="all-ant" depends="all-openide,all-core/javahelp,all-core/xerces13">
     <echo message="Building module ant..."/>
     <ant dir="../ant" target="netbeans"/>
   </target>
@@ -154,7 +154,7 @@
     <echo message="Building module ant/docs..."/>
     <ant dir="../ant/docs" target="netbeans"/>
   </target>
-  <target name="all-apisupport" depends="all-openide,all-core,all-core/javahelp,all-jarpackager,all-apisupport/lite">
+  <target name="all-apisupport" depends="all-openide,all-core,all-core/javahelp,all-core/xerces13,all-jarpackager,all-apisupport/lite">
     <echo message="Building module apisupport..."/>
     <ant dir="../apisupport" target="netbeans"/>
   </target>
@@ -194,6 +194,10 @@
     <echo message="Building module clazz..."/>
     <ant dir="../clazz" target="netbeans"/>
   </target>
+  <target name="all-core/xerces13" depends="all-openide">
+    <echo message="Building module core/xerces13..."/>
+    <ant dir="../core/xerces13" target="netbeans"/>
+  </target>
   <target name="all-db" depends="all-openide,all-openidex,all-form">
     <echo message="Building module db..."/>
     <ant dir="../db" target="netbeans"/>
@@ -645,6 +649,8 @@
           description="Build Auto Update NBM files and XML descriptions.">
     <!-- Note: partially sorted in dependency order -->
     <!-- (this could also be done with separate targets). -->
+    <echo message="Making NBM for module core/xerces13..."/>
+    <ant dir="../core/xerces13" target="nbm"/>
     <echo message="Making NBM for module ant..."/>
     <ant dir="../ant" target="nbm"/>
     <echo message="Making NBM for module ant/docs..."/>