Author: seb Date: Wed Dec 20 15:12:47 2006 New Revision: 1138 Modified: logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: layout chapter fix temporary changes to SampleLogging.java Modified: logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java Wed Dec 20 15:12:47 2006 @@ -17,6 +17,7 @@ try { JoranConfigurator configurator = new JoranConfigurator(); + lc.shutdownAndReset(); configurator.setContext(lc); configurator.doConfigure(args[0]); } catch (JoranException je) { @@ -24,8 +25,10 @@ } logger.debug("Everything's going well"); + logger.info("Everything's going well info"); + logger.warn("Everything's going well warn"); - logger.error("... not quite"); + logger.error("... not quite error"); } } Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Wed Dec 20 15:12:47 2006 @@ -1244,7 +1244,7 @@ case Level.WARN_INT: return WARN_COLOR; default: - return null; + return ""; } } } @@ -1267,7 +1267,7 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> - <b><Pattern>%-4relative [%thread] %%sample - %msg%n</Pattern></b> + <b><Pattern>%-4relative [%thread] %sample - %msg%n</Pattern></b> </layout> </appender>