January 2007 - logback-dev - mailman3.qos.ch

svn commit: r1189 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 10 Jan '07

10 Jan '07

Author: seb Date: Wed Jan 10 17:02:48 2007 New Revision: 1189 Modified: logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Log: better command 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 Wed Jan 10 17:02:48 2007 @@ -49,7 +49,7 @@ 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> + <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/ target_directory</div> <div class="section"> <p>

1 0

svn commit: r1188 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 10 Jan '07

10 Jan '07

Author: seb Date: Wed Jan 10 10:57:38 2007 New Revision: 1188 Modified: logback/trunk/logback-site/src/site/xdocTemplates/jmxConfig.xml Log: mini update Modified: logback/trunk/logback-site/src/site/xdocTemplates/jmxConfig.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/jmxConfig.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/jmxConfig.xml Wed Jan 10 10:57:38 2007 @@ -14,7 +14,7 @@ <p> As of version 0.8, logback ships with a component that allows configuration via JMX. Basically, it lets you reload the current - configuration, load a new one, or modify logger levels. + configuration, load a new one, list loggers and modify logger levels. </p> <h3>Configuring your server</h3> @@ -153,7 +153,10 @@ Get the level of a logger </p> <p> - Get the effective level of a logger + Change the level setting of a specified logger. + </p> + <p> + Change a list of all declared loggers. </p> <p> Change the level setting of a specified logger.

1 0

svn commit: r1187 - in logback/trunk: logback-examples/src/main/java/chapter4 logback-examples/src/main/java/chapter5 logback-examples/src/main/java/chapter7 logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 10 Jan '07

10 Jan '07

Author: seb Date: Wed Jan 10 10:46:46 2007 New Revision: 1187 Modified: logback/trunk/logback-examples/src/main/java/chapter4/CountingConsoleAppender.java logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes1.java logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes2.java logback/trunk/logback-examples/src/main/java/chapter4/IO.java logback/trunk/logback-examples/src/main/java/chapter5/MySampleConverter.java logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout.java logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout2.java logback/trunk/logback-examples/src/main/java/chapter5/PatternSample.java logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml Log: Updated example classes and doc ->Generics Modified: logback/trunk/logback-examples/src/main/java/chapter4/CountingConsoleAppender.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/CountingConsoleAppender.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/CountingConsoleAppender.java Wed Jan 10 10:46:46 2007 @@ -10,16 +10,17 @@ package chapter4; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.AppenderBase; import ch.qos.logback.core.Layout; -public class CountingConsoleAppender extends AppenderBase { +public class CountingConsoleAppender extends AppenderBase<LoggingEvent> { static int DEFAULT_LIMIT = 10; int counter = 0; int limit = DEFAULT_LIMIT; - private Layout layout; + private Layout<LoggingEvent> layout; public CountingConsoleAppender() { } @@ -42,24 +43,24 @@ super.start(); } - public void append(Object eventObject) { + public void append(LoggingEvent event) { if (counter >= limit) { return; } // output the events as formatted by our layout - System.out.print(this.layout.doLayout(eventObject)); + System.out.print(this.layout.doLayout(event)); // prepare for next event counter++; } - public Layout getLayout() { + public Layout<LoggingEvent> getLayout() { return layout; } - public void setLayout(Layout layout) { + public void setLayout(Layout<LoggingEvent> layout) { this.layout = layout; } } Modified: logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes1.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes1.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes1.java Wed Jan 10 10:46:46 2007 @@ -17,6 +17,7 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.WriterAppender; import ch.qos.logback.core.layout.EchoLayout; @@ -25,9 +26,9 @@ public static void main(String[] args) throws Exception { LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); lc.shutdownAndReset();//this is to cancel default-config. - WriterAppender writerAppender = new WriterAppender(); + WriterAppender<LoggingEvent> writerAppender = new WriterAppender<LoggingEvent>(); writerAppender.setContext(lc); - writerAppender.setLayout(new EchoLayout()); + writerAppender.setLayout(new EchoLayout<LoggingEvent>()); OutputStream os = new FileOutputStream("exitWoes1.log"); writerAppender.setWriter(new OutputStreamWriter(os)); Modified: logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes2.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes2.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/ExitWoes2.java Wed Jan 10 10:46:46 2007 @@ -17,6 +17,7 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.WriterAppender; import ch.qos.logback.core.layout.EchoLayout; import ch.qos.logback.core.util.StatusPrinter; @@ -26,9 +27,9 @@ public static void main(String[] args) throws Exception { LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); lc.shutdownAndReset();//this is to cancel default-config. - WriterAppender writerAppender = new WriterAppender(); + WriterAppender<LoggingEvent> writerAppender = new WriterAppender<LoggingEvent>(); writerAppender.setContext(lc); - writerAppender.setLayout(new EchoLayout()); + writerAppender.setLayout(new EchoLayout<LoggingEvent>()); OutputStream os = new FileOutputStream("exitWoes2.log"); writerAppender.setWriter(new OutputStreamWriter(os)); Modified: logback/trunk/logback-examples/src/main/java/chapter4/IO.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/IO.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/IO.java Wed Jan 10 10:46:46 2007 @@ -14,6 +14,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.layout.EchoLayout; @@ -40,14 +41,14 @@ // A FileAppender is created according to the buffering and // immediate flush setting of this IO instance. - FileAppender fa = new FileAppender(); + FileAppender<LoggingEvent> fa = new FileAppender<LoggingEvent>(); if (longMessage) { PatternLayout pa = new PatternLayout(); pa.setPattern("%r %5p %c [%t] - %m%n"); fa.setLayout(pa); } else { - fa.setLayout(new EchoLayout()); + fa.setLayout(new EchoLayout<LoggingEvent>()); } fa.setFile(getName() + ".log"); Modified: logback/trunk/logback-examples/src/main/java/chapter5/MySampleConverter.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter5/MySampleConverter.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter5/MySampleConverter.java Wed Jan 10 10:46:46 2007 @@ -12,8 +12,7 @@ private static final String WARN_COLOR = "\u001b[0;33m"; @Override - public String convert(Object eventObject) { - LoggingEvent event = (LoggingEvent) eventObject; + public String convert(LoggingEvent event) { StringBuffer sbuf = new StringBuffer(); sbuf.append(getColor(event.getLevel())); sbuf.append(event.getLevel()); Modified: logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout.java Wed Jan 10 10:46:46 2007 @@ -1,10 +1,9 @@ package chapter5; -import ch.qos.logback.classic.ClassicLayout; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.LayoutBase; -public class MySampleLayout extends LayoutBase<LoggingEvent> implements ClassicLayout { +public class MySampleLayout extends LayoutBase<LoggingEvent> { public String doLayout(LoggingEvent event) { StringBuffer sbuf = new StringBuffer(128); Modified: logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout2.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout2.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter5/MySampleLayout2.java Wed Jan 10 10:46:46 2007 @@ -1,10 +1,9 @@ package chapter5; -import ch.qos.logback.classic.ClassicLayout; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.LayoutBase; -public class MySampleLayout2 extends LayoutBase<LoggingEvent> implements ClassicLayout { +public class MySampleLayout2 extends LayoutBase<LoggingEvent> { String prefix = null; boolean printThreadName = true; Modified: logback/trunk/logback-examples/src/main/java/chapter5/PatternSample.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter5/PatternSample.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter5/PatternSample.java Wed Jan 10 10:46:46 2007 @@ -4,6 +4,7 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.ConsoleAppender; public class PatternSample { @@ -15,7 +16,7 @@ layout.setPattern("%-5level [%thread]: %message%n"); layout.start(); - ConsoleAppender appender = new ConsoleAppender(); + ConsoleAppender<LoggingEvent> appender = new ConsoleAppender<LoggingEvent>(); appender.setContext(rootLogger.getLoggerContext()); appender.setLayout(layout); appender.start(); Modified: logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java Wed Jan 10 10:46:46 2007 @@ -15,6 +15,7 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.MDC; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.ConsoleAppender; public class SimpleMDC { @@ -27,7 +28,7 @@ PatternLayout layout = new PatternLayout(); layout.setPattern("%X{first} %X{last} - %m%n"); layout.start(); - ConsoleAppender appender = new ConsoleAppender(); + ConsoleAppender<LoggingEvent> appender = new ConsoleAppender<LoggingEvent>(); appender.setLayout(layout); appender.start(); Logger root = (Logger)LoggerFactory.getLogger("root"); Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Wed Jan 10 10:46:46 2007 @@ -298,9 +298,9 @@ public static void main(String[] args) throws Exception { LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - WriterAppender writerAppender = new WriterAppender(); + WriterAppender<LoggingEvent> writerAppender = new WriterAppender<LoggingEvent>(); writerAppender.setContext(lc); - writerAppender.setLayout(new EchoLayout()); + writerAppender.setLayout(new EchoLayout<LoggingEvent>()); OutputStream os = new FileOutputStream("exitWoes1.log"); writerAppender.setWriter(new OutputStreamWriter(os)); @@ -2664,12 +2664,12 @@ import ch.qos.logback.core.Layout; -public class CountingConsoleAppender extends AppenderBase { +public class CountingConsoleAppender extends AppenderBase<LoggingEvent> { static int DEFAULT_LIMIT = 16; int counter = 0; int limit = DEFAULT_LIMIT; - private Layout layout; + private Layout<LoggingEvent> layout; public CountingConsoleAppender() { } @@ -2692,24 +2692,24 @@ super.start(); } - public void append(Object eventObject) { + public void append(LoggingEvent event) { if (counter >= limit) { return; } // output the events as formatted by our layout - System.out.print(this.layout.doLayout(eventObject)); + System.out.print(this.layout.doLayout(event)); // prepare for next event counter++; } - public Layout getLayout() { + public Layout<LoggingEvent> getLayout() { return layout; } - public void setLayout(Layout layout) { + public void setLayout(Layout<LoggingEvent> layout) { this.layout = layout; } }</pre></div> Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Wed Jan 10 10:46:46 2007 @@ -89,17 +89,7 @@ Logback classic only processes events of type <a href="../xref/ch/qos/logback/classic/spi/LoggingEvent.html"> <code>ch.qos.logback.classic.spi.LoggingEvent</code></a>. - Therefore, logback classic module imposes that - all its layouts implement - the <a href="../xref/ch/qos/logback/classic/ClassicLayout.html"><code>ClassicLayout</code> - </a> interface that is shown below. - </p> - - <div class="source"><pre>public interface ClassicLayout extends Layout { - - String doLayout(LoggingEvent event); - -}</pre></div> + </p> <h3>Writing your own Layout</h3> <p> @@ -118,11 +108,10 @@ (logback-examples/src/main/java/chapter5/MySampleLayout.java)</a></em> <div class="source"><pre>package chapter5; -import ch.qos.logback.classic.ClassicLayout; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.LayoutBase; -public class MySampleLayout extends LayoutBase<LoggingEvent> implements ClassicLayout { +public class MySampleLayout extends LayoutBase<LoggingEvent> { public String doLayout(LoggingEvent event) { StringBuffer sbuf = new StringBuffer(128); @@ -154,10 +143,6 @@ have to handle, by adding <em><LoggingEvent></em> after its declaration. </p> - <p><code>MySampleLayout</code> implements the <code>ClassicLayout</code> - interface, since it is intented to be used with the classic module. - </p> - <p>The marginally more interesting <code>doLayout(LoggingEvent event)</code> method begins by instantiating a StringBuffer. It proceeds by adding various fields of the event parameter. The Texan from Texas was careful to print @@ -232,11 +217,10 @@ <p>Here is the implementation of this class:</p> <div class="source"><pre>package chapter5; -import ch.qos.logback.classic.ClassicLayout; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.LayoutBase; -public class MySampleLayout2 extends LayoutBase<LoggingEvent> implements ClassicLayout { +public class MySampleLayout2 extends LayoutBase<LoggingEvent> { String prefix = null; boolean printThreadName = true; @@ -305,8 +289,7 @@ <p> Logback classic ships with a flexible layout called <a href="../xref/ch/qos/logback/classic/PatternLayout.html"> - <code>PatternLayout</code></a>, which implements the - <code>ClassicLayout</code> interface. + <code>PatternLayout</code></a>. As all classic layouts, <code>PatternLayout</code> takes a logging event and returns a String. However, the returned String can be customized at will by tweaking its @@ -351,7 +334,7 @@ layout.setPattern("%-5level [%thread]: %message%n"); layout.start();</b> - ConsoleAppender appender = new ConsoleAppender(); + ConsoleAppender<LoggingEvent> appender = new ConsoleAppender<LoggingEvent>(); appender.setContext(rootLogger.getLoggerContext()); appender.setLayout(layout); appender.start(); @@ -1237,8 +1220,7 @@ private static final String WARN_COLOR = "\u001b[0;33m"; @Override - <b>public String convert(Object eventObject) { - LoggingEvent event = (LoggingEvent) eventObject; + <b>public String convert(LoggingEvent event) { StringBuffer sbuf = new StringBuffer(); sbuf.append(getColor(event.getLevel())); sbuf.append(event.getLevel()); Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml Wed Jan 10 10:46:46 2007 @@ -134,7 +134,7 @@ PatternLayout layout = new PatternLayout(); layout.setPattern("%X{first} %X{last} - %m%n"); layout.start(); - ConsoleAppender appender = new ConsoleAppender(); + ConsoleAppender<LoggingEvent> appender = new ConsoleAppender<LoggingEvent>(); appender.setLayout(layout); appender.start(); Logger root = (Logger)LoggerFactory.getLogger("root");

1 0

svn commit: r1186 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 10 Jan '07

10 Jan '07

Author: seb Date: Wed Jan 10 10:29:33 2007 New Revision: 1186 Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java Log: Removed unused test app classes

1 0

[continuum] BUILD SUCCESSFUL: Logback Access Module
by John Noreplai 10 Jan '07

10 Jan '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Ok Previous State: Failed Started at: Wed, 10 Jan 2007 10:25:48 +0100 Finished at: Wed, 10 Jan 2007 10:26:06 +0100 Total time: 18s Build Trigger: Forced Exit code: 0 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes No files changed **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 55 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 22 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.db.DBAppenderTest [Server@658fb1f7]: [Thread[main,5,main]]: checkRunning(false) entered [Server@658fb1f7]: [Thread[main,5,main]]: checkRunning(false) exited [Server@658fb1f7]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@658fb1f7]: [Thread[main,5,main]]: checkRunning(false) entered [Server@658fb1f7]: [Thread[main,5,main]]: checkRunning(false) exited [Server@658fb1f7]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@624b035d]: [Thread[main,5,main]]: checkRunning(false) entered [Server@624b035d]: [Thread[main,5,main]]: checkRunning(false) exited [Server@624b035d]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@624b035d]: [Thread[main,5,main]]: checkRunning(false) entered [Server@624b035d]: [Thread[main,5,main]]: checkRunning(false) exited [Server@624b035d]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@7b112783]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7b112783]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7b112783]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@7b112783]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7b112783]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7b112783]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@1d10c424]: [Thread[main,5,main]]: checkRunning(false) entered [Server@1d10c424]: [Thread[main,5,main]]: checkRunning(false) exited [Server@1d10c424]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@1d10c424]: [Thread[main,5,main]]: checkRunning(false) entered [Server@1d10c424]: [Thread[main,5,main]]: checkRunning(false) exited [Server@1d10c424]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.233 sec Running ch.qos.logback.access.jetty.JettyBasicTest 2007-01-10 10:26:04.343::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2007-01-10 10:26:04.394::INFO: jetty-6.0.x 2007-01-10 10:26:04.451::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 10/01/2007:10:26:04 +0100 localhost 127.0.0.1 10/01/2007:10:26:04 +0100 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.225 sec Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec Running ch.qos.logback.access.filter.StatsByDayTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.038 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running ch.qos.logback.access.net.SocketAppenderTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.131 sec Results : Tests run: 29, Failures: 0, Errors: 0, Skipped: 0 [INFO] [jar:jar] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.8-SNAPSHOT.jar [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: default}] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.8-SNAPSHOT-sources.jar [INFO] [install:install] [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.8-SNAPSHOT.jar to /root/.m2/repository/ch/qos/logback/logback-access/0.8-SNAPSHOT/logback-access-0.8-SNAPSHOT.jar [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.8-SNAPSHOT-sources.jar to /root/.m2/repository/ch/qos/logback/logback-access/0.8-SNAPSHOT/logback-access-0.8-SNAPSHOT-sources.jar [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 16 seconds [INFO] Finished at: Wed Jan 10 10:26:06 CET 2007 [INFO] Final Memory: 16M/115M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

[continuum] BUILD FAILURE: Logback Access Module
by John Noreplai 10 Jan '07

10 Jan '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Wed, 10 Jan 2007 10:20:45 +0100 Finished at: Wed, 10 Jan 2007 10:20:56 +0100 Total time: 11s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes src/main/java/ch/qos/logback/access/html/HTMLLayout.java src/main/java/ch/qos/logback/access/db/DBAppender.java src/main/java/ch/qos/logback/access/net/SMTPAppender.java src/main/java/ch/qos/logback/access/net/SocketAppender.java src/main/java/ch/qos/logback/access/PatternLayout.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 55 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 22 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.db.DBAppenderTest [Server@3c6f579]: [Thread[main,5,main]]: checkRunning(false) entered [Server@3c6f579]: [Thread[main,5,main]]: checkRunning(false) exited [Server@3c6f579]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@3c6f579]: [Thread[main,5,main]]: checkRunning(false) entered [Server@3c6f579]: [Thread[main,5,main]]: checkRunning(false) exited [Server@3c6f579]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@7cf1bb78]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7cf1bb78]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7cf1bb78]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@7cf1bb78]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7cf1bb78]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7cf1bb78]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@2c76e369]: [Thread[main,5,main]]: checkRunning(false) entered [Server@2c76e369]: [Thread[main,5,main]]: checkRunning(false) exited [Server@2c76e369]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@2c76e369]: [Thread[main,5,main]]: checkRunning(false) entered [Server@2c76e369]: [Thread[main,5,main]]: checkRunning(false) exited [Server@2c76e369]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) entered [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) exited [Server@54bb7759]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) entered [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) exited [Server@54bb7759]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.793 sec Running ch.qos.logback.access.jetty.JettyBasicTest 2007-01-10 10:20:54.949::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2007-01-10 10:20:55.004::INFO: jetty-6.0.x 2007-01-10 10:20:55.077::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 10/01/2007:10:20:55 +0100 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 1.282 sec <<< FAILURE! Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec Running ch.qos.logback.access.filter.StatsByDayTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec Running ch.qos.logback.access.net.SocketAppenderTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.127 sec Results : Tests run: 29, Failures: 0, Errors: 1, Skipped: 0 [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] There are test failures. [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 10 seconds [INFO] Finished at: Wed Jan 10 10:20:56 CET 2007 [INFO] Final Memory: 14M/144M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

10 Jan '07

Author: seb Date: Wed Jan 10 10:16:05 2007 New Revision: 1185 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java 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/turbo/TurboFilter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/WriterAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DriverManagerConnectionSource.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/JNDIConnectionSource.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Log: Corrected "more informations" to "more information". Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Wed Jan 10 10:16:05 2007 @@ -45,7 +45,7 @@ * usual <code>PatternLayout</code>. * </p> * <p> - * For more informations about this layout, please refer to the online manual at + * For more information about this layout, please refer to the online manual at * http://logback.qos.ch/manual/layouts.html#AccessPatternLayout * * @author Ceki Gülcü Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java Wed Jan 10 10:16:05 2007 @@ -23,7 +23,7 @@ * The DBAppender inserts access events into three database tables in a format * independent of the Java programming language. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#AccessDBAppender * * @author Ceki Gülcü Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java Wed Jan 10 10:16:05 2007 @@ -26,7 +26,7 @@ * See {@link ch.qos.logback.access.PatternLayout} for documentation on the * available patterns. * <p> - * For more informations about this layout, please refer to the online manual at + * For more information about this layout, please refer to the online manual at * http://logback.qos.ch/manual/layouts.html#AccessHTMLLayout * * Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java Wed Jan 10 10:16:05 2007 @@ -21,7 +21,7 @@ * Send an e-mail when a specific access event occurs, typically when * certain pages are accessed. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#AccessSMTPAppender * <p> * @author Ceki Gülcü Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java Wed Jan 10 10:16:05 2007 @@ -20,7 +20,7 @@ * Sends {@link AccessEvent} objects to a remote a log server, usually a * {@link SocketNode}. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#AccessSocketAppender * * @author Ceki Gülcü Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java Wed Jan 10 10:16:05 2007 @@ -15,7 +15,7 @@ * its parent. * <p> * - * For more informations about turbo filters, please refer to the online manual at + * For more information about turbo filters, please refer to the online manual at * http://logback.qos.ch/manual/mdc.html * * @author Ceki Gülcü Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java Wed Jan 10 10:16:05 2007 @@ -40,7 +40,7 @@ * {#link String}. The format of the result depends on the * <em>conversion pattern</em>. * <p> - * For more informations about this layout, please refer to the online manual at + * For more information about this layout, please refer to the online manual at * http://logback.qos.ch/manual/layouts.html#ClassicPatternLayout * */ Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java Wed Jan 10 10:16:05 2007 @@ -27,7 +27,7 @@ * The DBAppender inserts logging events into three database tables in a format * independent of the Java programming language. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#DBAppender * * @author Ceki Gülcü Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java Wed Jan 10 10:16:05 2007 @@ -11,6 +11,9 @@ * One can specify a level and the behaviour of the filter when * said level is encountered in a logging event. * + * For more information about filters, please refer to the online manual at + * http://logback.qos.ch/manual/filters.html + * * @author Ceki Gülcü * @author Sébastien Pennec */ Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java Wed Jan 10 10:16:05 2007 @@ -13,6 +13,9 @@ * equal or above the specified level will trigger a * FilterReply.NEUTRAL result, to allow the rest of the * filter chain process the event. + * + * For more information about filters, please refer to the online manual at + * http://logback.qos.ch/manual/filters.html * * @author Sébastien Pennec */ Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java Wed Jan 10 10:16:05 2007 @@ -22,7 +22,7 @@ * Send an e-mail when a specific logging event occurs, typically on errors or * fatal errors. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#SMTPAppender * * @author Ceki Gülcü Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java Wed Jan 10 10:16:05 2007 @@ -20,7 +20,7 @@ * Sends {@link LoggingEvent} objects to a remote a log server, usually a * {@link SocketNode}. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#SocketAppender * * @author Ceki Gülcü 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 Wed Jan 10 10:16:05 2007 @@ -23,7 +23,7 @@ * This appender can be used to send messages to a remote * syslog daemon. * <p> - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#SyslogAppender * * @author Ceki G&uumllcü Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java Wed Jan 10 10:16:05 2007 @@ -13,7 +13,7 @@ * of parameters instead of a single event object. The latter is cleaner but * the latter is much more performant. * <p> - * For more informations about turbo filters, please refer to the online manual at + * For more information about turbo filters, please refer to the online manual at * http://logback.qos.ch/manual/filters.html#TurboFilter * * @author Ceki Gulcu Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java Wed Jan 10 10:16:05 2007 @@ -19,7 +19,7 @@ /** * This class is used to manage base functionnalities of all appenders. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#AppenderBase * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java Wed Jan 10 10:16:05 2007 @@ -18,7 +18,7 @@ * <code>System.err</code> using a layout specified by the user. The default * target is <code>System.out</code>. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#ConsoleAppender * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Wed Jan 10 10:16:05 2007 @@ -19,7 +19,7 @@ /** * FileAppender appends log events to a file. * - * For more informations about this appender, please refer to the online manual at + * For more informatio about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#FileAppender * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/WriterAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/WriterAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/WriterAppender.java Wed Jan 10 10:16:05 2007 @@ -20,7 +20,7 @@ * WriterAppender appends events to a hava.io.Writer. * This class provides basic services that other appenders build upon. * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#WriterAppender * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java Wed Jan 10 10:16:05 2007 @@ -20,7 +20,7 @@ * transparently obtaining JDBC {@link java.sql.Connection}s for logback classes * that require the use of a {@link java.sql.Connection}. * - * For more informations about this component, please refer to the online manual at + * For more information about this component, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#DBAppender * * @author <a href="mailto:rdecampo@twcny.rr.com">Ray DeCampo</a> Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java Wed Jan 10 10:16:05 2007 @@ -21,7 +21,7 @@ * manner based on a {@link javax.sql.DataSource DataSource}. * <p> * - * For more informations about this component, please refer to the online manual at + * For more information about this component, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#DBAppender * * @author Ray DeCampo Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DriverManagerConnectionSource.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DriverManagerConnectionSource.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DriverManagerConnectionSource.java Wed Jan 10 10:16:05 2007 @@ -19,7 +19,7 @@ * {@link ConnectionSource} that obtains the Connection in the traditional JDBC * manner based on the connection URL. * <p> - * For more informations about this component, please refer to the online manual at + * For more information about this component, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#DBAppender * * @author <a href="mailto:rdecampo@twcny.rr.com">Ray DeCampo</a> Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/JNDIConnectionSource.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/JNDIConnectionSource.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/JNDIConnectionSource.java Wed Jan 10 10:16:05 2007 @@ -30,7 +30,7 @@ * of connection pooling and whatever other goodies the application server * provides. * <p> - * For more informations about this component, please refer to the online manual at + * For more information about this component, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#DBAppender * * @author <a href="mailto:rdecampo@twcny.rr.com">Ray DeCampo</a> Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java Wed Jan 10 10:16:05 2007 @@ -15,7 +15,7 @@ * a given result must be returned after the evaluation either failed or succeeded. * </p> * - * For more informations about filters, please refer to the online manual at + * For more information about filters, please refer to the online manual at * http://logback.qos.ch/manual/filters.html * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java Wed Jan 10 10:16:05 2007 @@ -10,7 +10,7 @@ * and understand the built-in rules before rushing to write your own custom * filters. * <p> - * For more informations about filters, please refer to the online manual at + * For more information about filters, please refer to the online manual at * http://logback.qos.ch/manual/filters.html * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java Wed Jan 10 10:16:05 2007 @@ -20,7 +20,7 @@ * When rolling over, <code>FixedWindowRollingPolicy</code> renames files * according to a fixed window algorithm. * - * For more informations about this policy, please refer to the online manual at + * For more information about this policy, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#FixedWindowRollingPolicy * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Wed Jan 10 10:16:05 2007 @@ -20,7 +20,7 @@ * depending on {@link RollingPolicy} and {@link TriggeringPolicy}. * <p> * - * For more informations about this appender, please refer to the online manual at + * For more information about this appender, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#RollingFileAppender * * @author Heinz Richter Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java Wed Jan 10 10:16:05 2007 @@ -20,7 +20,7 @@ * the FileAppender using the SizeBasedTriggeringPolicy rolls the file * and creates a new one. * - * For more informations about this policy, please refer to the online manual at + * For more information about this policy, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#SizeBasedTriggeringPolicy * * @author Ceki Gülcü Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Wed Jan 10 10:16:05 2007 @@ -24,7 +24,7 @@ * powerful. It allows the rollover to be made based on time conditions. * It is possible to specify that the rollover must occur each day, or month, for example. * - * For more informations about this policy, please refer to the online manual at + * For more information about this policy, please refer to the online manual at * http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy * * @author Ceki Gülcü

1 0

[continuum] BUILD SUCCESSFUL: Logback Classic Module
by John Noreplai 09 Jan '07

09 Jan '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Ok Previous State: Failed Started at: Tue, 9 Jan 2007 23:40:47 +0100 Finished at: Tue, 9 Jan 2007 23:41:01 +0100 Total time: 14s Build Trigger: Schedule Exit code: 0 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes src/test/java/ch/qos/logback/classic/LoggerPerfTest.java src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java src/main/java/ch/qos/logback/classic/PatternLayout.java src/main/java/ch/qos/logback/classic/Logger.java src/main/java/ch/qos/logback/classic/html/HTMLLayout.java src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java src/main/java/ch/qos/logback/classic/pattern/DateConverter.java src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java pom.xml **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Classic Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/46/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 78 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 68 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.classic.LoggerContextTest Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.103 sec Running ch.qos.logback.classic.pattern.ClassNameAbbreviatorTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec Running ch.qos.logback.classic.pattern.MDCConverterTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 sec Running ch.qos.logback.classic.PatternLayoutTest Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.026 sec Running ch.qos.logback.classic.MessageFormattingTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec Running ch.qos.logback.classic.control.TestAction Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.classic.DynamicLoggerContextTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.664 sec Running ch.qos.logback.classic.pattern.ConverterTest Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.136 sec Running ch.qos.logback.classic.util.InitializationTest TEST 23:40:56.610 [main] DEBUG c.q.l.c.util.InitializationTest - Hello-didily-odily TEST 23:40:56.611 [main] DEBUG c.q.l.c.util.InitializationTest - Hello-didily-odily Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec Running ch.qos.logback.classic.db.DBAppenderTest [Server@6fb000e7]: [Thread[main,5,main]]: checkRunning(false) entered [Server@6fb000e7]: [Thread[main,5,main]]: checkRunning(false) exited [Server@6fb000e7]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@6fb000e7]: [Thread[main,5,main]]: checkRunning(false) entered [Server@6fb000e7]: [Thread[main,5,main]]: checkRunning(false) exited [Server@6fb000e7]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@56d73c7a]: [Thread[main,5,main]]: checkRunning(false) entered [Server@56d73c7a]: [Thread[main,5,main]]: checkRunning(false) exited [Server@56d73c7a]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@56d73c7a]: [Thread[main,5,main]]: checkRunning(false) entered [Server@56d73c7a]: [Thread[main,5,main]]: checkRunning(false) exited [Server@56d73c7a]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@647109c4]: [Thread[main,5,main]]: checkRunning(false) entered [Server@647109c4]: [Thread[main,5,main]]: checkRunning(false) exited [Server@647109c4]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@647109c4]: [Thread[main,5,main]]: checkRunning(false) entered [Server@647109c4]: [Thread[main,5,main]]: checkRunning(false) exited [Server@647109c4]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@7b36a43c]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7b36a43c]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7b36a43c]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@7b36a43c]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7b36a43c]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7b36a43c]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.896 sec Running ch.qos.logback.classic.html.HTMLLayoutTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.642 sec Running ch.qos.logback.classic.control.RandomUtilTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.035 sec Running ch.qos.logback.classic.turbo.MarkerFilterTest LOGBACK: No context given for ch.qos.logback.classic.turbo.MarkerFilter@df4cbee Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running ch.qos.logback.classic.net.SocketAppenderTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.45 sec Running ch.qos.logback.classic.control.ScenarioMakerTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.043 sec Running ch.qos.logback.classic.net.LoggingEventSerializationTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.023 sec Running ch.qos.logback.classic.control.CLCTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.classic.MDCTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running ch.qos.logback.classic.BasicLoggerTest |-WARN in ch.qos.logback.core.read.ListAppender[null] - Attempted to append to non started appender [null]. Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec Running ch.qos.logback.classic.net.SMTPAppenderTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.303 sec Running ch.qos.logback.classic.boolex.JaninoEventEvaluatorTest Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.284 sec Running ch.qos.logback.classic.joran.EvaluatorJoranTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec Running ch.qos.logback.classic.spi.ContextListenerTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running ch.qos.logback.classic.net.SyslogAppenderTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.222 sec Running ch.qos.logback.classic.joran.BasicJoranTest |-INFO in ch.qos.logback.core.joran.action.AppenderAction - About to instantiate appender of type [ch.qos.logback.core.read.ListAppender] |-INFO in ch.qos.logback.core.joran.action.AppenderAction - Naming appender as [LIST] |-INFO in ch.qos.logback.core.joran.action.AppenderAction - Popping appender named [LIST] from the object stack |-INFO in ch.qos.logback.classic.joran.action.LevelAction - root level set to DEBUG |-INFO in ch.qos.logback.core.joran.action.AppenderRefAction - Attaching appender named [LIST] to Logger[root] |-INFO in ch.qos.logback.classic.joran.action.ConfigurationAction - End of configuration. |-INFO in ch.qos.logback.core.joran.action.AppenderAction - About to instantiate appender of type [ch.qos.logback.core.read.ListAppender] |-INFO in ch.qos.logback.core.joran.action.AppenderAction - Naming appender as [LIST] |-INFO in ch.qos.logback.core.joran.action.AppenderAction - Popping appender named [LIST] from the object stack |-INFO in ch.qos.logback.classic.joran.action.LevelAction - ch.qos.logback.classic.joran level set to INFO |-INFO in ch.qos.logback.classic.joran.action.LevelAction - root level set to DEBUG |-INFO in ch.qos.logback.core.joran.action.AppenderRefAction - Attaching appender named [LIST] to Logger[root] |-INFO in ch.qos.logback.classic.joran.action.ConfigurationAction - End of configuration. |-INFO in ch.qos.logback.classic.joran.action.ConfigurationAction - Ignoring debug attribute. |-WARN in ch.qos.logback.classic.joran.action.EvaluatorAction - Assuming default evaluator class [ch.qos.logback.classic.boolex.JaninoEventEvaluator] |-INFO in ch.qos.logback.classic.joran.action.EvaluatorAction - Adding evaluator named [helloEval] to the object stack |-INFO in ch.qos.logback.core.joran.action.MatcherAction - matcher named as [m] |-INFO in ch.qos.logback.core.joran.action.MatcherAction - Popping appender named [m] from the object stack |-INFO in ch.qos.logback.classic.joran.action.EvaluatorAction - Starting evaluator named [helloEval] |-INFO in ch.qos.logback.core.joran.action.AppenderAction - About to instantiate appender of type [ch.qos.logback.classic.StringListAppender] |-INFO in ch.qos.logback.core.joran.action.AppenderAction - Naming appender as [STR_LIST] |-INFO in ch.qos.logback.core.joran.action.AppenderAction - Popping appender named [STR_LIST] from the object stack |-INFO in ch.qos.logback.classic.joran.action.LevelAction - root level set to DEBUG |-INFO in ch.qos.logback.core.joran.action.AppenderRefAction - Attaching appender named [STR_LIST] to Logger[root] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.042 sec Results : Tests run: 106, Failures: 0, Errors: 0, Skipped: 0 [INFO] [jar:jar] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/logback-classic-0.8-SNAPSHOT.jar [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: default}] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/logback-classic-0.8-SNAPSHOT-sources.jar [INFO] [jar:jar {execution: bundle-test-jar}] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/logback-classic-0.8-SNAPSHOT.jar [INFO] [jar:test-jar {execution: bundle-test-jar}] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/logback-classic-0.8-SNAPSHOT-tests.jar [INFO] [install:install] [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/logback-classic-0.8-SNAPSHOT.jar to /root/.m2/repository/ch/qos/logback/logback-classic/0.8-SNAPSHOT/logback-classic-0.8-SNAPSHOT.jar [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/logback-classic-0.8-SNAPSHOT-sources.jar to /root/.m2/repository/ch/qos/logback/logback-classic/0.8-SNAPSHOT/logback-classic-0.8-SNAPSHOT-sources.jar [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/logback-classic-0.8-SNAPSHOT-tests.jar to /root/.m2/repository/ch/qos/logback/logback-classic/0.8-SNAPSHOT/logback-classic-0.8-SNAPSHOT-tests.jar [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 13 seconds [INFO] Finished at: Tue Jan 09 23:41:01 CET 2007 [INFO] Final Memory: 17M/169M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

09 Jan '07

Author: ceki Date: Tue Jan 9 23:25:48 2007 New Revision: 1184 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/AccessConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ContentLengthConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalIPAddressConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalPortConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/NAConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/PostContentConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteHostConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteIPAddressConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteUserConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestAttributeConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestCookieConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestHeaderConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestMethodConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestParameterConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestProtocolConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURIConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURLConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ResponseHeaderConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ServerNameConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/StatusCodeConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java logback/trunk/logback-classic/pom.xml logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.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/pattern/ThreadConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachable.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java Log: Converters have been modified to use generic syntax Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Tue Jan 9 23:25:48 2007 @@ -137,9 +137,11 @@ /** * Add a line separator so that each line is on a separate line. */ - protected void postCompileProcessing(Converter head) { - Converter tail = findTail(head); - Converter newLineConverter = new LineSeparatorConverter(); + @SuppressWarnings("unchecked") + @Override + protected void postCompileProcessing(Converter<AccessEvent> head) { + Converter<AccessEvent> tail = findTail(head); + Converter<AccessEvent> newLineConverter = new LineSeparatorConverter(); if (tail == null) { head = newLineConverter; } else { Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java Tue Jan 9 23:25:48 2007 @@ -73,7 +73,7 @@ } buf.append(LINE_SEP); - Converter c = head; + Converter<AccessEvent> c = head; while (c != null) { appendEventToBuffer(buf, c, event); c = c.getNext(); @@ -84,7 +84,7 @@ return buf.toString(); } - private void appendEventToBuffer(StringBuffer buf, Converter c, + private void appendEventToBuffer(StringBuffer buf, Converter<AccessEvent> c, AccessEvent event) { buf.append("<td class=\""); buf.append(computeConverterName(c)); Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Tue Jan 9 23:25:48 2007 @@ -228,11 +228,11 @@ } - public boolean detachAppender(Appender appender) { + public boolean detachAppender(Appender<AccessEvent> appender) { return aai.detachAppender(appender); } - public Appender detachAppender(String name) { + public Appender<AccessEvent> detachAppender(String name) { return aai.detachAppender(name); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/AccessConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/AccessConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/AccessConverter.java Tue Jan 9 23:25:48 2007 @@ -8,7 +8,7 @@ import ch.qos.logback.core.status.Status; -abstract public class AccessConverter extends DynamicConverter implements ContextAware { +abstract public class AccessConverter extends DynamicConverter<AccessEvent> implements ContextAware { public final static char SPACE_CHAR = ' '; public final static char QUESTION_CHAR = '?'; @@ -23,12 +23,6 @@ return cab.getContext(); } - public final String convert(Object event) { - return convert((AccessEvent) event); - } - - abstract protected String convert(AccessEvent accessEvent); - public void addStatus(Status status) { cab.addStatus(status); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ContentLengthConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ContentLengthConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ContentLengthConverter.java Tue Jan 9 23:25:48 2007 @@ -4,7 +4,7 @@ public class ContentLengthConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { long len = accessEvent.getContentLength(); if(len == AccessEvent.SENTINEL) { return AccessEvent.NA; Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalIPAddressConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalIPAddressConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalIPAddressConverter.java Tue Jan 9 23:25:48 2007 @@ -17,7 +17,7 @@ } } - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return localIPAddressStr; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalPortConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalPortConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/LocalPortConverter.java Tue Jan 9 23:25:48 2007 @@ -5,7 +5,7 @@ public class LocalPortConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return Integer.toString(accessEvent.getLocalPort()); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/NAConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/NAConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/NAConverter.java Tue Jan 9 23:25:48 2007 @@ -10,7 +10,7 @@ */ public class NAConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return AccessEvent.NA; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/PostContentConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/PostContentConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/PostContentConverter.java Tue Jan 9 23:25:48 2007 @@ -16,7 +16,7 @@ public class PostContentConverter extends AccessConverter { @Override - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getPostContent(); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteHostConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteHostConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteHostConverter.java Tue Jan 9 23:25:48 2007 @@ -5,7 +5,7 @@ public class RemoteHostConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getRemoteHost(); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteIPAddressConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteIPAddressConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteIPAddressConverter.java Tue Jan 9 23:25:48 2007 @@ -4,7 +4,7 @@ public class RemoteIPAddressConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getRemoteAddr(); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteUserConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteUserConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RemoteUserConverter.java Tue Jan 9 23:25:48 2007 @@ -5,7 +5,7 @@ public class RemoteUserConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { String user = accessEvent.getRemoteUser(); if(user == null) { Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestAttributeConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestAttributeConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestAttributeConverter.java Tue Jan 9 23:25:48 2007 @@ -17,7 +17,7 @@ } } - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { if (!isStarted()) { return "INACTIVE_REQUEST_ATTRIB_CONV"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestCookieConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestCookieConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestCookieConverter.java Tue Jan 9 23:25:48 2007 @@ -17,7 +17,7 @@ } } - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { if (!isStarted()) { return "INACTIVE_COOKIE_CONVERTER"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestHeaderConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestHeaderConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestHeaderConverter.java Tue Jan 9 23:25:48 2007 @@ -17,7 +17,7 @@ } } - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { if(!isStarted()) { return "INACTIVE_HEADER_CONV"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestMethodConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestMethodConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestMethodConverter.java Tue Jan 9 23:25:48 2007 @@ -5,7 +5,7 @@ public class RequestMethodConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getMethod(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestParameterConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestParameterConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestParameterConverter.java Tue Jan 9 23:25:48 2007 @@ -17,7 +17,7 @@ } } - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { if (!isStarted()) { return "INACTIVE_REQUEST_PARAM_CONV"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestProtocolConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestProtocolConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestProtocolConverter.java Tue Jan 9 23:25:48 2007 @@ -5,7 +5,7 @@ public class RequestProtocolConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getProtocol(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURIConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURIConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURIConverter.java Tue Jan 9 23:25:48 2007 @@ -9,7 +9,7 @@ */ public class RequestURIConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getRequestURI(); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURLConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURLConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/RequestURLConverter.java Tue Jan 9 23:25:48 2007 @@ -9,7 +9,7 @@ */ public class RequestURLConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getRequestURL(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ResponseHeaderConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ResponseHeaderConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ResponseHeaderConverter.java Tue Jan 9 23:25:48 2007 @@ -17,7 +17,7 @@ } } - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { if(!isStarted()) { return "INACTIVE_REPONSE_HEADER_CONV"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ServerNameConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ServerNameConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/ServerNameConverter.java Tue Jan 9 23:25:48 2007 @@ -4,7 +4,7 @@ public class ServerNameConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return accessEvent.getServerName(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/StatusCodeConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/StatusCodeConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/StatusCodeConverter.java Tue Jan 9 23:25:48 2007 @@ -4,7 +4,7 @@ public class StatusCodeConverter extends AccessConverter { - protected String convert(AccessEvent accessEvent) { + public String convert(AccessEvent accessEvent) { return Integer.toString(accessEvent.getStatusCode()); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java Tue Jan 9 23:25:48 2007 @@ -18,16 +18,16 @@ * * @author Sébastien Pennec */ -public class BasicContext extends ContextBase implements AppenderAttachable, FilterAttachable { +public class BasicContext extends ContextBase implements AppenderAttachable<AccessEvent>, FilterAttachable { - AppenderAttachableImpl aai = new AppenderAttachableImpl(); + AppenderAttachableImpl<AccessEvent> aai = new AppenderAttachableImpl<AccessEvent>(); FilterAttachableImpl fai = new FilterAttachableImpl(); public void callAppenders(AccessEvent event) { aai.appendLoopOnAppenders(event); } - public void addAppender(Appender newAppender) { + public void addAppender(Appender<AccessEvent> newAppender) { aai.addAppender(newAppender); } @@ -39,11 +39,11 @@ return aai.detachAppender(appender); } - public Appender detachAppender(String name) { + public Appender<AccessEvent> detachAppender(String name) { return aai.detachAppender(name); } - public Appender getAppender(String name) { + public Appender<AccessEvent> getAppender(String name) { return aai.getAppender(name); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Tue Jan 9 23:25:48 2007 @@ -173,7 +173,7 @@ return aai.detachAppender(appender); } - public Appender detachAppender(String name) { + public Appender<AccessEvent> detachAppender(String name) { return aai.detachAppender(name); } Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Tue Jan 9 23:25:48 2007 @@ -70,11 +70,12 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - +  </dependencies> <build> Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Tue Jan 9 23:25:48 2007 @@ -214,7 +214,7 @@ } } - public synchronized Appender detachAppender(String name) { + public synchronized Appender<LoggingEvent> detachAppender(String name) { if (aai == null) { return null; } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java Tue Jan 9 23:25:48 2007 @@ -119,10 +119,10 @@ * * */ - protected void postCompileProcessing(Converter head) { + protected void postCompileProcessing(Converter<LoggingEvent> head) { if (!chainHandlesThrowable(head)) { - Converter tail = findTail(head); - Converter exConverter = new ThrowableInformationConverter(); + Converter<LoggingEvent> tail = findTail(head); + Converter<LoggingEvent> exConverter = new ThrowableInformationConverter(); if (tail == null) { head = exConverter; } else { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java Tue Jan 9 23:25:48 2007 @@ -75,7 +75,7 @@ } buf.append(LINE_SEP); - Converter c = head; + Converter<LoggingEvent> c = head; while (c != null) { appendEventToBuffer(buf, c, event); c = c.getNext(); @@ -89,7 +89,7 @@ return buf.toString(); } - private void appendEventToBuffer(StringBuffer buf, Converter c, + private void appendEventToBuffer(StringBuffer buf, Converter<LoggingEvent> c, LoggingEvent event) { buf.append("<td class=\""); buf.append(computeConverterName(c)); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java Tue Jan 9 23:25:48 2007 @@ -73,9 +73,7 @@ evaluatorList.add(ee); } - public String convert(Object event) { - - LoggingEvent le = (LoggingEvent) event; + public String convert(LoggingEvent le) { StringBuffer buf = new StringBuffer(); if (evaluatorList != null) { @@ -83,7 +81,7 @@ for (int i = 0; i < evaluatorList.size(); i++) { EventEvaluator ee = (EventEvaluator) evaluatorList.get(i); try { - if (ee.evaluate(event)) { + if (ee.evaluate(le)) { printCallerData = true; break; } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java Tue Jan 9 23:25:48 2007 @@ -12,6 +12,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.LoggerContextAware; import ch.qos.logback.classic.spi.LoggerContextAwareBase; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Context; import ch.qos.logback.core.pattern.DynamicConverter; import ch.qos.logback.core.status.Status; @@ -23,7 +24,7 @@ * * @author Ceki Gulcu */ -abstract public class ClassicConverter extends DynamicConverter implements +abstract public class ClassicConverter extends DynamicConverter<LoggingEvent> implements LoggerContextAware { LoggerContextAwareBase lcab = new LoggerContextAwareBase(); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java Tue Jan 9 23:25:48 2007 @@ -53,8 +53,7 @@ } } - public String convert(Object event) { - LoggingEvent le = (LoggingEvent) event; + public String convert(LoggingEvent le) { long timestamp = le.getTimeStamp(); // if called multiple times within the same millisecond Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java Tue Jan 9 23:25:48 2007 @@ -14,9 +14,7 @@ public class FileOfCallerConverter extends ClassicConverter { - public String convert(Object event) { - - LoggingEvent le = (LoggingEvent) event; + public String convert(LoggingEvent le) { CallerData[] cda = le.getCallerData(); if (cda != null && cda.length > 0) { return cda[0].getFileName(); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java Tue Jan 9 23:25:48 2007 @@ -9,8 +9,7 @@ */ public class LevelConverter extends ClassicConverter { - public String convert(Object event) { - LoggingEvent le = (LoggingEvent) event; + public String convert(LoggingEvent le) { return le.getLevel().toString(); } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java Tue Jan 9 23:25:48 2007 @@ -14,9 +14,7 @@ public class LineOfCallerConverter extends ClassicConverter { - public String convert(Object event) { - - LoggingEvent le = (LoggingEvent) event; + public String convert(LoggingEvent le) { CallerData[] cda = le.getCallerData(); if (cda != null && cda.length > 0) { return Integer.toString(cda[0].getLineNumber()); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java Tue Jan 9 23:25:48 2007 @@ -1,10 +1,11 @@ package ch.qos.logback.classic.pattern; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.CoreGlobal; public class LineSeparatorConverter extends ClassicConverter { - public String convert(Object event) { + public String convert(LoggingEvent event) { return CoreGlobal.LINE_SEPARATOR; } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java Tue Jan 9 23:25:48 2007 @@ -27,9 +27,8 @@ } @Override - public String convert(Object event) { - LoggingEvent loggingEvent = (LoggingEvent) event; - Map<String, String> mdcPropertyMap = loggingEvent.getMDCPropertyMap(); + public String convert(LoggingEvent event) { + Map<String, String> mdcPropertyMap = event.getMDCPropertyMap(); if (mdcPropertyMap == null) { return EMPTY_STRING; @@ -55,7 +54,7 @@ return buf.toString(); } - String value = loggingEvent.getMDCPropertyMap().get(key); + String value = event.getMDCPropertyMap().get(key); if (value != null) { return value; } else { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java Tue Jan 9 23:25:48 2007 @@ -18,9 +18,8 @@ */ public class MessageConverter extends ClassicConverter { - public String convert(Object event) { - LoggingEvent le = (LoggingEvent) event; - return le.getFormattedMessage(); + public String convert(LoggingEvent event) { + return event.getFormattedMessage(); } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java Tue Jan 9 23:25:48 2007 @@ -14,8 +14,7 @@ public class MethodOfCallerConverter extends ClassicConverter { - public String convert(Object event) { - LoggingEvent le = (LoggingEvent) event; + public String convert(LoggingEvent le) { CallerData[] cda = le.getCallerData(); if (cda != null && cda.length > 0) { return cda[0].getMethodName(); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java Tue Jan 9 23:25:48 2007 @@ -38,8 +38,8 @@ } } - public String convert(Object event) { - String fqn = getFullyQualifiedName((LoggingEvent) event); + public String convert(LoggingEvent event) { + String fqn = getFullyQualifiedName(event); if (abbreviator == null) { return fqn; Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java Tue Jan 9 23:25:48 2007 @@ -1,6 +1,7 @@ package ch.qos.logback.classic.pattern; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.CoreGlobal; @@ -22,7 +23,7 @@ */ public class NopThrowableInformationConverter extends ThrowableHandlingConverter { - public String convert(Object event) { + public String convert(LoggingEvent event) { return CoreGlobal.EMPTY_STRING; } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java Tue Jan 9 23:25:48 2007 @@ -16,9 +16,8 @@ long lastTimestamp = -1; String timesmapStr = null; - public String convert(Object event) { - LoggingEvent le = (LoggingEvent) event; - long timestamp = le.getTimeStamp(); + public String convert(LoggingEvent event) { + long timestamp = event.getTimeStamp(); // if called multiple times within the same millisecond // return old value 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 Tue Jan 9 23:25:48 2007 @@ -52,16 +52,15 @@ } } - public String convert(Object event) { - LoggingEvent le = (LoggingEvent) event; + public String convert(LoggingEvent event) { StringBuilder sb = new StringBuilder(); - int pri = facility + LevelToSyslogSeverity.convert(le); + int pri = facility + LevelToSyslogSeverity.convert(event); sb.append("<"); sb.append(pri); sb.append(">"); - fillInTimestamp(sb, le.getTimeStamp()); + fillInTimestamp(sb, event.getTimeStamp()); sb.append(' '); sb.append(localHostName); sb.append(' '); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java Tue Jan 9 23:25:48 2007 @@ -9,9 +9,8 @@ */ public class ThreadConverter extends ClassicConverter { - public String convert(Object event) { - LoggingEvent le = (LoggingEvent) event; - return le.getThreadName(); + public String convert(LoggingEvent event) { + return event.getThreadName(); } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Tue Jan 9 23:25:48 2007 @@ -84,11 +84,10 @@ super.stop(); } - public String convert(Object event) { + public String convert(LoggingEvent event) { StringBuffer buf = new StringBuffer(32); - LoggingEvent le = (LoggingEvent) event; - ThrowableInformation information = le.getThrowableInformation(); + ThrowableInformation information = event.getThrowableInformation(); if (information == null) { return CoreGlobal.EMPTY_STRING; 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 Tue Jan 9 23:25:48 2007 @@ -13,6 +13,7 @@ import java.net.InetAddress; import junit.framework.TestCase; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.classic.turbo.NOPTurboFilter; import ch.qos.logback.core.appender.NOPAppender; @@ -27,7 +28,7 @@ public void testSpeed() { long len = 1000*1000*10; loopBasic(len); - double avg = loopBasic(len); + double avg = loopBasic(len); System.out.println("Running on "+localhostName); // check for performance on KAL only @@ -53,7 +54,7 @@ double loopBasic(long len) { LoggerContext lc = new LoggerContext(); - NOPAppender mopAppender = new NOPAppender(); + NOPAppender<LoggingEvent> mopAppender = new NOPAppender<LoggingEvent>(); mopAppender.start(); Logger logger = lc.getLogger(this.getClass()); logger.setLevel(Level.OFF); @@ -67,7 +68,7 @@ double loopNopFilter(long len) { LoggerContext lc = new LoggerContext(); - NOPAppender mopAppender = new NOPAppender(); + NOPAppender<LoggingEvent> mopAppender = new NOPAppender<LoggingEvent>(); NOPTurboFilter nopFilter = new NOPTurboFilter(); nopFilter.setName("nop"); mopAppender.start(); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Tue Jan 9 23:25:48 2007 @@ -69,7 +69,7 @@ public void testLineOfCaller() { { - DynamicConverter converter = new LineOfCallerConverter(); + DynamicConverter<LoggingEvent> converter = new LineOfCallerConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); // the number below should be the line number of the previous line @@ -79,13 +79,13 @@ public void testLevel() { { - DynamicConverter converter = new LevelConverter(); + DynamicConverter<LoggingEvent> converter = new LevelConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals("INFO", buf.toString()); } { - DynamicConverter converter = new LevelConverter(); + DynamicConverter<LoggingEvent> converter = new LevelConverter(); converter.setFormattingInfo(new FormatInfo(1, 1, true, false)); StringBuffer buf = new StringBuffer(); converter.write(buf, le); @@ -94,21 +94,21 @@ } public void testThread() { - DynamicConverter converter = new ThreadConverter(); + DynamicConverter<LoggingEvent> converter = new ThreadConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals("main", buf.toString()); } public void testMessage() { - DynamicConverter converter = new MessageConverter(); + DynamicConverter<LoggingEvent> converter = new MessageConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals("Some message", buf.toString()); } public void testLineSeparator() { - DynamicConverter converter = new LineSeparatorConverter(); + DynamicConverter<LoggingEvent> converter = new LineSeparatorConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals(CoreGlobal.LINE_SEPARATOR, buf.toString()); @@ -116,14 +116,14 @@ public void testException() { { - DynamicConverter converter = new ThrowableInformationConverter(); + DynamicConverter<LoggingEvent> converter = new ThrowableInformationConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); // System.out.println(buf); } { - DynamicConverter converter = new ThrowableInformationConverter(); + DynamicConverter<LoggingEvent> converter = new ThrowableInformationConverter(); this.optionList.add("3"); converter.setOptionList(this.optionList); StringBuffer buf = new StringBuffer(); @@ -134,14 +134,14 @@ public void testLogger() { { - DynamicConverter converter = new LoggerConverter(); + DynamicConverter<LoggingEvent> converter = new LoggerConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals(this.getClass().getName(), buf.toString()); } { - DynamicConverter converter = new LoggerConverter(); + DynamicConverter<LoggingEvent> converter = new LoggerConverter(); this.optionList.add("20"); converter.setOptionList(this.optionList); converter.start(); @@ -153,7 +153,7 @@ public void testClass() { { - DynamicConverter converter = new ClassOfCallerConverter(); + DynamicConverter<LoggingEvent> converter = new ClassOfCallerConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals(this.getClass().getName(), buf.toString()); @@ -162,7 +162,7 @@ public void testMethodOfCaller() { { - DynamicConverter converter = new MethodOfCallerConverter(); + DynamicConverter<LoggingEvent> converter = new MethodOfCallerConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals("testMethodOfCaller", buf.toString()); @@ -171,7 +171,7 @@ public void testFileOfCaller() { { - DynamicConverter converter = new FileOfCallerConverter(); + DynamicConverter<LoggingEvent> converter = new FileOfCallerConverter(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); assertEquals("ConverterTest.java", buf.toString()); @@ -180,7 +180,7 @@ public void testCallerData() { { - DynamicConverter converter = new CallerDataConverter(); + DynamicConverter<LoggingEvent> converter = new CallerDataConverter(); converter.start(); StringBuffer buf = new StringBuffer(); @@ -191,7 +191,7 @@ } { - DynamicConverter converter = new CallerDataConverter(); + DynamicConverter<LoggingEvent> converter = new CallerDataConverter(); this.optionList.add("2"); this.optionList.add("XXX"); converter.setOptionList(this.optionList); @@ -207,7 +207,7 @@ } { - DynamicConverter converter = new CallerDataConverter(); + DynamicConverter<LoggingEvent> converter = new CallerDataConverter(); this.optionList.clear(); this.optionList.add("2"); this.optionList.add("XXX"); @@ -224,7 +224,7 @@ } } { - DynamicConverter converter = new CallerDataConverter(); + DynamicConverter<LoggingEvent> converter = new CallerDataConverter(); this.optionList.clear(); this.optionList.add("2"); this.optionList.add("XXX"); @@ -242,7 +242,7 @@ } { - DynamicConverter converter = new CallerDataConverter(); + DynamicConverter<LoggingEvent> converter = new CallerDataConverter(); this.optionList.clear(); this.optionList.add("2"); this.optionList.add("XXX"); @@ -262,7 +262,7 @@ public void testRelativeTime() throws Exception { { - DynamicConverter converter = new RelativeTimeConverter(); + DynamicConverter<LoggingEvent> converter = new RelativeTimeConverter(); Thread.sleep(100); StringBuffer buf = new StringBuffer(); converter.write(buf, makeLoggingEvent(null)); @@ -275,7 +275,7 @@ public void testSyslogStart() throws Exception { { - DynamicConverter converter = new SyslogStartConverter(); + DynamicConverter<LoggingEvent> converter = new SyslogStartConverter(); this.optionList.clear(); this.optionList.add("MAIL"); converter.setOptionList(this.optionList); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java Tue Jan 9 23:25:48 2007 @@ -18,7 +18,7 @@ protected String pattern; - protected Converter head; + protected Converter<E> head; protected String title = "Logback Log Messages"; @@ -70,7 +70,7 @@ } try { - Parser p = new Parser(pattern); + Parser<E> p = new Parser<E>(pattern); p.setContext(getContext()); Node t = p.parse(); this.head = p.compile(t, getDefaultConverterMap()); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java Tue Jan 9 23:25:48 2007 @@ -76,6 +76,4 @@ public void end(InterpretationContext ec, String n) { } - public void finish(InterpretationContext ec) { - } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java Tue Jan 9 23:25:48 2007 @@ -9,25 +9,25 @@ */ package ch.qos.logback.core.pattern; -public class CompositeConverter extends FormattingConverter { +public class CompositeConverter<E> extends FormattingConverter<E> { StringBuffer buf = new StringBuffer(); - Converter childConverter; + Converter<E> childConverter; - public String convert(Object event) { + public String convert(E event) { if (buf.capacity() > MAX_CAPACITY) { buf = new StringBuffer(INITIAL_BUF_SIZE); } else { buf.setLength(0); } - for (Converter c = childConverter; c != null; c = c.next) { + for (Converter<E> c = childConverter; c != null; c = c.next) { c.write(buf, event); } return buf.toString(); } - public void setChildConverter(Converter child) { + public void setChildConverter(Converter<E> child) { childConverter = child; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java Tue Jan 9 23:25:48 2007 @@ -15,9 +15,9 @@ * * @author ceki */ -abstract public class Converter { +abstract public class Converter<E> { - Converter next; + Converter<E> next; /** * The convert method is responsible for extracting data from the event and @@ -25,7 +25,7 @@ * * @param event */ - public abstract String convert(Object event); + public abstract String convert(E event); /** * In its simplest incarnation, a convert simply appends the data extracted from @@ -34,18 +34,18 @@ * @param buf The input buffer where data is appended * @param event The event from where data is extracted */ - public void write(StringBuffer buf, Object event) { + public void write(StringBuffer buf, E event) { buf.append(convert(event)); } - public final void setNext(Converter next) { + public final void setNext(Converter<E> next) { if (this.next != null) { throw new IllegalStateException("Next converter has been already set"); } this.next = next; } - public final Converter getNext() { + public final Converter<E> getNext() { return next; } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java Tue Jan 9 23:25:48 2007 @@ -4,7 +4,7 @@ import ch.qos.logback.core.spi.LifeCycle; -abstract public class DynamicConverter extends FormattingConverter implements LifeCycle { +abstract public class DynamicConverter<E> extends FormattingConverter<E> implements LifeCycle { // Contains a list of option Strings. private List optionList; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java Tue Jan 9 23:25:48 2007 @@ -9,7 +9,7 @@ */ package ch.qos.logback.core.pattern; -abstract public class FormattingConverter extends Converter { +abstract public class FormattingConverter<E> extends Converter<E> { static final int INITIAL_BUF_SIZE = 256; static final int MAX_CAPACITY = 1024; @@ -28,7 +28,7 @@ this.formattingInfo = formattingInfo; } - final public void write(StringBuffer buf, Object event) { + final public void write(StringBuffer buf, E event) { String s = convert(event); if(formattingInfo == null) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java Tue Jan 9 23:25:48 2007 @@ -9,7 +9,7 @@ */ package ch.qos.logback.core.pattern; -public final class LiteralConverter extends Converter { +public final class LiteralConverter<E> extends Converter<E> { String literal; @@ -17,7 +17,7 @@ this.literal = literal; } - public String convert(Object o) { + public String convert(E o) { return literal; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java Tue Jan 9 23:25:48 2007 @@ -25,7 +25,7 @@ abstract public class PatternLayoutBase<E> extends LayoutBase<E> { - Converter head; + Converter<E> head; String pattern; Map<String, String> instanceConverterMap = new HashMap<String, String>(); @@ -71,7 +71,7 @@ public void start() { try { - Parser p = new Parser(pattern); + Parser<E> p = new Parser<E>(pattern); if (getContext() != null) { p.setContext(getContext()); } @@ -94,10 +94,10 @@ * * @param head */ - protected void postCompileProcessing(Converter head) { + protected void postCompileProcessing(Converter<E> head) { } - protected void setContextForConverters(Converter head) { + protected void setContextForConverters(Converter<E> head) { Context context = getContext(); Converter c = head; @@ -111,7 +111,7 @@ protected String writeLoopOnConverters(E event) { StringBuffer buf = new StringBuffer(128); - Converter c = head; + Converter<E> c = head; while (c != null) { c.write(buf, event); c = c.getNext(); @@ -131,10 +131,10 @@ return this.getClass().getName() + "(" + getPattern() + ")"; } - protected static Converter findTail(Converter head) { - Converter c = head; + protected Converter<E> findTail(Converter<E> head) { + Converter<E> c = head; while (c != null) { - Converter next = c.getNext(); + Converter<E> next = c.getNext(); if (next == null) { break; } else { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java Tue Jan 9 23:25:48 2007 @@ -20,10 +20,10 @@ import ch.qos.logback.core.util.OptionHelper; -class Compiler extends ContextAwareBase { +class Compiler<E> extends ContextAwareBase { - Converter head; - Converter tail; + Converter<E> head; + Converter<E> tail; final Node top; final Map converterMap; @@ -32,26 +32,26 @@ this.converterMap = converterMap; } - Converter compile() { + Converter<E> compile() { head = tail = null; for (Node n = top; n != null; n = n.next) { switch (n.type) { case Node.LITERAL: - addToList(new LiteralConverter((String) n.getValue())); + addToList(new LiteralConverter<E>((String) n.getValue())); break; case Node.COMPOSITE: CompositeNode cn = (CompositeNode) n; - CompositeConverter compositeConverter = new CompositeConverter(); + CompositeConverter<E> compositeConverter = new CompositeConverter<E>(); compositeConverter.setFormattingInfo(cn.getFormatInfo()); - Compiler childCompiler = new Compiler(cn.getChildNode(), converterMap); + Compiler<E> childCompiler = new Compiler<E>(cn.getChildNode(), converterMap); childCompiler.setContext(context); - Converter childConverter = childCompiler.compile(); + Converter<E> childConverter = childCompiler.compile(); compositeConverter.setChildConverter(childConverter); addToList(compositeConverter); break; case Node.KEYWORD: KeywordNode kn = (KeywordNode) n; - DynamicConverter dynaConverter = createConverter(kn); + DynamicConverter<E> dynaConverter = createConverter(kn); if (dynaConverter != null) { dynaConverter.setFormattingInfo(kn.getFormatInfo()); dynaConverter.setOptionList(kn.getOptions()); @@ -59,7 +59,7 @@ } else { // if the appropriate dynaconverter cannot be found, then replace // it with a dummy LiteralConverter indicating an error. - Converter errConveter = new LiteralConverter("%PARSER_ERROR_" + Converter<E> errConveter = new LiteralConverter<E>("%PARSER_ERROR_" + kn.getValue()); addStatus(new ErrorStatus("["+kn.getValue()+"] is not a valid conversion word", this)); addToList(errConveter); @@ -70,7 +70,7 @@ return head; } - private void addToList(Converter c) { + private void addToList(Converter<E> c) { if (head == null) { head = tail = c; } else { @@ -85,7 +85,8 @@ * @param kn * @return */ - DynamicConverter createConverter(KeywordNode kn) { + @SuppressWarnings("unchecked") + DynamicConverter<E> createConverter(KeywordNode kn) { String keyword = (String) kn.getValue(); String converterClassStr = (String) converterMap.get(keyword); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java Tue Jan 9 23:25:48 2007 @@ -8,7 +8,7 @@ import ch.qos.logback.core.spi.ContextAwareBase; -public class Parser extends ContextAwareBase { +public class Parser<E> extends ContextAwareBase { final List tokenList; int pointer = 0; @@ -39,8 +39,8 @@ * @return * @throws ScanException */ - public Converter compile(final Node top, Map converterMap) { - Compiler compiler = new Compiler(top, converterMap); + public Converter<E> compile(final Node top, Map converterMap) { + Compiler<E> compiler = new Compiler<E>(top, converterMap); compiler.setContext(context); //compiler.setStatusManager(statusManager); return compiler.compile(); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java Tue Jan 9 23:25:48 2007 @@ -41,7 +41,7 @@ } String pattern; - Converter headTokenConverter; + Converter<Object> headTokenConverter; public FileNamePattern(String patternArg, Context contextArg) { setPattern(patternArg); @@ -52,7 +52,7 @@ void parse() { try { - Parser p = new Parser(pattern); + Parser<Object> p = new Parser<Object>(pattern); p.setContext(context); Node t = p.parse(); this.headTokenConverter = p.compile(t, CONVERTER_MAP); @@ -195,7 +195,7 @@ } public String convert(Object o) { - Converter p = headTokenConverter; + Converter<Object> p = headTokenConverter; StringBuffer buf = new StringBuffer(); while (p != null) { buf.append(p.convert(o)); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachable.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachable.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachable.java Tue Jan 9 23:25:48 2007 @@ -54,5 +54,5 @@ * Detach the appender with the name passed as parameter from the list of * appenders. */ - Appender detachAppender(String name); + Appender<E> detachAppender(String name); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Tue Jan 9 23:25:48 2007 @@ -143,7 +143,7 @@ * Remove the appender with the name passed as parameter form the list of * appenders. */ - public Appender detachAppender(String name) { + public Appender<E> detachAppender(String name) { if (name == null) { return null; } @@ -151,8 +151,8 @@ int size = appenderList.size(); for (int i = 0; i < size; i++) { - if (name.equals(((Appender) appenderList.get(i)).getName())) { - return (Appender) appenderList.remove(i); + if (name.equals((appenderList.get(i)).getName())) { + return appenderList.remove(i); } } return null; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java Tue Jan 9 23:25:48 2007 @@ -2,9 +2,10 @@ import ch.qos.logback.core.AppenderBase; -public class NOPAppender extends AppenderBase { +public class NOPAppender<E> extends AppenderBase<E> { @Override - protected void append(Object eventObject) { - } + protected void append(E eventObject) { + } } + \ No newline at end of file Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java Tue Jan 9 23:25:48 2007 @@ -41,9 +41,9 @@ super.tearDown(); } - String write(final Converter head, Object event) { + String write(final Converter<Object> head, Object event) { StringBuffer buf = new StringBuffer(); - Converter c = head; + Converter<Object> c = head; while (c != null) { c.write(buf, event); c = c.getNext(); @@ -52,27 +52,27 @@ } public void testLiteral() throws Exception { - Parser p = new Parser("hello"); + Parser<Object> p = new Parser<Object>("hello"); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("hello", result); } public void testBasic() throws Exception { { - Parser p = new Parser("abc %hello"); + Parser<Object> p = new Parser<Object>("abc %hello"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); - assertEquals("abc Hello", result); + assertEquals("abc Hello", result); } { - Parser p = new Parser("abc %hello %OTT"); + Parser<Object> p = new Parser<Object>("abc %hello %OTT"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc Hello 123", result); } @@ -80,70 +80,70 @@ public void testFormat() throws Exception { { - Parser p = new Parser("abc %7hello"); + Parser<Object> p = new Parser<Object>("abc %7hello"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc Hello", result); } { - Parser p = new Parser("abc %-7hello"); + Parser<Object> p = new Parser<Object>("abc %-7hello"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc Hello ", result); } { - Parser p = new Parser("abc %.3hello"); + Parser<Object> p = new Parser<Object>("abc %.3hello"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc llo", result); } { - Parser p = new Parser("abc %.-3hello"); + Parser<Object> p = new Parser<Object>("abc %.-3hello"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc Hel", result); } { - Parser p = new Parser("abc %4.5OTT"); + Parser<Object> p = new Parser<Object>("abc %4.5OTT"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc 123", result); } { - Parser p = new Parser("abc %-4.5OTT"); + Parser<Object> p = new Parser<Object>("abc %-4.5OTT"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc 123 ", result); } { - Parser p = new Parser("abc %3.4hello"); + Parser<Object> p = new Parser<Object>("abc %3.4hello"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc ello", result); } { - Parser p = new Parser("abc %-3.-4hello"); + Parser<Object> p = new Parser<Object>("abc %-3.-4hello"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("abc Hell", result); } @@ -151,28 +151,28 @@ public void testComposite() throws Exception { // { -// Parser p = new Parser("%(ABC)"); +// Parser<Object> p = new Parser<Object>("%(ABC)"); // p.setContext(context); // Node t = p.parse(); -// Converter head = p.compile(t, converterMap); +// Converter<Object> head = p.compile(t, converterMap); // String result = write(head, new Object()); // assertEquals("ABC", result); // } { Context c = new ContextBase(); - Parser p = new Parser("%(ABC %hello)"); + Parser<Object> p = new Parser<Object>("%(ABC %hello)"); p.setContext(c); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); StatusPrinter.print(c); assertEquals("ABC Hello", result); } { - Parser p = new Parser("%(ABC %hello)"); + Parser<Object> p = new Parser<Object>("%(ABC %hello)"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("ABC Hello", result); } @@ -180,53 +180,53 @@ public void testCompositeFormatting() throws Exception { { - Parser p = new Parser("xyz %4.10(ABC)"); + Parser<Object> p = new Parser<Object>("xyz %4.10(ABC)"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("xyz ABC", result); } { - Parser p = new Parser("xyz %-4.10(ABC)"); + Parser<Object> p = new Parser<Object>("xyz %-4.10(ABC)"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("xyz ABC ", result); } { - Parser p = new Parser("xyz %.2(ABC %hello)"); + Parser<Object> p = new Parser<Object>("xyz %.2(ABC %hello)"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("xyz lo", result); } { - Parser p = new Parser("xyz %.-2(ABC)"); + Parser<Object> p = new Parser<Object>("xyz %.-2(ABC)"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("xyz AB", result); } { - Parser p = new Parser("xyz %30.30(ABC %20hello)"); + Parser<Object> p = new Parser<Object>("xyz %30.30(ABC %20hello)"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("xyz ABC Hello", result); } } public void testUnknownWord() throws Exception { - Parser p = new Parser("%unknown"); + Parser<Object> p = new Parser<Object>("%unknown"); p.setContext(context); Node t = p.parse(); p.compile(t, converterMap); @@ -237,10 +237,10 @@ public void testWithNopEscape() throws Exception { { - Parser p = new Parser("xyz %hello\\_world"); + Parser<Object> p = new Parser<Object>("xyz %hello\\_world"); p.setContext(context); Node t = p.parse(); - Converter head = p.compile(t, converterMap); + Converter<Object> head = p.compile(t, converterMap); String result = write(head, new Object()); assertEquals("xyz Helloworld", result); }

1 0

[continuum] BUILD FAILURE: Logback Classic Module
by John Noreplai 09 Jan '07

09 Jan '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Tue, 9 Jan 2007 21:20:21 +0100 Finished at: Tue, 9 Jan 2007 21:20:32 +0100 Total time: 11s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes src/main/java/ch/qos/logback/classic/spi/LoggerComparator.java src/main/java/ch/qos/logback/classic/jmx/Configurator.java src/main/java/ch/qos/logback/classic/jmx/ConfiguratorMBean.java src/main/java/ch/qos/logback/classic/html/HTMLLayout.java src/main/java/ch/qos/logback/classic/LoggerContext.java pom.xml **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Classic Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/46/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/46/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. Downloading: http://repo1.maven.org/maven2/javax/jms/jms/1.1/jms-1.1.pom 677b downloaded Downloading: http://repo1.maven.org/maven2/javax/jms/jms/1.1/jms-1.1.jar [WARNING] Unable to get resource from repository central (http://repo1.maven.org/maven2) [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Failed to resolve artifact. Missing: ---------- 1) javax.jms:jms:jar:1.1 Try downloading the file manually from: http://java.sun.com/products/jms/docs.html Then, install it using the command: mvn install:install-file -DgroupId=javax.jms -DartifactId=jms \ -Dversion=1.1 -Dpackaging=jar -Dfile=/path/to/file Path to dependency: 1) ch.qos.logback:logback-classic:jar:0.8-SNAPSHOT 2) javax.jms:jms:jar:1.1 ---------- 1 required artifact is missing. for artifact: ch.qos.logback:logback-classic:jar:0.8-SNAPSHOT from the specified remote repositories: central (http://repo1.maven.org/maven2) [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 9 seconds [INFO] Finished at: Tue Jan 09 21:20:32 CET 2007 [INFO] Final Memory: 11M/83M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0