[jboss-svn-commits] JBL Code SVN: r15990 - in labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin: src/main/java/org/jboss/maven/plugins/jdocbook/gen/format and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2007-10-22 18:09:06 -0400 (Mon, 22 Oct 2007)
New Revision: 15990

Modified:
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/format/BasicFormatHandler.java
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/util/ResourceHelper.java
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/xslt/TransformerFactory.java
Log:
MPJDOCBOOK-4 : xerces + xinclude + jdk1.4

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml	2007-10-22 17:56:29 UTC (rev 15989)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml	2007-10-22 22:09:06 UTC (rev 15990)
@@ -119,11 +119,18 @@
             <version>2.6.2</version>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- depending upon which transformer factory you want to use -->
         <dependency>
             <groupId>saxon</groupId>
             <artifactId>saxon</artifactId>
             <version>6.5.3</version>
         </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.0</version>
+        </dependency>
 
         <!-- Maven Plugin deps -->
         <dependency>

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/format/BasicFormatHandler.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/format/BasicFormatHandler.java	2007-10-22 17:56:29 UTC (rev 15989)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/format/BasicFormatHandler.java	2007-10-22 22:09:06 UTC (rev 15990)
@@ -27,7 +27,7 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 
-import com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl;
+import org.apache.xerces.jaxp.SAXParserFactoryImpl;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProjectHelper;
 import org.codehaus.plexus.archiver.ArchiverException;
@@ -212,7 +212,7 @@
 
 	protected final SAXParserFactory createParserFactory() {
         SAXParserFactory parserFactory = new SAXParserFactoryImpl();
-        parserFactory.setXIncludeAware( factory.getOptions().isXincludeSupported() );
+        ( ( SAXParserFactoryImpl ) parserFactory ).setXIncludeAware( factory.getOptions().isXincludeSupported()  );
         return parserFactory;
     }
 

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/util/ResourceHelper.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/util/ResourceHelper.java	2007-10-22 17:56:29 UTC (rev 15989)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/util/ResourceHelper.java	2007-10-22 22:09:06 UTC (rev 15990)
@@ -42,7 +42,7 @@
 				return new URL( name );
 			}
 			catch ( MalformedURLException e ) {
-				throw new IllegalArgumentException( "malformed explicit file url [" + name + "]", e );
+				throw new IllegalArgumentException( "malformed explicit file url [" + name + "]");
 			}
 		}
 		else {

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/xslt/TransformerFactory.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/xslt/TransformerFactory.java	2007-10-22 17:56:29 UTC (rev 15989)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/gen/xslt/TransformerFactory.java	2007-10-22 22:09:06 UTC (rev 15990)
@@ -28,6 +28,7 @@
 import javax.xml.transform.stream.StreamSource;
 
 import com.icl.saxon.Controller;
+
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.jboss.maven.plugins.jdocbook.gen.XSLTException;
 import org.jboss.maven.plugins.jdocbook.gen.util.ResourceHelper;
@@ -104,7 +105,7 @@
 
 	private javax.xml.transform.TransformerFactory buildTransformerFactory() {
 		if ( transformerType == TransformerType.XALAN ) {
-			return new com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl();
+			return new org.apache.xalan.processor.TransformerFactoryImpl();
 		}
 		else {
 			// saxon as default...