- logback-dev - mailman3.qos.ch

svn commit: r679 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 15 Oct '06

15 Oct '06

Author: ceki Date: Sun Oct 15 17:25:49 2006 New Revision: 679 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Log: indentation changes only Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Sun Oct 15 17:25:49 2006 @@ -28,7 +28,6 @@ import ch.qos.logback.core.util.Compare; import ch.qos.logback.core.util.Constants; - /** * * Do not forget to call start() when configuring programatically. @@ -42,18 +41,19 @@ public SizeBasedRollingTest(String name) { super(name); } - + public void setUp() { - { - File target = new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.log"); - target.mkdirs(); - target.delete(); - } - { - File target = new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); - target.mkdirs(); - target.delete(); - } + { + File target = new File(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test2.log"); + target.mkdirs(); + target.delete(); + } + { + File target = new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); + target.mkdirs(); + target.delete(); + } } public void tearDown() { @@ -66,7 +66,7 @@ public void test1() throws Exception { // We purposefully use the \n as the line separator. // This makes the regression test system independent. - Context context = new ContextBase(); + Context context = new ContextBase(); Layout layout = new DummyLayout(); RollingFileAppender rfa = new RollingFileAppender(); rfa.setLayout(layout); @@ -76,32 +76,33 @@ fwrp.setContext(context); SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy(); sbtp.setContext(context); - + sbtp.setMaxFileSize("100"); sbtp.start(); - fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/sizeBased-test1.%i"); + fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test1.%i"); try { fwrp.start(); fail("The absence of activeFileName option should have caused an exception."); } catch (IllegalStateException e) { return; } - - //StatusPrinter.print(context.getStatusManager()); + + // StatusPrinter.print(context.getStatusManager()); } /** * Test basic rolling functionality. */ public void test2() throws Exception { - Context context = new ContextBase(); - + Context context = new ContextBase(); + DummyLayout layout = new DummyLayout(); RollingFileAppender rfa = new RollingFileAppender(); rfa.setName("ROLLING"); rfa.setLayout(layout); rfa.setContext(context); - + FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy(); swrp.setContext(context); SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy(); @@ -109,107 +110,122 @@ sbtp.setMaxFileSize("100"); swrp.setMinIndex(0); - swrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.log"); + swrp.setActiveFileName(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test2.log"); - swrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.%i"); + swrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test2.%i"); swrp.start(); rfa.setRollingPolicy(swrp); rfa.setTriggeringPolicy(sbtp); rfa.start(); - + // Write exactly 10 bytes with each log -// for (int i = 0; i < 25; i++) { -// Thread.sleep(100); -// if (i < 10) { -// rfa.doAppend("Hello---" + i); -// //logger.debug("Hello---" + i); -// } else if (i < 100) { -// rfa.doAppend("Hello---" + i); -// //logger.debug("Hello--" + i); -// } -// } - + // for (int i = 0; i < 25; i++) { + // Thread.sleep(100); + // if (i < 10) { + // rfa.doAppend("Hello---" + i); + // //logger.debug("Hello---" + i); + // } else if (i < 100) { + // rfa.doAppend("Hello---" + i); + // //logger.debug("Hello--" + i); + // } + // } + for (int i = 0; i < 45; i++) { - Thread.sleep(100); - rfa.doAppend("hello"); + Thread.sleep(100); + rfa.doAppend("hello"); } - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.log").exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.0").exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.1").exists()); + assertTrue(new File(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test2.log").exists()); + assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.0") + .exists()); + assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.1") + .exists()); // The File.length() method is not accurate under Windows if (!isWindows()) { - assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.log", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.l")); - assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.0", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.0")); - assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.1", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.1")); + assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test2.log", Constants.TEST_DIR_PREFIX + + "witness/rolling/sbr-test2.l")); + assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test2.0", Constants.TEST_DIR_PREFIX + + "witness/rolling/sbr-test2.0")); + assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX + + "output/sizeBased-test2.1", Constants.TEST_DIR_PREFIX + + "witness/rolling/sbr-test2.1")); } - - //StatusPrinter.print(context.getStatusManager()); + + // StatusPrinter.print(context.getStatusManager()); } /** * Same as testBasic but also with GZ compression. */ public void test3() throws Exception { - Context context = new ContextBase(); + Context context = new ContextBase(); DummyLayout layout = new DummyLayout(); RollingFileAppender rfa = new RollingFileAppender(); rfa.setLayout(layout); rfa.setContext(context); - + FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy(); fwrp.setContext(context); SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy(); sbtp.setContext(context); - + sbtp.setMaxFileSize("100"); fwrp.setMinIndex(0); fwrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); - fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/sbr-test3.%i.gz"); + fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + + "output/sbr-test3.%i.gz"); fwrp.start(); rfa.setRollingPolicy(fwrp); rfa.setTriggeringPolicy(sbtp); rfa.start(); // Write exactly 10 bytes with each log -// for (int i = 0; i < 25; i++) { -// Thread.sleep(100); -// if (i < 10) { -// rfa.doAppend("Hello---" + i); -// //logger.debug("Hello---" + i); -// } else if (i < 100) { -// rfa.doAppend("Hello---" + i); -// //logger.debug("Hello--" + i); -// } -// } + // for (int i = 0; i < 25; i++) { + // Thread.sleep(100); + // if (i < 10) { + // rfa.doAppend("Hello---" + i); + // //logger.debug("Hello---" + i); + // } else if (i < 100) { + // rfa.doAppend("Hello---" + i); + // //logger.debug("Hello--" + i); + // } + // } for (int i = 0; i < 45; i++) { - Thread.sleep(100); - rfa.doAppend("hello"); + Thread.sleep(100); + rfa.doAppend("hello"); } - - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log").exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.0.gz").exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.1.gz").exists()); + + assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log") + .exists()); + assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.0.gz") + .exists()); + assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.1.gz") + .exists()); if (!isWindows()) { - assertTrue(Compare.compare("Constants.TEST_DIR_PREFIXoutput/sbr-test3.log", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.l")); - assertTrue(Compare.gzCompare("Constants.TEST_DIR_PREFIXoutput/sbr-test3.0.gz", + assertTrue(Compare.compare( + "Constants.TEST_DIR_PREFIXoutput/sbr-test3.log", + Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.l")); + assertTrue(Compare.gzCompare( + "Constants.TEST_DIR_PREFIXoutput/sbr-test3.0.gz", Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.0.gz")); - assertTrue(Compare.gzCompare("Constants.TEST_DIR_PREFIXoutput/sbr-test3.1.gz", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.1.gz")); + assertTrue(Compare.gzCompare( + "Constants.TEST_DIR_PREFIXoutput/sbr-test3.1.gz", + Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.1.gz")); } - //StatusPrinter.print(context.getStatusManager()); + // StatusPrinter.print(context.getStatusManager()); } boolean isWindows() {

1 0

svn commit: r678 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 13 Oct '06

13 Oct '06

Author: seb Date: Fri Oct 13 17:53:20 2006 New Revision: 678 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Log: - CallerDataConverter.java and ThrowableInformationConverter.java error count added and corrected. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java Fri Oct 13 17:53:20 2006 @@ -19,6 +19,7 @@ import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.boolex.EventEvaluator; +import ch.qos.logback.core.status.ErrorStatus; /** @@ -31,6 +32,9 @@ int depth = 5; List<EventEvaluator> evaluatorList = null; + final int MAX_ERROR_COUNT = 4; + int errorCount = 0; + public void start() { String depthStr = getFirstOption(); if (depthStr == null) { @@ -84,7 +88,19 @@ break; } } catch (EvaluationException eex) { - // just ignore evaluation exception + errorCount++; + if (errorCount < MAX_ERROR_COUNT) { + addError("Exception thrown for evaluator named [" + ee.getName() + + "]", eex); + } else if (errorCount == MAX_ERROR_COUNT) { + ErrorStatus errorStatus = new ErrorStatus( + "Exception thrown for evaluator named [" + ee.getName() + "].", + this, eex); + errorStatus.add(new ErrorStatus("This was the last warning about this evaluator's errors." + + "We don't want the StatusManager to get flooded.", this)); + addStatus(errorStatus); + } + } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Fri Oct 13 17:53:20 2006 @@ -10,7 +10,7 @@ import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.boolex.EventEvaluator; - +import ch.qos.logback.core.status.ErrorStatus; /** * Add a stack trace i case the event contains a Throwable. @@ -21,10 +21,9 @@ int lengthOption; List<EventEvaluator> evaluatorList = null; - - final int MAX_ERROR_COUNT = 2; + + final int MAX_ERROR_COUNT = 4; int errorCount = 0; - public void start() { @@ -43,7 +42,7 @@ // we add one because, printing starts at offset 1 lengthOption = Integer.parseInt(lengthStr) + 1; } catch (NumberFormatException nfe) { - addError("Could not parser ["+lengthStr+" as an integer"); + addError("Could not parser [" + lengthStr + " as an integer"); lengthOption = Integer.MAX_VALUE; } } @@ -88,7 +87,8 @@ String[] stringRep = information.getThrowableStrRep(); - int length = (lengthOption > stringRep.length) ? stringRep.length : lengthOption; + int length = (lengthOption > stringRep.length) ? stringRep.length + : lengthOption; if (evaluatorList != null) { boolean printStack = true; @@ -100,8 +100,17 @@ break; } } catch (EvaluationException eex) { - if (++errorCount <= MAX_ERROR_COUNT) { - addError("Exception thrown for evaluator named ["+ee.getName()+"]", eex); + errorCount++; + if (errorCount < MAX_ERROR_COUNT) { + addError("Exception thrown for evaluator named [" + ee.getName() + + "]", eex); + } else if (errorCount == MAX_ERROR_COUNT) { + ErrorStatus errorStatus = new ErrorStatus( + "Exception thrown for evaluator named [" + ee.getName() + "].", + this, eex); + errorStatus.add(new ErrorStatus("This was the last warning about this evaluator's errors." + + "We don't want the StatusManager to get flooded.", this)); + addStatus(errorStatus); } } }

1 0

svn commit: r677 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 13 Oct '06

13 Oct '06

Author: seb Date: Fri Oct 13 17:40:25 2006 New Revision: 677 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Log: Added an errorCount in ThrowableInformationConverter.java to that it does not flood the status manager is case of errors in the expression evaluation Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Fri Oct 13 17:40:25 2006 @@ -21,6 +21,10 @@ int lengthOption; List<EventEvaluator> evaluatorList = null; + + final int MAX_ERROR_COUNT = 2; + int errorCount = 0; + public void start() { @@ -96,7 +100,9 @@ break; } } catch (EvaluationException eex) { - addError("Exception thrown for evaluator named ["+ee.getName()+"]", eex); + if (++errorCount <= MAX_ERROR_COUNT) { + addError("Exception thrown for evaluator named ["+ee.getName()+"]", eex); + } } }

1 0

svn commit: r676 - in logback/trunk: logback-classic/examples/classes logback-classic/examples/src/chapter5 logback-site/src/site/fml logback-site/src/site/xdocTemplates logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 13 Oct '06

13 Oct '06

Author: seb Date: Fri Oct 13 17:40:10 2006 New Revision: 676 Added: logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java - copied, changed from r670, /logback/trunk/logback-classic/examples/src/chapter5/EventEvaluatorExample.java logback/trunk/logback-classic/examples/src/chapter5/ExceptionEvaluatorExample.java logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml logback/trunk/logback-classic/examples/src/chapter5/exceptionEvaluatorConfig.xml logback/trunk/logback-site/src/site/fml/faq.fml Removed: logback/trunk/logback-classic/examples/src/chapter5/EventEvaluatorExample.java logback/trunk/logback-classic/examples/src/chapter5/eventEvaluatorConfig.xml Modified: logback/trunk/logback-classic/examples/classes/ (props changed) logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: On going work on chapter 5 - added HTMLLayout + examples with Evaluators to layouts.xml - added a faq.fml file with a first questions about jetty - organised imports in LoggerContext.java Copied: logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java (from r670, /logback/trunk/logback-classic/examples/src/chapter5/EventEvaluatorExample.java) ============================================================================== --- /logback/trunk/logback-classic/examples/src/chapter5/EventEvaluatorExample.java (original) +++ logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java Fri Oct 13 17:40:10 2006 @@ -5,19 +5,16 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.util.StatusPrinter; -public class EventEvaluatorExample { +public class CallerEvaluatorExample { public static void main(String[] args) throws InterruptedException { - Logger logger = (Logger) LoggerFactory.getLogger(EventEvaluatorExample.class); + Logger logger = (Logger) LoggerFactory.getLogger(CallerEvaluatorExample.class); LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); configurator.doConfigure(args[0]); - - StatusPrinter.print(lc); for (int i = 0; i < 5; i++) { if (i == 3) { @@ -26,7 +23,5 @@ logger.debug("logging statement" + i); } } - - StatusPrinter.print(lc); } } \ No newline at end of file Added: logback/trunk/logback-classic/examples/src/chapter5/ExceptionEvaluatorExample.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/examples/src/chapter5/ExceptionEvaluatorExample.java Fri Oct 13 17:40:10 2006 @@ -0,0 +1,33 @@ +package chapter5; + +import org.slf4j.LoggerFactory; +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.util.StatusPrinter; + +public class ExceptionEvaluatorExample { + + public static void main(String[] args) throws InterruptedException { + Logger logger = (Logger) LoggerFactory.getLogger(ExceptionEvaluatorExample.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure(args[0]); + + for (int i = 0; i < 5; i++) { + if (i == 3) { + Marker ignoreMarker = MarkerFactory.getMarker("IGNORE"); + logger.debug(ignoreMarker, "logging statement" + i, new Exception("test")); + } else { + logger.debug("logging statement" + i, new Exception("test")); + } + } + + StatusPrinter.print(lc); + } +} \ No newline at end of file Added: logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml Fri Oct 13 17:40:10 2006 @@ -0,0 +1,19 @@ +<configuration> + + <evaluator name="DISPLAY_CALLER_EVAL"> + <Expression>logger.getName().contains("chapter5") && message.contains("stacktrace")</Expression> + </evaluator> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" + value="%-4relative [%thread] %-5level - %msg %caller{2, DISPLAY_CALLER_EVAL}%n" /> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="STDOUT" /> + </root> +</configuration> \ No newline at end of file Added: logback/trunk/logback-classic/examples/src/chapter5/exceptionEvaluatorConfig.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/examples/src/chapter5/exceptionEvaluatorConfig.xml Fri Oct 13 17:40:10 2006 @@ -0,0 +1,19 @@ +<configuration> + + <evaluator name="DISPLAY_EX_EVAL"> + <Expression>marker.contains("IGNORE")</Expression> + </evaluator> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" + value="%-4relative [%thread] %-5level - %msg %ex{full, DISPLAY_EX_EVAL}%n" /> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="STDOUT" /> + </root> +</configuration> \ No newline at end of file Added: logback/trunk/logback-site/src/site/fml/faq.fml ============================================================================== --- (empty file) +++ logback/trunk/logback-site/src/site/fml/faq.fml Fri Oct 13 17:40:10 2006 @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="iso-8859-1" ?> + +<document> + + <body> + + <faqs title="Logback Frequently Asked Questions"> + <part id="Logback Classic"> + <title>Logback Classic</title> + + <faq id="setup_jetty"> + + <question> + How can I use logback with Jetty ? + </question> + + <answer> + <p> + A few jars must be present in the + <em>JETTY_HOME/lib</em> + directory. + </p> + <p> + Logback uses the SLF4J api. Therefore, the + <em>slf4j-api-VERSION.jar</em> + jar must be present. This jar can be found + by <a href="http://www.slf4j.org">downloading SLF4J</a>. + </p> + <p> + Logback's own jars must also be present. + These are + <em>logback-classic-VERSION.jar</em> + and + <em>logback-core-VERSION.jar</em> + . + </p> + <p> + To configure logback classic, a file called + <em>logback-classic.xml</em> + must be placed at the root directory of + Jetty, that is the + <em>JETTY_HOME</em> + directory. You can find configuration + samples in the + <em>examples/src/chapter4/conf/</em> + directory, in the distribution of logback. + </p> + </answer> + </faq> + </part> + </faqs> + </body> +</document> Modified: logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml Fri Oct 13 17:40:10 2006 @@ -26,6 +26,9 @@ <li> <a href="joran.html"><b>A introduction to Joran</b></a> </li> + <li> + <a href="faq.html"><b>A Frequently Asked Questions list (FAQ)</b></a> + </li> </ul> <p>A complete manual about logback is in the works at the moment. Each chapter will be 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 Fri Oct 13 17:40:10 2006 @@ -55,17 +55,15 @@ the logging event and returns a String. A synopsis of the Layout interface is shown below. </p> - <div class="source"> - public interface Layout extends ContextAware, LifeCycle { + <div class="source">public interface Layout extends ContextAware, LifeCycle { - String doLayout(Object event); + String doLayout(Object event); - String getHeader(); + String getHeader(); - String getFooter(); + String getFooter(); - String getContentType(); - </div> + String getContentType();</div> <p> This interface is really simple and yet is sufficent for many formatting needs. @@ -78,12 +76,18 @@ <p> As we've seen, a Layout implementation takes as a parameter an object that represents a logging event. The typing of the - parameter to <code>Object</code> + parameter to + <code>Object</code> is because logging events may have different ways of being designed. In logback classic, a logging event is represented - by the <code>ch.qos.logback.classic.LoggingEvent</code> + by the + <code>ch.qos.logback.classic.LoggingEvent</code> class. Therefore, all layouts in logback classic implement a - sub-interface of <code>Layout</code> named <code>ClassicLayout</code>. + sub-interface of + <code>Layout</code> + named + <code>ClassicLayout</code> + . </p> <p> @@ -92,78 +96,83 @@ looks like: </p> - <div class="source"> - public interface ClassicLayout extends Layout { + <div class="source">public interface ClassicLayout extends Layout { - String doLayout(LoggingEvent event); + String doLayout(LoggingEvent event); - } - </div> +}</div> <h3>PatternLayout</h3> <p> - Logback ships with a flexible layout called <code>PatternLayout</code>. - As all classic layouts, <code>PatternLayout</code> + Logback ships with a flexible layout called + <code>PatternLayout</code> + . As all classic layouts, + <code>PatternLayout</code> takes a logging event and returns a String. However, the returned String can be modified at will by tweaking its - conversion pattern. + conversion pattern. </p> <p> - The conversion pattern of <code>PatternLayout</code> + The conversion pattern of + <code>PatternLayout</code> is closely related to the conversion pattern of the - <code>printf()</code> function in the C programming language. - A conversion pattern is composed of literal text and format - control expressions called conversion specifiers. - You are free to insert any literal text within the conversion pattern. - Each conversion specifier starts with a percent sign (%) and is followed by + <code>printf()</code> + function in the C programming language. A conversion pattern + is composed of literal text and format control expressions + called conversion specifiers. You are free to insert any + literal text within the conversion pattern. Each conversion + specifier starts with a percent sign (%) and is followed by optional format modifiers and a conversion character. The conversion character controls the type of data to use, e.g. logger name, level, date, thread name. The format modifiers control such things as field width, padding, and left or right justification. The following is a simple example. </p> -<em>Example 5.1: Sample usage of a PatternLayout (examples/chapter5/PatternSample.java)</em> -<div class="source">public class PatternSample { + <em> + Example 5.1: Sample usage of a PatternLayout + (examples/chapter5/PatternSample.java) + </em> + <div class="source">public class PatternSample { static public void main(String[] args) throws Exception { - Logger rootLogger = (Logger) LoggerFactory.getLogger("root"); - + Logger rootLogger = (Logger) + LoggerFactory.getLogger("root"); + <b>PatternLayout layout = new PatternLayout(); layout.setPattern("%-5level [%thread]: %message%n"); layout.start();</b> - + ConsoleAppender appender = new ConsoleAppender(); appender.setContext(rootLogger.getLoggerContext()); - appender.setLayout(layout); - appender.start(); - + appender.setLayout(layout); appender.start(); + rootLogger.addAppender(appender); - rootLogger.debug("Message 1"); - rootLogger.warn("Message 2"); - } + rootLogger.debug("Message 1"); rootLogger.warn("Message 2"); + } }</div> <p> - The conversion pattern is set to be "%-5level [%thread]: %message%n". - Running PatternSample will yield the following output on the console. - </p> -<div class="source">DEBUG [main]: Message 1 -WARN [main]: Message 2</div> - <p> - Note that in the conversion pattern "%-5level [%thread]: %message%n" - there is no explicit separator between literal text and conversion - specifiers. When parsing a conversion pattern, <code>PatternLayout</code> - is capable of differentiating between literal text (space characters, the brackets, - colon character) and conversion specifiers. In the example above, - the conversion specifier %-5level means the level of the logging event - should be left justified to a width of five characters. - Format specifiers will be explained in a short moment. - </p> - <p> - The recognized conversion characters and words are + The conversion pattern is set to be "%-5level [%thread]: + %message%n". Running PatternSample will yield the following + output on the console. + </p> + <div class="source">DEBUG [main]: Message 1 WARN [main]: Message 2</div> + <p> + Note that in the conversion pattern "%-5level [%thread]: + %message%n" there is no explicit separator between literal + text and conversion specifiers. When parsing a conversion + pattern, + <code>PatternLayout</code> + is capable of differentiating between literal text (space + characters, the brackets, colon character) and conversion + specifiers. In the example above, the conversion specifier + %-5level means the level of the logging event should be left + justified to a width of five characters. Format specifiers + will be explained in a short moment. </p> + <p>The recognized conversion characters and words are</p> <table border="1" CELLPADDING="8"> <th>Conversion Character or Word</th> <th>Effect</th> @@ -238,25 +247,30 @@ <b>d / date</b> </td> <td> - <p>Used to output the date of the logging event. The - date conversion specifier may be followed by a set - of braces containing a date and time pattern strings - {@link java.text.SimpleDateFormat}, - <em>ABSOLUTE</em> - , - <em>DATE</em> - or - <em>ISO8601</em> - . - </p> - <p>For example, - <b>%d{HH:mm:ss,SSS}</b> - , - <b>%d{dd MMM yyyy ;HH:mm:ss,SSS}</b> - or - <b>%d{DATE}</b> - . If no date format specifier is given then ISO8601 - format is assumed. + <p> + Used to output the date of the logging event. + The date conversion specifier may be followed by + a set of braces containing a date and time + pattern strings {@link + java.text.SimpleDateFormat}, + <em>ABSOLUTE</em> + , + <em>DATE</em> + or + <em>ISO8601</em> + . + </p> + <p> + For example, + <b>%d{HH:mm:ss,SSS}</b> + , + <b> + %d{dd MMM yyyy ;HH:mm:ss,SSS} + </b> + or + <b>%d{DATE}</b> + . If no date format specifier is given then + ISO8601 format is assumed. </p> </td> </tr> @@ -305,8 +319,10 @@ execution speed is not an issue. </p> <p> - A precision specifier can be appended to the <em>caller</em> conversion - specifier to configure the depth of the information to be displayed. + A precision specifier can be appended to the + <em>caller</em> + conversion specifier to configure the depth of + the information to be displayed. </p> </td> </tr> @@ -424,7 +440,7 @@ <p> Used to output the MDC (mapped diagnostic context) associated with the thread that - generated the logging event. + generated the logging event. </p> <p> The @@ -435,13 +451,13 @@ where <code>clientNumber</code> is the key. The value in the MDC corresponding - to the key will be output. + to the key will be output. </p> <p> - If no additional - sub-option is specified, then the entire - contents of the MDC key value pair set is output - using a format key1=val1, key2=val2 + If no additional sub-option is specified, then + the entire contents of the MDC key value pair + set is output using a format key1=val1, + key2=val2 </p> <p> @@ -592,27 +608,28 @@ </td> </tr> </table> - - + + <h3>Option handling</h3> - - <p>A conversion specifier can be followed by options between curled brackets. - We have already seen some of the possibilities offered by logback's option handling - with, for example, the MDC conversion specifier: <em>%mdc{someKey}</em>. - </p> - <p> - However, there is much more to it than that. - </p> - <p> - The logger name conversion specifier can take an integer as a first option. - This will use logback's abbreviation mechanism to display a shorter logger name, - without loosing it's meaning. - </p> - + <p> - The next table should clear things up. + A conversion specifier can be followed by options between + curled brackets. We have already seen some of the + possibilities offered by logback's option handling with, for + example, the MDC conversion specifier: + <em>%mdc{someKey}</em> + . + </p> + <p>However, there is much more to it than that.</p> + <p> + The logger name conversion specifier can take an integer as + a first option. This will use logback's abbreviation + mechanism to display a shorter logger name, without loosing + it's meaning. </p> + <p>The next table should clear things up.</p> + <table BORDER="1" CELLPADDING="8"> <tr> @@ -645,115 +662,234 @@ <td>mainPackage.sub.sample.Bar</td> </tr> </table> - - <p> - Another very useful way of adding options to a conversion specifier is - when <code>PatternLayout</code> is used with <code>EventEvaluators</code>. - </p> - <p> - <code>EventEvaluators</code> have the responsability to check wether a give event - matches a give criteria. - </p> - <p> - Let's look at an example using <code>EventEvaluators</code>. The following - configuration file outputs the logging events to the console, displaying - date, thread, level, message and caller data. - </p> - <p> - Since displaying the caller data of a logging event is very expensive, this - information will be displayed only when the logging request is combined with - a specific marker. By doing that, we make sure that only the most important - logging requests will have their caller information generated and displayed, - without penalizing application performance. - </p> + <h4>Evaluators</h4> <p> - Here is how to configure logback to behave like we described: + Another very useful way of adding options to a conversion + specifier is when + <code>PatternLayout</code> + is used with + <code>EventEvaluators</code> + . + </p> + <p> + <code>EventEvaluators</code> + have the responsability to check wether a given event + matches a given criteria. + </p> + <p> + Let's look at an example using + <code>EventEvaluators</code> + . The following configuration file outputs the logging + events to the console, displaying date, thread, level, + message and caller data. + </p> + <p> + Since displaying the caller data of a logging event is very + expensive, this information will be displayed only when the + logging request comes from a specific logger, and whose + message contains a certain string. By doing that, we make + sure that only the most important logging requests will have + their caller information generated and displayed, without + penalizing application performance. </p> -<em>Example 5.2: Sample usage of EventEvaluators (examples/chapter5/eventEvaluatorConfig.xml)</em> -<div class="source"> -<configuration> - <b><evaluator name="DISPLAY_EVAL"> - <Expression>(marker.contains("DISPLAY"))</Expression> - </evaluator></b> - - <appender name="STDOUT" - class="ch.qos.logback.core.ConsoleAppender"> - <layout class="ch.qos.logback.classic.PatternLayout"> - <param name="Pattern" - value="%-4relative [%thread] %-5level - %msg <b>%caller{2, DISPLAY_EVAL}</b>%n" /> + <p> + Here is how to configure logback to behave like we + described: + </p> + <em> + Example 5.2: Sample usage of EventEvaluators + (examples/chapter5/callerEvaluatorConfig.xml) + </em> + <div class="source"><configuration> + <b><evaluator name="DISP_CALLER_EVAL"> + <Expression>logger.getName().contains("chapter5") && \ + message.contains("stacktrace")</Expression> + </evaluator></b> + + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" value="%-4relative [%thread] %-5level - %msg \ + <b>%caller{2, DISP_CALLER_EVAL}</b>%n" /> </layout> </appender> - <root> - <level value="debug" /> - <appender-ref ref="STDOUT" /> + <root> + <level value="debug" /> + <appender-ref ref="STDOUT" /> </root> -</configuration> -</div> - <p> - Let's test this configuration with the following code: - </p> -<em>Example 5.2: Sample usage of EventEvaluators (examples/chapter5/EventEvaluatorExample.java)</em> -<div class="source">public class EventEvaluatorExample { - - public static void main(String[] args) throws InterruptedException { - Logger logger = (Logger) LoggerFactory.getLogger(EventEvaluatorExample.class); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); +</configuration></div> + <p>Let's test this configuration with the following code.</p> + <em> + Example 5.2: Sample usage of EventEvaluators + (examples/chapter5/EventEvaluatorExample.java) + </em> + <div class="source">public class CallerEvaluatorExample { + + public static void main(String[] args) throws InterruptedException { + Logger logger = (Logger) + LoggerFactory.getLogger(CallerEvaluatorExample.class); + LoggerContext lc = (LoggerContext) + LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); configurator.doConfigure(args[0]); - for (int i = 0; i < 5; i++) { - if (i == 3) { - Marker displayMarker = MarkerFactory.getMarker("DISPLAY"); - logger.debug(displayMarker, "logging statement" + i); - } else { - logger.debug("logging statement" + i); - } - } - } + for (int i = 0; i < 5; i++) { if (i == 3) { + logger.debug("stacktrace logging statement" + i); + } else { + logger.debug("logging statement" + i); + } + } }</div> <p> - This class configures logback with the file given as an argument of - <code>main()</code> and sends 5 logging requests. The third one - is associated with a marker named <em>DISPLAY</em>. + This excerpt does nothing very fancy. Five logging requests + are issued, the third one being different from the others. </p> <p> - When a logging request is sent, the corresponding logging event - will pass through the evaluation process. Here, obviously, the - third request will match the evaluation, causing its caller data - to be displayed. + When a logging request is sent, the corresponding logging + event will pass through the evaluation process. Here, + obviously, the third request will match the evaluation, + causing its caller data to be displayed. </p> <p> - Here is the output of the <code>EventEvaluatorExample</code> class. + Here is the output of the + <code>EventEvaluatorExample</code> + class. </p> -<div class="source">0 [main] DEBUG - logging statement0 -0 [main] DEBUG - logging statement1 -0 [main] DEBUG - logging statement2 -0 [main] DEBUG - logging statement3 Caller+0 at chapter5.EventEvaluatorExample.main(EventEvaluatorExample.java:25) + <div class="source">0 [main] DEBUG - logging statement0 +0 [main] DEBUG - logging statement1 +0 [main] DEBUG - logging statement2 +0 [main] DEBUG - logging statement3 Caller+0 at chapter5.CallerEvaluatorExample.main \ + (CallerEvaluatorExample.java:25) -16 [main] DEBUG - logging statement4 </div> +16 [main] DEBUG - logging statement4</div> + <p> + Of course, one can change the expression to match one's + specific situation. An expression testing logger name and + request level could also be meaningful. + </p> + <p> + Let's look at a different situation. When exceptions are + added to a logging request, they are usually displayed. But + one can easily imagine that, for the sake of readability of + a log file, one would want only a certain type of exceptions + to be displayed. + </p> + <p>The following configuration will allow that.</p> + <em> + Example 5.3: Sample usage of EventEvaluators + (examples/chapter5/exceptionEvaluatorConfig.xml) + </em> + <div class="source"><configuration> + + <evaluator name="DISPLAY_EX_EVAL"> + <Expression>marker.contains("IGNORE")</Expression> + </evaluator> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" value="%-4relative [%thread] %-5level - %msg%n \ + %ex{full, DISPLAY_EX_EVAL}%n" /> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="STDOUT" /> + </root> +</configuration></div> + <p> + With this configuration, each time a marker named + <em>IGNORE</em> + will be associated with a logging request containing an + exception, no information will be displayed about the + exception. + </p> <h3>HTMLLayout</h3> + <p>HTMLLayout outputs events in an HTML table. Each row of the table corresponds to an event.</p> + <p> + The content of the table columns are specified using a + conversion pattern. See <code>PatternLayout</code> for documentation on + the available patterns. + </p> + <p> + Note that the pattern + <em>%ex</em> + used to display an Exception is not the only way to display + an Exception with this layout. If you use this pattern, a + table column will be created to display the potential + Exception's stacktrace. + </p> + <p> + However, a better solution is available in the form of + implementations of the <code>IThrowableRenderer</code> interface. + These implementations can be called and assigned to + HTMLLayout to manage the display of anything related to + Exceptions. + </p> + <p> + By default, a <code>DefaultThrowableRenderer</code> is + assigned to the HTMLLayout. It writes the Exception on a new + table row, along with its stacktrace, in a easily readable + manner. + </p> + <p> + If one wants to use the + <em>&ex</em> + pattern anyway, then a <code>NOPThrowableRenderer</code> can be specified + in the configuration file. + </p> + <p> + A user-specified external CSS file can be linked to the html + page. In case one does not want to customize the html + output, an internal CSS style is used. + </p> + <p> + The HTMLLayout is often used in conjunction with + SMTPAppender, to send a nicely formatted html email. Of + course, it can be used with any other Appender. + </p> + <p> + In case on wants to use the HTMLLayout with a SMTPAppender, + here is a sample configuration file that can be used. + </p> + <div class="source"><configuration> + <appender name="SMTP" class="ch.qos.logback.classic.net.SMTPAppender"> + <layout class="ch.qos.logback.classic.html.HTMLLayout"> + <param name="pattern" value="%relative%thread%mdc%level%class%msg" /> + </layout> + <throwableRenderer class="ch.qos.logback.classic.html.DefaultThrowableRenderer" /> + <param name="From" value="sender.email(a)domain.net" /> + <param name="SMTPHost" value="mail.domain.net" /> + <param name="Subject" value="LastEvent: %class - %msg" /> + <param name="To" value="destination.email(a)domain.net" /> + </appender> - <em> - Example 1.1: Basic template for logging - (examples/chapter1/HelloWorld1.java) - </em> - - - + <root> + <level value="debug" /> + <appender-ref ref="SMTP" /> + </root> +</configuration></div> + <p> + In this configuration file, the + <em>throwableRenderer</em> + element specifies the default implementation of + IThrowableRenderer. It could be omitted, but is showed for + educationnal purposes. + </p> - <h2>Logback access</h2> - <h3>PatternLayout</h3> - <h3>HTMLLayout</h3> + <h2>Logback access</h2> + <h3>PatternLayout</h3> + <h3>HTMLLayout</h3> -</body> + </body> </document>

1 0

svn commit: r675 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 13 Oct '06

13 Oct '06

Author: ceki Date: Fri Oct 13 17:18:37 2006 New Revision: 675 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Log: minor changes to avoid Eclipse warnings 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 Fri Oct 13 17:18:37 2006 @@ -10,19 +10,15 @@ package ch.qos.logback.classic; -import java.net.URL; import java.util.HashMap; import java.util.Hashtable; import org.slf4j.ILoggerFactory; -import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.LoggerContextRemoteView; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.status.ErrorStatus; -import ch.qos.logback.core.util.Loader; -import ch.qos.logback.core.util.StatusPrinter; /** * @author ceki Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Fri Oct 13 17:18:37 2006 @@ -105,8 +105,8 @@ String expected = "<"+(SyslogConstants.LOG_MAIL+SyslogConstants.DEBUG_SEVERITY)+">"; assertTrue(msg.startsWith(expected)); - String first = "<\\d{2}>\\w{3} \\d{2} \\d{2}(:\\d{2}){2} \\w* "; - String threadName = Thread.currentThread().getName(); + //String first = "<\\d{2}>\\w{3} \\d{2} \\d{2}(:\\d{2}){2} \\w* "; + //String threadName = Thread.currentThread().getName(); System.out.println(msg); //assertTrue(msg.matches(first +"\\["+threadName+"\\] "+ loggerName +" " +logMsg));

1 0

svn commit: r674 - in logback/trunk/logback-core/src/test: input/joran java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 13 Oct '06

13 Oct '06

Author: ceki Date: Fri Oct 13 17:18:01 2006 New Revision: 674 Added: logback/trunk/logback-core/src/test/input/joran/event1.xml logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/EventInterpreterTest.java Log: ongoing work on replaying Joran Added: logback/trunk/logback-core/src/test/input/joran/event1.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/event1.xml Fri Oct 13 17:18:01 2006 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE test> + +<test> + +  + <badBegin> + <touch/> + <touch/> + </badBegin> + + <hello name="John Doe">XXX</hello> + +</test> \ No newline at end of file Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/EventInterpreterTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/EventInterpreterTest.java Fri Oct 13 17:18:01 2006 @@ -0,0 +1,85 @@ +/** + * LOGBack: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, 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; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import junit.framework.TestCase; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.joran.spi.ExecutionContext; +import ch.qos.logback.core.joran.spi.Interpreter; +import ch.qos.logback.core.joran.spi.RuleStore; +import ch.qos.logback.core.joran.spi.SaxEvent; +import ch.qos.logback.core.joran.spi.SimpleRuleStore; +import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.StatusPrinter; + + +/** + * Test the way Interpreter skips elements in case of exceptions thrown by + * Actions. + * + * @author Ceki Gulcu + */ +public class EventInterpreterTest extends TestCase { + + public EventInterpreterTest(String name) { + super(name); + } + + protected void setUp() throws Exception { + super.setUp(); + } + + /* + * @see TestCase#tearDown() + */ + protected void tearDown() throws Exception { + super.tearDown(); + } + + SAXParser createParser() throws Exception { + SAXParserFactory spf = SAXParserFactory.newInstance(); + return spf.newSAXParser(); + } + + /** + * Tests that whenever an action throws an exception, processing of child + * elements is skipped. + * + * @throws Exception + */ + public void test1() throws Exception { + RuleStore rs = new SimpleRuleStore(new ContextBase()); + + Interpreter jp = new Interpreter(rs); + ExecutionContext ec = jp.getExecutionContext(); + ec.setContext(new ContextBase()); + + SAXParser saxParser = createParser(); + saxParser.parse("file:" + Constants.TEST_DIR_PREFIX + "input/joran/event1.xml", jp); + + StatusPrinter.print(ec.getStatusManager()); + for(SaxEvent se : jp.saxEventList) { + System.out.println(se); + } + + } + + +// public static Test suite() { +// TestSuite suite = new TestSuite(); +// //suite.addTest(new SkippingInInterpreterTest("testSkipSiblings2")); +// suite.addTestSuite(SkippingInInterpreterTest.class); +// return suite; +// } + +}

1 0

svn commit: r673 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 13 Oct '06

13 Oct '06

Author: ceki Date: Fri Oct 13 17:17:45 2006 New Revision: 673 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Log: Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java Fri Oct 13 17:17:45 2006 @@ -0,0 +1,102 @@ +package ch.qos.logback.core.joran; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.List; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.xml.sax.InputSource; + +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.joran.spi.SaxEvent; +import ch.qos.logback.core.joran.spi.SaxEventRecorder; +import ch.qos.logback.core.spi.ContextAwareBase; + +public class GenericConfigurator extends ContextAwareBase { + + final public void doConfigure(URL url) throws JoranException { + try { + InputStream in = url.openStream(); + doConfigure(in); + in.close(); + } catch (IOException ioe) { + String errMsg = "Could not open URL [" + url + "]."; + addError(errMsg, ioe); + throw new JoranException(errMsg, ioe); + } + } + + final public void doConfigure(String filename) throws JoranException { + doConfigure(new File(filename)); + } + + final public void doConfigure(File file) throws JoranException { + FileInputStream fis = null; + try { + fis = new FileInputStream(file); + doConfigure(fis); + } catch (IOException ioe) { + String errMsg = "Could not open [" + file.getName() + "]."; + addError(errMsg, ioe); + throw new JoranException(errMsg, ioe); + } finally { + if (fis != null) { + try { + fis.close(); + } catch (java.io.IOException ioe) { + String errMsg = "Could not close [" + file.getName() + "]."; + addError(errMsg, ioe); + throw new JoranException(errMsg,ioe); + } + } + } + } + + final public void doConfigure(InputStream inputStream) throws JoranException { + doConfigure(new InputSource(inputStream)); + } + + List<SaxEvent> recordEvents(InputSource inputSource) throws JoranException { + SAXParser saxParser = null; + SaxEventRecorder saxEventRecorder = new SaxEventRecorder(); + try { + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setValidating(false); + spf.setNamespaceAware(true); + saxParser = spf.newSAXParser(); + } catch (Exception pce) { + String errMsg = "Parser configuration error occured"; + addError(errMsg, pce); + throw new JoranException(errMsg, pce); + } + + try { + saxParser.parse(inputSource, saxEventRecorder); + return saxEventRecorder.saxEventList; + + } catch (IOException ie) { + String errMsg = "I/O error occurred while parsing xml file"; + addError(errMsg, ie); + throw new JoranException(errMsg, ie); + } catch (Exception ex) { + String errMsg = "Problem parsing XML document. See previously reported errors. Abandoning all further processing."; + addError(errMsg, ex); + throw new JoranException(errMsg, ex); + } + + } + + final public void doConfigure(final InputSource inputSource) + throws JoranException { + + List<SaxEvent> saxEventList; + saxEventList = recordEvents(inputSource); + + } + +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Fri Oct 13 17:17:45 2006 @@ -59,8 +59,7 @@ */ abstract public class JoranConfiguratorBase extends ContextAwareBase { Interpreter joranInterpreter; - boolean listAppnderAttached = false; - + final public void doConfigure(URL url) { try {

1 0

svn commit: r672 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi
by noreply.ceki＠qos.ch 13 Oct '06

13 Oct '06

Author: ceki Date: Fri Oct 13 17:17:37 2006 New Revision: 672 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/BodyEvent.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EndEvent.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/JoranException.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SaxEvent.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SaxEventRecorder.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/StartEvent.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java Log: ongoing work on replaying Joran Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/BodyEvent.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/BodyEvent.java Fri Oct 13 17:17:37 2006 @@ -0,0 +1,23 @@ +package ch.qos.logback.core.joran.spi; + +import org.xml.sax.Locator; + +public class BodyEvent extends SaxEvent { + + final String text; + + BodyEvent(String text, Locator locator) { + super(null, null, null, locator); + this.text = text; + } + + public String getText() { + return text; + } + + @Override + public String toString() { + return "BodyEvent("+getText()+")"+locator.getLineNumber()+","+locator.getColumnNumber(); + } + +} Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EndEvent.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EndEvent.java Fri Oct 13 17:17:37 2006 @@ -0,0 +1,17 @@ +package ch.qos.logback.core.joran.spi; + +import org.xml.sax.Locator; + +public class EndEvent extends SaxEvent { + + EndEvent(String namespaceURI, String localName, String qName, Locator locator) { + super(namespaceURI, localName, qName, locator); + } + + @Override + public String toString() { + return " EndEvent("+getQName()+") ["+locator.getLineNumber()+","+locator.getColumnNumber()+"]"; + } + + +} Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/JoranException.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/JoranException.java Fri Oct 13 17:17:37 2006 @@ -0,0 +1,14 @@ +package ch.qos.logback.core.joran.spi; + +public class JoranException extends Exception { + + private static final long serialVersionUID = 1112493363728774021L; + + public JoranException(String msg) { + super(msg); + } + + public JoranException(String msg, Throwable cause) { + super(msg, cause); + } +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java Fri Oct 13 17:17:37 2006 @@ -129,6 +129,7 @@ return match; } + @Override public boolean equals(Object o) { //System.out.println("in equals:" +this+ " vs. " + o); if ((o == null) || !(o instanceof Pattern)) { @@ -155,6 +156,7 @@ return true; } + @Override public int hashCode() { int hc = 0; int len = size(); @@ -168,6 +170,7 @@ return hc; } + @Override public String toString() { int size = components.size(); String result = ""; Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SaxEvent.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SaxEvent.java Fri Oct 13 17:17:37 2006 @@ -0,0 +1,41 @@ +package ch.qos.logback.core.joran.spi; + +import org.xml.sax.Locator; +import org.xml.sax.helpers.LocatorImpl; + +public class SaxEvent { + + final String namespaceURI; + final String localName; + final String qName; + final Locator locator; + + SaxEvent(String namespaceURI, String localName, String qName, Locator locator) { + this.namespaceURI = namespaceURI; + this.localName = localName; + this.qName = qName; + // locator impl is used to take a snapshot! + this.locator = new LocatorImpl(locator); + } + + public String getLocalName() { + return localName; + } + + public Locator getLocator() { + return locator; + } + + public String getNamespaceURI() { + return namespaceURI; + } + + public String getQName() { + return qName; + } + + @Override + public String toString() { + return this.getClass().getName()+", "+locator.getLineNumber()+","+locator.getColumnNumber(); + } +} Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SaxEventRecorder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SaxEventRecorder.java Fri Oct 13 17:17:37 2006 @@ -0,0 +1,83 @@ +package ch.qos.logback.core.joran.spi; + +import java.util.ArrayList; +import java.util.List; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; + +public class SaxEventRecorder extends DefaultHandler { + + private ExecutionContext ec; + + public List<SaxEvent> saxEventList = new ArrayList<SaxEvent>(); + Locator locator; + Pattern globalPattern; + + public void startDocument() { + } + + public Locator getLocator() { + return locator; + } + + public void setDocumentLocator(Locator l) { + locator = l; + } + + + public void startElement(String namespaceURI, String localName, String qName, + Attributes atts) { + + String tagName = getTagName(localName, qName); + globalPattern.push(tagName); + Pattern current = (Pattern) globalPattern.clone(); + saxEventList.add(new StartEvent(current, namespaceURI, localName, qName, atts, getLocator())); + } + + public void characters(char[] ch, int start, int length) { + String body = new String(ch, start, length); + + if(body != null) { + body = body.trim(); + } + if(body.length() > 0) { + saxEventList.add(new BodyEvent(body, getLocator())); + } + } + + public void endElement(String namespaceURI, String localName, String qName) { + saxEventList.add(new EndEvent(namespaceURI, localName, qName, getLocator())); + globalPattern.pop(); + } + + + String getTagName(String localName, String qName) { + String tagName = localName; + if ((tagName == null) || (tagName.length() < 1)) { + tagName = qName; + } + return tagName; + } + + public void error(SAXParseException spe) throws SAXException { + ec.addError("Parsing error", this, spe); + ec.addError("Parsing problem on line " + spe.getLineNumber() + + " and column " + spe.getColumnNumber(), this, spe); + } + + public void fatalError(SAXParseException spe) throws SAXException { + ec.addError("Parsing fatal error", this, spe); + ec.addError("Parsing problem on line " + spe.getLineNumber() + + " and column " + spe.getColumnNumber(), this, spe); + } + + public void warning(SAXParseException spe) throws SAXException { + ec.addWarn("Parsing warning", this, spe); + ec.addWarn("Parsing problem on line " + spe.getLineNumber() + + " and column " + spe.getColumnNumber(), this, spe); + } +} Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/StartEvent.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/StartEvent.java Fri Oct 13 17:17:37 2006 @@ -0,0 +1,29 @@ +package ch.qos.logback.core.joran.spi; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; + +public class StartEvent extends SaxEvent { + + final Attributes attributes; + final Pattern pattern; + + StartEvent(Pattern pattern, String namespaceURI, String localName, String qName, + Attributes attributes, Locator locator) { + super(namespaceURI, localName, qName, locator); + // locator impl is used to take a snapshot! + this.attributes = attributes; + this.pattern = pattern; + } + + public Attributes getAttributes() { + return attributes; + } + + + @Override + public String toString() { + return "StartEvent("+getQName()+") ["+locator.getLineNumber()+","+locator.getColumnNumber()+"]"; + } + +}

1 0

svn commit: r671 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi
by noreply.ceki＠qos.ch 13 Oct '06

13 Oct '06

Author: ceki Date: Fri Oct 13 17:17:11 2006 New Revision: 671 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java Log: ongoing work on replaying Joran Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java Fri Oct 13 17:17:11 2006 @@ -66,6 +66,9 @@ Pattern pattern; Locator locator; + public List<SaxEvent> saxEventList = new ArrayList<SaxEvent>(); + + /** * The <id>actionListStack</id> contains a list of actions that are executing * for the given XML element. @@ -100,7 +103,8 @@ public void startElement(String namespaceURI, String localName, String qName, Attributes atts) { - String tagName = getTagName(localName, qName); + + String tagName = getTagName(localName, qName); //System.out.println("startElement [" + tagName + "]"); @@ -121,9 +125,10 @@ } public void characters(char[] ch, int start, int length) { + + String body = new String(ch, start, length); List applicableActionList = (List) actionListStack.peek(); - String body = new String(ch, start, length); if(body != null) { body = body.trim(); } @@ -134,6 +139,8 @@ } public void endElement(String namespaceURI, String localName, String qName) { + saxEventList.add(new EndEvent(namespaceURI, localName, qName, getLocator())); + List applicableActionList = (List) actionListStack.pop(); // System.out.println("endElement ["+getTagName(localName, qName)+"]");

1 0

svn commit: r670 - logback/trunk/logback-access/lib
by noreply.ceki＠qos.ch 13 Oct '06

13 Oct '06

Author: ceki Date: Fri Oct 13 10:48:14 2006 New Revision: 670 Removed: logback/trunk/logback-access/lib/resin.jar Log: no need to keep resin.jar around since we do not target it.

1 0