You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by cz...@apache.org on 2007/01/30 09:26:55 UTC
svn commit: r501342 - in
/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml: ./
impl/ xpath/ xslt/
Author: cziegeler
Date: Tue Jan 30 00:26:54 2007
New Revision: 501342
URL: http://svn.apache.org/viewvc?view=rev&rev=501342
Log:
Readd component interface to implementation
Modified:
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/DefaultEntityResolver.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/JaxpParser.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/XercesParser.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/AbstractProcessorImpl.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/JaxenProcessorImpl.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon6ProcessorImpl.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon7ProcessorImpl.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/XPathProcessorImpl.java
excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xslt/XSLTProcessorImpl.java
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/DefaultEntityResolver.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/DefaultEntityResolver.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/DefaultEntityResolver.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/DefaultEntityResolver.java Tue Jan 30 00:26:54 2007
@@ -19,6 +19,7 @@
import java.io.IOException;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -56,7 +57,8 @@
Serviceable,
Parameterizable,
ThreadSafe,
- Disposable {
+ Disposable,
+ Component {
/** The catalog manager */
protected CatalogManager catalogManager = new CatalogManager();
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/JaxpParser.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/JaxpParser.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/JaxpParser.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/JaxpParser.java Tue Jan 30 00:26:54 2007
@@ -25,6 +25,7 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -94,7 +95,7 @@
public final class JaxpParser
extends AbstractLogEnabled
implements SAXParser, DOMParser,
- Poolable, Parameterizable, Serviceable, Disposable, ErrorHandler
+ Poolable, Parameterizable, Serviceable, Disposable, ErrorHandler, Component
{
private static final ContentHandler NULL = new DefaultHandler();
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/XercesParser.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/XercesParser.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/XercesParser.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/impl/XercesParser.java Tue Jan 30 00:26:54 2007
@@ -19,6 +19,7 @@
import java.io.IOException;
import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.xerces.dom.DocumentImpl;
@@ -45,7 +46,7 @@
public final class XercesParser
extends AbstractLogEnabled
implements org.apache.excalibur.xml.sax.SAXParser, org.apache.excalibur.xml.dom.DOMParser,
- ErrorHandler, ThreadSafe, Initializable
+ ErrorHandler, ThreadSafe, Initializable, Component
{
public void initialize()
throws Exception
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/AbstractProcessorImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/AbstractProcessorImpl.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/AbstractProcessorImpl.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/AbstractProcessorImpl.java Tue Jan 30 00:26:54 2007
@@ -18,6 +18,7 @@
import java.util.HashMap;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -37,7 +38,7 @@
*/
public abstract class AbstractProcessorImpl
extends AbstractLogEnabled
- implements XPathProcessor, Configurable, PrefixResolver
+ implements XPathProcessor, Configurable, PrefixResolver, Component
{
private final HashMap m_mappings = new HashMap();
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/JaxenProcessorImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/JaxenProcessorImpl.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/JaxenProcessorImpl.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/JaxenProcessorImpl.java Tue Jan 30 00:26:54 2007
@@ -42,7 +42,7 @@
*/
public final class JaxenProcessorImpl
extends AbstractProcessorImpl
- implements XPathProcessor, ThreadSafe
+ implements ThreadSafe
{
/**
* Evaluate XPath expression within a context.
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon6ProcessorImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon6ProcessorImpl.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon6ProcessorImpl.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon6ProcessorImpl.java Tue Jan 30 00:26:54 2007
@@ -54,7 +54,7 @@
*/
public class Saxon6ProcessorImpl
extends AbstractProcessorImpl
- implements XPathProcessor, ThreadSafe
+ implements ThreadSafe
{
private static final TransformerFactory factory = new TransformerFactoryImpl();
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon7ProcessorImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon7ProcessorImpl.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon7ProcessorImpl.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon7ProcessorImpl.java Tue Jan 30 00:26:54 2007
@@ -53,7 +53,7 @@
*/
public class Saxon7ProcessorImpl
extends AbstractProcessorImpl
- implements XPathProcessor, ThreadSafe
+ implements ThreadSafe
{
private static final TransformerFactory factory = new TransformerFactoryImpl();
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/XPathProcessorImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/XPathProcessorImpl.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/XPathProcessorImpl.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xpath/XPathProcessorImpl.java Tue Jan 30 00:26:54 2007
@@ -45,7 +45,7 @@
*/
public final class XPathProcessorImpl
extends AbstractProcessorImpl
- implements XPathProcessor, Configurable, ThreadSafe
+ implements ThreadSafe
{
private String m_baseURI;
Modified: excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xslt/XSLTProcessorImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xslt/XSLTProcessorImpl.java?view=diff&rev=501342&r1=501341&r2=501342
==============================================================================
--- excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xslt/XSLTProcessorImpl.java (original)
+++ excalibur/trunk/components/xmlutil/src/java/org/apache/excalibur/xml/xslt/XSLTProcessorImpl.java Tue Jan 30 00:26:54 2007
@@ -38,6 +38,7 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -78,12 +79,6 @@
* @version 1.0
* @since July 11, 2001
*/
-/**
- * @author CZiegeler
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
public class XSLTProcessorImpl
extends AbstractLogEnabled
implements XSLTProcessor,
@@ -92,7 +87,8 @@
Disposable,
Parameterizable,
Recyclable,
- URIResolver
+ URIResolver,
+ Component
{
/** The store service instance */
protected Store m_store;
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org