donaldp 02/05/17 22:35:49
Modified: component/src/java/org/apache/avalon/excalibur/component
Tag: ECM_LOGENABLED ComponentHandler.java
DefaultComponentFactory.java
DefaultComponentHandler.java
ExcaliburComponentManager.java
ExcaliburComponentSelector.java
PoolableComponentHandler.java
ThreadSafeComponentHandler.java
Log:
If developer uses LogKit Logger it will be passed through to all subclasses
(and thus there will be no performance penalty over existing setup).
Revision Changes Path
No revision
No revision
1.2.2.2 +2 -3
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ComponentHandler.java
Index: ComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ComponentHandler.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ComponentHandler.java 18 May 2002 05:13:05 -0000 1.2.2.1
+++ ComponentHandler.java 18 May 2002 05:35:49 -0000 1.2.2.2
@@ -15,7 +15,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.SingleThreaded;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -26,11 +25,11 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.2.2.1 $ $Date: 2002/05/18 05:13:05 $
+ * @version CVS $Revision: 1.2.2.2 $ $Date: 2002/05/18 05:35:49 $
* @since 4.0
*/
public abstract class ComponentHandler
- extends AbstractLogEnabled
+ extends AbstractDualLogEnabled
implements Initializable, Disposable
{
private Object m_referenceSemaphore = new Object();
1.2.2.2 +4 -16
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- DefaultComponentFactory.java 18 May 2002 05:13:05 -0000 1.2.2.1
+++ DefaultComponentFactory.java 18 May 2002 05:35:49 -0000 1.2.2.2
@@ -24,11 +24,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Loggable;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -39,11 +37,11 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
- * @version CVS $Revision: 1.2.2.1 $ $Date: 2002/05/18 05:13:05 $
+ * @version CVS $Revision: 1.2.2.2 $ $Date: 2002/05/18 05:35:49 $
* @since 4.0
*/
public class DefaultComponentFactory
- extends AbstractLogEnabled
+ extends AbstractDualLogEnabled
implements ObjectFactory, Disposable, ThreadSafe
{
/** The class which this <code>ComponentFactory</code>
@@ -76,10 +74,6 @@
*/
private final BucketMap m_components = new BucketMap();
- /** The LogKitManager for child ComponentSelectors
- */
- private org.apache.log.Logger m_logKitLogger;
-
/**
* Construct a new component factory for the specified component.
*
@@ -104,12 +98,6 @@
m_logkit = logkit;
}
- public void enableLogging( final Logger logger )
- {
- super.enableLogging( logger );
- m_logKitLogger = LogKit2LoggerTarget.createLogger( logger );
- }
-
public Object newInstance()
throws Exception
{
@@ -147,7 +135,7 @@
{
if( null == m_logkit || null == m_configuration )
{
- ( (Loggable)component ).setLogger( m_logKitLogger );
+ ( (Loggable)component ).setLogger( getLogkitLogger() );
}
else
{
@@ -155,7 +143,7 @@
if( null == logger )
{
getLogger().debug( "no logger attribute available, using
standard logger" );
- ( (Loggable)component ).setLogger( m_logKitLogger );
+ ( (Loggable)component ).setLogger( getLogkitLogger() );
}
else
{
1.1.2.2 +3 -11
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java
Index: DefaultComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DefaultComponentHandler.java 18 May 2002 05:13:05 -0000 1.1.2.1
+++ DefaultComponentHandler.java 18 May 2002 05:35:49 -0000 1.1.2.2
@@ -13,7 +13,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
/**
* The DefaultComponentHandler to make sure components are initialized
@@ -22,7 +21,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2002/05/18 05:13:05 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2002/05/18 05:35:49 $
* @since 4.0
*/
public class DefaultComponentHandler
@@ -71,15 +70,6 @@
}
/**
- * Sets the logger that the ComponentHandler will use.
- */
- public void enableLogging( final Logger logger )
- {
- m_factory.enableLogging( logger );
- super.enableLogging( logger );
- }
-
- /**
* Initialize the ComponentHandler.
*/
public void initialize()
@@ -88,6 +78,8 @@
{
return;
}
+ m_factory.setLogger( getLogkitLogger() );
+ m_factory.enableLogging( getLogger() );
if( getLogger().isDebugEnabled() )
{
1.5.2.2 +9 -7
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java
Index: ExcaliburComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- ExcaliburComponentManager.java 18 May 2002 05:13:05 -0000 1.5.2.1
+++ ExcaliburComponentManager.java 18 May 2002 05:35:49 -0000 1.5.2.2
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* Default component manager for Avalon's components.
@@ -32,11 +31,11 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
- * @version CVS $Revision: 1.5.2.1 $ $Date: 2002/05/18 05:13:05 $
+ * @version CVS $Revision: 1.5.2.2 $ $Date: 2002/05/18 05:35:49 $
* @since 4.0
*/
public class ExcaliburComponentManager
- extends AbstractLogEnabled
+ extends AbstractDualLogEnabled
implements ComponentManager,
Configurable,
Contextualizable,
@@ -308,6 +307,7 @@
m_roles,
m_logkit );
+ handler.setLogger( getLogkitLogger() );
handler.enableLogging( getLogger() );
handler.initialize();
}
@@ -392,10 +392,10 @@
{
if( null == m_roles )
{
- DefaultRoleManager role_info = new DefaultRoleManager();
- role_info.enableLogging( getLogger() );
- role_info.configure( configuration );
- m_roles = role_info;
+ final DefaultRoleManager roleInfo = new DefaultRoleManager();
+ roleInfo.enableLogging( getLogger() );
+ roleInfo.configure( configuration );
+ m_roles = roleInfo;
getLogger().debug( "No RoleManager given, deriving one from
configuration" );
}
@@ -625,6 +625,7 @@
getLogger().debug( "Handler type = " +
handler.getClass().getName() );
}
+ handler.setLogger( getLogkitLogger() );
handler.enableLogging( getLogger() );
m_componentHandlers.put( role, handler );
}
@@ -650,6 +651,7 @@
{
ComponentHandler handler =
ComponentHandler.getComponentHandler( instance );
+ handler.setLogger( getLogkitLogger() );
handler.enableLogging( getLogger() );
m_componentHandlers.put( role, handler );
}
1.4.2.2 +4 -3
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java
Index: ExcaliburComponentSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- ExcaliburComponentSelector.java 18 May 2002 05:13:06 -0000 1.4.2.1
+++ ExcaliburComponentSelector.java 18 May 2002 05:35:49 -0000 1.4.2.2
@@ -25,7 +25,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
@@ -33,11 +32,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.4.2.1 $ $Date: 2002/05/18 05:13:06 $
+ * @version CVS $Revision: 1.4.2.2 $ $Date: 2002/05/18 05:35:49 $
* @since 4.0
*/
public class ExcaliburComponentSelector
- extends AbstractLogEnabled
+ extends AbstractDualLogEnabled
implements Contextualizable,
ComponentSelector,
Composable,
@@ -503,6 +502,7 @@
m_roles,
m_logkit );
+ handler.setLogger( getLogkitLogger() );
handler.enableLogging( getLogger() );
handler.initialize();
m_componentHandlers.put( hint, handler );
@@ -540,6 +540,7 @@
{
final ComponentHandler handler =
ComponentHandler.getComponentHandler( instance );
+ handler.setLogger( getLogkitLogger() );
handler.enableLogging( getLogger() );
handler.initialize();
m_componentHandlers.put( hint, handler );
1.3.2.2 +5 -12
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java
Index: PoolableComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- PoolableComponentHandler.java 18 May 2002 05:13:06 -0000 1.3.2.1
+++ PoolableComponentHandler.java 18 May 2002 05:35:49 -0000 1.3.2.2
@@ -15,7 +15,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
/**
* The PoolableComponentHandler to make sure that poolable components are
initialized
@@ -81,7 +80,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
- * @version CVS $Revision: 1.3.2.1 $ $Date: 2002/05/18 05:13:06 $
+ * @version CVS $Revision: 1.3.2.2 $ $Date: 2002/05/18 05:35:49 $
* @since 4.0
*/
public class PoolableComponentHandler
@@ -145,16 +144,6 @@
}
/**
- * Sets the logger that the ComponentHandler will use.
- */
- public void enableLogging( final Logger logger )
- {
- m_factory.enableLogging( logger );
- m_pool.enableLogging( logger );
- super.enableLogging( logger );
- }
-
- /**
* Initialize the ComponentHandler.
*/
public void initialize()
@@ -163,6 +152,10 @@
{
return;
}
+
+ m_factory.setLogger( getLogkitLogger() );
+ m_factory.enableLogging( getLogger() );
+ m_pool.enableLogging( getLogger() );
if( getLogger().isDebugEnabled() )
{
1.2.2.2 +6 -12
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java
Index: ThreadSafeComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ThreadSafeComponentHandler.java 18 May 2002 05:13:06 -0000 1.2.2.1
+++ ThreadSafeComponentHandler.java 18 May 2002 05:35:49 -0000 1.2.2.2
@@ -14,7 +14,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
/**
* The ThreadSafeComponentHandler to make sure components are initialized
@@ -23,7 +22,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.2.2.1 $ $Date: 2002/05/18 05:13:06 $
+ * @version CVS $Revision: 1.2.2.2 $ $Date: 2002/05/18 05:35:49 $
* @since 4.0
*/
public class ThreadSafeComponentHandler
@@ -79,16 +78,6 @@
m_factory = null;
}
- public void enableLogging( final Logger logger )
- {
- if( null != m_factory )
- {
- m_factory.enableLogging( logger );
- }
-
- super.enableLogging( logger );
- }
-
/**
* Initialize the ComponentHandler.
*/
@@ -98,6 +87,11 @@
if( m_initialized )
{
return;
+ }
+ if( null != m_factory )
+ {
+ m_factory.setLogger( getLogkitLogger() );
+ m_factory.enableLogging( getLogger() );
}
if( m_instance == null )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
