mcconnell 2004/01/26 11:23:40
Modified:
merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit
DefaultLoggingFactory.java
DefaultLoggingManager.java Resources.properties
Log:
Add a debug flag and correct target attribute aquisition.
Revision Changes Path
1.3 +2 -2
avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingFactory.java
Index: DefaultLoggingFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoggingFactory.java 26 Jan 2004 17:36:16 -0000 1.2
+++ DefaultLoggingFactory.java 26 Jan 2004 19:23:40 -0000 1.3
@@ -564,7 +564,7 @@
{
final String name = getCategoryName( config, root );
final String priority = config.getAttribute( "priority", null );
- final String target = config.getAttribute( "targets", null );
+ final String target = config.getAttribute( "target", null );
CategoryDirective[] categories =
getCategoryDirectives( config );
return new CategoriesDirective( name, priority, target, categories );
@@ -611,7 +611,7 @@
{
final String name = getCategoryName( config, false );
final String priority = config.getAttribute( "priority", null );
- final String target = config.getAttribute( "targets", null );
+ final String target = config.getAttribute( "target", null );
return new CategoryDirective( name, priority, target );
}
1.3 +5 -4
avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingManager.java
Index: DefaultLoggingManager.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoggingManager.java 26 Jan 2004 17:36:16 -0000 1.2
+++ DefaultLoggingManager.java 26 Jan 2004 19:23:40 -0000 1.3
@@ -141,6 +141,7 @@
m_logger = getLoggerForCategory( channel );
m_logger.debug( "logging system established" );
+ m_logger.debug( "default logging target set to: " + target );
}
private LogTarget getDefaultLogTarget( CategoriesDirective categories )
@@ -258,14 +259,14 @@
{
final String message =
REZ.getString(
- "manager.notify.add-category", name,
priority.toLowerCase() );
+ "manager.notify.add-category-name-priority", name,
priority.toLowerCase() );
debug( message );
}
else
{
final String message =
REZ.getString(
- "manager.notify.add-root-category",
priority.toLowerCase() );
+ "manager.notify.add-category-priority",
priority.toLowerCase() );
debug( message );
}
}
@@ -275,14 +276,14 @@
{
final String message =
REZ.getString(
- "manager.notify.add-default-category", name );
+ "manager.notify.add-category-name", name );
debug( message );
}
else
{
final String message =
REZ.getString(
- "manager.notify.add-default-root" );
+ "manager.notify.add-category" );
debug( message );
}
}
1.3 +7 -6
avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/Resources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resources.properties 26 Jan 2004 17:36:16 -0000 1.2
+++ Resources.properties 26 Jan 2004 19:23:40 -0000 1.3
@@ -1,5 +1,5 @@
-target.notice.add=Adding log target [{0}].
-target.notice.fail=Could not load a declared log target [{0}].
+target.notice.add=adding log target [{0}]
+target.notice.fail=could not load a declared log target [{0}]
target.error.missing-factory=Log target factory key [{0}] is unknown.
target.error.missing-type=Missing 'type' attribute on target factory
declaration.{0}
@@ -24,10 +24,11 @@
factory.target-factory.unknown-element=Logging target factories
configuration contains an unrecognized element [{0}]. [{1}]
manager.invalid-default-target=Supplied default log target [{0}] is unknown.
-manager.notify.add-category=adding root category [{0}] with priority: [{1}].
-manager.notify.add-root-category=adding root category with priority: [{0}].
-manager.notify.add-default-category=adding category: [{0}].
-manager.notify.add-default-root=adding root category.
manager.error.internal=Internal error while getting logging channel for
category [{0}].
manager.error.priority=Unrecognized priority [{0}] for the category [{1}].
+
+manager.notify.add-category-name-priority=adding category [{0}] with
priority [{1}]
+manager.notify.add-category-priority=adding category with priority [{0}]
+manager.notify.add-category=adding root category
+manager.notify.add-category-name=adding category [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
