July 2006 - logback-dev - mailman3.qos.ch

svn commit: r79 - in logback/classic/trunk/src/test: input input/joran java java/ch/qos/logback/classic/joran
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 17:34:40 2006 New Revision: 79 Added: logback/classic/trunk/src/test/input/ - copied from r72, logback/classic/trunk/test/input/ logback/classic/trunk/src/test/java/ - copied from r72, logback/classic/trunk/test/src/java/ Modified: logback/classic/trunk/src/test/input/joran/callerData.xml logback/classic/trunk/src/test/input/joran/ignore.xml logback/classic/trunk/src/test/input/joran/simple2.xml logback/classic/trunk/src/test/input/joran/simpleList.xml logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java Log: moved files according to Maven conventions Modified: logback/classic/trunk/src/test/input/joran/callerData.xml ============================================================================== --- logback/classic/trunk/test/input/joran/callerData.xml (original) +++ logback/classic/trunk/src/test/input/joran/callerData.xml Fri Jul 14 17:34:40 2006 @@ -11,8 +11,8 @@ </matcher> </evaluator> - <appender name="CONSOLE" class="com.logback.core.ConsoleAppender"> - <layout class="com.logback.classic.PatternLayout"> + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%caller{4, helloEval}%d %level - %m%n</Pattern> </layout> </appender> Modified: logback/classic/trunk/src/test/input/joran/ignore.xml ============================================================================== --- logback/classic/trunk/test/input/joran/ignore.xml (original) +++ logback/classic/trunk/src/test/input/joran/ignore.xml Fri Jul 14 17:34:40 2006 @@ -6,8 +6,8 @@ <Expression>(marker.contains("IGNORE"))</Expression> </evaluator> - <appender name="CONSOLE" class="com.logback.core.ConsoleAppender"> - <layout class="com.logback.classic.PatternLayout"> + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%date %level - %m%n%ex{full, IGNORE_EVAL}</Pattern> </layout> </appender> Modified: logback/classic/trunk/src/test/input/joran/simple2.xml ============================================================================== --- logback/classic/trunk/test/input/joran/simple2.xml (original) +++ logback/classic/trunk/src/test/input/joran/simple2.xml Fri Jul 14 17:34:40 2006 @@ -3,8 +3,8 @@ <configuration xmlns:log4j='http://com.logback.com/' debug="true"> - <appender name="CONSOLE" class="com.logback.core.ConsoleAppender"> - <layout class="com.logback.classic.PatternLayout"> + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> <param name="Pattern" value="%d - %m%n"/> </layout> </appender> Modified: logback/classic/trunk/src/test/input/joran/simpleList.xml ============================================================================== --- logback/classic/trunk/test/input/joran/simpleList.xml (original) +++ logback/classic/trunk/src/test/input/joran/simpleList.xml Fri Jul 14 17:34:40 2006 @@ -3,7 +3,7 @@ <configuration xmlns:logback='http://com.logback.com/' debug="true"> - <appender name="LIST" class="com.logback.core.appender.ListAppender"> + <appender name="LIST" class="ch.qos.logback.core.appender.ListAppender"> <layout class="com.logback.classic.PatternLayout"> <param name="Pattern" value="%d - %m%n"/> </layout> Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java ============================================================================== --- logback/classic/trunk/test/src/java/ch/qos/logback/classic/joran/BasicJoranTest.java (original) +++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java Fri Jul 14 17:34:40 2006 @@ -10,22 +10,20 @@ package ch.qos.logback.classic.joran; import junit.framework.TestCase; - import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.classic.util.Constants; import ch.qos.logback.core.appender.ListAppender; import ch.qos.logback.core.util.StatusPrinter; - public class BasicJoranTest extends TestCase { public void test() { JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure("./input/joran/simpleList.xml"); + jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/simpleList.xml"); StatusPrinter.print(loggerContext.getStatusManager()); @@ -45,7 +43,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure("./input/joran/callerData.xml"); + jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); StatusPrinter.print(loggerContext.getStatusManager()); Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java ============================================================================== --- logback/classic/trunk/test/src/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java (original) +++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java Fri Jul 14 17:34:40 2006 @@ -22,6 +22,7 @@ import ch.qos.logback.classic.boolex.JaninoEventEvaluator; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.classic.util.Constants; import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.util.StatusPrinter; @@ -33,7 +34,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure("./input/joran/simpleEvaluator.xml"); + jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/simpleEvaluator.xml"); Map evalMap = (Map) loggerContext.getObject(CoreGlobal.EVALUATOR_MAP); @@ -54,7 +55,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure("./input/joran/ignore.xml"); + jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/ignore.xml");

1 0

svn commit: r78 - in logback/classic/trunk/test: input src/java
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 17:34:15 2006 New Revision: 78 Removed: logback/classic/trunk/test/input/ logback/classic/trunk/test/src/java/ Log: moved files according to Maven conventions

1 0

svn commit: r77 - in logback/classic/trunk/src: java main/java
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 17:32:56 2006 New Revision: 77 Added: logback/classic/trunk/src/main/java/ - copied from r72, logback/classic/trunk/src/java/ Removed: logback/classic/trunk/src/java/ Log: moved sources according to Maven conventions

1 0

svn commit: r76 - in logback/access/trunk/src: main test
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 17:18:38 2006 New Revision: 76 Added: logback/access/trunk/src/main/ logback/access/trunk/src/test/ Log: initial commit

1 0

svn commit: r75 - logback/core/trunk/src/test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 17:11:59 2006 New Revision: 75 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Log: path access modified Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Fri Jul 14 17:11:59 2006 @@ -216,10 +216,10 @@ } for (int i = 0; i < 3; i++) { - assertTrue(Compare.gzCompare(filenames[i], "src/test/witness/rolling/tbr-test3." + i + ".gz")); + assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test3." + i + ".gz")); } - assertTrue(Compare.compare(filenames[3], "src/test/witness/rolling/tbr-test3.3")); + assertTrue(Compare.compare(filenames[3], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test3.3")); } /** @@ -230,8 +230,8 @@ rfa1.setLayout(layout); TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy(); - tbrp1.setActiveFileName("src/test/output/test4.log"); - tbrp1.setFileNamePattern("src/test/output/test4-%d{" + DATE_PATTERN + "}"); + tbrp1.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test4.log"); + tbrp1.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{" + DATE_PATTERN + "}"); tbrp1.start(); rfa1.setRollingPolicy(tbrp1); rfa1.start(); @@ -243,10 +243,10 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 3; i++) { - filenames[i] = "src/test/output/test4-" + sdf.format(cal.getTime()); + filenames[i] = Constants.TEST_DIR_PREFIX + "output/test4-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[3] = "src/test/output/test4.log"; + filenames[3] = Constants.TEST_DIR_PREFIX + "output/test4.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); @@ -263,8 +263,8 @@ rfa2.setLayout(layout); TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy(); - tbrp2.setFileNamePattern("src/test/output/test4-%d{" + DATE_PATTERN + "}"); - tbrp2.setActiveFileName("src/test/output/test4.log"); + tbrp2.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{" + DATE_PATTERN + "}"); + tbrp2.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test4.log"); tbrp2.start(); rfa2.setRollingPolicy(tbrp2); rfa2.start(); @@ -275,7 +275,7 @@ } for (int i = 0; i < 4; i++) { - assertTrue(Compare.compare(filenames[i], "src/test/witness/rolling/tbr-test4." + i)); + assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test4." + i)); } } @@ -287,8 +287,8 @@ rfa.setLayout(layout); TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern("src/test/output/test5-%d{" + DATE_PATTERN + "}"); - tbrp.setActiveFileName("src/test/output/test5.log"); + tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test5-%d{" + DATE_PATTERN + "}"); + tbrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test5.log"); tbrp.start(); rfa.setRollingPolicy(tbrp); rfa.start(); @@ -299,11 +299,11 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 3; i++) { - filenames[i] = "src/test/output/test5-" + sdf.format(cal.getTime()); + filenames[i] = Constants.TEST_DIR_PREFIX + "output/test5-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[3] = "src/test/output/test5.log"; + filenames[3] = Constants.TEST_DIR_PREFIX + "output/test5.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); @@ -315,7 +315,7 @@ } for (int i = 0; i < 4; i++) { - assertTrue(Compare.compare(filenames[i], "src/test/witness/rolling/tbr-test5." + i)); + assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test5." + i)); } } @@ -327,8 +327,8 @@ rfa.setLayout(layout); TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern("src/test/output/test6-%d{" + DATE_PATTERN + "}.gz"); - tbrp.setActiveFileName("src/test/output/test6.log"); + tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test6-%d{" + DATE_PATTERN + "}.gz"); + tbrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test6.log"); tbrp.start(); rfa.setRollingPolicy(tbrp); rfa.start(); @@ -339,11 +339,11 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 3; i++) { - filenames[i] = "src/test/output/test6-" + sdf.format(cal.getTime()) + ".gz"; + filenames[i] = Constants.TEST_DIR_PREFIX + "output/test6-" + sdf.format(cal.getTime()) + ".gz"; cal.add(Calendar.SECOND, 1); } - filenames[3] = "src/test/output/test6.log"; + filenames[3] = Constants.TEST_DIR_PREFIX + "output/test6.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); @@ -359,10 +359,10 @@ } for (int i = 0; i < 3; i++) { - assertTrue(Compare.gzCompare(filenames[i], "src/test/witness/rolling/tbr-test6." + i + ".gz")); + assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test6." + i + ".gz")); } - assertTrue(Compare.compare(filenames[3], "src/test/witness/rolling/tbr-test6.3")); + assertTrue(Compare.compare(filenames[3], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test6.3")); } // public void testWithJoran1() throws Exception {

1 0

svn commit: r74 - logback/core/trunk/src/main/assembly
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 15:42:49 2006 New Revision: 74 Modified: logback/core/trunk/src/main/assembly/source.xml Log: corrected tags Modified: logback/core/trunk/src/main/assembly/source.xml ============================================================================== --- logback/core/trunk/src/main/assembly/source.xml (original) +++ logback/core/trunk/src/main/assembly/source.xml Fri Jul 14 15:42:49 2006 @@ -5,9 +5,15 @@ <format>tar.gz</format> </formats> <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> <fileSet> <includes> - <include>*.jar</include> <include>README*</include> <include>LICENSE*</include> <include>pom.xml</include>

1 0

svn commit: r73 - logback/core/trunk/src/main/assembly
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 15:34:24 2006 New Revision: 73 Modified: logback/core/trunk/src/main/assembly/source.xml Log: now including the core.jar Modified: logback/core/trunk/src/main/assembly/source.xml ============================================================================== --- logback/core/trunk/src/main/assembly/source.xml (original) +++ logback/core/trunk/src/main/assembly/source.xml Fri Jul 14 15:34:24 2006 @@ -7,6 +7,7 @@ <fileSets> <fileSet> <includes> + <include>*.jar</include> <include>README*</include> <include>LICENSE*</include> <include>pom.xml</include>

1 0

svn commit: r72 - logback/classic/trunk
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 12:00:21 2006 New Revision: 72 Added: logback/classic/trunk/pom.xml Log: initial commit Added: logback/classic/trunk/pom.xml ============================================================================== --- (empty file) +++ logback/classic/trunk/pom.xml Fri Jul 14 12:00:21 2006 @@ -0,0 +1,31 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>LOGBack</artifactId> + <groupId>ch.qos.logback</groupId> + <version>0.1-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>ch.qos.logback.classic</groupId> + <artifactId>logback-classic</artifactId> + <name>LOGBack classic</name> + <version>0.1-SNAPSHOT</version> + + <url>http://logback.qos.ch</url> + + <dependencies> + <dependency> + <groupId>ch.qos.logback.core</groupId> + <artifactId>logback-core</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file

1 0

svn commit: r71 - in logback/classic/trunk/src: main test
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 11:44:53 2006 New Revision: 71 Added: logback/classic/trunk/src/main/ logback/classic/trunk/src/test/ Log: initial commit

1 0

svn commit: r70 - logback/core/trunk/src/test/java/ch/qos/logback/core/util
by noreply.seb＠qos.ch 14 Jul '06

14 Jul '06

Author: seb Date: Fri Jul 14 10:29:59 2006 New Revision: 70 Added: logback/core/trunk/src/test/java/ch/qos/logback/core/util/Constants.java Log: initial commit Added: logback/core/trunk/src/test/java/ch/qos/logback/core/util/Constants.java ============================================================================== --- (empty file) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/util/Constants.java Fri Jul 14 10:29:59 2006 @@ -0,0 +1,7 @@ +package ch.qos.logback.core.util; + +public class Constants { + + public static final String TEST_DIR_PREFIX = "src/test/"; + +}

1 0