February 2007 - logback-dev

svn commit: r1338 - logbackRCP/trunk/plugins/LogbackPlugin
by noreply.seb＠qos.ch 20 Feb '07

20 Feb '07

Author: seb Date: Tue Feb 20 19:29:56 2007 New Revision: 1338 Added: logbackRCP/trunk/plugins/LogbackPlugin/build.properties Log: added build properties file Added: logbackRCP/trunk/plugins/LogbackPlugin/build.properties ============================================================================== --- (empty file) +++ logbackRCP/trunk/plugins/LogbackPlugin/build.properties Tue Feb 20 19:29:56 2007 @@ -0,0 +1,6 @@ +source.. = src/main/java/ +output.. = target/classes/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + icons/

1 0

svn commit: r1323 - in logback/trunk/logback-access/src/main/java/ch/qos/logback/access: pattern servlet
by noreply.ceki＠qos.ch 19 Feb '07

19 Feb '07

Author: ceki Date: Mon Feb 19 15:32:29 2007 New Revision: 1323 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/FullResponseConverter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java Log: Minor fixes Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/FullResponseConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/FullResponseConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/FullResponseConverter.java Mon Feb 19 15:32:29 2007 @@ -12,8 +12,10 @@ StringBuffer buf = new StringBuffer(); buf.append("HTTP/1.1 "); - buf.append(ae.getStatusCode()); - buf.append(" DO_FIXME"); + int statusCode = ae.getStatusCode(); + buf.append(statusCode); + buf.append(" "); + buf.append(getStatusCodeDescription(statusCode)); buf.append(Layout.LINE_SEP); List<String> hnList = ae.getResponseHeaderNameList(); @@ -29,4 +31,48 @@ return buf.toString(); } + static String getStatusCodeDescription(int sc) { + switch(sc) { + case 200: return "OK"; + case 201: return "Created"; + case 202: return "Accepted"; + case 203: return "Non-Authoritative Information"; + case 204: return "No Content"; + case 205: return "Reset Content"; + case 206: return "Partial Content"; + case 300: return "Multiple Choices"; + case 301: return "Moved Permanently"; + case 302: return "Found"; + case 303: return "See Other"; + case 304: return "Not Modified"; + case 305: return "Use Proxy"; + case 306: return "(Unused)"; + case 307: return "Temporary Redirect"; + case 400: return "Bad Request"; + case 401: return "Unauthorized"; + case 402: return "Payment Required"; + case 403: return "Forbidden"; + case 404: return "Not Found"; + case 405: return "Method Not Allowed"; + case 406: return "Not Acceptable"; + case 407: return "Proxy Authentication Required"; + case 408: return "Request Timeout"; + case 409: return "Conflict"; + case 410: return "Gone"; + case 411: return "Length Required"; + case 412: return "Precondition Failed"; + case 413: return "Request Entity Too Large"; + case 414: return "Request-URI Too Long"; + case 415: return "Unsupported Media Type"; + case 416: return "Requested Range Not Satisfiable"; + case 417: return "Expectation Failed"; + case 500: return "Internal Server Error"; + case 501: return "Not Implemented"; + case 502: return "Bad Gateway"; + case 503: return "Service Unavailable"; + case 504: return "Gateway Timeout"; + case 505: return "HTTP Version Not Supported"; + default: return "NA"; + } + } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java Mon Feb 19 15:32:29 2007 @@ -15,44 +15,47 @@ public TeeHttpServletResponse(HttpServletResponse httpServletResponse) { super(httpServletResponse); - //System.out.println("TeeHttpServletResponse.constructor called"); + // System.out.println("TeeHttpServletResponse.constructor called"); } @Override public ServletOutputStream getOutputStream() throws IOException { - //System.out.println("TeeHttpServletResponse.getOutputStream() called"); - if(teeServletOutputStream == null) { - teeServletOutputStream = new TeeServletOutputStream( - this.getResponse()); + if (teeServletOutputStream == null) { + teeServletOutputStream = new TeeServletOutputStream(this.getResponse()); } return teeServletOutputStream; } @Override public PrintWriter getWriter() throws IOException { - //System.out.println("TeeHttpServletResponse.getWriter() called"); + // System.out.println("TeeHttpServletResponse.getWriter() called"); if (this.writer == null) { - this.writer = new PrintWriter(new OutputStreamWriter(getOutputStream()), true); + this.writer = new PrintWriter(new OutputStreamWriter(getOutputStream()), + true); } return this.writer; } @Override public void flushBuffer() { - //System.out.println("TeeHttpServletResponse.flushBuffer() called"); + // System.out.println("TeeHttpServletResponse.flushBuffer() called"); this.writer.flush(); } - + byte[] getOutputBuffer() { - return teeServletOutputStream.getOutputBuffer(); + // teeServletOutputStream can be null if the getOutputStream method is never called. + if (teeServletOutputStream != null) { + return teeServletOutputStream.getOutputBuffer(); + } else { + return null; + } } - - - void finish() throws IOException { - if(this.writer != null) { + + void finish() throws IOException { + if (this.writer != null) { this.writer.close(); } - if(this.teeServletOutputStream != null) { + if (this.teeServletOutputStream != null) { this.teeServletOutputStream.close(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java Mon Feb 19 15:32:29 2007 @@ -11,60 +11,77 @@ final ServletOutputStream underlyingStream; final ByteArrayOutputStream baos; - - TeeServletOutputStream(ServletResponse httpServletResponse) throws IOException { - //System.out.println("TeeServletOutputStream.constructor() called"); + TeeServletOutputStream(ServletResponse httpServletResponse) + throws IOException { + // System.out.println("TeeServletOutputStream.constructor() called"); this.underlyingStream = httpServletResponse.getOutputStream(); + if (underlyingStream == null) { + System.out.println("XXXXX underlyingStream == null"); + } else { + System.out.println("XXXXX underlyingStream != null"); + } baos = new ByteArrayOutputStream(); } byte[] getOutputBuffer() { return baos.toByteArray(); } - + @Override public void write(int val) throws IOException { - //System.out.println("XXXXXXXXXXXWRITE TeeServletOutputStream.write(int) called"); - underlyingStream.write(val); - baos.write(val); + // System.out.println("XXXXXXXXXXXWRITE TeeServletOutputStream.write(int) + // called"); + if (underlyingStream != null) { + underlyingStream.write(val); + baos.write(val); + } } @Override public void write(byte[] byteArray) throws IOException { - //System.out.println("WRITE TeeServletOutputStream.write(byte[]) called"); + if (underlyingStream == null) { + return; + } + // System.out.println("WRITE TeeServletOutputStream.write(byte[]) called"); write(byteArray, 0, byteArray.length); } @Override public void write(byte byteArray[], int offset, int length) throws IOException { - //System.out.println("WRITE TeeServletOutputStream.write(byte[], int, int) called"); - //System.out.println(new String(byteArray, offset, length)); + if (underlyingStream == null) { + return; + } + // System.out.println("WRITE TeeServletOutputStream.write(byte[], int, int) + // called"); + // System.out.println(new String(byteArray, offset, length)); underlyingStream.write(byteArray, offset, length); baos.write(byteArray, offset, length); } public void close() throws IOException { - // System.out.println("CLOSE TeeServletOutputStream.close() called"); - - // If the servlet accessing the stream is using a writer instead of + // System.out.println("CLOSE TeeServletOutputStream.close() called"); + + // If the servlet accessing the stream is using a writer instead of // an OutputStream, it will probably call os.close() begore calling // writer.close. Thus, the undelying output stream will be called // before the data sent to the writer could be flushed. } public void finish() throws IOException { - //System.out.println("FINISH TeeServletOutputStream.close() called"); + // System.out.println("FINISH TeeServletOutputStream.close() called"); flush(); underlyingStream.close(); baos.close(); } public void flush() throws IOException { - //System.out.println("FLUSH TeeServletOutputStream.flush() called"); + if (underlyingStream == null) { + return; + } + // System.out.println("FLUSH TeeServletOutputStream.flush() called"); underlyingStream.flush(); baos.flush(); } - }

1 0

[Bug 46] New: TimeUtilTest tests are timezone sensitive
by bugzilla-daemon＠pixie.qos.ch 16 Feb '07

16 Feb '07

http://bugzilla.qos.ch/show_bug.cgi?id=46 Summary: TimeUtilTest tests are timezone sensitive Product: logback-core Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: normal Priority: P3 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: mreynolds(a)anystream.com I am building logback from the 0.9 source. The following tests failed when run in the EST (-05:00) time zone at approx 20:00. testDay() testWeek() testMonth() Temporarily changing to CET time zone allowed the tests to pass. -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 4

svn commit: r1322 - logback/trunk/logback-site/src/site/resources
by noreply.seb＠qos.ch 15 Feb '07

15 Feb '07

Author: seb Date: Thu Feb 15 17:53:40 2007 New Revision: 1322 Modified: logback/trunk/logback-site/src/site/resources/news.html Log: updated the news.html page after two bug fixes Modified: logback/trunk/logback-site/src/site/resources/news.html ============================================================================== --- logback/trunk/logback-site/src/site/resources/news.html (original) +++ logback/trunk/logback-site/src/site/resources/news.html Thu Feb 15 17:53:40 2007 @@ -22,8 +22,10 @@ <h2>Logback News</h2> Here are the latest news about logback. - - <h3>January 31st, 2007 - Release of version 0.9</h3> + <h3>MMMM ddd, 2007 - Release of version 0.9.x</h3> + <a href="http://bugzilla.qos.ch/show_bug.cgi?id=46">Bug #46</a> reported by Mark Renyolds has been fixed. The <code>TimeUtilTest</code> should now run fine under any time zone. + <a href="http://bugzilla.qos.ch/show_bug.cgi?id=45">Bug #45</a>, also reported by Mark Reynolds has been fixed. There should be no <code>ClassCastException</code> thrown anymore when passing an <code>Object</code> to the printing methods using the log4j-bridge module. + <h3>January 31st, 2007 - Release of version 0.9</h3> This version contains a new component, namely the <code>ContextSelector</code>, @@ -128,7 +130,7 @@ Version 0.6 of logback has been released. - + Logback classic now supports automatic configuration, allowing test and production @@ -169,17 +171,17 @@ Version 0.5 of logback has been released. - + This release offers a important improvements in Joran. In particular, Joran can now replay configuration elements. - + As in the previous release, a major area of work is the documentation which is being continously improved. - + <hr width="80%" align="center" /> @@ -193,19 +195,19 @@ implementations for the Jetty and Tomcat servers. Documentation was also added to show how to integrate logback-access with Jetty. - + As for the classic module, several appenders and layouts have been added or improved. The error reporting of logback has also been enhanced, presenting the user with a link to an online page explaining possible reasons for the error. - + A joran documentation was added, with examples in the core module. - + <hr width="80%" align="center" /> @@ -222,14 +224,14 @@ In response to a bug report by Rickard Nilsson on the logback mailing list, a bug affecting parametrized logging was fixed. - + We also released a <a href="http://logback.qos.ch/translator/">PropertiesTranslator</a> webapp that converts log4j.properties files to joran configuration files (in XML format). - + <hr width="80%" align="center" /> @@ -237,7 +239,7 @@ Version 0.2.5 of logback has been released. - + This release offers better documentation. With a number of @@ -256,7 +258,7 @@ It offers better tests, a few more functionalities, and enhanced documentation. We also improved the site design to make it simpler and more efficient. - + <hr width="80%" align="center" /> @@ -264,7 +266,7 @@ Version 0.1 of logback has been released. - + <hr width="80%" align="center" />

1 0

svn commit: r1321 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util
by noreply.seb＠qos.ch 15 Feb '07

15 Feb '07

Author: seb Date: Thu Feb 15 17:46:10 2007 New Revision: 1321 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Log: Changes related to bug #46 This test should now run fine under any time zone Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Thu Feb 15 17:46:10 2007 @@ -4,6 +4,7 @@ import java.util.Calendar; import java.util.Date; +import java.util.TimeZone; public class TimeUtilTest extends TestCase { @@ -34,38 +35,45 @@ long now = 1164042317522L; // Mon Nov 20 18:06:00 CET 2006 long expected = 1164042360000L; + long computed = TimeUtil.computeStartOfNextMinute(now); assertEquals(expected - now, 1000 * 42 + 478); assertEquals(expected, computed); } public void testHour() { - // Mon Nov 20 18:05:17,522 CET 2006 - long now = 1164042317522L; - // Mon Nov 20 19:00:00 CET 2006 - long expected = 1164045600000L; - // System.out.println(new Date(expected)); + // Mon Nov 20 18:05:17,522 GMT 2006 + long now = 1164045917522L; + now = correctBasedOnTimeZone(now); + // Mon Nov 20 19:00:00 GMT 2006 + long expected = 1164049200000L; + expected = correctBasedOnTimeZone(expected); + long computed = TimeUtil.computeStartOfNextHour(now); assertEquals(expected - now, 1000 * (42 + 60 * 54) + 478); assertEquals(expected, computed); } public void testDay() { - // Mon Nov 20 18:05:17 CET 2006 - long now = 1164042317522L; - // Tue Nov 21 00:00:00 CET 2006 - long expected = 1164063600000L; + // Mon Nov 20 18:05:17 GMT 2006 + long now = 1164045917522L; + now = correctBasedOnTimeZone(now); + // Tue Nov 21 00:00:00 GMT 2006 + long expected = 1164067200000L; + expected = correctBasedOnTimeZone(expected); long computed = TimeUtil.computeStartOfNextDay(now); + assertEquals(expected - now, 1000 * (3600 * 5 + 60 * 54 + 42) + 478); assertEquals(expected, computed); } public void testWeek() { - // Mon Nov 20 18:05:17 CET 2006 - long now = 1164042317522L; - // Sun Nov 26 00:00:00 CET 2006 - - long expected = 1164495600000L; + // Mon Nov 20 18:05:17 GMT 2006 + long now = 1164045917522L; + now = correctBasedOnTimeZone(now); + // Sun Nov 26 00:00:00 GMT 2006 + long expected = 1164499200000L; + expected = correctBasedOnTimeZone(expected); Calendar cal = Calendar.getInstance(); cal.setTime(new Date(now)); @@ -85,14 +93,22 @@ } public void testMonth() { - // Mon Nov 20 18:05:17 CET 2006 - long now = 1164042317522L; - // Fri Dec 01 00:00:00 CET 2006 - long expected = 1164927600000L; + // Mon Nov 20 18:05:17 GMT 2006 + long now = 1164045917522L; + now = correctBasedOnTimeZone(now); + // Fri Dec 01 00:00:00 GMT 2006 + long expected = 1164931200000L; + expected = correctBasedOnTimeZone(expected); + long computed = TimeUtil.computeStartOfNextMonth(now); assertEquals(expected - now, 1000 * (3600 * (5 + 24 * 10) + 60 * 54 + 42) + 478); assertEquals(expected, computed); } + + private long correctBasedOnTimeZone(long gmtLong) { + int offset = TimeZone.getDefault().getRawOffset(); + return gmtLong - offset; + } }

1 0

svn commit: r1320 - logback/trunk/log4j-bridge/src/main/java/org/apache/log4j
by noreply.seb＠qos.ch 15 Feb '07

15 Feb '07

Author: seb Date: Thu Feb 15 17:45:35 2007 New Revision: 1320 Modified: logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java Log: changed method signature Modified: logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java ============================================================================== --- logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java (original) +++ logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java Thu Feb 15 17:45:35 2007 @@ -139,7 +139,7 @@ * in addition, the call is marked with a marker named "TRACE". */ public void trace(Object message) { - lbLogger.debug(TRACE_MARKER, prepareMessage(message)); + lbLogger.debug(TRACE_MARKER, convertToString(message)); } /** @@ -147,7 +147,7 @@ * method of logback in addition, the call is marked with a marker named "TRACE". */ public void trace(Object message, Throwable t) { - lbLogger.debug(TRACE_MARKER, prepareMessage(message), t); + lbLogger.debug(TRACE_MARKER, convertToString(message), t); } /** @@ -155,7 +155,7 @@ * method of logback in addition, the call is marked with a marker named "TRACE". */ public void trace(Object message, Object o) { - lbLogger.debug(TRACE_MARKER, prepareMessage(message), o); + lbLogger.debug(TRACE_MARKER, convertToString(message), o); } /** @@ -173,7 +173,7 @@ public void debug(Object message) { // casting to String as SLF4J only accepts String instances, not Object // instances. - lbLogger.debug(prepareMessage(message)); + lbLogger.debug(convertToString(message)); } /** @@ -181,7 +181,7 @@ * method of logback. */ public void debug(Object message, Throwable t) { - lbLogger.debug(prepareMessage(message), t); + lbLogger.debug(convertToString(message), t); } /** @@ -189,7 +189,7 @@ * method of logback. */ public void debug(Object message, Object o) { - lbLogger.debug(prepareMessage(message), o); + lbLogger.debug(convertToString(message), o); } /** @@ -205,7 +205,7 @@ * method of logback. */ public void info(Object message) { - lbLogger.info(prepareMessage(message)); + lbLogger.info(convertToString(message)); } /** @@ -213,7 +213,7 @@ * method of logback. */ public void info(Object message, Throwable t) { - lbLogger.info(prepareMessage(message), t); + lbLogger.info(convertToString(message), t); } /** @@ -221,7 +221,7 @@ * method of logback. */ public void info(Object message, Object o) { - lbLogger.info(prepareMessage(message), o); + lbLogger.info(convertToString(message), o); } /** @@ -237,7 +237,7 @@ * method of logback. */ public void warn(Object message) { - lbLogger.warn(prepareMessage(message)); + lbLogger.warn(convertToString(message)); } /** @@ -245,7 +245,7 @@ * method of logback. */ public void warn(Object message, Throwable t) { - lbLogger.warn(prepareMessage(message), t); + lbLogger.warn(convertToString(message), t); } /** @@ -253,7 +253,7 @@ * method of logback. */ public void warn(Object message, Object o) { - lbLogger.warn(prepareMessage(message), o); + lbLogger.warn(convertToString(message), o); } /** @@ -269,7 +269,7 @@ * method of logback. */ public void error(Object message) { - lbLogger.error(prepareMessage(message)); + lbLogger.error(convertToString(message)); } /** @@ -277,7 +277,7 @@ * method of logback. */ public void error(Object message, Throwable t) { - lbLogger.error(prepareMessage(message), t); + lbLogger.error(convertToString(message), t); } /** @@ -285,7 +285,7 @@ * method of logback. */ public void error(Object message, Object o) { - lbLogger.error(prepareMessage(message), o); + lbLogger.error(convertToString(message), o); } /** @@ -301,7 +301,7 @@ * method of logback. */ public void fatal(Object message) { - lbLogger.error(FATAL_MARKER, prepareMessage(message)); + lbLogger.error(FATAL_MARKER, convertToString(message)); } /** @@ -309,7 +309,7 @@ * method of logback in addition, the call is marked with a marker named "FATAL". */ public void fatal(Object message, Throwable t) { - lbLogger.error(FATAL_MARKER, prepareMessage(message), t); + lbLogger.error(FATAL_MARKER, convertToString(message), t); } /** @@ -317,7 +317,7 @@ * method of logback in addition, the call is marked with a marker named "FATAL". */ public void fatal(Object message, Object o) { - lbLogger.error(FATAL_MARKER, prepareMessage(message), o); + lbLogger.error(FATAL_MARKER, convertToString(message), o); } /** @@ -350,7 +350,7 @@ } } - private String prepareMessage(Object message) { + private final String convertToString(Object message) { if (message == null) { return (String)message; } else {

1 0

svn commit: r1319 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util
by noreply.seb＠qos.ch 15 Feb '07

15 Feb '07

Author: seb Date: Thu Feb 15 16:46:12 2007 New Revision: 1319 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Log: reformat Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Thu Feb 15 16:46:12 2007 @@ -22,20 +22,20 @@ public void testSecond() { // Mon Nov 20 18:05:17,522 CET 2006 long now = 1164042317522L; - //Mon Nov 20 18:05:18,000 CET 2006 + // Mon Nov 20 18:05:18,000 CET 2006 long expected = 1164042318000L; long computed = TimeUtil.computeStartOfNextSecond(now); - assertEquals(expected - now, 478); + assertEquals(expected - now, 478); assertEquals(expected, computed); } - + public void testMinute() { // Mon Nov 20 18:05:17,522 CET 2006 long now = 1164042317522L; // Mon Nov 20 18:06:00 CET 2006 long expected = 1164042360000L; long computed = TimeUtil.computeStartOfNextMinute(now); - assertEquals(expected - now, 1000*42+478); + assertEquals(expected - now, 1000 * 42 + 478); assertEquals(expected, computed); } @@ -44,54 +44,55 @@ long now = 1164042317522L; // Mon Nov 20 19:00:00 CET 2006 long expected = 1164045600000L; - //System.out.println(new Date(expected)); + // System.out.println(new Date(expected)); long computed = TimeUtil.computeStartOfNextHour(now); - assertEquals(expected - now, 1000*(42+60*54)+478); + assertEquals(expected - now, 1000 * (42 + 60 * 54) + 478); assertEquals(expected, computed); } - + public void testDay() { // Mon Nov 20 18:05:17 CET 2006 long now = 1164042317522L; // Tue Nov 21 00:00:00 CET 2006 long expected = 1164063600000L; long computed = TimeUtil.computeStartOfNextDay(now); - assertEquals(expected - now, 1000*(3600*5+60*54+42)+478); + assertEquals(expected - now, 1000 * (3600 * 5 + 60 * 54 + 42) + 478); assertEquals(expected, computed); } - + public void testWeek() { // Mon Nov 20 18:05:17 CET 2006 long now = 1164042317522L; // Sun Nov 26 00:00:00 CET 2006 - + long expected = 1164495600000L; - + Calendar cal = Calendar.getInstance(); cal.setTime(new Date(now)); - - int dayOffset = cal.getFirstDayOfWeek()-Calendar.SUNDAY; - if(dayOffset != 0) { - expected += 24L*3600*1000* (cal.getFirstDayOfWeek()-Calendar.SUNDAY); + + int dayOffset = cal.getFirstDayOfWeek() - Calendar.SUNDAY; + if (dayOffset != 0) { + expected += 24L * 3600 * 1000 * (cal.getFirstDayOfWeek() - Calendar.SUNDAY); } - + long computed = TimeUtil.computeStartOfNextWeek(now); -// System.out.println("now "+new Date(now)); -// System.out.println("computed "+new Date(computed)); -// System.out.println("expected "+new Date(expected)); - assertEquals(expected - now, 1000*(3600*(5+24*(5+dayOffset))+60*54+42)+478); + // System.out.println("now "+new Date(now)); + // System.out.println("computed "+new Date(computed)); + // System.out.println("expected "+new Date(expected)); + assertEquals(expected - now, + 1000 * (3600 * (5 + 24 * (5 + dayOffset)) + 60 * 54 + 42) + 478); assertEquals(expected, computed); } - + public void testMonth() { // Mon Nov 20 18:05:17 CET 2006 long now = 1164042317522L; // Fri Dec 01 00:00:00 CET 2006 long expected = 1164927600000L; long computed = TimeUtil.computeStartOfNextMonth(now); - assertEquals(expected - now, 1000*(3600*(5+24*10)+60*54+42)+478); + assertEquals(expected - now, + 1000 * (3600 * (5 + 24 * 10) + 60 * 54 + 42) + 478); assertEquals(expected, computed); } - }

1 0

svn commit: r1318 - logback/trunk/log4j-bridge/src/test/java/org/apache/log4j
by noreply.seb＠qos.ch 15 Feb '07

15 Feb '07

Author: seb Date: Thu Feb 15 15:48:34 2007 New Revision: 1318 Modified: logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/LoggerTest.java Log: forgot to call the super.setUp and super.tearDown methods. Modified: logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/LoggerTest.java ============================================================================== --- logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/LoggerTest.java (original) +++ logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/LoggerTest.java Thu Feb 15 15:48:34 2007 @@ -23,7 +23,7 @@ ch.qos.logback.classic.Logger logbackLogger; org.apache.log4j.Logger log4jLogger; - public void setUp() { + public void setUp() throws Exception { context = (LoggerContext) LoggerFactory.getILoggerFactory(); context.shutdownAndReset(); appender = new ListAppender<LoggingEvent>(); @@ -36,15 +36,17 @@ log4jLogger = org.apache.log4j.Logger.getLogger(LoggerTest.class); logbackLogger = context.getLogger(LoggerTest.class); + super.setUp(); } - public void tearDown() { + public void tearDown() throws Exception { appender.stop(); context.stop(); appender = null; context = null; logbackLogger = null; log4jLogger = null; + super.tearDown(); } public void testLogWithObjectMessages() {

1 0

[Bug 45] New: ClassCastException with log4j-bridge
by bugzilla-daemon＠pixie.qos.ch 15 Feb '07

15 Feb '07

http://bugzilla.qos.ch/show_bug.cgi?id=45 Summary: ClassCastException with log4j-bridge Product: logback-general Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: blocker Priority: P1 Component: build-structure AssignedTo: logback-dev(a)qos.ch ReportedBy: mreynolds(a)anystream.com I am using log4j-bridge version 0.9. Many of the methods in org.apache.log4j.Category cast "Object message" to String resulting in a ClassCastException if the logging call is passing an object other than a String. Instead of casting, you should probably call message.toString(), which, in the absence of RenderSupport, is what log4j would do anyway. Thanks for logback! -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 2

svn commit: r1317 - in logback/trunk/log4j-bridge/src: main/java/org/apache/log4j test/java/org/apache/log4j
by noreply.seb＠qos.ch 15 Feb '07

15 Feb '07

Author: seb Date: Thu Feb 15 15:44:03 2007 New Revision: 1317 Added: logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/DummyObject.java logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/LoggerTest.java Removed: logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/InvokeLog4jTest.java Modified: logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java Log: Changes related to bug #45 A prepareMessage(Object message): String method has been added to the Category class to check whether the message is null or not and to take care of the casting. The InvokeLog4jTest class has been removed and replaced by a LoggerTest class that tests the same things, plus the changes related to bug #45. Compared to the old test class, the new class tests all this silently. Modified: logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java ============================================================================== --- logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java (original) +++ logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Category.java Thu Feb 15 15:44:03 2007 @@ -139,7 +139,7 @@ * in addition, the call is marked with a marker named "TRACE". */ public void trace(Object message) { - lbLogger.debug(TRACE_MARKER, (String) message); + lbLogger.debug(TRACE_MARKER, prepareMessage(message)); } /** @@ -147,7 +147,7 @@ * method of logback in addition, the call is marked with a marker named "TRACE". */ public void trace(Object message, Throwable t) { - lbLogger.debug(TRACE_MARKER, (String) message, t); + lbLogger.debug(TRACE_MARKER, prepareMessage(message), t); } /** @@ -155,7 +155,7 @@ * method of logback in addition, the call is marked with a marker named "TRACE". */ public void trace(Object message, Object o) { - lbLogger.debug(TRACE_MARKER, (String)message, o); + lbLogger.debug(TRACE_MARKER, prepareMessage(message), o); } /** @@ -173,7 +173,7 @@ public void debug(Object message) { // casting to String as SLF4J only accepts String instances, not Object // instances. - lbLogger.debug((String) message); + lbLogger.debug(prepareMessage(message)); } /** @@ -181,7 +181,7 @@ * method of logback. */ public void debug(Object message, Throwable t) { - lbLogger.debug((String) message, t); + lbLogger.debug(prepareMessage(message), t); } /** @@ -189,7 +189,7 @@ * method of logback. */ public void debug(Object message, Object o) { - lbLogger.debug((String)message, o); + lbLogger.debug(prepareMessage(message), o); } /** @@ -205,7 +205,7 @@ * method of logback. */ public void info(Object message) { - lbLogger.info((String) message); + lbLogger.info(prepareMessage(message)); } /** @@ -213,7 +213,7 @@ * method of logback. */ public void info(Object message, Throwable t) { - lbLogger.info((String) message, t); + lbLogger.info(prepareMessage(message), t); } /** @@ -221,7 +221,7 @@ * method of logback. */ public void info(Object message, Object o) { - lbLogger.info((String) message, o); + lbLogger.info(prepareMessage(message), o); } /** @@ -237,7 +237,7 @@ * method of logback. */ public void warn(Object message) { - lbLogger.warn((String) message); + lbLogger.warn(prepareMessage(message)); } /** @@ -245,7 +245,7 @@ * method of logback. */ public void warn(Object message, Throwable t) { - lbLogger.warn((String) message, t); + lbLogger.warn(prepareMessage(message), t); } /** @@ -253,7 +253,7 @@ * method of logback. */ public void warn(Object message, Object o) { - lbLogger.warn((String)message, o); + lbLogger.warn(prepareMessage(message), o); } /** @@ -269,7 +269,7 @@ * method of logback. */ public void error(Object message) { - lbLogger.error((String) message); + lbLogger.error(prepareMessage(message)); } /** @@ -277,7 +277,7 @@ * method of logback. */ public void error(Object message, Throwable t) { - lbLogger.error((String) message, t); + lbLogger.error(prepareMessage(message), t); } /** @@ -285,7 +285,7 @@ * method of logback. */ public void error(Object message, Object o) { - lbLogger.error((String)message, o); + lbLogger.error(prepareMessage(message), o); } /** @@ -301,7 +301,7 @@ * method of logback. */ public void fatal(Object message) { - lbLogger.error(FATAL_MARKER, (String) message); + lbLogger.error(FATAL_MARKER, prepareMessage(message)); } /** @@ -309,7 +309,7 @@ * method of logback in addition, the call is marked with a marker named "FATAL". */ public void fatal(Object message, Throwable t) { - lbLogger.error(FATAL_MARKER, (String) message, t); + lbLogger.error(FATAL_MARKER, prepareMessage(message), t); } /** @@ -317,7 +317,7 @@ * method of logback in addition, the call is marked with a marker named "FATAL". */ public void fatal(Object message, Object o) { - lbLogger.error(FATAL_MARKER, (String)message, o); + lbLogger.error(FATAL_MARKER, prepareMessage(message), o); } /** @@ -349,5 +349,13 @@ throw new IllegalStateException("Unknown Priority " + p); } } + + private String prepareMessage(Object message) { + if (message == null) { + return (String)message; + } else { + return message.toString(); + } + } } Added: logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/DummyObject.java ============================================================================== --- (empty file) +++ logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/DummyObject.java Thu Feb 15 15:44:03 2007 @@ -0,0 +1,8 @@ +package org.apache.log4j; + +public class DummyObject { + + public String toString() { + return "dummy"; + } +} Added: logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/LoggerTest.java ============================================================================== --- (empty file) +++ logback/trunk/log4j-bridge/src/test/java/org/apache/log4j/LoggerTest.java Thu Feb 15 15:44:03 2007 @@ -0,0 +1,147 @@ +package org.apache.log4j; + +import junit.framework.TestCase; + +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.read.ListAppender; + +/** + * A class that tests the invocation of the org.apache.log4j.Logger class that + * belongs to the log4j-bridge package + * + * @author Sébastien Pennec + * @author Ceki Gülcü + */ + +public class LoggerTest extends TestCase { + + LoggerContext context; + ListAppender<LoggingEvent> appender; + ch.qos.logback.classic.Logger logbackLogger; + org.apache.log4j.Logger log4jLogger; + + public void setUp() { + context = (LoggerContext) LoggerFactory.getILoggerFactory(); + context.shutdownAndReset(); + appender = new ListAppender<LoggingEvent>(); + appender.setContext(context); + appender.setName("listAppender"); + appender.start(); + ch.qos.logback.classic.Logger lbLogger = context + .getLogger(LoggerContext.ROOT_NAME); + lbLogger.addAppender(appender); + + log4jLogger = org.apache.log4j.Logger.getLogger(LoggerTest.class); + logbackLogger = context.getLogger(LoggerTest.class); + } + + public void tearDown() { + appender.stop(); + context.stop(); + appender = null; + context = null; + logbackLogger = null; + log4jLogger = null; + } + + public void testLogWithObjectMessages() { + LoggingEvent event; + + log4jLogger.debug("test"); + event = appender.list.get(0); + assertEquals("test", event.getMessage()); + appender.list.clear(); + + log4jLogger.debug(null); + event = appender.list.get(0); + assertEquals(null, event.getMessage()); + appender.list.clear(); + + DummyObject dummy = new DummyObject(); + log4jLogger.debug(dummy); + event = appender.list.get(0); + assertEquals(dummy.toString(), event.getMessage()); + appender.list.clear(); + } + + public void testIsEnabledAPI() { + assertTrue(log4jLogger.isTraceEnabled()); + assertTrue(log4jLogger.isDebugEnabled()); + assertTrue(log4jLogger.isInfoEnabled()); + assertTrue(log4jLogger.isWarnEnabled()); + assertTrue(log4jLogger.isErrorEnabled()); + } + + public void testPrintAPI() { + Exception e = new Exception("just testing"); + + log4jLogger.debug(null); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.debug("debug message"); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.info(null); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.info("info message"); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.warn(null); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.warn("warn message"); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.error(null); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.error("error message"); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.debug(null, e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.debug("debug message", e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.info(null, e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.info("info message", e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.warn(null, e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.warn("warn message", e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.error(null, e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + log4jLogger.error("error message", e); + assertEquals(1, appender.list.size()); + appender.list.clear(); + + } + +}

1 0