Author: ceki
Date: Fri Jul 31 18:43:55 2009
New Revision: 2396
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java
Log:
- minor cleanup in JoranConfigurator
- Added default class for layout within UnsynchronizedAppenderBase (in
DefaultNestedComponentRules.java)
-
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java
Fri Jul 31 18:43:55 2009
@@ -66,10 +66,6 @@
rs.addRule(new Pattern("configuration/root/appender-ref"),
new AppenderRefAction());
- //rs
- // .addRule(new Pattern("configuration/appender/layout"),
- // new LayoutAction());
-
// add jmxConfigurator only if we have JMX available.
// If running under JDK 1.4 (retrotranslateed logback) then we
// might not have JMX.
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java
Fri Jul 31 18:43:55 2009
@@ -12,6 +12,7 @@
import ch.qos.logback.classic.PatternLayout;
import ch.qos.logback.classic.boolex.JaninoEventEvaluator;
import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.UnsynchronizedAppenderBase;
import ch.qos.logback.core.filter.EvaluatorFilter;
import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
@@ -26,9 +27,8 @@
static public void addDefaultNestedComponentRegistryRules(
DefaultNestedComponentRegistry registry) {
- // if you modify the rules here, then do not forget to modify
- // SiftingJoranConfigurator as well.
registry.add(AppenderBase.class, "layout", PatternLayout.class);
+ registry.add(UnsynchronizedAppenderBase.class, "layout",
PatternLayout.class);
registry
.add(EvaluatorFilter.class, "evaluator", JaninoEventEvaluator.class);
_______________________________________________
logback-dev mailing list
[email protected]
http://qos.ch/mailman/listinfo/logback-dev
