Index: src/test/bugfixes/BugfixesTest.java
===================================================================
--- src/test/bugfixes/BugfixesTest.java	(revision 391)
+++ src/test/bugfixes/BugfixesTest.java	(working copy)
@@ -67,6 +67,7 @@
 import javax.activation.FileDataSource;
 import javax.xml.transform.dom.DOMSource;
 import org.w3c.dom.NodeList;
+import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
 
 /*
  * A class that contains test cases that verify some of the bug fixes made.
@@ -338,7 +339,7 @@
     public void testSetContentDOMSrc() throws Exception {
 
         DocumentBuilderFactory factory =
-            new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+            new DocumentBuilderFactoryImpl();
         factory.setNamespaceAware(true);
         DocumentBuilder builder = factory.newDocumentBuilder();
 
@@ -688,7 +689,7 @@
     public void testEvelopeNamespacePropogation() throws Exception {
 
         DocumentBuilderFactory factory =
-            new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+            new DocumentBuilderFactoryImpl();
         factory.setNamespaceAware(true);
         DocumentBuilder builder = factory.newDocumentBuilder();
 
@@ -850,7 +851,7 @@
     public void testSOAPBodyAddDocument() throws Exception {
 
         DocumentBuilderFactory factory =
-            new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+            new DocumentBuilderFactoryImpl();
         factory.setNamespaceAware(true);
         DocumentBuilder builder = factory.newDocumentBuilder();
 
@@ -948,7 +949,7 @@
 
         Document document = null;
         DocumentBuilderFactory factory =
-            new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+            new DocumentBuilderFactoryImpl();
         factory.setNamespaceAware(true);
 
         DocumentBuilder builder = factory.newDocumentBuilder();
@@ -1008,7 +1009,7 @@
         try {
             Document document = null;
             DocumentBuilderFactory factory =
-                new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+                new DocumentBuilderFactoryImpl();
             factory.setNamespaceAware(true);
   
             DocumentBuilder builder = factory.newDocumentBuilder();
Index: src/test/namespace/NSDeclTest.java
===================================================================
--- src/test/namespace/NSDeclTest.java	(revision 391)
+++ src/test/namespace/NSDeclTest.java	(working copy)
@@ -107,7 +107,7 @@
         ByteArrayInputStream bais2 = new ByteArrayInputStream(testDocBytes2);
         InputSource is = new InputSource(bais2);
         DocumentBuilderFactory dbf =
-            new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+            new org.apache.xerces.jaxp.DocumentBuilderFactoryImpl();
         dbf.setNamespaceAware(true);
         Document doc2 = dbf.newDocumentBuilder().parse(is);
         // Uncomment to enable dumping to see the DOM Node
Index: src/test/util/JAXPHelper.java
===================================================================
--- src/test/util/JAXPHelper.java	(revision 391)
+++ src/test/util/JAXPHelper.java	(working copy)
@@ -59,7 +59,7 @@
 
     static {
         DocumentBuilderFactory factory =
-            new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+            new org.apache.xerces.jaxp.DocumentBuilderFactoryImpl();
         try {
             builder = factory.newDocumentBuilder();
         } catch (Exception e) {
Index: src/java/com/sun/xml/messaging/saaj/soap/impl/TextImpl.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/soap/impl/TextImpl.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/soap/impl/TextImpl.java	(working copy)
@@ -49,7 +49,7 @@
 import com.sun.xml.messaging.saaj.util.LogDomainConstants;
 
 public class TextImpl
-    extends com.sun.org.apache.xerces.internal.dom.TextImpl
+    extends org.apache.xerces.dom.TextImpl
     implements javax.xml.soap.Text, org.w3c.dom.Text {
 
     protected static final Logger log =
Index: src/java/com/sun/xml/messaging/saaj/soap/impl/ElementImpl.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/soap/impl/ElementImpl.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/soap/impl/ElementImpl.java	(working copy)
@@ -47,6 +47,7 @@
 import javax.xml.namespace.QName;
 import javax.xml.soap.*;
 
+import org.apache.xerces.dom.ElementNSImpl;
 import org.w3c.dom.*;
 import org.w3c.dom.Node;
 
@@ -57,7 +58,7 @@
 import com.sun.xml.messaging.saaj.util.*;
 
 public class ElementImpl
-    extends com.sun.org.apache.xerces.internal.dom.ElementNSImpl
+    extends ElementNSImpl
     implements SOAPElement, SOAPBodyElement {
 
     public static final String DSIG_NS = "http://www.w3.org/2000/09/xmldsig#".intern();
Index: src/java/com/sun/xml/messaging/saaj/soap/impl/BodyImpl.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/soap/impl/BodyImpl.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/soap/impl/BodyImpl.java	(working copy)
@@ -49,6 +49,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
 import org.w3c.dom.*;
 
 import com.sun.xml.messaging.saaj.SOAPExceptionImpl;
@@ -314,7 +315,7 @@
         Document document = null;
         try {
             DocumentBuilderFactory factory = 
-                new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+               new DocumentBuilderFactoryImpl();
             factory.setNamespaceAware(true);
             DocumentBuilder builder = factory.newDocumentBuilder();
             document = builder.newDocument();
Index: src/java/com/sun/xml/messaging/saaj/soap/impl/CommentImpl.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/soap/impl/CommentImpl.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/soap/impl/CommentImpl.java	(working copy)
@@ -53,7 +53,7 @@
 import com.sun.xml.messaging.saaj.util.LogDomainConstants;
 
 public class CommentImpl
-    extends com.sun.org.apache.xerces.internal.dom.CommentImpl
+    extends org.apache.xerces.dom.CommentImpl
     implements javax.xml.soap.Text, org.w3c.dom.Comment { 
 
     protected static final Logger log =
Index: src/java/com/sun/xml/messaging/saaj/soap/impl/CDATAImpl.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/soap/impl/CDATAImpl.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/soap/impl/CDATAImpl.java	(working copy)
@@ -45,11 +45,13 @@
 import javax.xml.soap.SOAPElement;
 import javax.xml.soap.SOAPException;
 
+import org.apache.xerces.dom.CDATASectionImpl;
+
 import com.sun.xml.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.messaging.saaj.util.LogDomainConstants;
 
 public class CDATAImpl
-    extends com.sun.org.apache.xerces.internal.dom.CDATASectionImpl
+    extends CDATASectionImpl
     implements javax.xml.soap.Text {
 
     protected static final Logger log =
Index: src/java/com/sun/xml/messaging/saaj/soap/SOAPDocumentImpl.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/soap/SOAPDocumentImpl.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/soap/SOAPDocumentImpl.java	(working copy)
@@ -46,7 +46,7 @@
 
 import java.util.logging.Logger;
 
-import com.sun.org.apache.xerces.internal.dom.DocumentImpl;
+import org.apache.xerces.dom.DocumentImpl;
 import org.w3c.dom.*;
 
 import com.sun.xml.messaging.saaj.soap.impl.*;
Index: src/java/com/sun/xml/messaging/saaj/soap/SOAPDocumentFragment.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/soap/SOAPDocumentFragment.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/soap/SOAPDocumentFragment.java	(working copy)
@@ -44,8 +44,8 @@
 */
 package com.sun.xml.messaging.saaj.soap;
 
-import com.sun.org.apache.xerces.internal.dom.CoreDocumentImpl;
-import com.sun.org.apache.xerces.internal.dom.DocumentFragmentImpl;
+import org.apache.xerces.dom.CoreDocumentImpl;
+import org.apache.xerces.dom.DocumentFragmentImpl;
 
 public class SOAPDocumentFragment extends DocumentFragmentImpl {
 
Index: src/java/com/sun/xml/messaging/saaj/util/ParserPool.java
===================================================================
--- src/java/com/sun/xml/messaging/saaj/util/ParserPool.java	(revision 391)
+++ src/java/com/sun/xml/messaging/saaj/util/ParserPool.java	(working copy)
@@ -41,6 +41,8 @@
 package com.sun.xml.messaging.saaj.util;
 
 
+import org.apache.xerces.jaxp.SAXParserFactoryImpl;
+import org.apache.xerces.util.SymbolTable;
 import org.xml.sax.SAXException;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -63,7 +65,7 @@
         this.capacity = capacity;
         queue = new ArrayBlockingQueue(capacity);
         //factory = SAXParserFactory.newInstance();
-        factory = new com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl();
+        factory = new SAXParserFactoryImpl();
         factory.setNamespaceAware(true);
         for (int i=0; i < capacity; i++) {
            try {
@@ -112,7 +114,7 @@
      private void resetSaxParser(SAXParser parser) {
         try {
             //Object obj = parser.getProperty("http://apache.org/xml/properties/internal/symbol-table");
-            com.sun.org.apache.xerces.internal.util.SymbolTable table = new com.sun.org.apache.xerces.internal.util.SymbolTable();
+            SymbolTable table = new SymbolTable();
             parser.setProperty("http://apache.org/xml/properties/internal/symbol-table", table);
             //obj = parser.getProperty("http://apache.org/xml/properties/internal/symbol-table");
         } catch (SAXNotRecognizedException ex) {
Index: pom.xml
===================================================================
--- pom.xml	(revision 391)
+++ pom.xml	(working copy)
@@ -141,6 +141,11 @@
   
     <dependencies>
         <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.9.1</version>
+        </dependency>
+        <dependency>
             <groupId>org.jvnet.mimepull</groupId>
             <artifactId>mimepull</artifactId>
             <version>1.7</version>
Index: build.xml
===================================================================
--- build.xml	(revision 391)
+++ build.xml	(working copy)
@@ -137,6 +137,7 @@
   <property name="saaj.jar"                   	value="${lib.home}/saaj-api.jar"/>
   <property name="FastInfoset.jar"             	value="${lib.home}/FastInfoset.jar"/>
   <property name="mimepull.jar"             	value="${lib.home}/mimepull.jar"/>
+  <property name="xerces.jar"             	value="${lib.home}/xerces.jar"/>
 <!-- ************ Compiler Defaults ************************************** -->
 
   <!-- Should Java compilations set the 'debug' compiler option? -->
@@ -157,6 +158,7 @@
     <pathelement location="${qname.jar}"/>
     <pathelement location="${FastInfoset.jar}"/>
     <pathelement location="${mimepull.jar}"/>
+    <pathelement location="${xerces.jar}"/>
   </path>
 
   <property name="junit.jar"             value="${lib.home}/junit.jar"/>
@@ -165,6 +167,7 @@
     <pathelement location="${build.home}/classes" />
     <pathelement location="${build.home}/test/classes" />
     <pathelement location="${qname.jar}"/>
+    <pathelement location="${xerces.jar}"/>
     <pathelement location="${junit.jar}"/>
     <path refid="compile.classpath" />
     <pathelement path="${java.class.path}"/>
@@ -173,6 +176,7 @@
     <pathelement location="${build.home}/test/classes" />
     <pathelement location="${junit.jar}"/>
     <pathelement path="${java.class.path}"/>
+    <pathelement location="${xerces.jar}"/>
   </path>
 
 
Index: samples/saveandload/build.xml
===================================================================
--- samples/saveandload/build.xml	(revision 391)
+++ samples/saveandload/build.xml	(working copy)
@@ -66,6 +66,7 @@
     <include name="saaj-api.jar" />
     <include name="servlet.jar" />
     <include name="jax-qname.jar" />
+    <include name="xerces.jar" />
   </fileset>
 
   <fileset id="persister-classpath" dir="${saaj.home}/samples/persister/lib" >
Index: samples/soapnode/build.xml
===================================================================
--- samples/soapnode/build.xml	(revision 391)
+++ samples/soapnode/build.xml	(working copy)
@@ -66,6 +66,7 @@
     <include name="saaj-api.jar" />
     <include name="servlet.jar" />
     <include name="jax-qname.jar" />
+    <include name="xerces.jar" />
   </fileset>
 
   <fileset id="soapprocessor-classpath" dir="${saaj.home}/samples/soapprocessor/lib" >
Index: samples/book/WEB-INF/src/book/sender/SendingServlet.java
===================================================================
--- samples/book/WEB-INF/src/book/sender/SendingServlet.java	(revision 391)
+++ samples/book/WEB-INF/src/book/sender/SendingServlet.java	(working copy)
@@ -53,6 +53,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.soap.*;
 
+import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
 import org.w3c.dom.Document;
 
 /**
@@ -156,7 +157,7 @@
             String reqBase=urlSB.toString();
 
             DocumentBuilderFactory dbf =
-                new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+                new DocumentBuilderFactoryImpl();
             dbf.setNamespaceAware(true);
             DocumentBuilder docBuilder = dbf.newDocumentBuilder();
             Document bookInfo = docBuilder.parse(reqBase + "/bookinfo.xml");
Index: samples/book/WEB-INF/build.xml
===================================================================
--- samples/book/WEB-INF/build.xml	(revision 391)
+++ samples/book/WEB-INF/build.xml	(working copy)
@@ -100,6 +100,7 @@
     <include name="saaj-api.jar" />
     <include name="servlet.jar" />
     <include name="jax-qname.jar" />
+    <include name="xerces.jar" />
   </fileset>
 
   <!-- ==================== Init targets ==================== -->