Author: seb Date: Wed Sep 6 11:43:56 2006 New Revision: 513 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventExt.java - copied, changed from r497, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventExtBuilder.java - copied, changed from r508, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java Removed: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Log: cleaning class names: - Externalized LoggingEvent is now called LoggingEventExt - Serialized LoggingEvent is now LoggingEvent. changed names of builder classes accordingly Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Wed Sep 6 11:43:56 2006 @@ -35,6 +35,7 @@ * </p> * * @author Ceki Gülcü + * @author Sébastien Pennec */ public class LoggingEvent2 implements Serializable { Copied: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventExt.java (from r497, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java) ============================================================================== --- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventExt.java Wed Sep 6 11:43:56 2006 @@ -38,7 +38,7 @@ * @author Ceki Gülcü * @author Sébastien Pennec */ -public class LoggingEvent implements Externalizable { +public class LoggingEventExt implements Externalizable { /** * @@ -94,10 +94,10 @@ */ private long timeStamp; - public LoggingEvent() { + public LoggingEventExt() { } - public LoggingEvent(String fqcn, Logger logger, Level level, String message, + public LoggingEventExt(String fqcn, Logger logger, Level level, String message, Throwable throwable, Object[] argArray) { this.fqnOfLoggerClass = fqcn; this.logger = logger; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Wed Sep 6 11:43:56 2006 @@ -6,7 +6,7 @@ import junit.framework.TestCase; import ch.qos.logback.classic.net.testObjectBuilders.Builder; -import ch.qos.logback.classic.net.testObjectBuilders.LoggingEvent2Builder; +import ch.qos.logback.classic.net.testObjectBuilders.LoggingEventExtBuilder; import ch.qos.logback.classic.net.testObjectBuilders.LoggingEventBuilder; import ch.qos.logback.classic.net.testObjectBuilders.MinimalExtBuilder; import ch.qos.logback.classic.net.testObjectBuilders.MinimalSerBuilder; @@ -183,12 +183,12 @@ } public void testWithExternalization() throws Exception { - Builder builder = new LoggingEventBuilder(); + Builder builder = new LoggingEventExtBuilder(); runPerfTest(builder, "LoggingEvent object externalization"); } public void testWithSerialization() throws Exception { - Builder builder = new LoggingEvent2Builder(); + Builder builder = new LoggingEventBuilder(); runPerfTest(builder, "LoggingEvent object serialization"); } } Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventExtBuilder.java (from r508, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventExtBuilder.java Wed Sep 6 11:43:56 2006 @@ -2,12 +2,12 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.spi.LoggingEvent2; +import ch.qos.logback.classic.spi.LoggingEventExt; -public class LoggingEvent2Builder implements Builder { +public class LoggingEventExtBuilder implements Builder { public Object build(int i) { - LoggingEvent2 le = new LoggingEvent2(); + LoggingEventExt le = new LoggingEventExt(); le.setLevel(Level.DEBUG); le.setLogger(new LoggerContext().getLogger(LoggerContext.ROOT_NAME)); le.setMessage(MSG_PREFIX + i);