curcuru 01/03/01 11:55:03
Modified: test/java/src/org/apache/qetest/trax/sax
SAXResultAPITest.java
SAXTransformerFactoryAPITest.java
TemplatesHandlerAPITest.java
test/java/src/org/apache/qetest/xslwrapper TraxWrapper.java
Log:
Updates to make TraxWrapper and trax.* be completely JAXP 1.1
compliant; removed or changed references to Xalan's serializers to
use JAXP ways to do things
Revision Changes Path
1.3 +12 -10
xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXResultAPITest.java
Index: SAXResultAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXResultAPITest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SAXResultAPITest.java 2001/02/08 17:49:36 1.2
+++ SAXResultAPITest.java 2001/03/01 19:54:51 1.3
@@ -82,11 +82,6 @@
import org.w3c.dom.Node;
-// Xalan-J 2.x serializers (sould be changed to use just
-// identity transformer for this functionality)
-import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.serialize.Serializer;
-
// java classes
import java.io.File;
import java.io.FileOutputStream;
@@ -97,7 +92,7 @@
/**
* API Coverage test for the SAXResult class of TRAX.
* @author [EMAIL PROTECTED]
- * @version $Id: SAXResultAPITest.java,v 1.2 2001/02/08 17:49:36 curcuru Exp
$
+ * @version $Id: SAXResultAPITest.java,v 1.3 2001/03/01 19:54:51 curcuru Exp
$
*/
public class SAXResultAPITest extends XSLProcessorTestBase
{
@@ -326,11 +321,18 @@
// Use simple Xalan serializer for disk output, setting
// the stylesheet's output properties into it
Properties outProps = streamTemplates.getOutputProperties();
- Serializer serializer =
SerializerFactory.getSerializer(outProps);
+ // Use a TransformerHandler for serialization: this
+ // supports ContentHandler and can replace the
+ // Xalan/Xerces specific Serializers we used to use
+ TransformerHandler tHandler = saxFactory.newTransformerHandler();
FileOutputStream fos = new FileOutputStream(outNames.nextName());
- reporter.logTraceMsg("serializer.setOutputStream(new
FileOutputStream(" + outNames.currentName() + ")");
- serializer.setOutputStream(fos);
- SAXResult saxResult = new
SAXResult(serializer.asContentHandler());
+ //Serializer serializer =
SerializerFactory.getSerializer(outProps);
+ //reporter.logTraceMsg("serializer.setOutputStream(new
FileOutputStream(" + outNames.currentName() + ")");
+ //serializer.setOutputStream(fos);
+ //SAXResult saxResult = new
SAXResult(serializer.asContentHandler()); // use other ContentHandler
+ Result realResult = new StreamResult(fos);
+ tHandler.setResult(realResult);
+ SAXResult saxResult = new SAXResult(tHandler);
// Just do a normal transform to this result
Transformer transformer = streamTemplates.newTransformer();
1.5 +18 -27
xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXTransformerFactoryAPITest.java
Index: SAXTransformerFactoryAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXTransformerFactoryAPITest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SAXTransformerFactoryAPITest.java 2001/02/08 17:49:42 1.4
+++ SAXTransformerFactoryAPITest.java 2001/03/01 19:54:52 1.5
@@ -76,11 +76,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
-// Use Xalan's own serializers for SAX ContentHandler output
-import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.serialize.Serializer;
-import org.apache.xalan.templates.OutputProperties;
-
// Needed SAX, DOM, JAXP classes
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -103,7 +98,7 @@
* API Coverage test for SAXTransformerFactory.
* @author [EMAIL PROTECTED]
* @author [EMAIL PROTECTED]
- * @version $Id: SAXTransformerFactoryAPITest.java,v 1.4 2001/02/08 17:49:42
curcuru Exp $
+ * @version $Id: SAXTransformerFactoryAPITest.java,v 1.5 2001/03/01 19:54:52
curcuru Exp $
*/
public class SAXTransformerFactoryAPITest extends XSLProcessorTestBase
{
@@ -713,17 +708,16 @@
TransformerFactory tfactory = TransformerFactory.newInstance();
try
{
+ SAXTransformerFactory saxTFactory = (SAXTransformerFactory)
tfactory;
// The transformer will use a SAX parser as it's reader.
XMLReader reader = XMLReaderFactory.createXMLReader();
// Set the result handling to be a serialization to the file
output stream.
- Serializer serializer = SerializerFactory.getSerializer
-
(OutputProperties.getDefaultMethodProperties("xml"));
FileOutputStream fos = new FileOutputStream(outNames.nextName());
- serializer.setOutputStream(fos);
-// reader.setContentHandler(new
ExampleContentHandler(outNames.nextName())); // @todo update content handler!!!!
- reader.setContentHandler(serializer.asContentHandler()); //
@todo update content handler!!!!
+ Result realResult = new StreamResult(fos);
+ TransformerHandler tHandler =
saxTFactory.newTransformerHandler();
+ tHandler.setResult(realResult);
+ reader.setContentHandler(tHandler);
- SAXTransformerFactory saxTFactory = (SAXTransformerFactory)
tfactory;
reporter.logTraceMsg("saxTFactory.newXMLFilter(new
StreamSource(" + filenameToURL(xslName) + "))");
XMLFilter filter = saxTFactory.newXMLFilter(new
StreamSource(filenameToURL(xslName)));
@@ -779,12 +773,11 @@
XMLReader reader = XMLReaderFactory.createXMLReader();
// Set the result handling to be a serialization to the file
output stream.
- Serializer serializer = SerializerFactory.getSerializer
-
(OutputProperties.getDefaultMethodProperties("xml"));
FileOutputStream fos = new FileOutputStream(outNames.nextName());
- serializer.setOutputStream(fos);
-// reader.setContentHandler(new
ExampleContentHandler(outNames.nextName())); // @todo update content handler!!!!
- reader.setContentHandler(serializer.asContentHandler()); //
@todo update content handler!!!!
+ Result realResult = new StreamResult(fos);
+ TransformerHandler tHandler =
saxTFactory.newTransformerHandler();
+ tHandler.setResult(realResult);
+ reader.setContentHandler(tHandler);
filter.setParent(reader);
@@ -837,12 +830,11 @@
XMLReader reader = XMLReaderFactory.createXMLReader();
// Set the result handling to be a serialization to the file
output stream.
- Serializer serializer = SerializerFactory.getSerializer
-
(OutputProperties.getDefaultMethodProperties("xml"));
FileOutputStream fos = new FileOutputStream(outNames.nextName());
- serializer.setOutputStream(fos);
-// reader.setContentHandler(new
ExampleContentHandler(outNames.nextName())); // @todo update content handler!!!!
- reader.setContentHandler(serializer.asContentHandler()); //
@todo update content handler!!!!
+ Result realResult = new StreamResult(fos);
+ TransformerHandler tHandler =
saxTFactory.newTransformerHandler();
+ tHandler.setResult(realResult);
+ reader.setContentHandler(tHandler);
filter.setParent(reader);
// Now, when you call transformer.parse, it will set itself as
@@ -899,12 +891,11 @@
filter.setParent(reader);
// Set the result handling to be a serialization to the file
output stream.
- Serializer serializer = SerializerFactory.getSerializer
-
(OutputProperties.getDefaultMethodProperties("xml"));
FileOutputStream fos = new FileOutputStream(outNames.nextName());
- serializer.setOutputStream(fos);
-// filter.setContentHandler(new
ExampleContentHandler(outNames.nextName())); // @todo update content handler!!!!
- filter.setContentHandler(serializer.asContentHandler()); //
@todo update content handler!!!!
+ Result realResult = new StreamResult(fos);
+ TransformerHandler tHandler =
saxTFactory.newTransformerHandler();
+ tHandler.setResult(realResult);
+ filter.setContentHandler(tHandler);
// Log what output is about to be created
reporter.logTraceMsg("filter.parse(" + xmlName + ") into: " +
outNames.currentName());
1.4 +1 -6
xml-xalan/test/java/src/org/apache/qetest/trax/sax/TemplatesHandlerAPITest.java
Index: TemplatesHandlerAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/TemplatesHandlerAPITest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplatesHandlerAPITest.java 2001/02/08 17:49:46 1.3
+++ TemplatesHandlerAPITest.java 2001/03/01 19:54:53 1.4
@@ -84,11 +84,6 @@
import org.w3c.dom.Node;
-// Xalan-J 2.x serializers (sould be changed to use just
-// identity transformer for this functionality)
-import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.serialize.Serializer;
-
// java classes
import java.io.File;
import java.io.FileOutputStream;
@@ -99,7 +94,7 @@
/**
* API Coverage test for the TemplatesHandler class of TRAX.
* @author [EMAIL PROTECTED]
- * @version $Id: TemplatesHandlerAPITest.java,v 1.3 2001/02/08 17:49:46
curcuru Exp $
+ * @version $Id: TemplatesHandlerAPITest.java,v 1.4 2001/03/01 19:54:53
curcuru Exp $
*/
public class TemplatesHandlerAPITest extends XSLProcessorTestBase
{
1.12 +1 -6
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxWrapper.java
Index: TraxWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxWrapper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TraxWrapper.java 2001/02/23 21:01:20 1.11
+++ TraxWrapper.java 2001/03/01 19:54:59 1.12
@@ -93,12 +93,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-// Xalan-specific serializers for sax-to-sax flavor
-import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.serialize.Serializer;
-import org.apache.xalan.templates.OutputProperties;
-
/**
* Implementation of a ProcessorWrapper for a TrAX-compilant XSLT processor.
* <p>Currently defaults to the Xalan 2.x implementation, although
@@ -108,7 +103,7 @@
* @todo share constants between TraxWrapper, SaxonWrapper
* @todo document how we perform various types of transforms
* @author Shane Curcuru
- * @version $Id: TraxWrapper.java,v 1.11 2001/02/23 21:01:20 curcuru Exp $
+ * @version $Id: TraxWrapper.java,v 1.12 2001/03/01 19:54:59 curcuru Exp $
*/
public class TraxWrapper extends ProcessorWrapper
{
