Updated build to include neccessary jar files

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194118 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 39 deletions

diff --git a/src/org/apache/fop/tools/anttasks/Xslt.java b/src/org/apache/fop/tools/anttasks/Xslt.java
index 1b42d9d97..c38fd6961 100644
--- a/src/org/apache/fop/tools/anttasks/Xslt.java
+++ b/src/org/apache/fop/tools/anttasks/Xslt.java
@@ -58,7 +58,6 @@ import org.apache.tools.ant.Task;
 import java.net.*;
 import java.io.*;
 import java.util.*;
-//import org.apache.xalan.xslt.*;
 import org.w3c.dom.*;
 import org.xml.sax.SAXException;
 
@@ -205,18 +204,9 @@ public class Xslt extends Task {
 	    org.w3c.dom.Document source = buildDocument(infile);
 	    // Perform the transformation.
 	    System.out.println("============================");
-	    System.out.println("new xslt \nin: " + infile + "\nstyle: " +
+	    System.out.println("xslt \nin: " + infile + "\nstyle: " +
 			       xsltfile + "\nout: " + outfile);
 	    System.out.println("============================");
-	
-	    /*
-	    if (isTraxAvailable()) {
-		TraxTransform.transform(source, xsltfile, outfile);
-	    }
-	    else {
-		Xalan1Transform.transform(source, xsltfile, outfile);
-	    }
-	    */
 	    org.apache.fop.tools.xslt.XSLTransform.transform(source,xsltfile,outfile);
 	    
 	
@@ -236,23 +226,6 @@ public class Xslt extends Task {
     
     } //end transform
 
-    /*
-    private boolean isTraxAvailable() 
-    {
-	
-	try {
-	    // check for trax
-	    Class transformer = Class.forName("javax.xml.transform.Transformer");
-	    if (transformer != null) {
-		return true;
-	    }
-	}
-	catch (ClassNotFoundException ex){
-	    return false;
-	}	
-	return false;
-    }
-    */
     
     /**
      *  Checks for existence of output file and compares
diff --git a/src/org/apache/fop/tools/xslt/Xalan1Transform.java b/src/org/apache/fop/tools/xslt/Xalan1Transform.java
index ed04b46e1..fc08d663d 100644
--- a/src/org/apache/fop/tools/xslt/Xalan1Transform.java
+++ b/src/org/apache/fop/tools/xslt/Xalan1Transform.java
@@ -79,9 +79,7 @@ public class Xalan1Transform
 	}
 	
 	// Use XSLTProcessor to instantiate an XSLTProcessor.
-	XSLTProcessor processor = XSLTProcessorFactory.getProcessor
-	    (new org.apache.xalan.xpath.xdom.XercesLiaison());
-	
+	XSLTProcessor processor = XSLTProcessorFactory.getProcessor();
 	
 	XSLTInputSource xslSheet = new XSLTInputSource (xsltFilename);
 
@@ -126,8 +124,7 @@ public class Xalan1Transform
 	StylesheetRoot stylesheet = getStylesheet(xslURL,true);
 	
         // Perform the transformation.
-        stylesheet.process(XSLTProcessorFactory.getProcessor
-			   (new org.apache.xalan.xpath.xdom.XercesLiaison()),
+        stylesheet.process(XSLTProcessorFactory.getProcessor(),
 			   xmlSource, xmlResult);
     }
     
@@ -145,9 +142,8 @@ public class Xalan1Transform
 	StylesheetRoot stylesheet = getStylesheet(xslURL,true);
 	
         // Perform the transformation.
-        stylesheet.process(XSLTProcessorFactory.getProcessor
-			   (new org.apache.xalan.xpath.xdom.XercesLiaison()),
-			  source, xmlResult);
+        stylesheet.process(XSLTProcessorFactory.getProcessor(),
+			   source, xmlResult);
     }
 
     public static void transform(Document xmlSource, 
@@ -164,9 +160,8 @@ public class Xalan1Transform
 	
 	
         // Perform the transformation.
-	XSLTProcessor processor =
-	    XSLTProcessorFactory.getProcessor(new org.apache.xalan.xpath.xdom.XercesLiaison());
-
+	XSLTProcessor processor = XSLTProcessorFactory.getProcessor();
+	
         processor.process(source, xslSheet, xmlResult);
     }
 }