You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/10/19 23:19:42 UTC
svn commit: r326713 - in /cocoon/trunk/src: java/org/apache/cocoon/
java/org/apache/cocoon/components/xslt/
java/org/apache/cocoon/transformation/ webapp/WEB-INF/xconf/
Author: sylvain
Date: Wed Oct 19 14:19:29 2005
New Revision: 326713
URL: http://svn.apache.org/viewcvs?rev=326713&view=rev
Log:
Renaming XSLTProcessorImpl to TraxProcessor to avoid name clash with deprecated class in 2.1 branch
Added:
cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxErrorListener.java
- copied, changed from r326589, cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTErrorListener.java
cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java
- copied, changed from r326589, cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Removed:
cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTErrorListener.java
cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Modified:
cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java
cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
Modified: cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles?rev=326713&r1=326712&r2=326713&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles Wed Oct 19 14:19:29 2005
@@ -75,7 +75,7 @@
<!-- XSLT: -->
<role name="org.apache.excalibur.xml.xslt.XSLTProcessor"
shorthand="xslt-processor"
- default-class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"/>
+ default-class="org.apache.cocoon.components.xslt.TraxProcessor"/>
<role name="org.apache.excalibur.xml.xpath.XPathProcessor"
shorthand="xpath-processor"
Copied: cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxErrorListener.java (from r326589, cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTErrorListener.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxErrorListener.java?p2=cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxErrorListener.java&p1=cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTErrorListener.java&r1=326589&r2=326713&rev=326713&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTErrorListener.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxErrorListener.java Wed Oct 19 14:19:29 2005
@@ -29,7 +29,7 @@
* @version $Id$
* @since 2.1.8
*/
-public class XSLTErrorListener implements ErrorListener{
+public class TraxErrorListener implements ErrorListener{
private Logger logger;
private String uri;
@@ -40,7 +40,7 @@
/** The exception we had from error() or fatalError() */
private TransformerException exception;
- public XSLTErrorListener(Logger logger, String uri) {
+ public TraxErrorListener(Logger logger, String uri) {
this.logger = logger;
this.uri = uri;
}
Copied: cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java (from r326589, cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java?p2=cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java&p1=cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java&r1=326589&r2=326713&rev=326713&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java Wed Oct 19 14:19:29 2005
@@ -68,7 +68,7 @@
* @since 2.1.8
*/
-public class XSLTProcessorImpl extends AbstractLogEnabled implements XSLTProcessor, Serviceable, Initializable, Disposable, Parameterizable,
+public class TraxProcessor extends AbstractLogEnabled implements XSLTProcessor, Serviceable, Initializable, Disposable, Parameterizable,
Recyclable, URIResolver {
/** The store service instance */
protected Store m_store;
@@ -204,7 +204,7 @@
throw new XSLTProcessorException("Error retrieving template", e);
}
- XSLTErrorListener errorListener = new XSLTErrorListener(getLogger(), stylesheet.getURI());
+ TraxErrorListener errorListener = new TraxErrorListener(getLogger(), stylesheet.getURI());
try{
if (getLogger().isDebugEnabled()) {
getLogger().debug("Creating new Templates for " + id);
@@ -250,7 +250,7 @@
// Create transformer handler
final TransformerHandler handler = m_factory.newTransformerHandler(template);
- handler.getTransformer().setErrorListener(new XSLTErrorListener(getLogger(), stylesheet.getURI()));
+ handler.getTransformer().setErrorListener(new TraxErrorListener(getLogger(), stylesheet.getURI()));
handler.getTransformer().setURIResolver(this);
// Create aggregated validity
@@ -381,7 +381,7 @@
}
}
- _factory.setErrorListener(new XSLTErrorListener(getLogger(), null));
+ _factory.setErrorListener(new TraxErrorListener(getLogger(), null));
_factory.setURIResolver(this);
// FIXME (SM): implementation-specific parameter passing should be
@@ -480,7 +480,7 @@
}
TransformerHandler handler = m_factory.newTransformerHandler((Templates) templateAndValidityAndIncludes[0]);
- handler.getTransformer().setErrorListener(new XSLTErrorListener(getLogger(), stylesheet.getURI()));
+ handler.getTransformer().setErrorListener(new TraxErrorListener(getLogger(), stylesheet.getURI()));
handler.getTransformer().setURIResolver(this);
return new MyTransformerHandlerAndValidity(handler, storedValidity);
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java?rev=326713&r1=326712&r2=326713&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java Wed Oct 19 14:19:29 2005
@@ -41,7 +41,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.source.SourceUtil;
-import org.apache.cocoon.components.xslt.XSLTErrorListener;
+import org.apache.cocoon.components.xslt.TraxErrorListener;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -202,7 +202,7 @@
private SAXException exceptionDuringSetConsumer;
/** The error listener used by the stylesheet */
- private XSLTErrorListener errorListener;
+ private TraxErrorListener errorListener;
/**
* Configure this transformer.
@@ -416,7 +416,7 @@
result.setLexicalHandler(consumer);
this.transformerHandler.setResult(result);
- this.errorListener = new XSLTErrorListener(getLogger(), this.inputSource.getURI());
+ this.errorListener = new TraxErrorListener(getLogger(), this.inputSource.getURI());
this.transformerHandler.getTransformer().setErrorListener(this.errorListener);
}
Modified: cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf?rev=326713&r1=326712&r2=326713&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf Wed Oct 19 14:19:29 2005
@@ -377,7 +377,7 @@
+-->
<component logger="core.xslt"
role="org.apache.excalibur.xml.xslt.XSLTProcessor/xsltc"
- class="org.apache.cocoon.components.xslt.XSLTProcessorImpl">
+ class="org.apache.cocoon.components.xslt.TraxProcessor">
<parameter name="use-store" value="true"/>
<parameter name="transformer-factory" value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
</component>
@@ -387,7 +387,7 @@
+-->
<component logger="core.xslt"
role="org.apache.excalibur.xml.xslt.XSLTProcessor/xalan"
- class="org.apache.cocoon.components.xslt.XSLTProcessorImpl">
+ class="org.apache.cocoon.components.xslt.TraxProcessor">
<parameter name="use-store" value="true"/>
<parameter name="incremental-processing" value="false"/>
<parameter name="transformer-factory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
@@ -401,7 +401,7 @@
| <parameter name="transformer-factory" value="net.sf.saxon.TransformerFactoryImpl"/>
<component logger="core.xslt"
role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
- class="org.apache.cocoon.components.xslt.XSLTProcessorImpl">
+ class="org.apache.cocoon.components.xslt.TraxProcessor">
<parameter name="use-store" value="true"/>
<parameter name="transformer-factory" value="com.icl.saxon.TransformerFactoryImpl"/>
</component>