[logback-dev] svn commit: r1038 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/turbo test/java/ch/qos/logback/classic/turbo

[noreply.ceki at qos.ch]

Author: ceki
Date: Wed Nov 29 20:58:24 2006
New Revision: 1038

Added:
   logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java
      - copied, changed from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java
   logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java
      - copied, changed from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java
   logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingFilter.java
      - copied, changed from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java
   logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java
      - copied, changed from r1036, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java
Removed:
   logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java
   logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java
   logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java
   logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java
Modified:
   logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java

Log:
shorter names

Copied: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java (from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java)
==============================================================================
--- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java	(original)
+++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java	Wed Nov 29 20:58:24 2006
@@ -27,7 +27,7 @@
  * @author Ceki Gülcü
  * @author Sébastien Pennec
  */
-public class MDCTurboFilter extends MatchingTurboFilter {
+public class MDCFilter extends MatchingFilter {
 
   String MDCKey;
   String value;

Copied: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java (from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java)
==============================================================================
--- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java	(original)
+++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java	Wed Nov 29 20:58:24 2006
@@ -9,7 +9,7 @@
 /**
  * Checks whether the marker in the event matches the marker specified by the user as a property.
  */
-public class MarkerTurboFilter extends MatchingTurboFilter {
+public class MarkerFilter extends MatchingFilter {
 
   Marker marker2Match;
 

Copied: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingFilter.java (from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java)
==============================================================================
--- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java	(original)
+++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingFilter.java	Wed Nov 29 20:58:24 2006
@@ -8,7 +8,7 @@
  *  
  * @author Ceki Gulcu
  */
-public abstract class MatchingTurboFilter extends TurboFilter {
+public abstract class MatchingFilter extends TurboFilter {
 
   protected FilterReply onMatch = FilterReply.NEUTRAL;
   protected FilterReply onMismatch = FilterReply.NEUTRAL;

Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java (from r1036, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java)
==============================================================================
--- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java	(original)
+++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java	Wed Nov 29 20:58:24 2006
@@ -7,13 +7,13 @@
 
 import junit.framework.TestCase;
 
-public class MarkerTurboFilterTest extends TestCase {
+public class MarkerFilterTest extends TestCase {
 
   static String MARKER_NAME = "toto";
   
   Marker totoMarker = MarkerFactory.getMarker(MARKER_NAME);
   
-  public MarkerTurboFilterTest(String arg0) {
+  public MarkerFilterTest(String arg0) {
     super(arg0);
   }
 
@@ -26,7 +26,7 @@
   }
 
   public void testNoMarker() {
-    MarkerTurboFilter mkt = new MarkerTurboFilter();
+    MarkerFilter mkt = new MarkerFilter();
     mkt.start();
     assertFalse(mkt.isStarted());
     assertEquals(FilterReply.NEUTRAL, mkt.decide(totoMarker, null, null, null, null, null));
@@ -35,7 +35,7 @@
   }
   
   public void testBasic() {
-    MarkerTurboFilter mkt = new MarkerTurboFilter();
+    MarkerFilter mkt = new MarkerFilter();
     mkt.setMarker(totoMarker);
     mkt.setOnMatch("ACCEPT");
     mkt.setOnMismatch("DENY");

Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java
==============================================================================
--- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java	(original)
+++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java	Wed Nov 29 20:58:24 2006
@@ -18,7 +18,7 @@
   
   public static Test suite() {
     TestSuite suite = new TestSuite();
-    suite.addTestSuite(MarkerTurboFilterTest.class);
+    suite.addTestSuite(MarkerFilterTest.class);
     return suite;
   }
 }
\ No newline at end of file