[logback-dev] svn commit: r2090 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/sift test/java/ch/qos/logback/core test/java/ch/qos/logback/core/sift

[noreply.ceki at qos.ch]

Author: ceki
Date: Thu Dec 18 22:22:44 2008
New Revision: 2090

Removed:
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/SiftingAppenderTest.java
Modified:
   logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllCoreTest.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/AppenderTrackerTest.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/PackageTest.java
   logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/ScenarioBasedAppenderTrackerTest.java

Log:
SiftingAppender has been largely made generic by virtue of its migration to lb-core

Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java
==============================================================================
--- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java	(original)
+++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java	Thu Dec 18 22:22:44 2008
@@ -27,7 +27,7 @@
  */
 public abstract class SiftingAppenderBase<E, K> extends UnsynchronizedAppenderBase<E> {
 
-  AppenderTracker<E, K> appenderTracker = new AppenderTrackerImpl<E, K>();
+  protected AppenderTracker<E, K> appenderTracker = new AppenderTrackerImpl<E, K>();
   //Map<String, Appender<LoggingEvent>> appenderMap = new Hashtable<String, Appender<LoggingEvent>>();
 
   String mdcKey;

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllCoreTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllCoreTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/AllCoreTest.java	Thu Dec 18 22:22:44 2008
@@ -22,7 +22,8 @@
   ch.qos.logback.core.joran.PackageTest.class,
   ch.qos.logback.core.appender.PackageTest.class,
   ch.qos.logback.core.spi.PackageTest.class,
-  ch.qos.logback.core.rolling.PackageTest.class})
+  ch.qos.logback.core.rolling.PackageTest.class,
+  ch.qos.logback.core.sift.PackageTest.class})
 public class AllCoreTest {
 
 }

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/AppenderTrackerTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/AppenderTrackerTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/AppenderTrackerTest.java	Thu Dec 18 22:22:44 2008
@@ -8,8 +8,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import ch.qos.logback.classic.sift.AppenderTracker;
-import ch.qos.logback.classic.sift.AppenderTrackerImpl;
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.ContextBase;
 import ch.qos.logback.core.read.ListAppender;

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/PackageTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/PackageTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/PackageTest.java	Thu Dec 18 22:22:44 2008
@@ -14,6 +14,6 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
- at SuiteClasses({SiftingAppenderTest.class})
+ at SuiteClasses({ScenarioBasedAppenderTrackerTest.class})
 public class PackageTest  {
 }
\ No newline at end of file

Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/ScenarioBasedAppenderTrackerTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/ScenarioBasedAppenderTrackerTest.java	(original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/sift/ScenarioBasedAppenderTrackerTest.java	Thu Dec 18 22:22:44 2008
@@ -14,8 +14,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import ch.qos.logback.classic.sift.AppenderTracker;
-
 public class ScenarioBasedAppenderTrackerTest {
 
   Simulator simulator;