bloritsch 2003/04/03 05:43:52
Modified: fortress/src/java/org/apache/avalon/fortress/impl/handler
ComponentFactory.java
fortress/src/java/org/apache/avalon/fortress/util
ContextManager.java
Log:
apply updates from Jorg Schaible
Revision Changes Path
1.20 +5 -3
avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ComponentFactory.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ComponentFactory.java 22 Mar 2003 12:46:33 -0000 1.19
+++ ComponentFactory.java 3 Apr 2003 13:43:51 -0000 1.20
@@ -131,7 +131,9 @@
m_configuration = configuration;
m_serviceManager = serviceManager;
m_context = new DefaultContext( context );
- ( (DefaultContext)m_context ).put( "component.name",
configuration.getAttribute( "id", componentClass.getName() ) );
+ final String name = configuration.getAttribute( "id",
componentClass.getName() );
+ ( (DefaultContext)m_context ).put( "component.name", name );
+ ( (DefaultContext)m_context ).put( "component.logger",
configuration.getAttribute( "logger", name ) );
( (DefaultContext)m_context ).makeReadOnly();
m_loggerManager = loggerManager;
m_extManager = extManager;
@@ -206,7 +208,7 @@
try
{
- final String name = (String)m_context.get("component.name");
+ final String name = (String)m_context.get("component.logger");
if( getLogger().isDebugEnabled() )
{
final String message = "logger name is " + name;
1.15 +3 -3
avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ContextManager.java 29 Mar 2003 18:53:24 -0000 1.14
+++ ContextManager.java 3 Apr 2003 13:43:52 -0000 1.15
@@ -720,8 +720,8 @@
}
// Resolve a name for the logger, taking the logPrefix into account
- String lmDefaultLoggerName = "";
- String lmLoggerName = loggerManagerConfig.getAttribute( "logger",
"system.logkit" );
+ String lmDefaultLoggerName = (String)m_rootContext.get(
ContextManagerConstants.LOG_CATEGORY );
+ String lmLoggerName = loggerManagerConfig.getAttribute( "logger",
lmDefaultLoggerName + ".system.logkit" );
// Create the default logger for the Logger Manager.
org.apache.log.Logger lmDefaultLogger =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
