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/10/23 22:05:11 UTC
svn commit: r587637 - in /excalibur/trunk/components/sourceresolve:
avalon/src/main/java/org/apache/excalibur/source/impl/
avalon/src/main/test/org/apache/excalibur/source/impl/
impl/src/main/java/org/apache/excalibur/source/factories/ impl/src/main/ja...
Author: cziegeler
Date: Tue Oct 23 13:05:10 2007
New Revision: 587637
URL: http://svn.apache.org/viewvc?rev=587637&view=rev
Log:
Use commons logging for logging.
Modified:
excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/CommonsVFSSourceFactory.java
excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/HTTPSClientSourceFactory.java
excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/ResourceSourceFactory.java
excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/SourceResolverImpl.java
excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/URLSourceFactory.java
excalibur/trunk/components/sourceresolve/avalon/src/main/test/org/apache/excalibur/source/impl/SourceResolverImplTestCase.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/CommonsVFSSource.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSourceFactory.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSourceFactory.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractLoggable.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractSourceResolver.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/DefaultSourceResolver.java
Modified: excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/CommonsVFSSourceFactory.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/CommonsVFSSourceFactory.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/CommonsVFSSourceFactory.java (original)
+++ excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/CommonsVFSSourceFactory.java Tue Oct 23 13:05:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.excalibur.source.impl;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
@@ -33,19 +31,6 @@
* @version $Id$
*/
public class CommonsVFSSourceFactory extends org.apache.excalibur.source.factories.CommonsVFSSourceFactory
- implements ThreadSafe, LogEnabled
+ implements ThreadSafe
{
- /**
- * Enables logging for this source.
- *
- * @param logger {@link Logger} instance to use
- * @see org.apache.avalon.framework.logger.LogEnabled
- * #enableLogging(org.apache.avalon.framework.logger.Logger)
- */
- public void enableLogging(final Logger logger) {
- m_logger = logger;
- }
-
- /** Our logging target */
- private Logger m_logger;
}
Modified: excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/HTTPSClientSourceFactory.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/HTTPSClientSourceFactory.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/HTTPSClientSourceFactory.java (original)
+++ excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/HTTPSClientSourceFactory.java Tue Oct 23 13:05:10 2007
@@ -42,6 +42,8 @@
public void parameterize( final Parameters params )
throws ParameterException
{
+ this.setProxyHost(params.getParameter( HTTPClientSourceFactory.PROXY_HOST, null ));
+ this.setProxyPort(params.getParameterAsInteger( HTTPClientSourceFactory.PROXY_PORT, -1 ));
try {
if ( params.getParameter(SSL_PROVIDER, null ) != null ) {
this.setProvider( params.getParameter(SSL_PROVIDER) );
Modified: excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/ResourceSourceFactory.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/ResourceSourceFactory.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/ResourceSourceFactory.java (original)
+++ excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/ResourceSourceFactory.java Tue Oct 23 13:05:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.excalibur.source.impl;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
@@ -33,19 +31,6 @@
*/
public class ResourceSourceFactory
extends org.apache.excalibur.source.factories.ResourceSourceFactory
- implements LogEnabled, ThreadSafe
+ implements ThreadSafe
{
- /**
- * Enables logging for this source.
- *
- * @param logger {@link Logger} instance to use
- * @see org.apache.avalon.framework.logger.LogEnabled
- * #enableLogging(org.apache.avalon.framework.logger.Logger)
- */
- public void enableLogging(final Logger logger) {
- m_logger = logger;
- }
-
- /** Our logging target */
- private Logger m_logger;
}
Modified: excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/SourceResolverImpl.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/SourceResolverImpl.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/SourceResolverImpl.java (original)
+++ excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/SourceResolverImpl.java Tue Oct 23 13:05:10 2007
@@ -24,8 +24,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
@@ -60,7 +58,6 @@
implements Serviceable,
Contextualizable,
Disposable,
- LogEnabled,
ThreadSafe
{
@@ -70,9 +67,6 @@
/** The special Source factories */
protected ServiceSelector m_factorySelector;
- /** Our logger. */
- private Logger m_logger;
-
/**
* @see org.apache.excalibur.source.impl.AbstractSourceResolver#getSourceFactory(java.lang.String)
*/
@@ -95,35 +89,6 @@
protected void releaseSourceFactory(SourceFactory factory)
{
this.m_factorySelector.release(factory);
- }
-
- /**
- * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
- */
- public void enableLogging(Logger logger)
- {
- this.m_logger = logger;
- }
-
- protected final Logger getLogger()
- {
- return this.m_logger;
- }
-
- /**
- * @see org.apache.excalibur.source.impl.AbstractSourceResolver#debug(java.lang.String)
- */
- protected final void debug(String text)
- {
- this.m_logger.debug(text);
- }
-
- /**
- * @see org.apache.excalibur.source.impl.AbstractSourceResolver#isDebugEnabled()
- */
- protected final boolean isDebugEnabled()
- {
- return this.m_logger.isDebugEnabled();
}
/**
Modified: excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/URLSourceFactory.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/URLSourceFactory.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/URLSourceFactory.java (original)
+++ excalibur/trunk/components/sourceresolve/avalon/src/main/java/org/apache/excalibur/source/impl/URLSourceFactory.java Tue Oct 23 13:05:10 2007
@@ -86,10 +86,10 @@
*/
public Source getSource(String uri, Map parameters) throws MalformedURLException, IOException
{
- if (this.isDebugEnabled())
+ if (this.getLogger().isDebugEnabled())
{
final String message = "Creating source object for " + uri;
- this.debug(message);
+ this.getLogger().debug(message);
}
// First check if it's a file
@@ -110,9 +110,9 @@
catch (MalformedURLException mue)
{
// Maybe a file name containing a ':' ?
- if (this.isDebugEnabled())
+ if (this.getLogger().isDebugEnabled())
{
- this.debug("URL " + uri + " is malformed. Assuming it's a file path.", mue);
+ this.getLogger().debug("URL " + uri + " is malformed. Assuming it's a file path.", mue);
}
return createFileSource(uri);
}
Modified: excalibur/trunk/components/sourceresolve/avalon/src/main/test/org/apache/excalibur/source/impl/SourceResolverImplTestCase.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/avalon/src/main/test/org/apache/excalibur/source/impl/SourceResolverImplTestCase.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/avalon/src/main/test/org/apache/excalibur/source/impl/SourceResolverImplTestCase.java (original)
+++ excalibur/trunk/components/sourceresolve/avalon/src/main/test/org/apache/excalibur/source/impl/SourceResolverImplTestCase.java Tue Oct 23 13:05:10 2007
@@ -52,7 +52,6 @@
//
final SourceResolverImpl resolver = new SourceResolverImpl();
- resolver.enableLogging( logger );
//
// create the context argument and set the root directory and
@@ -71,7 +70,6 @@
//
final ResourceSourceFactory factory = new ResourceSourceFactory();
- factory.enableLogging( logger.getChildLogger( "factory" ) );
// create a selector and add the factory to the selector,
// add the selector to the manager, and service the resolver
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/CommonsVFSSource.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/CommonsVFSSource.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/CommonsVFSSource.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/CommonsVFSSource.java Tue Oct 23 13:05:10 2007
@@ -67,8 +67,8 @@
setContentLength(m_fileContent.getSize());
} catch (final FileSystemException e) {
- if (this.isWarnEnabled()) {
- this.warn(
+ if (this.getLogger().isWarnEnabled()) {
+ this.getLogger().warn(
"Unable to determine content length for " + m_location, e
);
}
@@ -79,8 +79,8 @@
setLastModified(m_fileContent.getLastModifiedTime());
} catch (final FileSystemException e) {
- if (this.isWarnEnabled()) {
- this.warn(
+ if (this.getLogger().isWarnEnabled()) {
+ this.getLogger().warn(
"Unable to determine last modified date for " + m_location, e
);
}
@@ -114,8 +114,8 @@
return m_fileObject.exists();
} catch (final FileSystemException e) {
- if (this.isWarnEnabled()) {
- this.warn("Unable to determine existence for " + m_location, e);
+ if (this.getLogger().isWarnEnabled()) {
+ this.getLogger().warn("Unable to determine existence for " + m_location, e);
}
return false;
}
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java Tue Oct 23 13:05:10 2007
@@ -40,6 +40,7 @@
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.util.DateParseException;
import org.apache.commons.httpclient.util.DateUtil;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -299,9 +300,9 @@
final String key = (String) i.next();
final String value = (String) this.m_parameters.get( key );
- if ( this.isDebugEnabled() )
+ if ( this.getLogger().isDebugEnabled() )
{
- this.debug(
+ this.getLogger().debug(
"Adding header '" + key + "', with value '" + value + "'"
);
}
@@ -372,9 +373,9 @@
}
catch ( final IOException e )
{
- if ( this.isDebugEnabled() )
+ if ( this.getLogger().isDebugEnabled() )
{
- this.debug(
+ this.getLogger().debug(
"Unable to determine response data, using defaults", e
);
}
@@ -585,9 +586,9 @@
}
catch ( final NumberFormatException e )
{
- if ( this.isDebugEnabled() )
+ if ( this.getLogger().isDebugEnabled() )
{
- this.debug(
+ this.getLogger().debug(
"Unable to determine content length, returning -1", e
);
}
@@ -665,7 +666,7 @@
public OutputStream getOutputStream() throws IOException
{
final File tempFile = File.createTempFile("httpclient", "tmp");
- return new WrappedFileOutputStream( tempFile, this );
+ return new WrappedFileOutputStream( tempFile, this.getLogger() );
}
/**
@@ -683,7 +684,7 @@
/**
* Reference to a logger.
*/
- private AbstractLoggable m_logger;
+ private Log m_logger;
/**
* Constructor, creates a new {@link WrappedFileOutputStream}
@@ -693,7 +694,7 @@
* @param logger {@link Logger} reference.
* @exception IOException if an error occurs
*/
- public WrappedFileOutputStream( final File file, final AbstractLoggable logger )
+ public WrappedFileOutputStream( final File file, final Log logger )
throws IOException
{
super( file );
@@ -823,9 +824,9 @@
);
}
- if ( this.isDebugEnabled() )
+ if ( this.getLogger().isDebugEnabled() )
{
- this.debug( this.m_uri + " deleted (" + response + ")");
+ this.getLogger().debug( this.m_uri + " deleted (" + response + ")");
}
}
catch ( final IOException e )
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSourceFactory.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSourceFactory.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSourceFactory.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSourceFactory.java Tue Oct 23 13:05:10 2007
@@ -48,10 +48,10 @@
public Source getSource( String location, Map parameters )
throws MalformedURLException, IOException, SourceException
{
- if( this.isDebugEnabled() )
+ if( this.getLogger().isDebugEnabled() )
{
final String message = "Creating source object for " + location;
- this.debug( message );
+ this.getLogger().debug( message );
}
return new ResourceSource( location );
}
@@ -61,10 +61,10 @@
*/
public void release( Source source )
{
- if( null != source && this.isDebugEnabled() )
+ if( null != source && this.getLogger().isDebugEnabled() )
{
final String message = "Releasing source object for " + source.getURI();
- this.debug( message );
+ this.getLogger().debug( message );
}
// do nothing here
}
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSourceFactory.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSourceFactory.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSourceFactory.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSourceFactory.java Tue Oct 23 13:05:10 2007
@@ -70,10 +70,10 @@
*/
public Source getSource(String uri, Map parameters) throws MalformedURLException, IOException
{
- if (this.isDebugEnabled())
+ if (this.getLogger().isDebugEnabled())
{
final String message = "Creating source object for " + uri;
- this.debug(message);
+ this.getLogger().debug(message);
}
// First check if it's a file
@@ -94,9 +94,9 @@
catch (MalformedURLException mue)
{
// Maybe a file name containing a ':' ?
- if (this.isDebugEnabled())
+ if (this.getLogger().isDebugEnabled())
{
- this.debug("URL " + uri + " is malformed. Assuming it's a file path.", mue);
+ this.getLogger().debug("URL " + uri + " is malformed. Assuming it's a file path.", mue);
}
return createFileSource(uri);
}
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractLoggable.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractLoggable.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractLoggable.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractLoggable.java Tue Oct 23 13:05:10 2007
@@ -29,43 +29,9 @@
public abstract class AbstractLoggable
{
/** Logger */
- protected Log m_logger;
+ protected final Log m_logger = LogFactory.getLog(getClass());
- protected void initLogger()
- {
- if ( m_logger == null )
- {
- m_logger = LogFactory.getLog(getClass());
- }
- }
-
- public boolean isDebugEnabled()
- {
- initLogger();
- return m_logger.isDebugEnabled();
- }
-
- public void debug(String text)
- {
- initLogger();
- m_logger.debug(text);
- }
-
- public void debug(String text, Throwable t)
- {
- initLogger();
- m_logger.debug(text, t);
- }
-
- public boolean isWarnEnabled()
- {
- initLogger();
- return m_logger.isWarnEnabled();
- }
-
- public void warn(String text, Throwable t)
- {
- initLogger();
- m_logger.warn(text, t);
+ protected Log getLogger() {
+ return m_logger;
}
}
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractSourceResolver.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractSourceResolver.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractSourceResolver.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/AbstractSourceResolver.java Tue Oct 23 13:05:10 2007
@@ -47,6 +47,7 @@
* @version $Id$
*/
public abstract class AbstractSourceResolver
+ extends AbstractLoggable
implements SourceResolver
{
@@ -61,16 +62,6 @@
m_baseURL = baseurl;
}
- protected boolean isDebugEnabled()
- {
- return false;
- }
-
- protected void debug(String text)
- {
- // we do not log
- }
-
protected abstract SourceFactory getSourceFactory(String protocol);
protected void releaseSourceFactory(SourceFactory factory)
@@ -97,9 +88,9 @@
Map parameters )
throws MalformedURLException, IOException, SourceException
{
- if( this.isDebugEnabled() )
+ if( this.getLogger().isDebugEnabled() )
{
- this.debug( "Resolving '" + location + "' with base '" + baseURI + "' in context '" + m_baseURL + "'" );
+ this.getLogger().debug( "Resolving '" + location + "' with base '" + baseURI + "' in context '" + m_baseURL + "'" );
}
if( location == null ) throw new MalformedURLException( "Invalid System ID" );
if( null != baseURI && SourceUtil.indexOfSchemeColon(baseURI) == -1 )
@@ -141,8 +132,8 @@
if ( factory != null )
{
systemID = absolutize( factory, baseURI, systemID );
- if( this.isDebugEnabled() )
- this.debug( "Resolved to systemID : " + systemID );
+ if( this.getLogger().isDebugEnabled() )
+ this.getLogger().debug( "Resolved to systemID : " + systemID );
source = factory.getSource( systemID, parameters );
}
}
@@ -161,8 +152,8 @@
throw new SourceException( "Unable to select source factory for '" + systemID + "'. No default factory found.");
}
systemID = absolutize( factory, baseURI, systemID );
- if( this.isDebugEnabled() )
- this.debug( "Resolved to systemID : " + systemID );
+ if( this.getLogger().isDebugEnabled() )
+ this.getLogger().debug( "Resolved to systemID : " + systemID );
source = factory.getSource( systemID, parameters );
}
finally
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/DefaultSourceResolver.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/DefaultSourceResolver.java?rev=587637&r1=587636&r2=587637&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/DefaultSourceResolver.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/DefaultSourceResolver.java Tue Oct 23 13:05:10 2007
@@ -19,8 +19,6 @@
import java.util.Collections;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.excalibur.source.SourceFactory;
import org.apache.excalibur.source.SourceResolver;
@@ -34,9 +32,6 @@
extends AbstractSourceResolver
{
- /** Logger */
- protected final Log m_logger = LogFactory.getLog(getClass());
-
/** The list of source factories. */
protected Map m_sourceFactories = Collections.EMPTY_MAP;
@@ -51,21 +46,5 @@
protected SourceFactory getSourceFactory(String protocol)
{
return (SourceFactory)m_sourceFactories.get(protocol);
- }
-
- /**
- * @see org.apache.excalibur.source.impl.AbstractSourceResolver#debug(java.lang.String)
- */
- protected void debug(String text)
- {
- m_logger.debug(text);
- }
-
- /**
- * @see org.apache.excalibur.source.impl.AbstractSourceResolver#isDebugEnabled()
- */
- protected boolean isDebugEnabled()
- {
- return m_logger.isDebugEnabled();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org