Index: build.xml
===================================================================
RCS file: /cvs/apisupport/build.xml,v
retrieving revision 1.55
diff -u -r1.55 build.xml
--- build.xml	11 Feb 2002 12:00:06 -0000	1.55
+++ build.xml	11 Feb 2002 16:00:35 -0000
@@ -37,6 +37,7 @@
         </fileset>
 	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->
         <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
+        <!-- Needed: DOM/SAX/JAXP APIs; Xerces serializer package: -->
         <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
       <exclude name="org/netbeans/modules/apisupport/ant/"/>
Index: manifest.mf
===================================================================
RCS file: /cvs/apisupport/manifest.mf,v
retrieving revision 1.58
diff -u -r1.58 manifest.mf
--- manifest.mf	29 Jan 2002 14:38:12 -0000	1.58
+++ manifest.mf	11 Feb 2002 16:00:35 -0000
@@ -6,7 +6,7 @@
 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-IDE-Dependencies: IDE/1 > 2.3
-OpenIDE-Module-Package-Dependencies: [org.apache.xerces.parsers.DOMParser]
+OpenIDE-Module-Package-Dependencies: [org.apache.xml.serialize.EncodingInfo]
 Class-Path: docs/apisupport-manual.zip
 
 Name: org/netbeans/modules/apisupport/ManifestDataLoader.class
Index: src/org/netbeans/modules/apisupport/layers/ParseRegen.java
===================================================================
RCS file: /cvs/apisupport/src/org/netbeans/modules/apisupport/layers/ParseRegen.java,v
retrieving revision 1.12
diff -u -r1.12 ParseRegen.java
--- src/org/netbeans/modules/apisupport/layers/ParseRegen.java	11 Feb 2002 12:24:18 -0000	1.12
+++ src/org/netbeans/modules/apisupport/layers/ParseRegen.java	11 Feb 2002 16:00:36 -0000
@@ -24,7 +24,6 @@
 import org.xml.sax.*;
 import org.w3c.dom.*;
 import org.w3c.dom.events.*;
-import org.apache.xerces.parsers.*;
 import org.apache.xml.serialize.*;
 
 import org.openide.*;
@@ -143,11 +142,13 @@
         FileObject fo = getFileObject ();
         LayerDataNode.err.log ("ParseRegen.parseDocument: fo=" + fo);
         try {
+            /*
             DOMParser parser = new DOMParser ();
             parser.setFeature ("http://xml.org/sax/features/validation", true); // NOI18N
             parser.setFeature ("http://apache.org/xml/features/dom/defer-node-expansion", false); // NOI18N
             parser.setEntityResolver (EntityCatalog.getDefault ());
             parser.setErrorHandler (this);
+             */
             Reader rd;
             EditorCookie editor = getEditor ();
             if (editor != null) {
@@ -170,8 +171,11 @@
                         LayerDataNode.err.notify(mfue);
                     }
                 }
+                /*
                 parser.parse (in);
                 Document doc = parser.getDocument ();
+                 */
+                Document doc = XMLUtil.parse(in, true, false, this, EntityCatalog.getDefault());
                 if (editor != null) {
                     //LayerDataNode.err.log ("doc=" + doc);
                     EventTarget targ = (EventTarget) doc;