This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via b572ad6f784af47731dffcbe3e56476b190ede44 (commit) via 21ab32421307f702eecfa2d71376155cc0bcdfb5 (commit) via 46ae12bdf2d732aeb1f2579afe5c0bd1bd1cfc91 (commit) from c16086d475427676097597cea89460e504ca0cd6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=b572ad6f784af47731dffcbe3... http://github.com/ceki/logback/commit/b572ad6f784af47731dffcbe3e56476b190ede... commit b572ad6f784af47731dffcbe3e56476b190ede44 Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Oct 4 15:30:17 2011 +0200 fix LBCLASSIC-283 diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java index 96c7650..8064a34 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java @@ -104,7 +104,7 @@ public class SerializationPerfTest extends TestCase { public void setUp() throws Exception { super.setUp(); if (runWithExternalMockServer) { - oos = new ObjectOutputStream(new Socket("pixie", + oos = new ObjectOutputStream(new Socket("localhost", ExternalMockSocketServer.PORT).getOutputStream()); } else { oos = new ObjectOutputStream(new NOPOutputStream()); http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=21ab32421307f702eecfa2d71... http://github.com/ceki/logback/commit/21ab32421307f702eecfa2d71376155cc0bcdf... commit 21ab32421307f702eecfa2d71376155cc0bcdfb5 Author: Pierre Queinnec <pierre.queinnec@zenika.com> Date: Thu Jul 14 23:58:13 2011 +0800 Fix the exception occuring because LoggingEvent is not serializable by using LoggingEventVO instances for the benchmark. diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java index a5fe745..96c7650 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java @@ -19,8 +19,8 @@ import java.net.Socket; import junit.framework.TestCase; import ch.qos.logback.classic.net.testObjectBuilders.Builder; -import ch.qos.logback.classic.net.testObjectBuilders.TrivialLoggingEventBuilder; import ch.qos.logback.classic.net.testObjectBuilders.MinimalSerBuilder; +import ch.qos.logback.classic.net.testObjectBuilders.TrivialLoggingEventVOBuilder; public class SerializationPerfTest extends TestCase { @@ -194,8 +194,8 @@ public class SerializationPerfTest extends TestCase { // } public void testWithSerialization() throws Exception { - Builder builder = new TrivialLoggingEventBuilder(); - runPerfTest(builder, "LoggingEvent object serialization"); + Builder builder = new TrivialLoggingEventVOBuilder(); + runPerfTest(builder, "LoggingEventVO object serialization"); } http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=46ae12bdf2d732aeb1f2579af... http://github.com/ceki/logback/commit/46ae12bdf2d732aeb1f2579afe5c0bd1bd1cfc... commit 46ae12bdf2d732aeb1f2579afe5c0bd1bd1cfc91 Author: Pierre Queinnec <pierre.queinnec@zenika.com> Date: Thu Jul 14 23:48:25 2011 +0800 Add a builder for LoggingEventVO objects. diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/TrivialLoggingEventVOBuilder.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/TrivialLoggingEventVOBuilder.java new file mode 100644 index 0000000..d04c2d1 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/TrivialLoggingEventVOBuilder.java @@ -0,0 +1,31 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2011, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.classic.net.testObjectBuilders; + +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.classic.spi.LoggingEventVO; + +/** + * @author Pierre Queinnec + */ +public class TrivialLoggingEventVOBuilder implements Builder { + + public Object build(int i) { + TrivialLoggingEventBuilder loggingEventBuilder = new TrivialLoggingEventBuilder(); + LoggingEvent event = (LoggingEvent) loggingEventBuilder.build(i); + + return LoggingEventVO.build(event); + } + +} ----------------------------------------------------------------------- Summary of changes: .../logback/classic/net/SerializationPerfTest.java | 8 +++--- ...lder.java => TrivialLoggingEventVOBuilder.java} | 27 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) copy logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/{MinimalSerBuilder.java => TrivialLoggingEventVOBuilder.java} (55%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.