cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r511799 - /cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
Date Mon, 26 Feb 2007 13:19:57 GMT
Author: cziegeler
Date: Mon Feb 26 05:19:56 2007
New Revision: 511799

URL: http://svn.apache.org/viewvc?view=rev&rev=511799
Log:
Remove old transformer-factory configuration.

Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java?view=diff&rev=511799&r1=511798&r2=511799
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
(original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
Mon Feb 26 05:19:56 2007
@@ -80,7 +80,6 @@
  *   <use-browser-capabilities-db>false</use-browser-capabilities-db>
  *   <use-session-info>false</use-session-info>
  *   <xslt-processor-role>xslt</xslt-processor-role>
- *   <transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
  *   <check-includes>true</check-includes>
  * </map:transformer>
  * </pre>
@@ -113,11 +112,6 @@
  * If no processor is specified, this transformer will use the XSLT implementation
  * that Cocoon uses internally.
  *
- * The &lt;transformer-factory&gt; configuration allows to specify the TrAX transformer
factory
- * implementation that will be used to obtain the XSLT processor. This is only useful for
- * compatibility reasons. Please configure the XSLT processor in the cocoon.xconf properly
- * and use the xslt-processor-role configuration mentioned above.
- *
  * The &lt;check-includes&gt; configuration specifies if the included stylesheets
are
  * also checked for changes during caching. If this is set to true (default), the
  * included stylesheets are also checked for changes; if this is set to false, only
@@ -216,10 +210,6 @@
         this.useSessionInfo = child.getValueAsBoolean(false);
         this._useSessionInfo = this.useSessionInfo;
 
-        child = conf.getChild("transformer-factory");
-        // traxFactory is null, if transformer-factory config is unspecified
-        final String traxFactory = child.getValue(null);
-
         child = conf.getChild("xslt-processor-role");
         String xsltProcessorRole = child.getValue(XSLTProcessor.ROLE);
         if (!xsltProcessorRole.startsWith(XSLTProcessor.ROLE)) {
@@ -240,19 +230,11 @@
             getLogger().debug("Use session info is " + this.useSessionInfo);
             getLogger().debug("Use TrAX Processor " + xsltProcessorRole);
             getLogger().debug("Check for included stylesheets is " + this.checkIncludes);
-            if (traxFactory != null) {
-                getLogger().debug("Use TrAX Transformer Factory " + traxFactory);
-            } else {
-                getLogger().debug("Use default TrAX Transformer Factory.");
-            }
             getLogger().debug("Default source = " + this.defaultSrc);
         }
 
         try {
             this.xsltProcessor = (XSLTProcessor) this.manager.lookup(xsltProcessorRole);
-            if (traxFactory != null) {
-                this.xsltProcessor.setTransformerFactory(traxFactory);
-            }
         } catch (ServiceException e) {
             throw new ConfigurationException("Cannot load XSLT processor", e);
         }
@@ -577,22 +559,22 @@
         try {
             super.endDocument();
         } catch(Exception e) {
-            
+
             Throwable realEx = this.errorListener.getThrowable();
             if (realEx == null) realEx = e;
-            
+
             if (realEx instanceof RuntimeException) {
                 throw (RuntimeException)realEx;
             }
-            
+
             if (realEx instanceof SAXException) {
                 throw (SAXException)realEx;
             }
-            
+
             if (realEx instanceof Error) {
                 throw (Error)realEx;
             }
-            
+
             throw new NestableRuntimeException(realEx);
         }
         this.finishedDocument = true;



Mime
View raw message