You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by gg...@apache.org on 2019/04/22 01:38:00 UTC
[xalan-test] 01/01: This commit was manufactured by cvs2svn to
create tag 'xalan_2_2_D9'.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to annotated tag xalan_2_2_D9
in repository https://gitbox.apache.org/repos/asf/xalan-test.git
commit cf38360f537839a17fb229cbdfcaa4c23c7ef994
Author: No Author <de...@apache.org>
AuthorDate: Fri Aug 10 21:33:55 2001 +0000
This commit was manufactured by cvs2svn to create tag 'xalan_2_2_D9'.
---
build.xml | 4 +-
.../org/apache/qetest/xsl/ConformanceDirRules.java | 33 +-
.../org/apache/qetest/xslwrapper/TraxWrapper.java | 1054 --------------------
qetest.xml | 65 --
4 files changed, 14 insertions(+), 1142 deletions(-)
diff --git a/build.xml b/build.xml
index 3ca0dd1..30c36d5 100644
--- a/build.xml
+++ b/build.xml
@@ -27,8 +27,7 @@
<!-- Initialize: define various properties about locations, jars, etc. -->
<!-- ================================================================== -->
<!-- First, read in the user's own default properties, if they exist -->
- <property name="local.properties" value="my.test.properties"/>
- <property file="${local.properties}" />
+ <property file="my.test.properties" />
<!-- Then, read in the default checked-in properties -->
<property file="test.properties" />
@@ -176,7 +175,6 @@
from the testxsl.jar file instead of below.
-->
<pathelement location="${test.src.dir}" />
- <pathelement location="${test.build.dir}" />
<pathelement location="${testxsl.jar}" />
</classpath>
</taskdef>
diff --git a/java/src/org/apache/qetest/xsl/ConformanceDirRules.java b/java/src/org/apache/qetest/xsl/ConformanceDirRules.java
index dbedb57..927461b 100644
--- a/java/src/org/apache/qetest/xsl/ConformanceDirRules.java
+++ b/java/src/org/apache/qetest/xsl/ConformanceDirRules.java
@@ -60,12 +60,10 @@ import java.io.FilenameFilter;
import java.io.File;
import java.util.Hashtable;
-import java.util.StringTokenizer;
/**
* Returns directories that are either on an inclusion list, or
* just ones that don't begin with [x|X], or are 'CVS'.
- * Rudimentary multiple inclusion dirs are now supported.
* @author shane_curcuru@lotus.com
* @version $Id$
*/
@@ -78,7 +76,7 @@ public class ConformanceDirRules implements FilenameFilter
/**
* Initialize with a case-sensitive Hash of directory names to include.
*
- * @param iDirs hash of inclusion dirs
+ * NEEDSDOC @param iDirs
*/
public ConformanceDirRules(Hashtable iDirs)
{
@@ -86,9 +84,9 @@ public class ConformanceDirRules implements FilenameFilter
}
/**
- * Initialize with a case-insensitive String directory name(s) to include.
+ * Initialize with a case-insensitive String directory name to include.
*
- * @param incDir semicolon-delimited string of inclusion dir(s)
+ * NEEDSDOC @param incDir
*/
public ConformanceDirRules(String incDir)
{
@@ -109,7 +107,7 @@ public class ConformanceDirRules implements FilenameFilter
/**
* Accessor methods for case-sensitive Hash of directory names to include.
*
- * @param iDirs hash of inclusion dirs
+ * NEEDSDOC @param iDirs
*/
public void setIncludeDirs(Hashtable iDirs)
{
@@ -123,7 +121,7 @@ public class ConformanceDirRules implements FilenameFilter
/**
* Accessor methods for case-sensitive Hash of directory names to include.
*
- * @return clone of our hash of inclusion dirs
+ * NEEDSDOC ($objectName$) @return
*/
public Hashtable getIncludeDirs()
{
@@ -143,7 +141,7 @@ public class ConformanceDirRules implements FilenameFilter
/**
* Accessor method to set a case-insensitive String directory name to include.
*
- * @param incDir semicolon-delimited string of inclusion dir(s)
+ * NEEDSDOC @param incDir
*/
public void setIncludeDirs(String incDir)
{
@@ -155,8 +153,8 @@ public class ConformanceDirRules implements FilenameFilter
* <p><b>Note:</b> simply uses .toUpperCase() and .toLowerCase() on the input string;
* does not do full case-checking on the entire string!</p>
*
- * @param incDir semicolon-delimited string of inclusion dir(s)
- * @param caseSensitive - should be obvious, shouldn't it?
+ * NEEDSDOC @param incDir
+ * NEEDSDOC @param caseSensitive
*/
public void setIncludeDirs(String incDir, boolean caseSensitive)
{
@@ -166,17 +164,12 @@ public class ConformanceDirRules implements FilenameFilter
includeDirs = null;
includeDirs = new Hashtable();
- StringTokenizer st = new StringTokenizer(incDir, ";");
- while (st.hasMoreTokens())
+ includeDirs.put(incDir, "");
+
+ if (!caseSensitive)
{
- String tmp = st.nextToken();
- // Value in hash is ignored
- includeDirs.put(tmp, Boolean.TRUE);
- if (!caseSensitive)
- {
- includeDirs.put(tmp.toUpperCase(), Boolean.TRUE);
- includeDirs.put(tmp.toLowerCase(), Boolean.TRUE);
- }
+ includeDirs.put(incDir.toUpperCase(), "");
+ includeDirs.put(incDir.toLowerCase(), "");
}
}
else
diff --git a/java/src/org/apache/qetest/xslwrapper/TraxWrapper.java b/java/src/org/apache/qetest/xslwrapper/TraxWrapper.java
deleted file mode 100644
index 1aa5980..0000000
--- a/java/src/org/apache/qetest/xslwrapper/TraxWrapper.java
+++ /dev/null
@@ -1,1054 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 2000 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xalan" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 2000, Lotus
- * Development Corporation., http://www.lotus.com. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-/*
- *
- * TraxWrapper.java
- *
- */
-package org.apache.qetest.xslwrapper;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import java.io.PrintWriter; // currently only used in unimplemented setDiagnosticsOutput
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-
-// Needed SAX and DOM classes
-import org.xml.sax.InputSource;
-import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.*; // LexicalHandler?
-import org.w3c.dom.Node;
-
-// javax parsers and trax imports
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-
-/**
- * Implementation of a ProcessorWrapper for a TrAX-compilant XSLT processor.
- * <p>Currently defaults to the Xalan 2.x implementation, although
- * it should respect the trax.processor.xslt system property.</p>
- * @todo add better support for liaisons, or different processing
- * models (DOM, SAX, from files, whatever), etc.
- * @todo share constants between TraxWrapper, SaxonWrapper
- * @todo document how we perform various types of transforms
- * @author Shane Curcuru
- * @version $Id$
- * @deprecated Please use TransformWrapper classes instead.
- * ProcessorWrapper subclasses are being replaced with
- * TransformWrapper subclasses over time; when the appropriate
- * TransformWrapper flavors for Xalan-J 2.x are available, please
- * plan on using them.
- * @see org.apache.qetest.xslwrapper.TransformWrapper
- * @see org.apache.qetest.xslwrapper.TraxFileWrapper
- * @see org.apache.qetest.xslwrapper.TraxStreamWrapper
- * @see org.apache.qetest.xslwrapper.TraxSAXWrapper
- * @see org.apache.qetest.xslwrapper.TraxDOMWrapper
- */
-public class TraxWrapper extends ProcessorWrapper
-{
-
- /** No-op Ctor for the generic TRAX interface wrapper. */
- public TraxWrapper(){}
-
- /** Reference to current processor - TRaX flavor - convenience method. */
- protected javax.xml.transform.TransformerFactory processor = null;
-
- /**
- * @return reference to underlying TransformerFactory
- */
- public javax.xml.transform.TransformerFactory getTraxProcessor()
- {
- return (processor);
- }
-
- /** A preprocessed stylesheet that we're saving. */
- private Templates savedStylesheet = null;
-
- /** Whatever parameters the user has set. */
- private Hashtable params = null;
-
- /** Which type of transform we should perform. */
- protected int transformType = DEFAULT_TYPE;
-
- /** Constants for different types of transforms. */
- public static final String FILE_TO_FILE = "file-to-file";
-
- /** NEEDSDOC Field FILE_TO_FILE_TYPE */
- public static final int FILE_TO_FILE_TYPE = 1;
-
- /** NEEDSDOC Field DOM_TO_DOM */
- public static final String DOM_TO_DOM = "dom-to-dom";
-
- /** NEEDSDOC Field DOM_TO_DOM_TYPE */
- public static final int DOM_TO_DOM_TYPE = 2;
-
- /** NEEDSDOC Field SAX_TO_SAX */
- public static final String SAX_TO_SAX = "sax-to-sax";
-
- /** NEEDSDOC Field SAX_TO_SAX_TYPE */
- public static final int SAX_TO_SAX_TYPE = 3;
-
- /** NEEDSDOC Field SAX_TO_STREAM */
- public static final String SAX_TO_STREAM = "sax-to-stream";
-
- /** NEEDSDOC Field SAX_TO_STREAM_TYPE */
- public static final int SAX_TO_STREAM_TYPE = 4;
-
- /** NEEDSDOC Field DOM_TO_STREAM */
- public static final String DOM_TO_STREAM = "dom-to-stream";
-
- /** NEEDSDOC Field DOM_TO_STREAM_TYPE */
- public static final int DOM_TO_STREAM_TYPE = 5;
-
- /** NEEDSDOC Field STREAM_TO_DOM */
- public static final String STREAM_TO_DOM = "stream-to-dom";
-
- /** NEEDSDOC Field STREAM_TO_DOM_TYPE */
- public static final int STREAM_TO_DOM_TYPE = 6;
-
- /** NEEDSDOC Field AS_XML_FILTER */
- public static final String AS_XML_FILTER = "as-xml-filter";
-
- /** NEEDSDOC Field AS_XML_FILTER_TYPE */
- public static final int AS_XML_FILTER_TYPE = 7;
-
- /** NEEDSDOC Field SCOTT */
- public static final String SCOTT = "scott";
-
- /** NEEDSDOC Field AS_XML_FILTER_TYPE */
- public static final int SCOTT_TYPE = 8;
-
- /** NEEDSDOC Field SAX_TO_SAX */
- public static final String SAX_PIPES = "sax-pipes";
-
- /** NEEDSDOC Field SAX_TO_SAX_TYPE */
- public static final int SAX_PIPES_TYPE = 9;
-
- /** NEEDSDOC Field DEFAULT_TRANSFORM */
- public static final String DEFAULT_TRANSFORM = FILE_TO_FILE;
-
- /** NEEDSDOC Field DEFAULT_TYPE */
- public static final int DEFAULT_TYPE = FILE_TO_FILE_TYPE;
-
- /**
- * Mapping of transform types to integer constants.
- */
- protected static Hashtable typeMap = null;
-
- // Static class initializer for our typeMap
- static
- {
- typeMap = new Hashtable();
-
- typeMap.put(FILE_TO_FILE, new Integer(FILE_TO_FILE_TYPE));
- typeMap.put(DOM_TO_DOM, new Integer(DOM_TO_DOM_TYPE));
- typeMap.put(SAX_TO_SAX, new Integer(SAX_TO_SAX_TYPE));
- typeMap.put(SAX_TO_STREAM, new Integer(SAX_TO_STREAM_TYPE));
- typeMap.put(DOM_TO_STREAM, new Integer(DOM_TO_STREAM_TYPE));
- typeMap.put(STREAM_TO_DOM, new Integer(STREAM_TO_DOM_TYPE));
- typeMap.put(AS_XML_FILTER, new Integer(AS_XML_FILTER_TYPE));
- typeMap.put(SCOTT, new Integer(SCOTT_TYPE));
- typeMap.put(SAX_PIPES, new Integer(SAX_PIPES_TYPE));
- }
- ;
-
- /** NEEDSDOC Field TRAX_PROCESSOR_XSLT */
- public static final String TRAX_PROCESSOR_XSLT = "javax.xml.transform.TransformerFactory";
-
- /** NEEDSDOC Field ORG_XML_SAX_DRIVER */
- public static final String ORG_XML_SAX_DRIVER = "org.xml.sax.driver";
-
- /** NEEDSDOC Field DEFAULT_PROCESSOR */
- public static final String DEFAULT_PROCESSOR =
- "org.apache.xalan.processor.TransformerFactoryImpl";
-
- /** NEEDSDOC Field DEFAULT_PARSER */
- public static final String DEFAULT_PARSER =
- "org.apache.xerces.parsers.SAXParser";
-
- /** NEEDSDOC Field TRAX_WRAPPER_TYPE */
- public static final String TRAX_WRAPPER_TYPE = "trax.wrapper.type";
-
- /**
- * Construct a processor of the appropriate flavor, optionally specifying a liaison.
- * <p>May throw exceptions related to the creating of a new processor.</p>
- * <p>Note liaison support is not really implemented - a TODO item.</p>
- * <p>This method defaults the "trax.processor.xslt" system
- * property to the Xalan 2.x implementation. It also reads
- * the "trax.wrapper.type" property to determine how we should
- * perform transformations: eg, SAX2SAX, DOM2DOM, FILE2FILE, etc..</p>
- *
- * @param liaisonClassName [optional] if non-null & non-blank,
- * classname of an XML liaison
- * @return (Object)processor as a side effect; null if error
- * @throws java.lang.Exception covers any underlying exceptions
- */
- public Object createNewProcessor(String liaisonClassName)
- throws java.lang.Exception // Cover all exception cases
- {
-
- // Cleanup any prior objects
- cleanup();
-
- // Default the System property trax.processor.xslt
- // to the FQCN of the xalan implementation, if needed
- Properties props = System.getProperties();
-
- // Get, with default, then put back to install default
- String val = props.getProperty(TRAX_PROCESSOR_XSLT,
- DEFAULT_PROCESSOR);
-
- props.put(TRAX_PROCESSOR_XSLT, val);
-
- // Get, with default, then put back to install default
- val = props.getProperty(ORG_XML_SAX_DRIVER, DEFAULT_PARSER);
-
- props.put(ORG_XML_SAX_DRIVER, val);
-
- // Publish any changs.
- // Note that this call may throw SecurityException in
- // some cases, cf. if called from an applet
- System.setProperties(props);
-
- // Also get the 'type' of transformation we should perform
- // with TRAX - using SAX, using files, DOMs, whatever
- try
- {
- Integer i =
- (Integer) typeMap.get(System.getProperty(TRAX_WRAPPER_TYPE,
- DEFAULT_TRANSFORM));
-
- transformType = i.intValue();
- }
- catch (Exception e)
- {
-
- // Just set the default; ignore the exception
- transformType = DEFAULT_TYPE;
- }
-
- // Get a factory of 'xslt' stuff (i.e. Xalan)
- processor = TransformerFactory.newInstance();
- p = (Object) processor;
-
- // Return here; will be null if error or exception raised
- return (p);
- }
-
- /**
- * Get a description of the wrappered processor.
- * Note: Now auto-creates a processor if needed: this could
- * have unintended side-effects in future applications, but
- * makes the current code much simpler. In the future, we'll
- * probably get rid of the system property setting stuff and
- * just have subclasses for every flavor.
- * @return info-string describing the processor and possibly it's common options
- */
- public String getDescription()
- {
- if (null == processor)
- {
- try
- {
- createNewProcessor(null);
- }
- catch (Exception e)
- {
- /* no-op, let it fail: we can continue anyways */
- }
- }
-
- StringBuffer buf = new StringBuffer("TRaX");
- buf.append(";");
- buf.append("Java");
- buf.append(";");
- buf.append(System.getProperties().getProperty(TRAX_PROCESSOR_XSLT)); // TODO - improve this
- buf.append(";");
- buf.append(System.getProperties().getProperty(TRAX_WRAPPER_TYPE)); // TODO - improve this
-
- return buf.toString();
- }
-
- /**
- * Process the xmlSource using the xslStylesheet to produce the resultFile.
- * <p>May throw exceptions related to asking the processor to perform the process.</p>
- * <p>Attempts to ask each processor to accomplish the task in the simplest
- * and most obvious manner. Often copied from various processor's samples.</p>
- * <p>This also respects the "trax.wrapper.type" System property to
- * support different types of transforms.</p>
- *
- * @param xmlSource name of source XML file
- * @param xslStylesheet name of stylesheet XSL file
- * @param resultFile name of output file, presumably XML
- * @return milliseconds process time took
- * @throws java.lang.Exception covers any underlying exceptions
- */
- public long processToFile(
- String xmlSource, String xslStylesheet, String resultFile)
- throws java.lang.Exception // Cover all exception cases
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- // Declare variables ahead of time to minimize latency
- long startTime = 0;
- long xmlTime = 0;
-
- // Create trax-specific sources - only as needed!
-
- // May throw IOException
- // Note: use OutputStream derivative, not Writer derivative, so that
- // the processor can properly control the output encoding!
- FileOutputStream resultStream = new FileOutputStream(resultFile);
-
- // Read and compile the stylesheet - only as needed!
-
- switch (transformType)
- {
-
- // Each case does timing just on the transformation
- // @todo check for ERROR return from underlying operations!
- case FILE_TO_FILE_TYPE :
- startTime = System.currentTimeMillis();
-
- // Default method of building the stylesheet
- Transformer transformer = processor.newTransformer(new StreamSource(xslStylesheet));
- // Apply any parameters needed (note: may affect timing
- // data slightly with method call and Properties lookup)
- applyParams(transformer, params);
- // Transform the XML document into the output stream
- transformer.transform(new StreamSource(xmlSource), new StreamResult(resultStream));
-
- xmlTime = System.currentTimeMillis() - startTime;
- break;
-
- case DOM_TO_DOM_TYPE :
- xmlTime = processDOMToDOM(xmlSource, xslStylesheet, resultStream);
- break;
-
- case SAX_TO_SAX_TYPE :
- xmlTime = processSAXToSAX(xmlSource, xslStylesheet, resultStream);
- break;
-
- case SAX_PIPES_TYPE :
- xmlTime = processPipes(xmlSource, xslStylesheet, resultStream);
- break;
-
- case SCOTT_TYPE :
- xmlTime = processScott(xmlSource, xslStylesheet, resultStream);
- break;
- default :
- throw new java.lang.IllegalStateException("bad/unimplemented transformType("
- + transformType
- + ") for: "
- + TRAX_WRAPPER_TYPE);
- }
-
- // Force output stream closed, just in case
- resultStream.close();
-
- // Return the timing data
- return (xmlTime);
- }
-
-
- /**
- * Perform the transform from a DOM to a DOM (then serialize).
- *
- * //@todo EVALUATE TIMING: right now, we time everything,
- * all DOM building and transforms (but not serialization)
- * @param xmlSource name of source XML file
- * @param xslStylesheet name of stylesheet XSL file
- * @param resultFile name of output file, presumably XML
- * @return milliseconds process time took
- * @throws java.lang.Exception covers any underlying exceptions
- */
- protected long processDOMToDOM(
- String xmlSource, String xslStylesheet, OutputStream resultStream)
- throws java.lang.Exception // Cover all exception cases
- {
- if (!(processor.getFeature(DOMSource.FEATURE)
- && processor.getFeature(DOMResult.FEATURE)))
- {
- // If DOMs are not supported in either input (Sources)
- // or output (Results), then bail
- return ERROR;
- }
- long endTime = 0;
- long startTime = System.currentTimeMillis();
-
- // Parse in the stylesheet into a DOM
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
- dfactory.setNamespaceAware(true);
- DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
- Node xslDoc = docBuilder.parse(new InputSource(xslStylesheet));
-
- // Create a DOMSource to encapsulate the xsl DOM
- DOMSource dsource = new DOMSource(xslDoc);
- // If we don't do this, the transformer won't know how to
- // resolve relative URLs in the stylesheet.
- dsource.setSystemId(xslStylesheet);
-
- // Build a stylesheet from the DOMSource
- Templates templates = processor.newTemplates(dsource);
- Transformer transformer = templates.newTransformer();
-
- // Parse in the xml data into a DOM
- dfactory = DocumentBuilderFactory.newInstance();
- dfactory.setNamespaceAware(true);
- docBuilder = dfactory.newDocumentBuilder();
- Node xmlDoc = docBuilder.parse(new InputSource(xmlSource));
-
- // Prepare a result and transform it into a DOM
- org.w3c.dom.Document outNode = docBuilder.newDocument();
- applyParams(transformer, params);
- transformer.transform(new DOMSource(xmlDoc, xmlSource),
- new DOMResult(outNode));
- // Stop timing now
- endTime = System.currentTimeMillis();
-
- // Now serialize output to disk with identity transformer
- Transformer serializer = processor.newTransformer();
- Properties serializationProps = templates.getOutputProperties();
- serializer.setOutputProperties(serializationProps);
- serializer.transform(new DOMSource(outNode),
- new StreamResult(resultStream));
-
- return (endTime - startTime);
- }
-
- /**
- * Perform the transform from SAX to SAX (then serialize).
- *
- * //@todo EVALUATE TIMING: currently times entire process
- * @param xmlSource name of source XML file
- * @param xslStylesheet name of stylesheet XSL file
- * @param resultFile name of output file, presumably XML
- * @return milliseconds process time took
- * @throws java.lang.Exception covers any underlying exceptions
- */
- protected long processSAXToSAX(String xmlSource,
- String xslStylesheet,
- OutputStream resultStream)
- throws java.lang.Exception // Cover all exceptions
- {
- if (!(processor.getFeature(SAXSource.FEATURE)
- && processor.getFeature(SAXResult.FEATURE)))
- {
- // If SAX is not supported in either input (Sources)
- // or output (Results), then bail
- return ERROR;
- }
- long endTime = 0;
- long startTime = System.currentTimeMillis();
-
- // Mostly copied from samples\SAX2SAX
- // Cast the TransformerFactory.
- SAXTransformerFactory stf =
- ((SAXTransformerFactory) processor);
-
- try
- {
- stf.setAttribute(
- "http://xml.apache.org/xalan/features/incremental"
- , Boolean.TRUE);
- }
- catch(IllegalArgumentException iae)
- {
- // log?
- }
-
- // Create a ContentHandler to handle parsing of the xsl
- TemplatesHandler templatesHandler = stf.newTemplatesHandler();
-
- // Create an XMLReader and set its ContentHandler.
- XMLReader xslReader = XMLReaderFactory.createXMLReader();
- xslReader.setContentHandler(templatesHandler);
-
- // Parse the stylesheet.
- xslReader.parse(xslStylesheet);
- // @todo Do we need to set systemID at all?
-
- //Get the Templates object from the ContentHandler.
- Templates templates = templatesHandler.getTemplates();
- // Get the outputProperties from the stylesheet, so
- // we can later use them for the serialization
- Properties xslOutputProps = templates.getOutputProperties();
-
- // Create a ContentHandler to handle parsing of the XML
- TransformerHandler stylesheetHandler = stf.newTransformerHandler(templates);
-
- // Use a new XMLReader to parse the XML document
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
- xmlReader.setContentHandler(stylesheetHandler);
-
- // Set the ContentHandler to also function as LexicalHandler,
- // includes "lexical" events (e.g., comments and CDATA).
- xmlReader.setProperty(
- "http://xml.org/sax/properties/lexical-handler",
- stylesheetHandler);
- xmlReader.setProperty("http://xml.org/sax/properties/declaration-handler",
- stylesheetHandler);
-
- // These two lines were added by sb.
- xmlReader.setDTDHandler(stylesheetHandler);
- stylesheetHandler.setSystemId(xmlSource);
-
- try
- {
- xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes",
- true);
- xmlReader.setFeature("http://apache.org/xml/features/validation/dynamic",
- true);
- }
- catch (org.xml.sax.SAXException se)
- {
- // We don't care.
- }
-
-
- // Create a 'pipe'-like identity transformer, so we can
- // easily get our results serialized to disk
- TransformerHandler serializingHandler = stf.newTransformerHandler();
- // Set the stylesheet's output properties into the output
- // via it's Transformer
- serializingHandler.getTransformer().setOutputProperties(xslOutputProps);
- // Set the output to be our given resultStream
- serializingHandler.setResult(new StreamResult(resultStream));
-
- // Create a SAXResult dumping into our 'pipe' serializer
- SAXResult saxResult = new SAXResult(serializingHandler);
- saxResult.setLexicalHandler(serializingHandler);
-
- // Set the original stylesheet to dump into our result
- stylesheetHandler.setResult(saxResult);
-
- // Parse the XML input document.
- xmlReader.parse(xmlSource);
-
- // Stop timing now
- endTime = System.currentTimeMillis();
-
- return (endTime - startTime);
- }
-
- /**
- * Perform the transform from multiple pipes.
- * The transform goes from:
- * xmlReader->identityTransform(pipe1)->identityTransform(pipe2)
- * ->conformanceTestTranform(pipe3)->identityTransform(pipe4)
- * ->serializer
- * @param xmlSource name of source XML file
- * @param xslStylesheet name of stylesheet XSL file
- * @param resultFile name of output file, presumably XML
- * @return milliseconds process time took
- * @throws java.lang.Exception covers any underlying exceptions
- */
- protected long processPipes(String xmlSource,
- String xslStylesheet,
- OutputStream resultStream)
- throws java.lang.Exception // Cover all exceptions
- {
-
- if (!(processor.getFeature(SAXSource.FEATURE)
- && processor.getFeature(SAXResult.FEATURE)))
- {
- // If SAX is not supported in either input (Sources)
- // or output (Results), then bail
- return ERROR;
- }
- long endTime = 0;
- long startTime = System.currentTimeMillis();
-
- // Mostly copied from samples\SAX2SAX
- // Cast the TransformerFactory.
- SAXTransformerFactory stf =
- ((SAXTransformerFactory) processor);
-
- /** The identity transform string, for support of newTransformerHandler()
- * and newTransformer(). */
- final String identityTransform =
- "<xsl:stylesheet " + "xmlns:xsl='http://www.w3.org/1999/XSL/Transform' "
- + "version='1.0'>" + "<xsl:template match='/|node()'>"
- + "<xsl:copy-of select='.'/>" + "</xsl:template>" + "</xsl:stylesheet>";
-
- StringReader reader = new StringReader(identityTransform);
- Templates identityTemplate = stf.newTemplates(new StreamSource(reader));
-
- // Create a ContentHandler to handle parsing of the xsl
- TemplatesHandler templatesHandler = stf.newTemplatesHandler();
-
- // Create an XMLReader and set its ContentHandler.
- XMLReader xslReader = XMLReaderFactory.createXMLReader();
- xslReader.setContentHandler(templatesHandler);
-
- // Parse the stylesheet.
- xslReader.parse(xslStylesheet);
- // @todo Do we need to set systemID at all?
-
- //Get the Templates object from the ContentHandler.
- Templates templates = templatesHandler.getTemplates();
-
- // Get the outputProperties from the stylesheet, so
- // we can later use them for the serialization
- Properties xslOutputProps = templates.getOutputProperties();
-
- // Create Pipe 1
- // Create a ContentHandler to handle parsing of the XML
- TransformerHandler pipe1 = stf.newTransformerHandler(identityTemplate);
-
- // Use a new XMLReader to parse the XML document
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
- xmlReader.setContentHandler(pipe1);
-
- // Set the ContentHandler to also function as LexicalHandler,
- // includes "lexical" events (e.g., comments and CDATA).
- xmlReader.setProperty(
- "http://xml.org/sax/properties/lexical-handler",
- pipe1);
- xmlReader.setProperty("http://xml.org/sax/properties/declaration-handler",
- pipe1);
-
- // These two lines were added by sb.
- xmlReader.setDTDHandler(pipe1);
- pipe1.setSystemId(xmlSource);
-
- try
- {
- xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes",
- true);
- xmlReader.setFeature("http://apache.org/xml/features/validation/dynamic",
- true);
- }
- catch (org.xml.sax.SAXException se)
- {
- // We don't care.
- }
-
- // Create pipe 2
- TransformerHandler pipe2 = stf.newTransformerHandler(identityTemplate);
- pipe1.setResult(new SAXResult(pipe2));
-
- // Create pipe 3
- TransformerHandler pipe3 = stf.newTransformerHandler(templates);
- pipe2.setResult(new SAXResult(pipe3));
-
- // Create pipe 4
- TransformerHandler pipe4 = stf.newTransformerHandler(identityTemplate);
- pipe3.setResult(new SAXResult(pipe4));
-
- // Create a 'pipe'-like identity transformer, so we can
- // easily get our results serialized to disk
- TransformerHandler serializingHandler = stf.newTransformerHandler();
- // Set the stylesheet's output properties into the output
- // via it's Transformer
- serializingHandler.getTransformer().setOutputProperties(xslOutputProps);
- // Set the output to be our given resultStream
- serializingHandler.setResult(new StreamResult(resultStream));
-
- // Create a SAXResult dumping into our 'pipe' serializer
- SAXResult saxResult = new SAXResult(serializingHandler);
- saxResult.setLexicalHandler(serializingHandler);
-
- // Set the original stylesheet to dump into our result
- pipe4.setResult(saxResult);
-
- // Parse the XML input document.
- xmlReader.parse(xmlSource);
-
- // Stop timing now
- endTime = System.currentTimeMillis();
-
- return (endTime - startTime);
- }
-
-
- protected String objectFilename = "TEMP-FILE-TraxWrapper.ser";
- /**
- * Perform the transform with Scott's example.
- * //@todo rename and reevaluate - I'm in a hurry today
- * //@todo EVALUATE TIMING: currently times entire process
- * @param xmlSource name of source XML file
- * @param xslStylesheet name of stylesheet XSL file
- * @param resultFile name of output file, presumably XML
- * @return milliseconds process time took
- * @throws java.lang.Exception covers any underlying exceptions
- */
- protected long processScott(String xmlSource,
- String xslStylesheet,
- OutputStream resultStream)
- throws java.lang.Exception // Cover all exceptions
- {
- if (!(processor.getFeature(StreamSource.FEATURE)
- && processor.getFeature(StreamResult.FEATURE)))
- {
- // If Stream is not supported in either input (Sources)
- // or output (Results), then bail
- return ERROR;
- }
- long endTime = 0;
- long startTime = System.currentTimeMillis();
-
- // Create templates normally
- Templates templates = processor.newTemplates(new StreamSource(xslStylesheet));
-
- // Serialize the Templates to disk using normal Java methods
- // Note this needs more work to be robust - need to handle
- // cleaning up previous files on disk, or maybe use a random
- // name generator each time
- ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(objectFilename));
- oos.writeObject(templates);
- oos.close();
-
- // Deserialize the Templates to disk using normal Java methods
- ObjectInputStream ois = new ObjectInputStream(new FileInputStream(objectFilename));
- Templates templates2 = (Templates)ois.readObject();
-
- // Use the transformer as normal to transform
- Transformer transformer = templates2.newTransformer();
- transformer.transform(new StreamSource(xmlSource), new StreamResult(resultStream));
-
- // Stop timing now
- endTime = System.currentTimeMillis();
-
- return (endTime - startTime);
- }
-
- /**
- * Preprocess a stylesheet and set it into the processor, based on string inputs.
- *
- * //@todo Does NOT respect the "trax.wrapper.type" System property yet.
- * @param xslStylesheet name of stylesheet XSL file
- * @return milliseconds process time took or ProcessorWrapper.ERROR
- * @throws java.lang.Exception covers any underlying exceptions
- */
- public long preProcessStylesheet(String xslStylesheet)
- throws java.lang.Exception // should cover all exception cases
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- // Declare variables ahead of time to minimize latency
- long startTime = 0;
- long endTime = 0;
-
- // Create trax-specific sources
- Source xsl = new StreamSource(xslStylesheet);
-
- // Begin timing the whole process
- startTime = System.currentTimeMillis();
-
- // Read and compile the stylesheet
- savedStylesheet = processor.newTemplates(xsl);
- endTime = System.currentTimeMillis();
- stylesheetReady = true;
-
- return (endTime - startTime);
- }
-
- /**
- * Process the xmlSource using the xslStylesheet to produce the resultFile.
- *
- * //@todo Does NOT respect the "trax.wrapper.type" System property yet.
- * @param xmlSource name of source XML file
- * @param resultFile name of output file, presumably XML
- * @return milliseconds process time took or ProcessorWrapper.ERROR
- * @throws java.lang.Exception covers any underlying exceptions
- */
- public long processToFile(String xmlSource, String resultFile)
- throws java.lang.Exception // should cover all exception cases
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- // Declare variables ahead of time to minimize latency
- long startTime = 0;
- long endTime = 0;
-
- // May throw IOException
- FileOutputStream resultStream = new FileOutputStream(resultFile);
-
- // Use the precompiled stylesheet
- Transformer transformer = savedStylesheet.newTransformer();
-
- applyParams(transformer, params);
-
- // Begin timing the whole process
- startTime = System.currentTimeMillis();
-
- // HACK: this should work off of transformType as well!
- transformer.transform(new StreamSource(xmlSource), new StreamResult(resultStream));
-
- endTime = System.currentTimeMillis();
-
- // Force output stream closed, just in case
- resultStream.close();
-
- return (endTime - startTime);
- }
-
-
- /**
- * Process xmlSource with embedded stylesheet to produce resultFile.
- * <p>Wrappers will ask their processor to parse an XML file
- * that presumably has an <?xml-stylesheet element in it.</p>
- *
- * @param xmlSource file name of source XML file
- * @param resultFile file name of output file
- * @return milliseconds process time took or ProcessorWrapper.ERROR
- * @throws java.lang.Exception covers any underlying exceptions
- */
- public long processEmbeddedToFile(String xmlSource, String resultFile)
- throws java.lang.Exception // should cover all exception cases
- {
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- // Declare variables ahead of time to minimize latency
- long startTime = 0;
- long endTime = 0;
- String media= null; // currently ignored
- String title = null; // currently ignored
- String charset = null; // currently ignored
-
- // May throw IOException
- FileOutputStream resultStream = new FileOutputStream(resultFile);
-
- // Begin timing the whole process
- startTime = System.currentTimeMillis();
-
- // Get the xml-stylesheet and process it
- Source stylesheetSource = processor.getAssociatedStylesheet(new StreamSource(xmlSource),
- media, title, charset);
-
- Transformer transformer = processor.newTransformer(stylesheetSource);
-
- applyParams(transformer, params);
-
- transformer.transform(new StreamSource(xmlSource), new StreamResult(resultStream));
-
- endTime = System.currentTimeMillis();
-
- // Force output stream closed, just in case
- resultStream.close();
-
- return (endTime - startTime);
- }
-
-
- /**
- * Reset the state.
- */
- public void reset()
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- // Does not appear to be applicable for TRaX?
- stylesheetReady = false;
- savedStylesheet = null;
- params = null;
- }
-
- /**
- * Set diagnostics output PrintWriter - not implemented.
- *
- * @param pw ignored
- */
- public void setDiagnosticsOutput(java.io.PrintWriter pw)
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- // Unimplemented; silently fail
- // processor.setDiagnosticsOutput(pw);
- }
-
- /**
- * Set the indent level of the processor - not implemented.
- *
- * @param i ignored
- */
- public void setIndent(int i)
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- // Unimplemented; silently fail
- // TODO: implement for Xalan/LotusXSL specific setFeature()
- // processor.getXMLProcessorLiaison().setIndent(i);
- }
-
- /**
- * Set a String name=value param in the processor, if applicable.
- *
- * @param key name of the parameter, encoded for TRAX
- * @param expression value of the parameter
- */
- public void setStylesheetParam(String key, String expression)
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- if (params == null)
- params = new Hashtable();
-
- // Just put the param in our hash; individual methods will
- // make use of these later when needed
- params.put(key, expression);
- }
-
- /**
- * Set a String namespace:name=value param in the processor, if applicable.
- * @todo Needs Implementation: namespace is currently <b>ignored!</b>
- * @param namespace of the param
- * @param key name of the param
- * @param expression value of the param
- */
- public void setStylesheetParam(String namespace, String key,
- String expression)
- {
-
- // Ensure we (apparently) have some processor
- if (processor == null)
- throw new java.lang.IllegalStateException(
- "You must call createNewProcessor first!");
-
- if (params == null)
- params = new Hashtable();
-
- // Just put the param in our hash; individual methods will
- // make use of these later when needed
- params.put(key, expression);
- }
-
- /**
- * Apply our set of parameters to a transformer.
- *
- * @todo update to munge TRAX-encoded {namespace}'s as needed
- * @todo should we call t.setParameters(Properties) instead?
- * @param t transformer to set parameters on
- * @param h hash of paramName=paramVal objects
- */
- protected void applyParams(Transformer t, Hashtable h)
- {
-
- if (params == null)
- return;
-
- for (Enumeration enum = h.keys();
- enum.hasMoreElements(); /* no increment portion */ )
- {
- Object key = enum.nextElement();
-
- // @todo update to munge TRAX-encoded {namespace}'s as needed
- t.setParameter(key.toString(), h.get(key));
- }
- }
-
- /** Worker method to cleanup any internal state. */
- private void cleanup()
- {
-
- processor = null;
- p = null;
- stylesheetReady = false;
- savedStylesheet = null;
- params = null;
- }
-} // end of class TraxWrapper
-
diff --git a/qetest.xml b/qetest.xml
deleted file mode 100644
index b070aec..0000000
--- a/qetest.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * qetest.xml
- * Ant 1.3.x build script for compiling the qetest
- * independent testing framework.
- *
- * Closely related to build.xml for Xalan testing.
- *
- * @author shane_curcuru@lotus.com
- * @see build.bat
- */
--->
-<project name="qetest" default="jar" basedir=".">
-
- <!-- Specific locations related to building code -->
- <property name="test.src.dir" value="java/src"/>
- <property name="test.root" value="org/apache/qetest/"/>
- <property name="test.build.dir" value="java/build"/>
-
- <!-- Names/locations of .jar files we build -->
- <property name="qetest.jar.name" value="qetest.jar"/>
- <property name="qetest.jar" value="${test.build.dir}/${qetest.jar.name}"/>
-
- <target name="init.build"
- description="Prepare build output tree, copy prebuilts">
- <mkdir dir="${test.build.dir}" />
- </target>
-
- <!-- Compile the independent test framework and the custom
- Ant task for running tests.
- -->
- <target name="compile.qetest" depends="init.build"
- description="Compile base qetest files and custom task">
- <javac srcdir="${test.src.dir}"
- destdir="${test.build.dir}"
- includes="${test.root}*.java"
- debug="${debug}" />
- <!-- Compile the custom Ant task used by Xalan tests; this is
- actually independent too, and should probably be moved into
- just the qetest package. This gets compiled here so that it
- can be used in the build.xml for <xalantest> definition.
- -->
- <javac srcdir="${test.src.dir}"
- destdir="${test.build.dir}"
- includes="${test.root}/xsl/XSLTestAntTask.java"
- debug="${debug}" />
- </target>
-
- <!-- Jar up the files; only requires qetest files, but the 'all'
- target below also compiles the custom Ant task too.
- -->
- <target name="jar" depends="compile.qetest"
- description="Jar base qetest files; no Xalan dependencies">
- <jar jarfile="${qetest.jar}"
- basedir="${test.build.dir}"
- includes="${test.root}**" />
- </target>
-
- <target name="clean"
- description="Clean up the compiled tests">
- <delete dir="${test.build.dir}"/>
- </target>
-
-</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org