August 2008 - logback-dev - mailman3.qos.ch

svn commit: r1749 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/util logback-classic/src/test/java/ch/qos/logback/classic/util logback-classic/src/test/resources logback-examples/src/main/java/chapter1 logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 09 Aug '08

09 Aug '08

Author: ceki Date: Sat Aug 9 21:50:32 2008 New Revision: 1749 Added: logback/trunk/logback-classic/src/test/resources/BOO_logback-test.xml logback/trunk/logback-classic/src/test/resources/README.txt Removed: logback/trunk/logback-classic/src/test/resources/logback-test.xml Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LoggerStatusPrinter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java logback/trunk/logback-examples/src/main/java/chapter1/HelloWorld2.java logback/trunk/logback-site/src/site/pages/index.html logback/trunk/logback-site/src/site/pages/mailinglist.html logback/trunk/logback-site/src/site/pages/manual/introduction.html logback/trunk/logback-site/src/site/pages/setup.html logback/trunk/logback-site/src/site/pages/team.html Log: - logback-examples should work under Eclipse - simplification of LoggerStatusPrinter - improvements to documentation Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LoggerStatusPrinter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LoggerStatusPrinter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LoggerStatusPrinter.java Sat Aug 9 21:50:32 2008 @@ -12,18 +12,14 @@ import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.util.StatusPrinter; public class LoggerStatusPrinter { public static void printStatusInDefaultContext() { - Logger logger = (Logger) LoggerFactory.getLogger(LoggerStatusPrinter.class); - LoggerContext lc = logger.getLoggerContext(); - StatusManager sm = lc.getStatusManager(); - StatusPrinter.print(sm); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + StatusPrinter.print(lc); } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java Sat Aug 9 21:50:32 2008 @@ -10,6 +10,7 @@ import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.LoggerFactory; @@ -40,6 +41,10 @@ } @Test + @Ignore + // this test works only if logback-test.xml or logback.xml files are on the classpath. + // However, this is something we try to avoid in order to simplify the life + // of users trying to follows the manual and logback-examples from an IDE public void testAutoconfig() { Appender appender = root.getAppender("STDOUT"); assertNotNull(appender); @@ -47,6 +52,10 @@ } @Test + @Ignore + // this test works only if logback-test.xml or logback.xml files are on the classpath. + // However, this is something we try to avoid in order to simplify the life + // of users trying to follows the manual and logback-examples from an IDE public void testReset() throws JoranException { { ContextInitializer.autoConfig(lc); Added: logback/trunk/logback-classic/src/test/resources/BOO_logback-test.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/BOO_logback-test.xml Sat Aug 9 21:50:32 2008 @@ -0,0 +1,15 @@ +<configuration> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" + value="TEST %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" /> + </layout> + </appender> + + <root> + <level value="ERROR" /> + <appender-ref ref="STDOUT" /> + </root> +</configuration> \ No newline at end of file Added: logback/trunk/logback-classic/src/test/resources/README.txt ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/README.txt Sat Aug 9 21:50:32 2008 @@ -0,0 +1,5 @@ + +Few test cases InitializationTest requite the presence of logback.xml or logback-test.xml +to be present in the classpath. However, this conflict with the logback-examples module. +In particular, when users attempt to follow the manual by importing the project in an IDE +such as Eclipse. \ No newline at end of file Modified: logback/trunk/logback-examples/src/main/java/chapter1/HelloWorld2.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter1/HelloWorld2.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter1/HelloWorld2.java Sat Aug 9 21:50:32 2008 @@ -11,14 +11,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import ch.qos.logback.classic.util.LoggerStatusPrinter; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.core.util.StatusPrinter; public class HelloWorld2 { public static void main(String[] args) { Logger logger = LoggerFactory.getLogger("chapter1.HelloWorld2"); logger.debug("Hello world."); - LoggerStatusPrinter.printStatusInDefaultContext(); + + // print internal state + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + StatusPrinter.print(lc); } } Modified: logback/trunk/logback-site/src/site/pages/index.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/index.html (original) +++ logback/trunk/logback-site/src/site/pages/index.html Sat Aug 9 21:50:32 2008 @@ -39,7 +39,8 @@ significantly improved version of log4j. Moreover, logback-classic natively implements the <a href="http://www.slf4j.org">SLF4J API</a> so that you can readily switch back and forth between - logback and other logging systems such as log4j or JDK14 Logging. + logback and other logging systems such as log4j or + java.util.logging (JUL). </p> <p>The logback-access module integrates with Servlet containers, @@ -48,7 +49,14 @@ on top of logback-core. </p> - + <h3>Sister projects</h3> + + <p>The <a href="http://audit.qos.ch">logback-audit</a> project is + designed for processing logging events having long-term business + significance. Logback-audit is commercial software based on + logback-core. + </p> + <script src="templates/footer.js"></script> </div> </body> Modified: logback/trunk/logback-site/src/site/pages/mailinglist.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/mailinglist.html (original) +++ logback/trunk/logback-site/src/site/pages/mailinglist.html Sat Aug 9 21:50:32 2008 @@ -162,7 +162,7 @@ <h2>On IRC</h2> <p>We can also be reached by IRC at <span - class="big"><code>irc.freenode.net#logback</code></span>. </p> + class="big"><code>irc.freenode.net#qos.ch</code></span>. </p> <p> </p> Modified: logback/trunk/logback-site/src/site/pages/manual/introduction.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/introduction.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/introduction.html Sat Aug 9 21:50:32 2008 @@ -98,24 +98,21 @@ <p> - On the first line of the main() method, the variable named <code>logger</code> - is assigned a <code>Logger</code> - instance retreived by invoking the static method <code>getLogger</code> - in the <code>LoggerFactory</code> class. - This logger is named "chapter1.HelloWorld1". The main method proceeds to call the - <code>debug</code> method of this logger passing "Hello World" as an argument. - We say that the main - method contains a logging statement of level debug with the message "Hello world". + On the first line of the main() method, the variable named + <code>logger</code> is assigned a <code>Logger</code> instance + retrieved by invoking the static <code>getLogger</code> method + from the <code>LoggerFactory</code> class. This logger is named + "chapter1.HelloWorld1". The main method proceeds to call the + <code>debug</code> method of this logger passing "Hello World" + as an argument. We say that the main method contains a logging + statement of level DEBUG with the message "Hello world". </p> - <p> - You will note that the above example does not reference any - logback classes. In most cases, as far as logging is - concerned, your classes will need to import only SLF4J - classes. In principle, you will have to import logback - classes only for configuring logback. Thus, the vast - majority of your classes will only be cognizant of SLF4J API - and oblivious to the existence of logback. + <p>Note that the above example does not reference any logback + classes. In most cases, as far as logging is concerned, your + classes will only need to import SLF4J classes. Thus, the vast + majority, if not all, of your classes will be cognizant of SLF4J + API and oblivious to the existence of logback. </p> @@ -124,12 +121,11 @@ </p> <div class="source"><pre>java chapter1.HelloWorld1</pre></div> - <p> - Launching the <code>HelloWorld1</code> - application will output a single line on the console. By virtue of - to logback's default configuration policy, when no default file - is found to configure logback explicitely, logback will add a - <code>ConsoleAppender</code> to the root logger. + <p>Launching the <code>HelloWorld1</code> application will output + a single line on the console. By virtue of to logback's default + configuration policy, when no default configuration file is found, + logback will add a <code>ConsoleAppender</code> to the root + logger. </p> <div class="source"><pre>20:49:07.962 [main] DEBUG chapter1.HelloWorld1 - Hello world.</pre></div> @@ -149,14 +145,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -<b>import ch.qos.logback.classic.util.LoggerStatusPrinter;</b> +<b>import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.core.util.StatusPrinter;</b> public class HelloWorld2 { public static void main(String[] args) { Logger logger = LoggerFactory.getLogger("chapter1.HelloWorld2"); logger.debug("Hello world."); - <b>LoggerStatusPrinter.printStatusInDefaultContext();</b> + + // print internal state + <b>LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + StatusPrinter.print(lc);</b> } }</pre></div> Modified: logback/trunk/logback-site/src/site/pages/setup.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/setup.html (original) +++ logback/trunk/logback-site/src/site/pages/setup.html Sat Aug 9 21:50:32 2008 @@ -20,59 +20,61 @@ <div id="content"> -<h2>Classpath Setup</h2> + <h2>Classpath Setup</h2> -<p> -In order to run the examples provided in the documentation, -you need to add the following jars to your class path: -</p> - -<ul> - <p>logback-core-${version}.jar</p> - <p>logback-classic-${version}.jar</p> - <p>logback-examples-${version}.jar</p> - <p>slf4j-api-${slf4j.version}.jar</p> -</ul> - -<h3>Example</h3> - -<p> -Assuming your current directory is -<em>$LOGBACK_HOME/logback-examples</em>, where <em>$LOGBACK_HOME</em> stands -for the directory where you installed logback, you can launch the first -sample application, <em>chapter1.HelloWord1</em> with the following command: -</p> + <p>In order to run the examples provided in the documentation, you + need to add the following jars to your class path: + </p> + + <ul> + <li>logback-core-${version}.jar</li> + <li>logback-classic-${version}.jar</li> + <li>logback-examples-${version}.jar</li> + <li>slf4j-api-${slf4j.version}.jar</li> + </ul> + + <h3>Running from the command line</h3> + + <p>Assuming your current directory is + <em>$LOGBACK_HOME/logback-examples</em>, where + <em>$LOGBACK_HOME</em> stands for the directory where you installed + logback, you can launch the first sample application, + <em>chapter1.HelloWord1</em> with the following command: + </p> <div class="source"><pre>java -cp lib/slf4j-api-${slf4j.version}.jar;../logback-core-${version}.jar;\ ../logback-classic-${version}.jar;logback-examples-${version}.jar\ chapter1.HelloWorld1</pre></div> -<p> -It is more convenient to set the CLASSPATH environment variable -once and for all before running the examples. -</p> -<p>The <em>setClasspath.cmd</em> script located in the $LOGBACK_HOME/logback-examples -folder will configure the class path for the MS Windows platform. For Unix, you can -use <em>setClasspath.sh</em>. -</p> - -<p>Please edit the script in order to adapt the <em>LB_HOME</em> variable -to match your local environment.</p> - -<p> -Please be aware that many examples will launch java classes along -with configuration files. To access these files by using -the same commands as written in the documentation, you will need to -issue the commands from within the <em>$LOGBACK_HOME/logback-examples</em> -directory. -</p> + <p>It is more convenient to set the CLASSPATH environment variable + once and for all before running the examples. + </p> + + <p>The <em>setClasspath.cmd</em> script located in the + $LOGBACK_HOME/logback-examples folder will configure the class path + for the MS Windows platform. For Unix, you can use + <em>setClasspath.sh</em>. + </p> + + <p>Please edit the script in order to adapt the <em>LB_HOME</em> variable + to match your local environment.</p> + + <p>Please be aware that many examples will launch java classes along + with configuration files. To access these files by using the same + commands as written in the documentation, you will need to issue the + commands from within the <em>$LOGBACK_HOME/logback-examples</em> + directory. + </p> + + <h3>Using an IDE, e.g. Eclipse</h3> + + <p>You can import the logback project into Eclipse. Since logback + uses maven as its build system, the "maven eclipse:eclipse" command + will create the <em>.classpath</em> and <em>.project</em> files for + Eclipse. You can then import the logback project into Eclipse in one + or two clicks.</p> - - - - - Modified: logback/trunk/logback-site/src/site/pages/team.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/team.html (original) +++ logback/trunk/logback-site/src/site/pages/team.html Sat Aug 9 21:50:32 2008 @@ -48,14 +48,6 @@ first sight. His interests range from cryptography, system monitoring and testing to application interoperability. </p> - - <p>One of the core lessons he has learned over the years is - that unit tests lie at the heart of maintainable - software. Adding tests at the end of development cycle - yields poor results. Tests must be part of development right - from the beginning. - </p> - </td> </tr> <tr class="a">

1 0

svn commit: r1748 - in logback/trunk: . logback-access logback-classic logback-core
by noreply.ceki＠qos.ch 09 Aug '08

09 Aug '08

Author: ceki Date: Sat Aug 9 21:48:25 2008 New Revision: 1748 Modified: logback/trunk/LICENSE.txt logback/trunk/logback-access/LICENSE.txt logback/trunk/logback-classic/LICENSE.txt logback/trunk/logback-core/LICENSE.txt Log: indentation changes only Modified: logback/trunk/LICENSE.txt ============================================================================== --- logback/trunk/LICENSE.txt (original) +++ logback/trunk/LICENSE.txt Sat Aug 9 21:48:25 2008 @@ -6,17 +6,17 @@ Copyright (C) 2000-2008, QOS.ch -Source code and binaries for logback, including logback-core, -logback-classic and logback-access modules, are distributed under the -GNU Lesser General Public License Version 2.1, as published by the +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the Free Software Foundation. -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; either -version 2.1 of the License, or (at your option) any later version. +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; either version 2.1 of the +License, or (at your option) any later version. -This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. Modified: logback/trunk/logback-access/LICENSE.txt ============================================================================== --- logback/trunk/logback-access/LICENSE.txt (original) +++ logback/trunk/logback-access/LICENSE.txt Sat Aug 9 21:48:25 2008 @@ -6,17 +6,17 @@ Copyright (C) 2000-2008, QOS.ch -Source code and binaries for logback, including logback-core, -logback-classic and logback-access modules, are distributed under the -GNU Lesser General Public License Version 2.1, as published by the +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the Free Software Foundation. -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; either -version 2.1 of the License, or (at your option) any later version. +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; either version 2.1 of the +License, or (at your option) any later version. -This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. Modified: logback/trunk/logback-classic/LICENSE.txt ============================================================================== --- logback/trunk/logback-classic/LICENSE.txt (original) +++ logback/trunk/logback-classic/LICENSE.txt Sat Aug 9 21:48:25 2008 @@ -6,17 +6,17 @@ Copyright (C) 2000-2008, QOS.ch -Source code and binaries for logback, including logback-core, -logback-classic and logback-access modules, are distributed under the -GNU Lesser General Public License Version 2.1, as published by the +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the Free Software Foundation. -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; either -version 2.1 of the License, or (at your option) any later version. +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; either version 2.1 of the +License, or (at your option) any later version. -This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. Modified: logback/trunk/logback-core/LICENSE.txt ============================================================================== --- logback/trunk/logback-core/LICENSE.txt (original) +++ logback/trunk/logback-core/LICENSE.txt Sat Aug 9 21:48:25 2008 @@ -6,17 +6,17 @@ Copyright (C) 2000-2008, QOS.ch -Source code and binaries for logback, including logback-core, -logback-classic and logback-access modules, are distributed under the -GNU Lesser General Public License Version 2.1, as published by the +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the Free Software Foundation. -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; either -version 2.1 of the License, or (at your option) any later version. +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; either version 2.1 of the +License, or (at your option) any later version. -This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.

1 0

svn commit: r1747 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 09 Aug '08

09 Aug '08

Author: ceki Date: Sat Aug 9 21:26:06 2008 New Revision: 1747 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Log: let the JIT do its magic Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Sat Aug 9 21:26:06 2008 @@ -39,7 +39,7 @@ } public void testParameterized() { - basicDurationInNanos(NORMAL_RUN_LENGTH); + loopParameterized(NORMAL_RUN_LENGTH); double avgDuration = loopParameterized(NORMAL_RUN_LENGTH); long referencePerf = 36; BogoPerf.assertDuration(avgDuration, referencePerf, REFERENCE_BIPS);

1 0

svn commit: r1746 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 09 Aug '08

09 Aug '08

Author: ceki Date: Sat Aug 9 16:59:12 2008 New Revision: 1746 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Log: - minor clean up 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 Sat Aug 9 16:59:12 2008 @@ -9,11 +9,10 @@ */ package ch.qos.logback.classic.joran; +import junit.framework.TestCase; + import org.slf4j.MDC; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; @@ -205,11 +204,4 @@ LoggingEvent le = (LoggingEvent) listAppender.list.get(0); assertEquals("hello user2", le.getMessage()); } - - public static Test suite() { - TestSuite suite = new TestSuite(); - //suite.addTestSuite(JoranConfiguratorTest.class); - suite.addTest(new JoranConfiguratorTest("testStatusListener")); - return suite; - } }

1 0

svn commit: r1745 - in logback/trunk: . logback-access logback-classic logback-core logback-site/src/site/pages
by noreply.ceki＠qos.ch 09 Aug '08

09 Aug '08

Author: ceki Date: Sat Aug 9 16:58:38 2008 New Revision: 1745 Modified: logback/trunk/LICENSE.txt logback/trunk/logback-access/LICENSE.txt logback/trunk/logback-classic/LICENSE.txt logback/trunk/logback-core/LICENSE.txt logback/trunk/logback-site/src/site/pages/license.html Log: - reverting to LGPL 2.1 license as in the previous versions of logback Given that GPL+classpath exception is rejected in the same way as LGPL by those requesting for a licensing change, there is no need for change if the end result is the same. Modified: logback/trunk/LICENSE.txt ============================================================================== --- logback/trunk/LICENSE.txt (original) +++ logback/trunk/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,4 +1,3 @@ - Logback LICENSE --------------- @@ -7,34 +6,17 @@ Copyright (C) 2000-2008, QOS.ch -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - - -CLASSPATH EXCEPTION TO THE GPL - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from or -based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not obliged -to do so. If you do not wish to do so, delete this exception statement -from your version. - - +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +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; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-access/LICENSE.txt ============================================================================== --- logback/trunk/logback-access/LICENSE.txt (original) +++ logback/trunk/logback-access/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,12 +1,22 @@ - -Logback Core Module LICENSE ---------------------------- +Logback LICENSE +--------------- -Logback Core Module source code and binaries are distributed under the -GNU Lesser General Public License as published by the Free Software Foundation. +Logback: the reliable, generic, fast and flexible logging library for +Java. -Logback: the generic, reliable, fast and flexible logging library for Java. +Copyright (C) 2000-2008, QOS.ch -Copyright (C) 2000-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. \ No newline at end of file +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +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; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-classic/LICENSE.txt ============================================================================== --- logback/trunk/logback-classic/LICENSE.txt (original) +++ logback/trunk/logback-classic/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,12 +1,22 @@ - -Logback Core Module LICENSE ---------------------------- +Logback LICENSE +--------------- -Logback Core Module source code and binaries are distributed under the -GNU Lesser General Public License as published by the Free Software Foundation. +Logback: the reliable, generic, fast and flexible logging library for +Java. -Logback: the generic, reliable, fast and flexible logging library for Java. +Copyright (C) 2000-2008, QOS.ch -Copyright (C) 2000-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. \ No newline at end of file +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +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; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-core/LICENSE.txt ============================================================================== --- logback/trunk/logback-core/LICENSE.txt (original) +++ logback/trunk/logback-core/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,12 +1,22 @@ - -Logback Core Module LICENSE ---------------------------- +Logback LICENSE +--------------- -Logback Core Module source code and binaries are distributed under the -GNU Lesser General Public License as published by the Free Software Foundation. +Logback: the reliable, generic, fast and flexible logging library for +Java. -Logback: the generic, reliable, fast and flexible logging library for Java. +Copyright (C) 2000-2008, QOS.ch -Copyright (C) 2000-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. \ No newline at end of file +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +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; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-site/src/site/pages/license.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/license.html (original) +++ logback/trunk/logback-site/src/site/pages/license.html Sat Aug 9 16:58:38 2008 @@ -23,34 +23,35 @@ <h2>Logback License</h2> </div> + <p>Logback source code and binaries are distributed under the <a - href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public - License version 2</a> as published by the Free Software Foundation. + href="http://www.gnu.org/licenses/lgpl-2.1.html">GNU Lesser General + Public License version 2.1</a> as published by the Free Software + Foundation. </p> <div class="source"><pre>Logback: the reliable, generic, fast and flexible logging library for Java. Copyright (C) 2000-2008, QOS.ch -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +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; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. </pre></div>  -<p>Logback will remain an open-source project distributed under the -GPL for the foreseeable future -- foreseeable as in the future you can -reasonably think or talk about. In other words, there are no plans -whatsoever to make logback a commercial project. -</p> - <p>Please note that logback is intended to be used behind the SLF4J API, which is licensed under <a href="http://www.slf4j.org/license.html">an X11 type license</a>. @@ -62,29 +63,6 @@ of your contribution and to protect the project in case of litigation. </p> - -<h3>Classpath Exception</h3> - -<p>Linking this library statically or dynamically with other modules -is making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. -</p> - -<p>As a special exception, the copyright holders of this library give -you permission to link this library with independent modules to -produce an executable, regardless of the license terms of these -independent modules, and to copy and distribute the resulting -executable under terms of your choice, provided that you also meet, -for each linked independent module, the terms and conditions of the -license of that module. An independent module is a module which is not -derived from or based on this library. If you modify this library, you -may extend this exception to your version of the library, but you are -not obliged to do so. If you do not wish to do so, delete this -exception statement from your version. -</p> - - <script src="templates/footer.js"></script> </div> </body>

1 0

svn commit: r1744 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db
by noreply.ceki＠qos.ch 09 Aug '08

09 Aug '08

Author: ceki Date: Sat Aug 9 16:52:28 2008 New Revision: 1744 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Log: correcting copyright year Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Sat Aug 9 16:52:28 2008 @@ -1,7 +1,7 @@ /** * Logback: the reliable, generic, 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

1 0

svn commit: r1743 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 08 Aug '08

08 Aug '08

Author: ceki Date: Fri Aug 8 16:44:58 2008 New Revision: 1743 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Log: import clean up Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Fri Aug 8 16:44:58 2008 @@ -25,7 +25,6 @@ import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.TrivialStatusListener; import ch.qos.logback.core.util.Constants; -import ch.qos.logback.core.util.StatusPrinter; public class TrivialcConfiguratorTest {

1 0

svn commit: r1742 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic main/java/ch/qos/logback/classic/util test/java/ch/qos/logback/classic/util
by noreply.ceki＠qos.ch 07 Aug '08

07 Aug '08

Author: ceki Date: Thu Aug 7 16:58:04 2008 New Revision: 1742 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/util/ContextInitializer.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusListenerConfigHelper.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java Log: Relates to LBCLASSIC-59 LBCLASSIC-58 - unit testing addition of status listener by logback.statusListenerClass system property 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 Aug 7 16:58:04 2008 @@ -31,13 +31,15 @@ import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.spi.LifeCycle; import ch.qos.logback.core.status.ErrorStatus; +import ch.qos.logback.core.status.StatusListener; +import ch.qos.logback.core.status.StatusManager; /** - * LoggerContext glues many of the logback-classic components together. In principle, - * every logback-classic component instance is attached either directly or indirecty - * to a LoggerContext instance. Just as importantly LoggerContext implements the - * {@link ILoggerFactory} acting as the manufacturing source of {@link Logger} - * instances. + * LoggerContext glues many of the logback-classic components together. In + * principle, every logback-classic component instance is attached either + * directly or indirecty to a LoggerContext instance. Just as importantly + * LoggerContext implements the {@link ILoggerFactory} acting as the + * manufacturing source of {@link Logger} instances. * * @author Ceki Gulcu */ @@ -160,7 +162,7 @@ * reference, otherwise returns <code>null</code>. * * @param name - * the name of the logger to search for. + * the name of the logger to search for. */ public Logger exists(String name) { return (Logger) loggerCache.get(name); @@ -180,7 +182,7 @@ Collections.sort(loggerList, new LoggerComparator()); return loggerList; } - + public LoggerContextRemoteView getLoggerContextRemoteView() { return loggerContextRemoteView; } @@ -189,6 +191,15 @@ root.recursiveReset(); clearAllTurboFilters(); fireOnReset(); + // TODO is it a good idea to reset the status listeners? + resetStatusListeners(); + } + + void resetStatusListeners() { + StatusManager sm = getStatusManager(); + for (StatusListener sl : sm.getCopyOfStatusListenerList()) { + sm.remove(sl); + } } public void addTurboFilter(TurboFilter newFilter) { @@ -215,7 +226,7 @@ return cfai.getTurboFilterChainDecision(marker, logger, level, format, params, t); } - + final public FilterReply getTurboFilterChainDecision(final Marker marker, final Logger logger, final Level level, final String format, final Object param, final Throwable t) { @@ -223,9 +234,9 @@ return FilterReply.NEUTRAL; } return cfai.getTurboFilterChainDecision(marker, logger, level, format, - new Object[]{param}, t); + new Object[] { param }, t); } - + final public FilterReply getTurboFilterChainDecision(final Marker marker, final Logger logger, final Level level, final String format, final Object param1, final Object param2, final Throwable t) { @@ -233,7 +244,7 @@ return FilterReply.NEUTRAL; } return cfai.getTurboFilterChainDecision(marker, logger, level, format, - new Object[]{param1, param2}, t); + new Object[] { param1, param2 }, t); } public TurboFilter getFirstTurboFilter() { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Thu Aug 7 16:58:04 2008 @@ -22,7 +22,9 @@ final public static String AUTOCONFIG_FILE = "logback.xml"; final public static String TEST_AUTOCONFIG_FILE = "logback-test.xml"; final public static String CONFIG_FILE_PROPERTY = "logback.configurationFile"; - + final public static String STATUS_LISTENER_CLASS = "logback.statusListenerClass"; + final public static String SYSOUT = "SYSOUT"; + public static void configureByResource(LoggerContext loggerContext, URL url) throws JoranException { if (url == null) { @@ -80,6 +82,5 @@ ClassLoader tccl = Loader.getTCL(); autoConfig(loggerContext, tccl); } - } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusListenerConfigHelper.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusListenerConfigHelper.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusListenerConfigHelper.java Thu Aug 7 16:58:04 2008 @@ -7,27 +7,23 @@ public class StatusListenerConfigHelper { - final public static String STATUS_LISTENER_CLASS = "logback.statusListenerClass"; - final public static String SYSOUT = "SYSOUT"; - - static void installIfAsked(LoggerContext loggerContext) { - String slClass = System.getProperty(STATUS_LISTENER_CLASS, null); + String slClass = System.getProperty( + ContextInitializer.STATUS_LISTENER_CLASS, null); if (!OptionHelper.isEmpty(slClass)) { addStatusListener(loggerContext, slClass); - } + } } - + static void addStatusListener(LoggerContext loggerContext, String listenerClass) { StatusListener listener = null; - if (SYSOUT.equalsIgnoreCase(listenerClass)) { + if (ContextInitializer.SYSOUT.equalsIgnoreCase(listenerClass)) { listener = new OnConsoleStatusListener(); } else { try { listener = (StatusListener) OptionHelper.instantiateByClassName( listenerClass, StatusListener.class, loggerContext); - loggerContext.getStatusManager().add(listener); } catch (Exception e) { // printing on the console is the best we can do e.printStackTrace(); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java Thu Aug 7 16:58:04 2008 @@ -1,7 +1,16 @@ package ch.qos.logback.classic.util; -import junit.framework.TestCase; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; + +import java.util.List; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.slf4j.LoggerFactory; import ch.qos.logback.classic.Logger; @@ -9,32 +18,38 @@ import ch.qos.logback.core.Appender; import ch.qos.logback.core.ConsoleAppender; import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.StatusListener; +import ch.qos.logback.core.status.TrivialStatusListener; -public class InitializationTest extends TestCase { +public class InitializationTest { org.slf4j.Logger logger = LoggerFactory.getLogger(InitializationTest.class); LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); Logger root = (Logger) LoggerFactory.getLogger("root"); - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { logger.debug("Hello-didily-odily"); - } - protected void tearDown() throws Exception { - super.tearDown(); + @After + public void tearDown() throws Exception { System.clearProperty(ContextInitializer.CONFIG_FILE_PROPERTY); + System.clearProperty(ContextInitializer.STATUS_LISTENER_CLASS); + lc.shutdownAndReset(); } + @Test public void testAutoconfig() { Appender appender = root.getAppender("STDOUT"); assertNotNull(appender); assertTrue(appender instanceof ConsoleAppender); } - public void testReset() { + @Test + public void testReset() throws JoranException { { + ContextInitializer.autoConfig(lc); Appender appender = root.getAppender("STDOUT"); assertNotNull(appender); assertTrue(appender instanceof ConsoleAppender); @@ -46,17 +61,39 @@ } } + @Test public void testAutoConfigFromSystemProperties() throws JoranException { doAutoConfigFromSystemProperties(TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); doAutoConfigFromSystemProperties("autoConfigAsResource.xml"); // test passing a URL. note the relative path syntax with file:src/test/... doAutoConfigFromSystemProperties("file:"+TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); } + public void doAutoConfigFromSystemProperties(String val) throws JoranException { - lc.shutdownAndReset(); + //lc.shutdownAndReset(); System.setProperty(ContextInitializer.CONFIG_FILE_PROPERTY, val); ContextInitializer.autoConfig(lc); Appender appender = root.getAppender("AUTO_BY_SYSTEM_PROPERTY"); assertNotNull(appender); } + + @Test + public void teztAutoStatusListener() throws JoranException { + System.setProperty(ContextInitializer.STATUS_LISTENER_CLASS, TrivialStatusListener.class.getName()); + List<StatusListener> sll = lc.getStatusManager().getCopyOfStatusListenerList(); + assertEquals(0, sll.size()); + doAutoConfigFromSystemProperties(TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); + sll = lc.getStatusManager().getCopyOfStatusListenerList(); + assertTrue(sll.size() +" should be 1", sll.size() == 1); + } + + @Test + public void teztAutoOnConsoleStatusListener() throws JoranException { + System.setProperty(ContextInitializer.STATUS_LISTENER_CLASS, ContextInitializer.SYSOUT); + List<StatusListener> sll = lc.getStatusManager().getCopyOfStatusListenerList(); + assertEquals(0, sll.size()); + doAutoConfigFromSystemProperties(TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); + sll = lc.getStatusManager().getCopyOfStatusListenerList(); + assertTrue(sll.size() +" should be 1", sll.size() == 1); + } }

1 0

svn commit: r1741 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util
by noreply.ceki＠qos.ch 07 Aug '08

07 Aug '08

Author: ceki Date: Thu Aug 7 15:38:10 2008 New Revision: 1741 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusListenerConfigHelper.java Log: this class was mistakenly omitted in revision 1740 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusListenerConfigHelper.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusListenerConfigHelper.java Thu Aug 7 15:38:10 2008 @@ -0,0 +1,40 @@ +package ch.qos.logback.classic.util; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.core.status.OnConsoleStatusListener; +import ch.qos.logback.core.status.StatusListener; +import ch.qos.logback.core.util.OptionHelper; + +public class StatusListenerConfigHelper { + + final public static String STATUS_LISTENER_CLASS = "logback.statusListenerClass"; + final public static String SYSOUT = "SYSOUT"; + + + static void installIfAsked(LoggerContext loggerContext) { + String slClass = System.getProperty(STATUS_LISTENER_CLASS, null); + if (!OptionHelper.isEmpty(slClass)) { + addStatusListener(loggerContext, slClass); + } + } + + static void addStatusListener(LoggerContext loggerContext, + String listenerClass) { + StatusListener listener = null; + if (SYSOUT.equalsIgnoreCase(listenerClass)) { + listener = new OnConsoleStatusListener(); + } else { + try { + listener = (StatusListener) OptionHelper.instantiateByClassName( + listenerClass, StatusListener.class, loggerContext); + loggerContext.getStatusManager().add(listener); + } catch (Exception e) { + // printing on the console is the best we can do + e.printStackTrace(); + } + } + if (listener != null) { + loggerContext.getStatusManager().add(listener); + } + } +}

1 0

svn commit: r1740 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/util logback-classic/src/test/java/ch/qos/logback/classic/joran logback-core/src/main/java/ch/qos/logback/core/status logback-core/src/main/java/ch/qos/logback/core/util logback-core/src/test/input/joran logback-core/src/test/java/ch/qos/logback/core/joran logback-core/src/test/java/ch/qos/logback/core/status
by noreply.ceki＠qos.ch 07 Aug '08

07 Aug '08

Author: ceki Date: Thu Aug 7 15:37:26 2008 New Revision: 1740 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/OnConsoleStatusListener.java logback/trunk/logback-core/src/test/input/joran/illformed.xml logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/TrivialStatusListener.java - copied, changed from r1739, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Log: Relates to LBCLASSIC-59 LBCLASSIC-58 - Setting the logback.statusListenerClass system property to the name of a StatusListener class will automatically instantiate an instance of that class and register will the StatusManager currently in use by the logger context. By convention, SYSOUT represents a shorthand for ch.qos.logback.core.status.OnConsoleStatusListener - documentation to follow Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Thu Aug 7 15:37:26 2008 @@ -59,6 +59,8 @@ public static void autoConfig(LoggerContext loggerContext, ClassLoader classLoader) throws JoranException { + StatusListenerConfigHelper.installIfAsked(loggerContext); + URL url = findConfigFileURLFromSystemProperties(classLoader); if (url == null) { url = Loader.getResource(TEST_AUTOCONFIG_FILE, classLoader); @@ -77,6 +79,7 @@ throws JoranException { ClassLoader tccl = Loader.getTCL(); autoConfig(loggerContext, tccl); - } + + } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/OnConsoleStatusListener.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/OnConsoleStatusListener.java Thu Aug 7 15:37:26 2008 @@ -0,0 +1,12 @@ +package ch.qos.logback.core.status; + +import ch.qos.logback.core.util.StatusPrinter; + +public class OnConsoleStatusListener implements StatusListener { + + public void addStatusEvent(Status status) { + StringBuilder sb = new StringBuilder(); + StatusPrinter.buildStr(sb, "", status); + System.out.println(sb); + } +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Thu Aug 7 15:37:26 2008 @@ -79,7 +79,7 @@ } } - private static void buildStr(StringBuilder sb, String indentation, Status s) { + public static void buildStr(StringBuilder sb, String indentation, Status s) { String prefix; if (s.hasChildren()) { prefix = indentation + "+ "; Added: logback/trunk/logback-core/src/test/input/joran/illformed.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/illformed.xml Thu Aug 7 15:37:26 2008 @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<x> + <inc increment="1"> +</x> Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java Thu Aug 7 15:37:26 2008 @@ -9,6 +9,7 @@ */ package ch.qos.logback.core.joran; +import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -18,7 +19,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(SkippingInInterpreterTest.class); - suite.addTestSuite(TrivialcConfiguratorTest.class); + suite.addTest(new JUnit4TestAdapter(TrivialcConfiguratorTest.class)); suite.addTest(ch.qos.logback.core.joran.action.PackageTest.suite()); suite.addTest(ch.qos.logback.core.joran.event.PackageTest.suite()); suite.addTest(ch.qos.logback.core.joran.spi.PackageTest.suite()); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Thu Aug 7 15:37:26 2008 @@ -10,52 +10,81 @@ package ch.qos.logback.core.joran; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.HashMap; -import junit.framework.TestCase; +import org.junit.Test; + import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.action.ext.IncAction; import ch.qos.logback.core.joran.spi.Pattern; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.TrivialStatusListener; import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.StatusPrinter; -public class TrivialcConfiguratorTest extends TestCase { +public class TrivialcConfiguratorTest { Context context = new ContextBase(); - - public TrivialcConfiguratorTest(String arg0) { - super(arg0); - } - protected void setUp() throws Exception { - super.setUp(); - } - - protected void tearDown() throws Exception { - super.tearDown(); - } - public void doTest(String filename) throws Exception { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x/inc"), new IncAction()); TrivialConfigurator gc = new TrivialConfigurator(rulesMap); - + gc.setContext(context); - gc.doConfigure(Constants.TEST_DIR_PREFIX - + "input/joran/"+ filename); + gc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/" + filename); } - - public void test() throws Exception { + + @Test + public void smokeTezt() throws Exception { int oldBeginCount = IncAction.beginCount; int oldEndCount = IncAction.endCount; int oldErrorCount = IncAction.errorCount; doTest("inc.xml"); assertEquals(oldErrorCount, IncAction.errorCount); - assertEquals(oldBeginCount+1, IncAction.beginCount); - assertEquals(oldEndCount+1, IncAction.endCount); + assertEquals(oldBeginCount + 1, IncAction.beginCount); + assertEquals(oldEndCount + 1, IncAction.endCount); } + @Test + public void teztInexistentFile() { + TrivialStatusListener tsl = new TrivialStatusListener(); + String filename = "nothereBLAH.xml"; + context.getStatusManager().add(tsl); + try { + doTest(filename); + } catch (Exception e) { + } + assertTrue(tsl.list.size() + " should be greater than or equal to 1", + tsl.list.size() >= 1); + Status s0 = tsl.list.get(0); + assertTrue(s0.getMessage().startsWith("Could not open [" + filename + "]")); + } + + @Test + public void teztIllFormedXML() { + TrivialStatusListener tsl = new TrivialStatusListener(); + String filename = "illformed.xml"; + context.getStatusManager().add(tsl); + try { + doTest(filename); + } catch (Exception e) { + } + assertEquals(2, tsl.list.size()); + Status s0 = tsl.list.get(0); + assertTrue(s0.getMessage().startsWith( + "Parsing fatal error on line 5 and column 3")); + Status s1 = tsl.list.get(1); + assertTrue(s1 + .getMessage() + .startsWith( + "Problem parsing XML document. See previously reported errors. Abandoning all further processing.")); + } } Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/TrivialStatusListener.java (from r1739, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/TrivialStatusListener.java Thu Aug 7 15:37:26 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.classic.joran; +package ch.qos.logback.core.status; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ public class TrivialStatusListener implements StatusListener { - List<Status> list = new ArrayList<Status>(); + public List<Status> list = new ArrayList<Status>(); public void addStatusEvent(Status status) { list.add(status);

1 0