--- src/main/java/org/codehaus/mojo/docbook/TransformMojo.java	(revision 4192)
+++ src/main/java/org/codehaus/mojo/docbook/TransformMojo.java	Tue May 22 12:50:35 MSD 2007
@@ -51,13 +51,10 @@
 public class TransformMojo
     extends AbstractMojo
 {
-    private static String XERCES_PARSER_CONFIG = "org.apache.xerces.xni.parser.XMLParserConfiguration";
 
-    private static String XERCES_XINCLUDE_PARSER = "org.apache.xerces.parsers.XIncludeParserConfiguration";
-
     /**
      * Directory where the source Docbook files are located.
      *  
@@ -130,10 +127,6 @@
             System.setProperty( "http.nonProxyHosts", activeProxy.getNonProxyHosts() );
         }
 
-        // Set XInclude Xerces parser so we're able to process master olink database file
-        String xercesParser = System.getProperty( TransformMojo.XERCES_PARSER_CONFIG );
-        System.setProperty( TransformMojo.XERCES_PARSER_CONFIG, TransformMojo.XERCES_XINCLUDE_PARSER );
-
         try
         {
             URI stylesheetLocationURI = new URI( this.stylesheetLocation );
@@ -153,7 +146,9 @@
         }
         catch ( TransformerException exc )
         {
-            throw new MojoFailureException( exc.getLocalizedMessage() );
+          final MojoFailureException e = new MojoFailureException(exc.getLocalizedMessage());
+          e.initCause(exc);
+            throw e;
         }
         catch ( URISyntaxException exc )
         {
@@ -169,16 +164,6 @@
         }
         finally
         {
-            // Reset XInclude Xerces parser to previous value
-            if ( xercesParser != null )
-            {
-                System.setProperty( TransformMojo.XERCES_PARSER_CONFIG, xercesParser );
-            }
-            else
-            {
-                // In 1.4 there's no clear property method... is this correct?
-                System.setProperty( TransformMojo.XERCES_PARSER_CONFIG, "" );
-            }
 
             if ( httpProxyHost != null )
             {
--- pom.xml	(revision 4192)
+++ pom.xml	Tue May 22 12:50:27 MSD 2007
@@ -72,17 +72,10 @@
       <version>1.5.1</version>
     </dependency>
     <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.6.0</version>
-      <scope>runtime</scope>
+      <groupId>saxon</groupId>
+      <artifactId>saxon</artifactId>
+      <version>6.5.3</version>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
   <reporting>
     <plugins>