[logback-dev] svn commit: r1726 - in logback/trunk: . logback-core/src/test/java/ch/qos/logback/core/rolling logback-core/src/test/java/ch/qos/logback/core/rolling/helper logback-core/src/test/java/ch/qos/logback/core/util logback-examples logback-site/src/site/pages

noreply.ceki at qos.ch noreply.ceki at qos.ch
Mon Jul 28 23:42:23 CEST 2008


Author: ceki
Date: Mon Jul 28 23:42:22 2008
New Revision: 1726

Modified:
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java
   logback/trunk/logback-examples/pom.xml
   logback/trunk/logback-site/src/site/pages/news.html
   logback/trunk/pom.xml

Log:
- test from the c.q.l.core.rolling package send their output to files
  under the target directory. See also http://www.qos.ch/pipermail/logback-dev/2008-July/002610.html
- logback now depends on slf4j version 5.1.3-snapshot
- lb-examples depends on slf4j-ext

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java	Mon Jul 28 23:42:22 2008
@@ -43,7 +43,7 @@
     super.setUp();
     layout = new EchoLayout<Object>();
 
-    File target = new File(Constants.TEST_DIR_PREFIX + "output/test.log");
+    File target = new File(Constants.OUTPUT_DIR_PREFIX + "test.log");
     target.mkdirs();
     target.delete();
   }
@@ -57,7 +57,7 @@
     RollingFileAppender<Object> rfa = new RollingFileAppender<Object>();
     rfa.setLayout(layout);
     rfa.setContext(context);
-    rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test.log");
+    rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "test.log");
     
     // rollover by the second
     String datePattern = "yyyy-MM-dd_HH_mm_ss";
@@ -65,7 +65,7 @@
     String[] filenames = new String[2];
 
     TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
-    tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test-%d{" + datePattern + "}");
+    tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test-%d{" + datePattern + "}");
     //tbrp.setActiveFileName("src/test/output/test.log");
     tbrp.setContext(context);
     tbrp.setParent(rfa);
@@ -81,8 +81,8 @@
     DelayerUtil.delayUntilNextSecond(50);
     rfa.doAppend("Hello 1");
 
-    filenames[0] = Constants.TEST_DIR_PREFIX + "output/test-" + sdf.format(cal.getTime());
-    filenames[1] = Constants.TEST_DIR_PREFIX + "output/test.log";
+    filenames[0] = Constants.OUTPUT_DIR_PREFIX + "test-" + sdf.format(cal.getTime());
+    filenames[1] = Constants.OUTPUT_DIR_PREFIX + "test.log";
 
     for (int i = 0; i < filenames.length; i++) {
       //System.out.println("before i=" + i);

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java	Mon Jul 28 23:42:22 2008
@@ -44,13 +44,13 @@
 
   public void setUp() {
     {
-      File target = new File(Constants.TEST_DIR_PREFIX
-          + "output/sizeBased-test2.log");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX
+          + "sizeBased-test2.log");
       target.mkdirs();
       target.delete();
     }
     {
-      File target = new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log");
       target.mkdirs();
       target.delete();
     }
@@ -80,8 +80,8 @@
 
     sbtp.setMaxFileSize("100");
     sbtp.start();
-    fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX
-        + "output/sizeBased-test1.%i");
+    fwrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX
+        + "sizeBased-test1.%i");
     try {
       fwrp.start();
       fail("The absence of activeFileName option should have caused an exception.");
@@ -103,8 +103,8 @@
     rfa.setName("ROLLING");
     rfa.setLayout(layout);
     rfa.setContext(context);
-    rfa.setFile(Constants.TEST_DIR_PREFIX
-        + "output/sizeBased-test2.log");
+    rfa.setFile(Constants.OUTPUT_DIR_PREFIX
+        + "sizeBased-test2.log");
     
     FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy();
     swrp.setContext(context);
@@ -116,8 +116,8 @@
 //    swrp.setActiveFileName(Constants.TEST_DIR_PREFIX
 //        + "output/sizeBased-test2.log");
 
-    swrp.setFileNamePattern(Constants.TEST_DIR_PREFIX
-        + "output/sizeBased-test2.%i");
+    swrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX
+        + "sizeBased-test2.%i");
     swrp.setParent(rfa);
     swrp.start();
 
@@ -142,25 +142,25 @@
       rfa.doAppend("hello");
     }
 
-    assertTrue(new File(Constants.TEST_DIR_PREFIX
-        + "output/sizeBased-test2.log").exists());
-    assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.0")
+    assertTrue(new File(Constants.OUTPUT_DIR_PREFIX
+        + "sizeBased-test2.log").exists());
+    assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sizeBased-test2.0")
         .exists());
-    assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.1")
+    assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sizeBased-test2.1")
         .exists());
 
     // The File.length() method is not accurate under Windows
 
     if (!isWindows()) {
 
-      assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX
-          + "output/sizeBased-test2.log", Constants.TEST_DIR_PREFIX
+      assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX
+          + "sizeBased-test2.log", Constants.TEST_DIR_PREFIX
           + "witness/rolling/sbr-test2.l"));
-      assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX
-          + "output/sizeBased-test2.0", Constants.TEST_DIR_PREFIX
+      assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX
+          + "sizeBased-test2.0", Constants.TEST_DIR_PREFIX
           + "witness/rolling/sbr-test2.0"));
-      assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX
-          + "output/sizeBased-test2.1", Constants.TEST_DIR_PREFIX
+      assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX
+          + "sizeBased-test2.1", Constants.TEST_DIR_PREFIX
           + "witness/rolling/sbr-test2.1"));
     }
 
@@ -176,7 +176,7 @@
     RollingFileAppender<Object> rfa = new RollingFileAppender<Object>();
     rfa.setLayout(layout);
     rfa.setContext(context);
-    rfa.setFile(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log");
+    rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log");
 
     FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy();
     fwrp.setContext(context);
@@ -186,8 +186,8 @@
     sbtp.setMaxFileSize("100");
     fwrp.setMinIndex(0);
     //fwrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log");
-    fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX
-        + "output/sbr-test3.%i.gz");
+    fwrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX
+        + "sbr-test3.%i.gz");
     fwrp.setParent(rfa);
     fwrp.start();
     rfa.setRollingPolicy(fwrp);
@@ -211,11 +211,11 @@
       rfa.doAppend("hello");
     }
 
-    assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log")
+    assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log")
         .exists());
-    assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.0.gz")
+    assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.0.gz")
         .exists());
-    assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.1.gz")
+    assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.1.gz")
         .exists());
 
     if (!isWindows()) {

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java	Mon Jul 28 23:42:22 2008
@@ -60,17 +60,17 @@
     context.setName("test");
     // Delete .log files
     {
-      File target = new File(Constants.TEST_DIR_PREFIX + "output/test4.log");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX + "test4.log");
       target.mkdirs();
       target.delete();
     }
     {
-      File target = new File(Constants.TEST_DIR_PREFIX + "output/test5.log");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX + "test5.log");
       target.mkdirs();
       target.delete();
     }
     {
-      File target = new File(Constants.TEST_DIR_PREFIX + "output/test6.log");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX + "test6.log");
       target.mkdirs();
       target.delete();
     }
@@ -93,7 +93,7 @@
 
     TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
     tbrp.setContext(context);
-    tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test1-%d{"
+    tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test1-%d{"
         + DATE_PATTERN + "}");
     tbrp.setParent(rfa);
     tbrp.setCurrentTime(currentTime);
@@ -105,7 +105,7 @@
     String[] filenames = new String[3];
 
     for (int i = 0; i < 3; i++) {
-      filenames[i] = Constants.TEST_DIR_PREFIX + "output/test1-"
+      filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test1-"
           + sdf.format(cal.getTime());
       cal.add(Calendar.SECOND, 1);
     }
@@ -143,7 +143,7 @@
     rfa1.setLayout(layout);
 
     TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy();
-    tbrp1.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test2-%d{"
+    tbrp1.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test2-%d{"
         + DATE_PATTERN + "}");
     tbrp1.setContext(context);
     tbrp1.setParent(rfa1);
@@ -156,7 +156,7 @@
     String[] filenames = new String[3];
 
     for (int i = 0; i < 3; i++) {
-      filenames[i] = Constants.TEST_DIR_PREFIX + "output/test2-"
+      filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test2-"
           + sdf.format(cal.getTime());
       cal.add(Calendar.SECOND, 1);
     }
@@ -179,7 +179,7 @@
 
     TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy();
     tbrp2.setContext(context);
-    tbrp2.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test2-%d{"
+    tbrp2.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test2-%d{"
         + DATE_PATTERN + "}");
     tbrp2.setParent(rfa2);
     tbrp2.setCurrentTime(tbrp1.getCurrentTime());
@@ -213,7 +213,7 @@
 
     TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
     tbrp.setContext(context);
-    tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test3-%d{"
+    tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test3-%d{"
         + DATE_PATTERN + "}.gz");
     tbrp.setParent(rfa);
     tbrp.setCurrentTime(currentTime);
@@ -225,12 +225,12 @@
     String[] filenames = new String[4];
 
     for (int i = 0; i < 2; i++) {
-      filenames[i] = Constants.TEST_DIR_PREFIX + "output/test3-"
+      filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test3-"
           + sdf.format(cal.getTime()) + ".gz";
       cal.add(Calendar.SECOND, 1);
     }
 
-    filenames[3] = Constants.TEST_DIR_PREFIX + "output/test3-"
+    filenames[3] = Constants.OUTPUT_DIR_PREFIX + "test3-"
         + sdf.format(cal.getTime());
 
     // System.out.println("Waiting until next second and 100 millis.");
@@ -264,12 +264,12 @@
     RollingFileAppender<Object> rfa1 = new RollingFileAppender<Object>();
     rfa1.setContext(context);
     rfa1.setLayout(layout);
-    rfa1.setFile(Constants.TEST_DIR_PREFIX + "output/test4.log");
+    rfa1.setFile(Constants.OUTPUT_DIR_PREFIX + "test4.log");
 
     TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy();
     tbrp1.setContext(context);
     // tbrp1.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test4.log");
-    tbrp1.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{"
+    tbrp1.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test4-%d{"
         + DATE_PATTERN + "}");
     tbrp1.setParent(rfa1);
     tbrp1.setCurrentTime(currentTime);
@@ -281,11 +281,11 @@
     String[] filenames = new String[3];
 
     for (int i = 0; i < 2; i++) {
-      filenames[i] = Constants.TEST_DIR_PREFIX + "output/test4-"
+      filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test4-"
           + sdf.format(cal.getTime());
       cal.add(Calendar.SECOND, 1);
     }
-    filenames[2] = Constants.TEST_DIR_PREFIX + "output/test4.log";
+    filenames[2] = Constants.OUTPUT_DIR_PREFIX + "test4.log";
 
     // System.out.println("Waiting until next second and 100 millis.");
     tbrp1.setCurrentTime(addTime(currentTime, 1100));
@@ -301,11 +301,11 @@
     RollingFileAppender<Object> rfa2 = new RollingFileAppender<Object>();
     rfa2.setContext(context);
     rfa2.setLayout(layout);
-    rfa2.setFile(Constants.TEST_DIR_PREFIX + "output/test4.log");
+    rfa2.setFile(Constants.OUTPUT_DIR_PREFIX + "test4.log");
 
     TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy();
     tbrp2.setContext(context);
-    tbrp2.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{"
+    tbrp2.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test4-%d{"
         + DATE_PATTERN + "}");
     // tbrp2.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test4.log");
     tbrp2.setParent(rfa2);
@@ -336,11 +336,11 @@
     RollingFileAppender<Object> rfa = new RollingFileAppender<Object>();
     rfa.setContext(context);
     rfa.setLayout(layout);
-    rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test5.log");
+    rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "test5.log");
 
     TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
     tbrp.setContext(context);
-    tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test5-%d{"
+    tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test5-%d{"
         + DATE_PATTERN + "}");
     // tbrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test5.log");
     tbrp.setParent(rfa);
@@ -353,12 +353,12 @@
     String[] filenames = new String[4];
 
     for (int i = 0; i < 2; i++) {
-      filenames[i] = Constants.TEST_DIR_PREFIX + "output/test5-"
+      filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test5-"
           + sdf.format(cal.getTime());
       cal.add(Calendar.SECOND, 1);
     }
 
-    filenames[2] = Constants.TEST_DIR_PREFIX + "output/test5.log";
+    filenames[2] = Constants.OUTPUT_DIR_PREFIX + "test5.log";
 
     // System.out.println("Waiting until next second and 100 millis.");
     tbrp.setCurrentTime(addTime(currentTime, 1100));
@@ -386,11 +386,11 @@
     RollingFileAppender<Object> rfa = new RollingFileAppender<Object>();
     rfa.setContext(context);
     rfa.setLayout(layout);
-    rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test6.log");
+    rfa.setFile(Constants.OUTPUT_DIR_PREFIX+ "test6.log");
 
     TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
     tbrp.setContext(context);
-    tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test6-%d{"
+    tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test6-%d{"
         + DATE_PATTERN + "}.gz");
     // tbrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test6.log");
     tbrp.setParent(rfa);
@@ -403,12 +403,12 @@
     String[] filenames = new String[4];
 
     for (int i = 0; i < 2; i++) {
-      filenames[i] = Constants.TEST_DIR_PREFIX + "output/test6-"
+      filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test6-"
           + sdf.format(cal.getTime()) + ".gz";
       cal.add(Calendar.SECOND, 1);
     }
 
-    filenames[2] = Constants.TEST_DIR_PREFIX + "output/test6.log";
+    filenames[2] = Constants.OUTPUT_DIR_PREFIX + "test6.log";
 
     // System.out.println("Waiting until next second and 100 millis.");
     tbrp.setCurrentTime(addTime(currentTime, 1100));

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java	Mon Jul 28 23:42:22 2008
@@ -38,8 +38,8 @@
       File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress1.txt");
                                                         
       copy(source, dest);
-      File target = new File(Constants.TEST_DIR_PREFIX
-          + "output/compress1.txt.gz");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX
+          + "compress1.txt.gz");
       target.mkdirs();
       target.delete();
     }
@@ -47,8 +47,8 @@
       File source = new File(Constants.TEST_DIR_PREFIX + "input/compress2.copy");
       File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress2.txt");
       copy(source, dest);
-      File target = new File(Constants.TEST_DIR_PREFIX
-          + "output/compress2.txt.gz");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX
+          + "compress2.txt.gz");
       target.mkdirs();
       target.delete();
     }
@@ -56,8 +56,8 @@
       File source = new File(Constants.TEST_DIR_PREFIX + "input/compress3.copy");
       File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress3.txt");
       copy(source, dest);
-      File target = new File(Constants.TEST_DIR_PREFIX
-          + "output/compress3.txt.zip");
+      File target = new File(Constants.OUTPUT_DIR_PREFIX
+          + "compress3.txt.zip");
       target.mkdirs();
       target.delete();
     }
@@ -69,35 +69,35 @@
   public void test1() throws Exception {
     Compressor compressor = new Compressor(CompressionMode.GZ,
         Constants.TEST_DIR_PREFIX + "input/compress1.txt",
-        Constants.TEST_DIR_PREFIX + "output/compress1.txt.gz");
+        Constants.OUTPUT_DIR_PREFIX + "compress1.txt.gz");
     compressor.setContext(context);
     compressor.compress();
 
     StatusPrinter.print(context.getStatusManager());
     assertEquals(0, context.getStatusManager().getCount());
-    assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX
-        + "output/compress1.txt.gz", Constants.TEST_DIR_PREFIX
+    assertTrue(Compare.gzCompare(Constants.OUTPUT_DIR_PREFIX
+        + "compress1.txt.gz", Constants.TEST_DIR_PREFIX
         + "witness/compress1.txt.gz"));
   }
 
   public void test2() throws Exception {
     Compressor compressor = new Compressor(CompressionMode.GZ,
         Constants.TEST_DIR_PREFIX + "input/compress2.txt",
-        Constants.TEST_DIR_PREFIX + "output/compress2.txt");
+        Constants.OUTPUT_DIR_PREFIX + "compress2.txt");
     compressor.setContext(context);
     compressor.compress();
 
     StatusPrinter.print(context.getStatusManager());
     assertEquals(0, context.getStatusManager().getCount());
-    assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX
-        + "output/compress2.txt.gz", Constants.TEST_DIR_PREFIX
+    assertTrue(Compare.gzCompare(Constants.OUTPUT_DIR_PREFIX
+        + "compress2.txt.gz", Constants.TEST_DIR_PREFIX
         + "witness/compress2.txt.gz"));
   }
 
   public void test3() throws Exception {
     Compressor compressor = new Compressor(CompressionMode.ZIP, 
         Constants.TEST_DIR_PREFIX + "input/compress3.txt",
-        Constants.TEST_DIR_PREFIX + "output/compress3.txt");
+        Constants.OUTPUT_DIR_PREFIX + "compress3.txt");
     compressor.setContext(context);
     compressor.compress();
     StatusPrinter.print(context.getStatusManager());

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java	Mon Jul 28 23:42:22 2008
@@ -3,16 +3,7 @@
 
 public class Constants {
   
-//  static {
-//    File f = new File("");
-//    String path = "";
-//    String absolute = f.getAbsolutePath();
-//    if (!absolute.endsWith("logback-core")) {
-//      path = "logback-core/";
-//    }
-//    TEST_DIR_PREFIX = path + "src/test/";
-//  }
-
   public static final String TEST_DIR_PREFIX = "src/test/";
-
+  public static final String OUTPUT_DIR_PREFIX = "target/test-output/";
+  
 }

Modified: logback/trunk/logback-examples/pom.xml
==============================================================================
--- logback/trunk/logback-examples/pom.xml	(original)
+++ logback/trunk/logback-examples/pom.xml	Mon Jul 28 23:42:22 2008
@@ -48,6 +48,11 @@
 		</dependency>
 		
 		<dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-ext</artifactId>
+		</dependency>
+		
+		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<scope>compile</scope>

Modified: logback/trunk/logback-site/src/site/pages/news.html
==============================================================================
--- logback/trunk/logback-site/src/site/pages/news.html	(original)
+++ logback/trunk/logback-site/src/site/pages/news.html	Mon Jul 28 23:42:22 2008
@@ -55,6 +55,14 @@
   developpers list.
   </p>
 
+  <p><a href="http://jira.qos.ch/browse/LBCORE-32">LBCORE-32</a>
+  </p>
+
+
+  <p><a href="http://jira.qos.ch/browse/LBCLASSIC-53">LBCLASSIC-53</a>
+  </p>
+  
+
   
   <hr width="80%" align="center" />
  

Modified: logback/trunk/pom.xml
==============================================================================
--- logback/trunk/pom.xml	(original)
+++ logback/trunk/pom.xml	Mon Jul 28 23:42:22 2008
@@ -36,7 +36,7 @@
   
   <properties>
     <!-- slf4j.version property is used below and in setClasspath.cmd -->
-    <slf4j.version>1.5.2</slf4j.version>  
+    <slf4j.version>1.5.3-SNAPSHOT</slf4j.version>  
     <consolePlugin.version>1.1.0</consolePlugin.version>  
     <retrotranslator.verify>false</retrotranslator.verify>
   </properties>
@@ -78,7 +78,12 @@
         <artifactId>log4j-over-slf4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
-      
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-ext</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+		
       <dependency>
         <groupId>janino</groupId>
         <artifactId>janino</artifactId>


More information about the logback-dev mailing list