jdk-sandbox: comparison jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java

equal deleted inserted replaced

-:c348e06f0e82
+:d601e4bba306
 * $Id: TransformerImpl.java,v 1.10 2007/06/13 01:57:09 joehw Exp $
 */
 package com.sun.org.apache.xalan.internal.xsltc.trax;
+import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 private XSLTCDTMManager _dtmManager = null;
 /**
 * A reference to an object that creates and caches XMLReader objects.
 */
-private XMLReaderManager _readerManager = XMLReaderManager.getInstance();
+private XMLReaderManager _readerManager;
 /**
 * A flag indicating whether we use incremental building of the DTM.
 */
 //private boolean _isIncremental = false;
 /**
 * State of the secure processing feature.
 */
 private boolean _isSecureProcessing = false;
+/**
+* Indicates whether implementation parts should use
+*   service loader (or similar).
+* Note the default value (false) is the safe option..
+*/
+private boolean _useServicesMechanism;
 /**
 * A hashtable to store parameters for the identity transform. These
 * are not needed during the transformation, but we must keep track of
 * them to be fully complaint with the JAXP API.
 _translet = (AbstractTranslet) translet;
 _properties = createOutputProperties(outputProperties);
 _propertiesClone = (Properties) _properties.clone();
 _indentNumber = indentNumber;
 _tfactory = tfactory;
+_useServicesMechanism = _tfactory.useServicesMechnism();
+_readerManager = XMLReaderManager.getInstance(_useServicesMechanism);
 //_isIncremental = tfactory._incremental;
 }
 /**
 * Return the state of the secure processing feature.
 /**
 * Set the state of the secure processing feature.
 */
 public void setSecureProcessing(boolean flag) {
 _isSecureProcessing = flag;
+}
+/**
+* Return the state of the services mechanism feature.
+*/
+public boolean useServicesMechnism() {
+return _useServicesMechanism;
+}
+/**
+* Set the state of the services mechanism feature.
+*/
+public void setServicesMechnism(boolean flag) {
+_useServicesMechanism = flag;
 }
 /**
 * Returns the translet wrapped inside this Transformer or
 * null if this is the identity transform.
 _method = (String) _properties.get(OutputKeys.METHOD);
 // Get encoding using getProperty() to use defaults
 _encoding = (String) _properties.getProperty(OutputKeys.ENCODING);
-_tohFactory = TransletOutputHandlerFactory.newInstance();
+_tohFactory = TransletOutputHandlerFactory.newInstance(_useServicesMechanism);
 _tohFactory.setEncoding(_encoding);
 if (_method != null) {
 _tohFactory.setOutputMethod(_method);
 }
 if (systemId.startsWith("file:")) {
 // if StreamResult(File) or setSystemID(File) was used,
 // the systemId will be URI encoded as a result of File.toURI(),
 // it must be decoded for use by URL
 try{
-Class clazz =   ObjectFactory.findProviderClass("java.net.URI", ObjectFactory.findClassLoader(), true);
+URI uri = new URI(systemId) ;
-Constructor  construct   = clazz.getConstructor(new Class[] {java.lang.String.class} );
-URI uri = (URI) construct.newInstance(new Object[]{systemId}) ;
 systemId = "file:";
 String host = uri.getHost(); // decoded String
 String path = uri.getPath(); //decoded String
 if (path == null) {
 systemId += "//" + host + path;
 } else {
 systemId += "//" + path;
 }
 }
-catch(ClassNotFoundException e){
-// running on J2SE 1.3 which doesn't have URI Class so OK to ignore
-//ClassNotFoundException.
-}
 catch (Exception  exception) {
 // URI exception which means nothing can be done so OK to ignore
 }
 url = new URL(systemId);
 if (_dtmManager == null) {
 _dtmManager =
 (XSLTCDTMManager)_tfactory.getDTMManagerClass()
 .newInstance();
+_dtmManager.setServicesMechnism(_useServicesMechanism);
 }
 dom = (DOM)_dtmManager.getDTM(source, false, wsfilter, true,
 false, false, 0, hasIdCall);
 } else if (_dom != null) {
 dom = _dom;
 (source instanceof SAXSource &&
 ((SAXSource)source).getInputSource()==null &&
 ((SAXSource)source).getXMLReader()==null )||
 (source instanceof DOMSource &&
 ((DOMSource)source).getNode()==null)){
-DocumentBuilderFactory builderF =
+DocumentBuilderFactory builderF = FactoryImpl.getDOMFactory(_useServicesMechanism);
-DocumentBuilderFactory.newInstance();
+DocumentBuilder builder = builderF.newDocumentBuilder();
-DocumentBuilder builder =
-builderF.newDocumentBuilder();
 String systemID = source.getSystemId();
 source = new DOMSource(builder.newDocument());
 // Copy system ID from original, empty Source to new
 if (systemID != null) {
 while (e.hasMoreTokens()) {
 translet.addCdataElement(e.nextToken());
 }
 }
 }
+else if (name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE)) {
+if (value != null && value.equals("yes")) {
+translet._isStandalone = true;
+}
+}
 }
 }
 /**
 * This method is used to pass any properties to the output handler
 }
 }
 else if (name.equals(OutputPropertiesFactory.S_BUILTIN_EXTENSIONS_UNIVERSAL +"indent-amount")) {
 if (value != null) {
 handler.setIndentAmount(Integer.parseInt(value));
+}
+}
+else if (name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE)) {
+if (value != null && value.equals("yes")) {
+handler.setIsStandalone(true);
 }
 }
 else if (name.equals(OutputKeys.CDATA_SECTION_ELEMENTS)) {
 if (value != null) {
 StringTokenizer e = new StringTokenizer(value);
 name.equals(OutputKeys.CDATA_SECTION_ELEMENTS) ||
 name.equals(OutputKeys.MEDIA_TYPE) ||
 name.equals(OutputKeys.OMIT_XML_DECLARATION)   ||
 name.equals(OutputKeys.STANDALONE) ||
 name.equals(OutputKeys.VERSION) ||
+name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE) ||
 name.charAt(0) == '{');
 }
 /**
 * Checks if a given output property is default (2nd layer only)
 */
 public DOM retrieveDocument(String baseURI, String href, Translet translet) {
 try {
 // Argument to document function was: document('');
 if (href.length() == 0) {
-href = new String(baseURI);
+href = baseURI;
 }
 /*
 *  Fix for bug 24188
 *  Incase the _uriResolver.resolve(href,base) is null

changeset 12458	d601e4bba306
parent 12457	c348e06f0e82
child 17534	21dc0b2762da