- logback-dev - mailman3.qos.ch

svn commit: r465 - in logback/trunk: . logback-access logback-classic logback-core logback-site logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 15 Aug '06

15 Aug '06

Author: seb Date: Tue Aug 15 11:18:07 2006 New Revision: 465 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/logback-site/src/site/xdocTemplates/news.xml logback/trunk/pom.xml Log: updated poms and news.xml to correspond to version 0.2 Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Tue Aug 15 11:18:07 2006 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Tue Aug 15 11:18:07 2006 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Tue Aug 15 11:18:07 2006 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Tue Aug 15 11:18:07 2006 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-site/src/site/xdocTemplates/news.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/news.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/news.xml Tue Aug 15 11:18:07 2006 @@ -10,7 +10,21 @@ <h2>Logback News</h2> <p>Here are the last news about the project.</p> - + + <h3>August 15th, 2006 - 0.2 version available</h3> + <p> + A 0.2 version of all three modules of logback + is now available. + </p> + <p> + It offers better tests, a few more functionnalities, and an improved documentation. + We also improved the site design to make it simpler and more efficient. + An archive containing source code, binaries and docs is available + at the <a href="download.html">download page</a>. + </p> + + <hr width="50%" align="center" /> + <h3>July 26th, 2006 - 0.1 version available</h3> <p> A first 0.1 version of all three modules of logback Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Tue Aug 15 11:18:07 2006 @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> <packaging>pom</packaging> <name>Logback</name> @@ -36,55 +36,53 @@ <dependencyManagement> <dependencies> -  - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - </dependency> - -  - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <version>2.4.3</version> - </dependency> - -  - <dependency> - <groupId>tomcat</groupId> - <artifactId>catalina</artifactId> - <version>5.5.12</version> - </dependency> - - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.0.0beta9</version> - </dependency> - - <dependency> - <groupId>com.caucho</groupId> - <artifactId>resin</artifactId> - <version>3.0.9</version> - </dependency> - +  + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - <version>6.0.0beta9</version> - </dependency> - </dependencies> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + +  + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + <version>2.4.3</version> + </dependency> + +  + <dependency> + <groupId>tomcat</groupId> + <artifactId>catalina</artifactId> + <version>5.5.12</version> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.0.0beta9</version> + </dependency> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>resin</artifactId> + <version>3.0.9</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + <version>6.0.0beta9</version> + </dependency> + + </dependencies> </dependencyManagement> <build> @@ -136,7 +134,7 @@ <configuration> <descriptors> <descriptor> - src/main/assembly/source.xml + src/main/assembly/dist.xml </descriptor> </descriptors> <finalName>

1 0

svn commit: r464 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 15 Aug '06

15 Aug '06

Author: seb Date: Tue Aug 15 11:16:32 2006 New Revision: 464 Modified: logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Log: corrected bad link in repos.xml Modified: logback/trunk/logback-site/src/site/xdocTemplates/repos.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/repos.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Tue Aug 15 11:16:32 2006 @@ -55,7 +55,7 @@ <p> Note that anonymous access allows read-only access only. For read-write access please contact the logback <a - href="../mailinglist.html">developer list</a> . + href="mailinglist.html">developer list</a> . </p> </div> </body>

1 0

svn commit: r463 - logback/trunk/src/main/assembly
by noreply.seb＠qos.ch 15 Aug '06

15 Aug '06

Author: seb Date: Tue Aug 15 11:15:14 2006 New Revision: 463 Added: logback/trunk/src/main/assembly/dist.xml - copied, changed from r458, logback/trunk/src/main/assembly/source.xml Removed: logback/trunk/src/main/assembly/source.xml Log: modified global assembly. Copied: logback/trunk/src/main/assembly/dist.xml (from r458, logback/trunk/src/main/assembly/source.xml) ============================================================================== --- logback/trunk/src/main/assembly/source.xml (original) +++ logback/trunk/src/main/assembly/dist.xml Tue Aug 15 11:15:14 2006 @@ -1,5 +1,5 @@ <assembly> - <id>src</id> + <id>dist</id> <formats> <format>zip</format> <format>tar.gz</format> @@ -77,7 +77,30 @@ <include>logback-access-${project.version}.jar</include> </includes> </fileSet> - + +  + <fileSet> + <directory>logback-core/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>logback-core-${project.version}-sources.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>logback-classic/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>logback-classic-${project.version}-sources.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>logback-access/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>logback-access-${project.version}-sources.jar</include> + </includes> + </fileSet> +  <fileSet> <directory>logback-classic/examples/</directory>

1 0

svn commit: r462 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 14 Aug '06

14 Aug '06

Author: seb Date: Mon Aug 14 20:44:19 2006 New Revision: 462 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Log: improved a test Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Mon Aug 14 20:44:19 2006 @@ -113,10 +113,16 @@ public void testStatusWithUnconfiguredContext() { Logger logger = lc.getLogger(LoggerContextTest.class); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 3; i++) { logger.debug("test"); } + logger = lc.getLogger("x.y.z"); + + for (int i = 0; i < 3; i++) { + logger.debug("test"); + } + StatusManager sm = lc.getStatusManager(); assertTrue("StatusManager has recieved too many messages", sm.getCount() == 1); }

1 0

svn commit: r461 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 11 Aug '06

11 Aug '06

Author: seb Date: Fri Aug 11 19:03:04 2006 New Revision: 461 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Log: - added a test case to be sure that the LoggerContext doesn't get flooded with messages when no appenders are configured related bug: id=2 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Fri Aug 11 19:03:04 2006 @@ -9,10 +9,8 @@ */ package ch.qos.logback.classic; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.LoggerContext; -import junit.framework.*; +import junit.framework.TestCase; +import ch.qos.logback.core.status.StatusManager; public class LoggerContextTest extends TestCase { LoggerContext lc; @@ -111,5 +109,16 @@ LoggerTestHelper.assertLevels(null, lc.getLogger("w.x.y"), Level.INFO); LoggerTestHelper.assertLevels(null, wxyz, Level.INFO); } + + public void testStatusWithUnconfiguredContext() { + Logger logger = lc.getLogger(LoggerContextTest.class); + + for (int i = 0; i < 10; i++) { + logger.debug("test"); + } + + StatusManager sm = lc.getStatusManager(); + assertTrue("StatusManager has recieved too many messages", sm.getCount() == 1); + } } \ No newline at end of file

1 0

svn commit: r460 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 11 Aug '06

11 Aug '06

Author: seb Date: Fri Aug 11 11:31:45 2006 New Revision: 460 Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml Log: - updated bugreport.xml introduction - spelling fix on documentation.xml Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml Fri Aug 11 11:31:45 2006 @@ -2,13 +2,60 @@ <document> <body> - <h2>Bug reporting</h2> +<h2>Before you report a bug</h2> - <p>The logback project uses a bugzilla based management system to - track bugs.</p> +<p> +The logback community consists of those who use logback and its modules, +help answer questions on discussions lists, contribute documentation and patches, +and those who develop and maintain the code for logback and its modules. +Almost all those who assist on a day to day basis resolving bug reports do this for +a wide variety of reasons, and almost all of them do this on their own time. +</p> +<p> +Many bugs reported end up not being a bug in logback, but are due to misconfiguration, +problems caused by installed applications, the operating system, etc. +</p> +<p> +Before reporting a bug please make every effort to resolve the problem yourself. +Just reporting a bug will not fix it. A good bug report includes a detailed description +of the problem and a succinct test case which can reproduce the problem. +</p> - <p>You can report and follow logback bugs by following <a - href="http://bugzilla.qos.ch/">this link</a>.</p> +<h3>Review the documentation</h3> +<p> +Review the documentation for the version of component you are using. +The problem you are having may already be addressed in the docs. +</p> + +<h3>Search the mailing list archives</h3> +<p> +It is very likely you are not the first to run into a problem. +Others may have already found a solution. +Our various mailing lists are likely to have discussed this problem before. +</p> + +<h3>Search Bugzilla</h3> + +<p> +Please search the bug database to see if the bug you are seeing has already been reported. +The bug may have already been fixed and is available in a later version. +If someone else has reported the same bug, you could add supporting information to help reproduce and resolve the bug. +</p> +<ul> + <li><a href="http://bugzilla.qos.ch/query.cgi">Search for logback bugs</a></li> +</ul> + +<h2>Reporting with Bugzilla</h2> +<p> +Only after you have exhausted the aforementioned steps, should you file a formal report in bugzilla. +</p> +<p> +Please make sure you provide as much information as possible. +Its very hard to fix a bug if the person looking into the problem can't reproduce it. +</p> +<ul> + <li><a href="http://bugzilla.qos.ch/enter_bug.cgi">Report new logback bug</a></li> +</ul> 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 Aug 11 11:31:45 2006 @@ -3,7 +3,7 @@ <properties> <author email="ceki at qos ddoott ch ">Ceki Gulcu</author> - <title>Documentaions</title> + <title>Documentations</title> </properties> <body>

1 0

Margin too wide
by Ceki Gülcü 11 Aug '06

11 Aug '06

Hello Sebastien, I find that the <h1>, <h2> and <h3> tags include too much of a margin (or padding). It should be possible to modify the site css to reduce the extra space. -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://ceki.blogspot.com/

2 1

svn commit: r458 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 22:28:58 2006 New Revision: 458 Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml logback/trunk/logback-site/src/site/xdocTemplates/index.xml logback/trunk/logback-site/src/site/xdocTemplates/license.xml logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Log: several doc changes Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml Thu Aug 10 22:28:58 2006 @@ -2,11 +2,14 @@ <document> <body> -<h2>Bug reporting</h2> + <h2>Bug reporting</h2> -<p>The logback project uses a bugzilla based management system to track bugs.</p> -<p>You can report and follow logback bugs by following <a href="http://bugzilla.qos.ch/">this link</a>.</p> + <p>The logback project uses a bugzilla based management system to + track bugs.</p> + <p>You can report and follow logback bugs by following <a + href="http://bugzilla.qos.ch/">this link</a>.</p> + </body> 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 Thu Aug 10 22:28:58 2006 @@ -3,27 +3,23 @@ <properties> <author email="ceki at qos ddoott ch ">Ceki Gulcu</author> - <title>Logback project Docs</title> + <title>Documentaions</title> </properties> <body> - <div class="section"> - <h2>Documentation</h2> - </div> - - <p>Here are some documents about the logback project modules.</p> - <p> - This section is pretty light at the moment, but will grow - with the developping of $logback. - </p> + <h2>logback documentation</h2> + + <p>Below is a list of documentaiton currently available for the + logback project.</p> <ul> <li> - <a href="apidocs/index.html">Logback Javadoc</a> + <a href="shortIntro.html"><b>A short introduction to logback-classic</b></a> </li> + <li> - <a href="shortIntro.html">A short introduction to logback classic</a> + <a href="apidocs/index.html"><b>javadoc</b></a> </li> </ul> Modified: logback/trunk/logback-site/src/site/xdocTemplates/index.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/index.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/index.xml Thu Aug 10 22:28:58 2006 @@ -18,26 +18,26 @@ as 1999. </p> <p> - Logback's basic architecture is sufficiently generic so as - to apply under different circumstances. At present time, - logback is divided into three modules, Core, Classic and - Access. + Logback's basic architecture is sufficiently generic so as to + apply under different circumstances. At present time, logback is + divided into three modules, logback-core, logback-classic and + logback-access. </p> + <p> - The Core module lays the groundwork for the other two - modules. The Classic module can be assimilated to an - improved version of log4j. 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. + The logback-core module lays the groundwork for the other two + modules. The logback-classic module can be assimilated to a + 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. The Access module integrates with Servlet containers to provide HTTP-access log functionality. Note that you can easily build your own modules on top of the Core module. </p> - <p>Please stay tuned for further updates on this web-page.</p> + </body> </document> Modified: logback/trunk/logback-site/src/site/xdocTemplates/license.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/license.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/license.xml Thu Aug 10 22:28:58 2006 @@ -20,17 +20,13 @@ as published by the Free Software Foundation. </p> - <div class="source"> - <p> -Logback: the reliable, generic, fast and flexible logging library for Java. - <br /> + <div class="source big">Logback: the reliable, generic, fast and flexible logging library for Java. + Copyright (C) 2000-2006, QOS.ch - <br /> -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. - </p> - </div> + +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.</div> </body> Modified: logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml Thu Aug 10 22:28:58 2006 @@ -38,12 +38,14 @@ <table class="bodyTable"> <tr class="a"> <th>Name</th> + <th>Volume</th> <th>Subscribe</th> <th>Unsubscribe</th> <th>Archive</th> </tr> <tr class="b"> <td>Logback Announce List</td> + <td>Low</td> <td> <a href="http://qos.ch/mailman/listinfo/logback-announce"> @@ -51,10 +53,7 @@ </a> </td> <td> - <a - href="http://qos.ch/mailman/options/logback-announce"> - Unsubscribe - </a> + <a href="http://qos.ch/mailman/options/logback-announce">Unsubscribe</a> </td> <td> <a @@ -65,6 +64,7 @@ </tr> <tr class="a"> <td>Logback User List</td> + <td>Medium</td> <td> <a href="http://qos.ch/mailman/listinfo/logback-user"> @@ -86,6 +86,7 @@ </tr> <tr class="b"> <td>Logback Dev List</td> + <td>Medium</td> <td> <a href="http://qos.ch/mailman/listinfo/logback-dev"> Modified: logback/trunk/logback-site/src/site/xdocTemplates/repos.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/repos.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Thu Aug 10 22:28:58 2006 @@ -13,18 +13,16 @@ </div> <p> - To enable logback developers to work together, we - keep the source code in revision control systems called + We keep the source code in revision control systems called Subversion. Developers have write access to the Subversion repository, enabling them to make changes to the source - code. Everyone has read access to the repositories, so you - may download the most up-to-date development version of the + code. Everyone has read access to the repositories, so you may + download the most up-to-date development version of the software. Note that the latest version in the Subversion - repository many not work as expected, it may not even - compile properly. If you are looking for a stable release of - the source code, you should download an official - distribution instead of the latest version in the Subversion - repositories. + repository many not work as expected, it may not even compile + properly. If you are looking for a stable release of the source + code, you should download an official distribution instead of + the latest version in the Subversion repositories. There are several ways to access the Subversion repositories: @@ -34,44 +32,30 @@ <h2>Web Access</h2> </div> <p> - If you just wish to browse around or download a few - individual files, the best tool is the web-based ViewCVS - interface for CVS repositories and ViewCVS interface for - Subversion or go straight to the public repositories at: + If you just wish to browse around or download a few individual + files, you can do so with web-based ViewVC interface: </p> + <p> - <a href="http://svn.qos.ch/viewcvs/logback/trunk/"> - Logback SVN Repository - </a> + <a + href="http://svn.qos.ch/viewcvs/logback/trunk/">http://svn.qos.ch/viewcvs/logback/trunk/</a> </p> <div class="section"> <h2>Checking out a read-only copy</h2> </div> <p> - To access the Subversion repositories anonymously, you will - need a Subversion client. - </p> - - <p>You can check out the entire logback project by using this command:</p> + To access the Subversion repositories anonymously, you will need + a Subversion client. You can check out the entire logback + project with the following command:</p> <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/</div> - - <p>If you prefer to check out only one of the logback project modules, make your choice:</p> - - <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-core</div> - - <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-classic</div> - <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-access</div> - - <div class="section"> <p> - Note that anonymous access allows read-only access only. - For read-write access please contact the logback - <a href="../mailinglist.html">developer list</a> - . + Note that anonymous access allows read-only access only. For + read-write access please contact the logback <a + href="../mailinglist.html">developer list</a> . </p> </div> </body>

1 0

svn commit: r457 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 21:17:35 2006 New Revision: 457 Modified: logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml Log: - We don't allow unsubscribed users to post, so there is no point in including a mailto: link Modified: logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml Thu Aug 10 21:17:35 2006 @@ -40,7 +40,6 @@ <th>Name</th> <th>Subscribe</th> <th>Unsubscribe</th> - <th>Post</th> <th>Archive</th> </tr> <tr class="b"> @@ -56,10 +55,7 @@ href="http://qos.ch/mailman/options/logback-announce"> Unsubscribe </a> - </td> - <td> - <a href="mailto:logback-announce@qos.ch">Post</a> - </td> + </td> <td> <a href="http://www.qos.ch/pipermail/logback-announce/"> @@ -80,10 +76,7 @@ href="http://qos.ch/mailman/options/logback-user"> Unsubscribe </a> - </td> - <td> - <a href="mailto:logback-user@qos.ch">Post</a> - </td> + </td> <td> <a href="http://www.qos.ch/pipermail/logback-user/"> @@ -104,10 +97,7 @@ href="http://qos.ch/mailman/options/logback-dev"> Unsubscribe </a> - </td> - <td> - <a href="mailto:logback-dev@qos.ch">Post</a> - </td> + </td> <td> <a href="http://www.qos.ch/pipermail/logback-dev/">

1 0

svn commit: r456 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/net main/java/ch/qos/logback/classic/pattern main/java/ch/qos/logback/classic/util test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 20:09:20 2006 New Revision: 456 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Log: ongoing work on syslog appender Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java Thu Aug 10 20:09:20 2006 @@ -22,23 +22,24 @@ */ public class SyslogAppender extends SyslogAppenderBase { - Layout layout; - String pattern; - String patternSuffix; + String prefixPattern; + + static final public String DEFAULT_SUFFIX_PATTERN = "[%thread] %logger %m%exception"; + + public Layout buildLayout(String facilityStr) { - public Layout buildLayout(int facility) { PatternLayout pl = new PatternLayout(); pl.getInstanceConverterMap().put("syslogStart", SyslogStartConverter.class.getName()); - if(patternSuffix == null) { - patternSuffix = "%syslogStart{"+facility+"}"; + if(prefixPattern == null) { + prefixPattern = "%syslogStart{"+facilityStr+"}"; } - if(pattern == null) { - pattern = "%m%exception"; + if(suffixPattern == null) { + suffixPattern = DEFAULT_SUFFIX_PATTERN; } - pl.setPattern(patternSuffix+pattern); + pl.setPattern(prefixPattern+suffixPattern); pl.setContext(getContext()); pl.start(); return pl; @@ -56,22 +57,4 @@ return LevelToSyslogSeverity.convert(event); } - /* - * Set the layout directly. Normally, for the user SyslogAppender would want to set - * the patterns and not the layout directly. - * - * @see ch.qos.logback.core.Appender#setLayout(ch.qos.logback.core.Layout) - */ - public void setLayout(Layout layout) { - this.layout = layout; - } - - /* - * - * @see ch.qos.logback.core.Appender#getLayout() - */ - public Layout getLayout() { - return layout; - } - } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java Thu Aug 10 20:09:20 2006 @@ -33,12 +33,12 @@ String facilityStr = getFirstOption(); if (facilityStr == null) { - //errorCount++; addError("was expecting a facility string as an option"); return; } facility = SyslogAppenderBase.facilityStringToint(facilityStr); + localHostName = getLocalHostname(); try { simpleFormat = new SimpleDateFormat("MMM dd hh:mm:ss", new DateFormatSymbols(Locale.US)); @@ -57,7 +57,7 @@ StringBuilder sb = new StringBuilder(); int pri = facility + LevelToSyslogSeverity.convert(le); - System.out.println("" + pri); + sb.append("<"); sb.append(pri); sb.append(">"); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java Thu Aug 10 20:09:20 2006 @@ -33,7 +33,7 @@ case Level.INFO_INT: return SyslogConstants.INFO_SEVERITY; case Level.DEBUG_INT: - return SyslogConstants.LOG_ALERT; + return SyslogConstants.DEBUG_SEVERITY; default: throw new IllegalArgumentException("Level " + level + " is not a valid level for a printing method"); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java Thu Aug 10 20:09:20 2006 @@ -9,27 +9,49 @@ */ package ch.qos.logback.classic.net; +import java.net.DatagramPacket; import java.net.DatagramSocket; +import java.util.ArrayList; +import java.util.List; /** - * + * * @author Ceki G&uumllcü */ public class MockSyslogServer extends Thread { + static final int PORT = 14805; + final int loopLen; - DatagramSocket socket; + + List<String> msgList = new ArrayList<String>(); + boolean finished = false; MockSyslogServer(int loopLen) { super(); this.loopLen = loopLen; - } - + @Override public void run() { - for(int i = 0; i < loopLen; i++) { - - } + DatagramSocket socket = null; + try { + socket = new DatagramSocket(PORT); + + for (int i = 0; i < loopLen; i++) { + byte[] buf = new byte[1024]; + DatagramPacket packet = new DatagramPacket(buf, buf.length); + socket.receive(packet); + String msg = new String(buf, 0, packet.getLength()); + msgList.add(msg); + } + } catch (Exception se) { + se.printStackTrace(); + } finally { + if(socket != null) { + socket.close(); + } + } + finished = true; } } 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 Thu Aug 10 20:09:20 2006 @@ -10,6 +10,10 @@ package ch.qos.logback.classic.net; import junit.framework.TestCase; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.core.net.SyslogConstants; +import ch.qos.logback.core.util.StatusPrinter; public class SyslogAppenderTest extends TestCase { @@ -25,4 +29,80 @@ super.tearDown(); } + public void testBasic() throws InterruptedException { + MockSyslogServer mockServer = new MockSyslogServer(1); + mockServer.start(); + + LoggerContext lc = new LoggerContext(); + lc.setName("test"); + SyslogAppender sa = new SyslogAppender(); + sa.setContext(lc); + sa.setSyslogHost("localhost"); + sa.setFacility("MAIL"); + sa.setPort(MockSyslogServer.PORT); + sa.start(); + assertTrue(sa.isStarted()); + + String loggerName = this.getClass().getName(); + Logger logger = lc.getLogger(loggerName); + logger.addAppender(sa); + String logMsg = "hello"; + logger.debug(logMsg); + StatusPrinter.print(lc.getStatusManager()); + + // wait max 2 seconds for mock server to finish. However, it should + // much sooner than that. + mockServer.join(2000); + assertTrue(mockServer.finished); + assertEquals(1, mockServer.msgList.size()); + String msg = mockServer.msgList.get(0); + + 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(); + + assertTrue(msg.matches(first +"\\["+threadName+"\\] "+ loggerName +" " +logMsg)); + + } + + public void testExceptoin() throws InterruptedException { + MockSyslogServer mockServer = new MockSyslogServer(1); + mockServer.start(); + + LoggerContext lc = new LoggerContext(); + lc.setName("test"); + SyslogAppender sa = new SyslogAppender(); + sa.setContext(lc); + sa.setSyslogHost("localhost"); + sa.setFacility("MAIL"); + sa.setPort(MockSyslogServer.PORT); + sa.start(); + assertTrue(sa.isStarted()); + + String loggerName = this.getClass().getName(); + Logger logger = lc.getLogger(loggerName); + logger.addAppender(sa); + String logMsg = "hello"; + logger.debug(logMsg, new Exception("just testing")); + StatusPrinter.print(lc.getStatusManager()); + + // wait max 2 seconds for mock server to finish. However, it should + // much sooner than that. + mockServer.join(2000); + assertTrue(mockServer.finished); + assertEquals(1, mockServer.msgList.size()); + String msg = mockServer.msgList.get(0); + + 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(); + System.out.println(msg); + //assertTrue(msg.matches(first +"\\["+threadName+"\\] "+ loggerName +" " +logMsg)); + + //fail("check exceptions"); + } }

1 0