- logback-dev - mailman3.qos.ch

svn commit: r2060 - logback/trunk/logback-examples/lib
by noreply.ceki＠qos.ch 04 Dec '08

04 Dec '08

Author: ceki Date: Thu Dec 4 23:07:32 2008 New Revision: 2060 Removed: logback/trunk/logback-examples/lib/slf4j-api-1.5.5.jar logback/trunk/logback-examples/lib/slf4j-api-1.5.6.jar Log: Presence of slf4j-api-1.5.x.jar apparently causes a conflict

1 0

svn commit: r2059 - logback/trunk/logback-examples/src/main/java/chapter3
by noreply.ceki＠qos.ch 04 Dec '08

04 Dec '08

Author: ceki Date: Thu Dec 4 22:26:20 2008 New Revision: 2059 Modified: logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution1.xml logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution2.xml logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution3.xml logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution4.xml Log: cosmetic changes Modified: logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution1.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution1.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution1.xml Thu Dec 4 22:26:20 2008 @@ -1,15 +1,15 @@ <configuration> - <property name="USER_HOME" value="/home/sebastien" /> + <property name="USER_HOME" value="/home/sebastien" /> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${USER_HOME}/myApp.log</file> - <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%msg%n</Pattern> - </layout> - </appender> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>${USER_HOME}/myApp.log</file> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%msg%n</Pattern> + </layout> + </appender> - <root level="debug"> - <appender-ref ref="FILE" /> - </root> + <root level="debug"> + <appender-ref ref="FILE" /> + </root> </configuration> \ No newline at end of file Modified: logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution2.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution2.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution2.xml Thu Dec 4 22:26:20 2008 @@ -1,13 +1,13 @@ <configuration> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${USER_HOME}/myApp.log</file> - <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%msg%n</Pattern> - </layout> - </appender> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>${USER_HOME}/myApp.log</file> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%msg%n</Pattern> + </layout> + </appender> - <root level="debug"> - <appender-ref ref="FILE" /> - </root> + <root level="debug"> + <appender-ref ref="FILE" /> + </root> </configuration> \ No newline at end of file Modified: logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution3.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution3.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution3.xml Thu Dec 4 22:26:20 2008 @@ -1,15 +1,15 @@ <configuration> - <property file="src/main/java/chapter3/variables1.properties" /> + <property file="src/main/java/chapter3/variables1.properties" /> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${USER_HOME}/myApp.log</file> - <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%msg%n</Pattern> - </layout> - </appender> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>${USER_HOME}/myApp.log</file> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%msg%n</Pattern> + </layout> + </appender> - <root level="debug"> - <appender-ref ref="FILE" /> - </root> + <root level="debug"> + <appender-ref ref="FILE" /> + </root> </configuration> \ No newline at end of file Modified: logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution4.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution4.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/variableSubstitution4.xml Thu Dec 4 22:26:20 2008 @@ -1,15 +1,15 @@ <configuration> - <property file="src/main/java/chapter3/variables2.properties" /> + <property file="src/main/java/chapter3/variables2.properties" /> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>${destination}/myApp.log</file> - <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%msg%n</Pattern> - </layout> - </appender> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>${destination}/myApp.log</file> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%msg%n</Pattern> + </layout> + </appender> - <root level="debug"> - <appender-ref ref="FILE" /> - </root> + <root level="debug"> + <appender-ref ref="FILE" /> + </root> </configuration> \ No newline at end of file

1 0

svn commit: r2058 - logback/trunk/logback-examples/lib
by noreply.ceki＠qos.ch 04 Dec '08

04 Dec '08

Author: ceki Date: Thu Dec 4 22:25:12 2008 New Revision: 2058 Added: logback/trunk/logback-examples/lib/slf4j-api-1.5.5.jar (contents, props changed) logback/trunk/logback-examples/lib/slf4j-api-1.5.6.jar (contents, props changed) Log: update jar files Added: logback/trunk/logback-examples/lib/slf4j-api-1.5.5.jar ============================================================================== Binary file. No diff available. Added: logback/trunk/logback-examples/lib/slf4j-api-1.5.6.jar ============================================================================== Binary file. No diff available.

1 0

svn commit: r2056 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/main/java/ch/qos/logback/classic/joran/action logback-classic/src/main/java/ch/qos/logback/classic/pattern logback-classic/src/test/java/ch/qos/logback/classic logback-classic/src/test/java/ch/qos/logback/classic/pattern logback-core/src/main/java/ch/qos/logback/core/joran/action logback-core/src/main/java/ch/qos/logback/core/pattern
by noreply.ceki＠qos.ch 04 Dec '08

04 Dec '08

Author: ceki Date: Thu Dec 4 20:39:39 2008 New Revision: 2056 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ContextNameConverter.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MessageFormattingTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java Log: - Added ContextNameConverter displaying the logger context's name. - migrated some tests to JUnit4 format - other cosmetic changes Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java Thu Dec 4 20:39:39 2008 @@ -12,10 +12,12 @@ import java.util.HashMap; import java.util.Map; +import ch.qos.logback.classic.joran.action.ContextNameAction; import ch.qos.logback.classic.pattern.CallerDataConverter; -import ch.qos.logback.classic.pattern.EnsureExceptionHandling; import ch.qos.logback.classic.pattern.ClassOfCallerConverter; +import ch.qos.logback.classic.pattern.ContextNameConverter; import ch.qos.logback.classic.pattern.DateConverter; +import ch.qos.logback.classic.pattern.EnsureExceptionHandling; import ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter; import ch.qos.logback.classic.pattern.FileOfCallerConverter; import ch.qos.logback.classic.pattern.LevelConverter; @@ -107,6 +109,9 @@ defaultConverterMap.put("nopexception", NopThrowableInformationConverter.class.getName()); + defaultConverterMap.put("cn", ContextNameAction.class.getName()); + defaultConverterMap.put("contextName", ContextNameConverter.class.getName()); + defaultConverterMap.put("caller", CallerDataConverter.class.getName()); defaultConverterMap.put("marker", MarkerConverter.class.getName()); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java Thu Dec 4 20:39:39 2008 @@ -60,6 +60,7 @@ if(OptionHelper.isEmpty(envEntryValue)) { addError("["+envEntryName+"] has null or empty value"); } else { + addInfo("Setting context variable ["+asName+"] to ["+envEntryValue+"]"); context.putProperty(asName, envEntryValue); } } catch (NamingException e) { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java Thu Dec 4 20:39:39 2008 @@ -19,7 +19,7 @@ /** - * This class serves the super-class of all converters in LOGBack. It extends + * This class serves the super-class of all converters in logback. It extends * {@link DynamicConverter} and also implements {@link LoggerContextAware}. * * @author Ceki Gulcu Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ContextNameConverter.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ContextNameConverter.java Thu Dec 4 20:39:39 2008 @@ -0,0 +1,28 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.pattern; + +import ch.qos.logback.classic.spi.LoggingEvent; + +/** + * Converts an event to the logger context's name. + * + * @author Ceki Gülcü + */ +public class ContextNameConverter extends ClassicConverter { + + /** + * Return the name of the logger context's name. + */ + public String convert(LoggingEvent event) { + return getContext().getName(); + } + +} Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java Thu Dec 4 20:39:39 2008 @@ -9,6 +9,7 @@ */ package ch.qos.logback.classic; +import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -19,7 +20,7 @@ TestSuite suite = new TestSuite(); suite.addTest(org.slf4j.impl.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.PackageTest.suite()); + suite.addTest(new JUnit4TestAdapter(ch.qos.logback.classic.PackageTest.class)); suite.addTest(ch.qos.logback.classic.util.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.control.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.joran.PackageTest.suite()); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java Thu Dec 4 20:39:39 2008 @@ -1,29 +1,40 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package ch.qos.logback.classic; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; -public class MDCTest extends TestCase { +import org.junit.Test; +public class MDCTest { + @Test public void test() throws InterruptedException { MDCTestThread threadA = new MDCTestThread("a"); threadA.start(); - + MDCTestThread threadB = new MDCTestThread("b"); threadB.start(); - + threadA.join(); threadB.join(); - - + assertNull(threadA.x0); assertEquals("a", threadA.x1); assertNull(threadA.x2); - + assertNull(threadB.x0); assertEquals("b", threadB.x1); assertNull(threadB.x2); - + } - + } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MessageFormattingTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MessageFormattingTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MessageFormattingTest.java Thu Dec 4 20:39:39 2008 @@ -9,15 +9,20 @@ */ package ch.qos.logback.classic; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; + +import org.junit.Before; +import org.junit.Test; + import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; -public class MessageFormattingTest extends TestCase { +public class MessageFormattingTest { LoggerContext lc; ListAppender<LoggingEvent> listAppender; + @Before public void setUp() { lc = new LoggerContext(); Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); @@ -27,6 +32,7 @@ logger.addAppender(listAppender); } + @Test public void testFormattingOneArg() { Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); logger.debug("{}", new Integer(12)); @@ -34,6 +40,7 @@ assertEquals("12", event.getFormattedMessage()); } + @Test public void testFormattingTwoArg() { Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); logger.debug("{}-{}", new Integer(12), new Integer(13)); @@ -41,6 +48,7 @@ assertEquals("12-13", event.getFormattedMessage()); } + @Test public void testNoFormatting() { Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); logger.debug("test", new Integer(12), new Integer(13)); @@ -48,6 +56,7 @@ assertEquals("test", event.getFormattedMessage()); } + @Test public void testNoFormatting2() { Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); logger.debug("test"); @@ -55,6 +64,7 @@ assertEquals("test", event.getFormattedMessage()); } + @Test public void testMessageConverter() { Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); logger.debug("{}", 12); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java Thu Dec 4 20:39:39 2008 @@ -9,21 +9,17 @@ */ package ch.qos.logback.classic; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; -public class PackageTest extends TestCase { +(a)RunWith(Suite.class) +@SuiteClasses( { LoggerContextTest.class, LoggerPerfTest.class, + ScenarioBasedLoggerContextTest.class, PatternLayoutTest.class, + LoggerTest.class, LoggerSerializationTest.class, + MessageFormattingTest.class, MDCTest.class, + TurboFilteringInLoggerTest.class }) - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(new JUnit4TestAdapter(LoggerContextTest.class)); - suite.addTest(new JUnit4TestAdapter(LoggerPerfTest.class)); - suite.addTest(new JUnit4TestAdapter(ScenarioBasedLoggerContextTest.class)); - suite.addTest(new JUnit4TestAdapter(PatternLayoutTest.class)); - suite.addTest(new JUnit4TestAdapter(LoggerTest.class)); - suite.addTest(new JUnit4TestAdapter(LoggerSerializationTest.class)); - suite.addTestSuite(MessageFormattingTest.class); - suite.addTestSuite(MDCTest.class); - suite.addTestSuite(TurboFilteringInLoggerTest.class); - return suite; - } + +public class PackageTest { } \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java Thu Dec 4 20:39:39 2008 @@ -11,11 +11,13 @@ import static ch.qos.logback.classic.TestConstants.ISO_REGEX; import static ch.qos.logback.classic.TestConstants.MAIN_REGEX; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; +import org.junit.Before; import org.junit.Test; import ch.qos.logback.classic.pattern.ConverterTest; @@ -26,7 +28,9 @@ public class PatternLayoutTest extends AbstractPatternLayoutBaseTest { - LoggerContext lc = new LoggerContext(); + + private PatternLayout pl = new PatternLayout(); + private LoggerContext lc = new LoggerContext(); Logger logger = lc.getLogger(ConverterTest.class); LoggingEvent le; List optionList = new ArrayList(); @@ -36,7 +40,12 @@ Exception ex = new Exception("Bogus exception"); le = makeLoggingEvent(ex); } - + + @Before + public void setUp() { + pl.setContext(lc); + } + LoggingEvent makeLoggingEvent(Exception ex) { return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class .getName(), logger, Level.INFO, "Some message", ex, null); @@ -53,10 +62,7 @@ @Test public void testOK() { - PatternLayout pl = new PatternLayout(); pl.setPattern("%d %le [%t] %lo{30} - %m%n"); - Context context = new LoggerContext(); - pl.setContext(context); pl.start(); String val = pl.doLayout(getEventObject()); // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some message @@ -67,10 +73,7 @@ @Test public void testNoExeptionHandler() { - PatternLayout pl = new PatternLayout(); pl.setPattern("%m%n"); - Context context = new LoggerContext(); - pl.setContext(context); pl.start(); String val = pl.doLayout(le); assertTrue(val.contains("java.lang.Exception: Bogus exception")); @@ -78,10 +81,7 @@ @Test public void testCompositePattern() { - PatternLayout pl = new PatternLayout(); pl.setPattern("%-56(%d %lo{20}) - %m%n"); - Context context = new LoggerContext(); - pl.setContext(context); pl.start(); String val = pl.doLayout(getEventObject()); // 2008-03-18 21:55:54,250 c.q.l.c.pattern.ConverterTest - Some message @@ -92,10 +92,7 @@ @Test public void testNopExeptionHandler() { - PatternLayout pl = new PatternLayout(); pl.setPattern("%nopex %m%n"); - Context context = new LoggerContext(); - pl.setContext(context); pl.start(); String val = pl.doLayout(le); assertTrue(!val.contains("java.lang.Exception: Bogus exception")); @@ -103,10 +100,7 @@ @Test public void testWithParenthesis() { - PatternLayout pl = new PatternLayout(); pl.setPattern("\$%msg:%msg\$ %msg"); - Context context = new LoggerContext(); - pl.setContext(context); pl.start(); le = makeLoggingEvent(null); String val = pl.doLayout(le); @@ -116,11 +110,8 @@ @Test public void testWithLettersComingFromLog4j() { - PatternLayout pl = new PatternLayout(); //Letters: p = level and c = logger pl.setPattern("%d %p [%t] %c{30} - %m%n"); - Context context = new LoggerContext(); - pl.setContext(context); pl.start(); String val = pl.doLayout(getEventObject()); // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some message @@ -128,6 +119,15 @@ assertTrue(val.matches(regex)); } + @Test + public void contextNameTest() { + pl.setPattern("%contextName"); + lc.setName("aValue"); + pl.start(); + String val = pl.doLayout(getEventObject()); + assertEquals("aValue", val); + } + @Override public Context getContext() { return lc; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java Thu Dec 4 20:39:39 2008 @@ -1,34 +1,36 @@ package ch.qos.logback.classic; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; import org.slf4j.Marker; import org.slf4j.MarkerFactory; import ch.qos.logback.classic.turbo.MarkerFilter; import ch.qos.logback.classic.turbo.TurboFilter; import ch.qos.logback.core.spi.FilterReply; -import junit.framework.TestCase; -public class TurboFilteringInLoggerTest extends TestCase { + +public class TurboFilteringInLoggerTest { static final String BLUE = "BLUE"; LoggerContext context; Logger logger; Marker blueMarker = MarkerFactory.getMarker(BLUE); - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { context = new LoggerContext(); context.setName("test"); context.start(); logger = context.getLogger(TurboFilteringInLoggerTest.class); } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - + private void addYesFilter() { YesFilter filter = new YesFilter(); filter.start(); @@ -57,78 +59,91 @@ context.addTurboFilter(filter); } + @Test public void testIsDebugEnabledWithYesFilter() { addYesFilter(); logger.setLevel(Level.INFO); assertTrue(logger.isDebugEnabled()); } + @Test public void testIsInfoEnabledWithYesFilter() { addYesFilter(); logger.setLevel(Level.WARN); assertTrue(logger.isInfoEnabled()); } + @Test public void testIsWarnEnabledWithYesFilter() { addYesFilter(); logger.setLevel(Level.ERROR); assertTrue(logger.isWarnEnabled()); } + @Test public void testIsErrorEnabledWithYesFilter() { addYesFilter(); logger.setLevel(Level.OFF); assertTrue(logger.isErrorEnabled()); } + @Test public void testIsEnabledForWithYesFilter() { addYesFilter(); logger.setLevel(Level.ERROR); assertTrue(logger.isEnabledFor(Level.INFO)); } + @Test public void testIsEnabledForWithNoFilter() { addNoFilter(); logger.setLevel(Level.DEBUG); assertFalse(logger.isEnabledFor(Level.INFO)); } + @Test public void testIsDebugEnabledWithNoFilter() { addNoFilter(); logger.setLevel(Level.DEBUG); assertFalse(logger.isDebugEnabled()); } + @Test public void testIsInfoEnabledWithNoFilter() { addNoFilter(); logger.setLevel(Level.DEBUG); assertFalse(logger.isInfoEnabled()); } + @Test public void testIsWarnEnabledWithNoFilter() { addNoFilter(); logger.setLevel(Level.DEBUG); assertFalse(logger.isWarnEnabled()); } + @Test public void testIsErrorEnabledWithNoFilter() { addNoFilter(); logger.setLevel(Level.DEBUG); assertFalse(logger.isErrorEnabled()); } + @Test public void testIsErrorEnabledWithAcceptBlueFilter() { addAcceptBLUEFilter(); logger.setLevel(Level.ERROR); assertTrue(logger.isDebugEnabled(blueMarker)); } + @Test public void testIsErrorEnabledWithDenyBlueFilter() { addDenyBLUEFilter(); logger.setLevel(Level.ALL); assertFalse(logger.isDebugEnabled(blueMarker)); } + @Test public void testLoggingContextReset() { addYesFilter(); assertNotNull(context.getTurboFilterList().get(0)); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Thu Dec 4 20:39:39 2008 @@ -9,7 +9,9 @@ */ package ch.qos.logback.classic.pattern; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; @@ -66,7 +68,7 @@ StringBuffer buf = new StringBuffer(); converter.write(buf, le); // the number below should be the line number of the previous line - assertEquals("67", buf.toString()); + assertEquals("69", buf.toString()); } } @@ -132,14 +134,14 @@ @Test public void testLogger() { { - DynamicConverter<LoggingEvent> converter = new LoggerConverter(); + ClassicConverter converter = new LoggerConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals(this.getClass().getName(), buf.toString()); } { - DynamicConverter<LoggingEvent> converter = new LoggerConverter(); + ClassicConverter converter = new LoggerConverter(); this.optionList.add("20"); converter.setOptionList(this.optionList); converter.start(); @@ -317,4 +319,14 @@ assertEquals("someValue", result); } + @Test + public void contextNameConverter() { + ClassicConverter converter = new ContextNameConverter(); + converter.setContext(lc); + lc.setName("aValue"); + LoggingEvent event = makeLoggingEvent(null); + + String result = converter.convert(event); + assertEquals("aValue", result); + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java Thu Dec 4 20:39:39 2008 @@ -10,7 +10,6 @@ package ch.qos.logback.core.joran.action; - import org.xml.sax.Attributes; import org.xml.sax.Locator; @@ -19,47 +18,46 @@ import ch.qos.logback.core.joran.spi.Interpreter; import ch.qos.logback.core.spi.ContextAwareBase; - - /** - * + * * Most of the work for configuring log4j is done by Actions. - * + * * Methods of an Action are invoked while an XML file is parsed through. - * - * This class is largely inspired from the relevant class in the commons-digester - * project of the Apache Software Foundation. - * + * + * This class is largely inspired from the relevant class in the + * commons-digester project of the Apache Software Foundation. + * * @author Craig McClanahan * @author Christopher Lenz * @author Ceki Gülcü - * + * */ public abstract class Action extends ContextAwareBase { - + public static final String NAME_ATTRIBUTE = "name"; public static final String VALUE_ATTRIBUTE = "value"; public static final String FILE_ATTRIBUTE = "file"; public static final String CLASS_ATTRIBUTE = "class"; public static final String PATTERN_ATTRIBUTE = "pattern"; - + public static final String ACTION_CLASS_ATTRIBUTE = "actionClass"; /** * Called when the parser first encounters an element. - * + * * The return value indicates whether child elements should be processed. If * the returned value is 'false', then child elements are ignored. */ - public abstract void begin( - InterpretationContext ec, String name, Attributes attributes) throws ActionException ; - + public abstract void begin(InterpretationContext ec, String name, + Attributes attributes) throws ActionException; - public void body(InterpretationContext ec, String body) throws ActionException { + public void body(InterpretationContext ec, String body) + throws ActionException { // NOP } - public abstract void end(InterpretationContext ec, String name) throws ActionException; + public abstract void end(InterpretationContext ec, String name) + throws ActionException; public String toString() { return this.getClass().getName(); @@ -82,4 +80,10 @@ } return -1; } + + protected String getLineColStr(InterpretationContext ec) { + String line = "line: " + getLineNumber(ec) + ", column: " + + getColumnNumber(ec); + return line; + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java Thu Dec 4 20:39:39 2008 @@ -1,11 +1,11 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * Copyright (C) 1999-2005, QOS.ch, LOGBack.com - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.core.pattern;

1 0

[JIRA] Resolved: (LBCLASSIC-43) Application name for a web-app
by Ceki Gulcu (JIRA) 04 Dec '08

04 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-43?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu resolved LBCLASSIC-43. --------------------------------- Fix Version/s: 0.9.12 Resolution: Fixed Fixed in revision #2053 > Application name for a web-app > ------------------------------ > > Key: LBCLASSIC-43 > URL: http://jira.qos.ch/browse/LBCLASSIC-43 > Project: logback-classic > Issue Type: Improvement > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Ceki Gulcu > Assignee: Logback dev list > Priority: Minor > Fix For: 0.9.12 > > > Logback should provide support for setting the application name of a web-app (or a JEE application) out of the box. The LoggingContext is a good place for this. > See also: > http://www.qos.ch/pipermail/logback-user/2008-March/000400.html -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[JIRA] Created: (LBCLASSIC-90) null logger levels during the reset
by mateusz jedruch (JIRA) 04 Dec '08

04 Dec '08

null logger levels during the reset ----------------------------------- Key: LBCLASSIC-90 URL: http://jira.qos.ch/browse/LBCLASSIC-90 Project: logback-classic Issue Type: New Feature Reporter: mateusz jedruch Assignee: Logback dev list After calling LoggerContext#shutdownAndReset logger levels should be nulled -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 1

svn commit: r2055 - in logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran: . action
by noreply.ceki＠qos.ch 04 Dec '08

04 Dec '08

Author: ceki Date: Thu Dec 4 19:20:11 2008 New Revision: 2055 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.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/action/LoggerAction.java Log: Allow setting variables from JNDI 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 Thu Dec 4 19:20:11 2008 @@ -14,6 +14,7 @@ import ch.qos.logback.classic.joran.action.ConsolePluginAction; import ch.qos.logback.classic.joran.action.ContextNameAction; import ch.qos.logback.classic.joran.action.EvaluatorAction; +import ch.qos.logback.classic.joran.action.InsertFromJNDIAction; import ch.qos.logback.classic.joran.action.JMXConfiguratorAction; import ch.qos.logback.classic.joran.action.LayoutAction; import ch.qos.logback.classic.joran.action.LevelAction; @@ -45,6 +46,7 @@ rs.addRule(new Pattern("configuration"), new ConfigurationAction()); rs.addRule(new Pattern("configuration/contextName"), new ContextNameAction()); + rs.addRule(new Pattern("configuration/insertFromJNDI"), new InsertFromJNDIAction()); rs.addRule(new Pattern("*/evaluator"), new EvaluatorAction()); rs.addRule(new Pattern("*/evaluator/matcher"), new MatcherAction()); Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java Thu Dec 4 19:20:11 2008 @@ -0,0 +1,74 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.classic.joran.action; + +import javax.naming.Context; +import javax.naming.NamingException; + +import org.xml.sax.Attributes; + +import ch.qos.logback.classic.util.JNDIUtil; +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.util.OptionHelper; + +/** + * Insert an env-entry found in JNDI as a new context variable + + * @author Ceki Gulcu + * + */ +public class InsertFromJNDIAction extends Action { + + public static String ENV_ENTRY_NAME_ATTR="env-entry-name"; + public static String AS_ATTR="as"; + + public void begin(InterpretationContext ec, String name, Attributes attributes) { + + int errorCount = 0; + String envEntryName = attributes.getValue(ENV_ENTRY_NAME_ATTR); + String asName = attributes.getValue(AS_ATTR); + String envEntryValue; + + if(OptionHelper.isEmpty(envEntryName)) { + String lineColStr = getLineColStr(ec); + addError("["+ENV_ENTRY_NAME_ATTR+"] missing, around "+lineColStr); + errorCount++; + } + + if(OptionHelper.isEmpty(asName)) { + String lineColStr = getLineColStr(ec); + addError("["+AS_ATTR+"] missing, around "+lineColStr); + errorCount++; + } + + if(errorCount != 0) { + return; + } + + try { + Context ctx = JNDIUtil.getInitialContext(); + envEntryValue = JNDIUtil.lookup(ctx, envEntryName); + if(OptionHelper.isEmpty(envEntryValue)) { + addError("["+envEntryName+"] has null or empty value"); + } else { + context.putProperty(asName, envEntryValue); + } + } catch (NamingException e) { + addError("Failed to lookup JNDI env-entry ["+envEntryName+"]"); + } + + + } + + public void end(InterpretationContext ec, String name) { + } +} Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java Thu Dec 4 19:20:11 2008 @@ -41,9 +41,8 @@ if (OptionHelper.isEmpty(loggerName)) { inError = true; - String line = ", around line " + getLineNumber(ec) + " column " - + getColumnNumber(ec); - String errorMsg = "No 'name' attribute in element " + name + line; + String aroundLine = getLineColStr(ec); + String errorMsg = "No 'name' attribute in element " + name + ", around " +aroundLine; addError(errorMsg); return; }

1 0

svn commit: r2054 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 04 Dec '08

04 Dec '08

Author: ceki Date: Thu Dec 4 18:16:01 2008 New Revision: 2054 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Log: Fixes LBCLASSIC-90. Logger reset set logger levels to NULL, except for the root logger which gets set to DEBUG. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Thu Dec 4 18:16:01 2008 @@ -320,8 +320,18 @@ return childLogger; } + private void localLevelReset() { + effectiveLevelInt = DEBUG_INT; + if(isRootLogger()) { + level = Level.DEBUG; + } else { + level = null; + } + } + void recursiveReset() { detachAndStopAllAppenders(); + localLevelReset(); additive = true; if (childrenList == null) { return; Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Thu Dec 4 18:16:01 2008 @@ -200,6 +200,7 @@ resetStatusListeners(); } + private void resetStatusListeners() { StatusManager sm = getStatusManager(); for (StatusListener sl : sm.getCopyOfStatusListenerList()) { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Thu Dec 4 18:16:01 2008 @@ -152,4 +152,24 @@ sm.getCount() == 1); } + + @Test + public void resetTest() { + + Logger root = lc.getLogger(LoggerContext.ROOT_NAME); + Logger a = lc.getLogger("a"); + Logger ab = lc.getLogger("a.b"); + + ab.setLevel(Level.WARN); + root.setLevel(Level.INFO); + lc.reset(); + assertEquals(Level.DEBUG, root.getEffectiveLevel()); + assertEquals(Level.DEBUG, a.getEffectiveLevel()); + assertEquals(Level.DEBUG, ab.getEffectiveLevel()); + + assertEquals(Level.DEBUG, root.getLevel()); + assertNull(a.getLevel()); + assertNull(ab.getLevel()); + + } } \ No newline at end of file

1 0

svn commit: r2053 - in logback/trunk: logback-classic logback-classic/src/main/java/ch/qos/logback/classic/joran logback-classic/src/main/java/ch/qos/logback/classic/joran/action logback-classic/src/main/java/org/slf4j/impl logback-classic/src/test/input/joran logback-classic/src/test/java/ch/qos/logback/classic/joran logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/joran/action logback-core/src/test/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 04 Dec '08

04 Dec '08

Author: ceki Date: Thu Dec 4 17:37:45 2008 New Revision: 2053 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ContextNameAction.java logback/trunk/logback-classic/src/test/input/joran/contextRename.xml logback/trunk/logback-core/src/test/java/ch/qos/logback/core/ContextBaseTest.java Modified: logback/trunk/logback-classic/pom.xml logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java Log: - Allow for the logger context name to be changed from a config file + related test cases. See also LBCLASSIC-43 - cosmetic changes Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Thu Dec 4 17:37:45 2008 @@ -48,7 +48,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-ext</artifactId> - <scope>compile</scope> + <scope>test</scope> </dependency> <dependency> 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 Thu Dec 4 17:37:45 2008 @@ -12,6 +12,7 @@ import ch.qos.logback.classic.joran.action.ConfigurationAction; import ch.qos.logback.classic.joran.action.ConsolePluginAction; +import ch.qos.logback.classic.joran.action.ContextNameAction; import ch.qos.logback.classic.joran.action.EvaluatorAction; import ch.qos.logback.classic.joran.action.JMXConfiguratorAction; import ch.qos.logback.classic.joran.action.LayoutAction; @@ -43,6 +44,7 @@ rs.addRule(new Pattern("configuration"), new ConfigurationAction()); + rs.addRule(new Pattern("configuration/contextName"), new ContextNameAction()); rs.addRule(new Pattern("*/evaluator"), new EvaluatorAction()); rs.addRule(new Pattern("*/evaluator/matcher"), new MatcherAction()); Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ContextNameAction.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ContextNameAction.java Thu Dec 4 17:37:45 2008 @@ -0,0 +1,37 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.classic.joran.action; + +import org.xml.sax.Attributes; + +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.spi.InterpretationContext; + +public class ContextNameAction extends Action { + + public void begin(InterpretationContext ec, String name, Attributes attributes) { + } + + public void body(InterpretationContext ec, String body) { + + String finalBody = ec.subst(body); + addInfo("Setting logger context name as [" + finalBody + "]"); + try { + context.setName(finalBody); + } catch (IllegalStateException e) { + addError("Failed to rename context [" + context.getName() + "] as [" + + finalBody + "]", e); + } + } + + public void end(InterpretationContext ec, String name) { + } +} Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (original) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Thu Dec 4 17:37:45 2008 @@ -62,7 +62,7 @@ private StaticLoggerBinder() { - defaultLoggerContext.setName("default"); + defaultLoggerContext.setName(CoreConstants.DEFAULT_CONTEXT_NAME); } public static StaticLoggerBinder getSingleton() { Added: logback/trunk/logback-classic/src/test/input/joran/contextRename.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/contextRename.xml Thu Dec 4 17:37:45 2008 @@ -0,0 +1,3 @@ +<configuration> + <contextName>wombat</contextName> +</configuration> \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Thu Dec 4 17:37:45 2008 @@ -25,6 +25,7 @@ import ch.qos.logback.classic.turbo.NOPTurboFilter; import ch.qos.logback.classic.turbo.TurboFilter; import ch.qos.logback.classic.util.TeztConstants; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.util.StatusPrinter; @@ -99,11 +100,17 @@ @Test public void testStatusListener() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/statusListener.xml"); - StatusPrinter.print(loggerContext); } @Test + public void contextRename() throws JoranException { + loggerContext.setName(CoreConstants.DEFAULT_CONTEXT_NAME); + configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/contextRename.xml"); + assertEquals("wombat", loggerContext.getName()); + } + + @Test public void testEval() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java Thu Dec 4 17:37:45 2008 @@ -33,15 +33,14 @@ * context is initialized with a {@link BasicStatusManager}. A null value for * the 'statusManager' argument is not allowed. * - * - * A malicious attacker can set the status manager to a dummy instance, + * A malicious attacker can set the status manager to a dummy instance, * disabling internal error reporting. * * @param statusManager * the new status manager */ - // added in response to http://jira.qos.ch/browse/LBCORE-35 public void setStatusManager(StatusManager statusManager) { + // this method was added in response to http://jira.qos.ch/browse/LBCORE-35 if (sm == null) { throw new IllegalArgumentException("null StatusManager not allowed"); } @@ -72,10 +71,23 @@ return name; } - public void setName(String name) { - if (this.name != null) { + /** + * The context name can be set only if it is not already set, or if the + * current name is the default context name, namely "default", or if the + * current name and the old name are the same. + * + * @throws IllegalStateException + * if the context already has a name, other than "default". + */ + public void setName(String name) throws IllegalStateException { + if (name != null && name.equals(this.name)) { + return; // idempotent naming + } + if (this.name == null + || CoreConstants.DEFAULT_CONTEXT_NAME.equals(this.name)) { + this.name = name; + } else { throw new IllegalStateException("Context has been already given a name"); } - this.name = name; } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java Thu Dec 4 17:37:45 2008 @@ -11,6 +11,10 @@ public static final String CODES_URL = "http://logback.qos.ch/codes.html"; /** + * The default context name. + */ + public static final String DEFAULT_CONTEXT_NAME = "default"; + /** * Customized pattern conversion rules are stored under this key in the * {@link Context} object store. */ Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java Thu Dec 4 17:37:45 2008 @@ -1,13 +1,12 @@ /** - * LOGBack: the generic, reliable, fast and flexible logging framework. + * Logback: the generic, reliable, fast and flexible logging framework. * - * Copyright (C) 1999-2006, QOS.ch + * Copyright (C) 2000-2008, QOS.ch * * This library is free software, you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ - package ch.qos.logback.core.joran.action; import java.util.Stack; Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/ContextBaseTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/ContextBaseTest.java Thu Dec 4 17:37:45 2008 @@ -0,0 +1,43 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.core; + +import static org.junit.Assert.fail; + +import org.junit.Test; + +public class ContextBaseTest { + + ContextBase context = new ContextBase(); + + @Test + public void renameDefault() { + context.setName(CoreConstants.DEFAULT_CONTEXT_NAME); + context.setName("hello"); + } + + + @Test + public void idempotentNameTest() { + context.setName("hello"); + context.setName("hello"); + } + + @Test + public void renameTest() { + context.setName("hello"); + try { + context.setName("x"); + fail("renaming is not allowed"); + } catch (IllegalStateException ise) { + } + } + +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java Thu Dec 4 17:37:45 2008 @@ -5,6 +5,6 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -(a)SuiteClasses({WriterAppenderTest.class}) +@SuiteClasses( { ContextBaseTest.class, WriterAppenderTest.class }) public class PackageTest { }

1 0

[JIRA] Issue Comment Edited: (LBCLASSIC-43) Application name for a web-app
by Ceki Gulcu (JIRA) 04 Dec '08

04 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-43?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu edited comment on LBCLASSIC-43 at 12/4/08 5:32 PM: -------------------------------------------------------------- There are several ways to read this issue. One is to add an HttpServletFilter for invoking MDC.put("applicationName","whatever") which seems noisy. Another way to look at this, is to to set the name of the logger context from a configuration file. For example, <configuration... <contextName>newName</contextName> </configration> was (Author: noreply.ceki(a)qos.ch) There are several ways to read this issue. One, is to add an HttpServletFilter for invoking MDC.put("applicationName","whatever") which seems noisy. Anothtr way to look at this, is to to set the name of the logger context from a configuration file. For example, <configuration contextName="whatever">...</configration> > Application name for a web-app > ------------------------------ > > Key: LBCLASSIC-43 > URL: http://jira.qos.ch/browse/LBCLASSIC-43 > Project: logback-classic > Issue Type: Improvement > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Ceki Gulcu > Assignee: Logback dev list > Priority: Minor > > Logback should provide support for setting the application name of a web-app (or a JEE application) out of the box. The LoggingContext is a good place for this. > See also: > http://www.qos.ch/pipermail/logback-user/2008-March/000400.html -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0