Author: seb
Date: Thu Nov 2 19:19:33 2006
New Revision: 853
Added:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterReply.java
- copied, changed from r852,
/logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/FilterReply.java
Removed:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/FilterReply.java
Modified:
logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachable.java
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachableImpl.java
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DebugUsersTurboFilter.java
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java
logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/NOPTurboFilter.java
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java
Log:
moved FilterReply to ch.qos.logback.core.spi.
Modified:
logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
==============================================================================
---
logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
(original)
+++
logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
Thu Nov 2 19:19:33 2006
@@ -19,11 +19,11 @@
import ch.qos.logback.core.Context;
import ch.qos.logback.core.CoreGlobal;
import ch.qos.logback.core.filter.Filter;
-import ch.qos.logback.core.filter.FilterReply;
import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.spi.AppenderAttachable;
import ch.qos.logback.core.spi.AppenderAttachableImpl;
import ch.qos.logback.core.spi.FilterAttachableImpl;
+import ch.qos.logback.core.spi.FilterReply;
import ch.qos.logback.core.status.ErrorStatus;
import ch.qos.logback.core.status.StatusManager;
import ch.qos.logback.core.util.StatusPrinter;
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java
Thu Nov 2 19:19:33 2006
@@ -21,9 +21,9 @@
import ch.qos.logback.classic.spi.LoggerRemoteView;
import ch.qos.logback.classic.spi.LoggingEvent;
import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.filter.FilterReply;
import ch.qos.logback.core.spi.AppenderAttachable;
import ch.qos.logback.core.spi.AppenderAttachableImpl;
+import ch.qos.logback.core.spi.FilterReply;
public final class Logger implements org.slf4j.Logger, AppenderAttachable,
Serializable {
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java
Thu Nov 2 19:19:33 2006
@@ -22,7 +22,7 @@
import ch.qos.logback.classic.turbo.TurboFilter;
import ch.qos.logback.core.ContextBase;
import ch.qos.logback.core.CoreGlobal;
-import ch.qos.logback.core.filter.FilterReply;
+import ch.qos.logback.core.spi.FilterReply;
import ch.qos.logback.core.status.ErrorStatus;
/**
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachable.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachable.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachable.java
Thu Nov 2 19:19:33 2006
@@ -5,7 +5,7 @@
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.turbo.TurboFilter;
-import ch.qos.logback.core.filter.FilterReply;
+import ch.qos.logback.core.spi.FilterReply;
/**
* Interface for attaching ClassicFilter instances to objects.
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachableImpl.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachableImpl.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterAttachableImpl.java
Thu Nov 2 19:19:33 2006
@@ -14,7 +14,7 @@
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.turbo.TurboFilter;
-import ch.qos.logback.core.filter.FilterReply;
+import ch.qos.logback.core.spi.FilterReply;
/**
* Implementation of ClassicFilterAttachable.
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DebugUsersTurboFilter.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DebugUsersTurboFilter.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DebugUsersTurboFilter.java
Thu Nov 2 19:19:33 2006
@@ -9,7 +9,7 @@
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.MDC;
-import ch.qos.logback.core.filter.FilterReply;
+import ch.qos.logback.core.spi.FilterReply;
/**
* This class allows output of debug level events to a certain list of users.
Modified:
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java
==============================================================================
---
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java
(original)
+++
logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java
Thu Nov 2 19:19:33 2006
@@ -5,8 +5,8 @@
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.core.filter.Filter;
-import ch.qos.logback.core.filter.FilterReply;
import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.FilterReply;
import ch.qos.logback.core.spi.LifeCycle;
/**
Modified:
logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/NOPTurboFilter.java
==============================================================================
---
logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/NOPTurboFilter.java
(original)
+++
logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/NOPTurboFilter.java
Thu Nov 2 19:19:33 2006
@@ -4,7 +4,7 @@
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
-import ch.qos.logback.core.filter.FilterReply;
+import ch.qos.logback.core.spi.FilterReply;
public class NOPTurboFilter extends TurboFilter {
Modified:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java
==============================================================================
---
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java
Thu Nov 2 19:19:33 2006
@@ -10,10 +10,10 @@
package ch.qos.logback.core;
import ch.qos.logback.core.filter.Filter;
-import ch.qos.logback.core.filter.FilterReply;
import ch.qos.logback.core.spi.ContextAwareBase;
import ch.qos.logback.core.spi.FilterAttachable;
import ch.qos.logback.core.spi.FilterAttachableImpl;
+import ch.qos.logback.core.spi.FilterReply;
import ch.qos.logback.core.status.WarnStatus;
Modified:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java
==============================================================================
---
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java
Thu Nov 2 19:19:33 2006
@@ -1,5 +1,7 @@
package ch.qos.logback.core.filter;
+import ch.qos.logback.core.spi.FilterReply;
+
/**
* <p>
* This abstract class is meant to be a base for specific evaluator filters.
Modified:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
==============================================================================
---
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
Thu Nov 2 19:19:33 2006
@@ -2,6 +2,7 @@
import ch.qos.logback.core.boolex.EvaluationException;
import ch.qos.logback.core.boolex.EventEvaluator;
+import ch.qos.logback.core.spi.FilterReply;
public class EvaluatorFilter extends AbstractEvalutatorFilter {
Modified:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java
==============================================================================
---
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/Filter.java
Thu Nov 2 19:19:33 2006
@@ -1,6 +1,7 @@
package ch.qos.logback.core.filter;
import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.FilterReply;
import ch.qos.logback.core.spi.LifeCycle;
/**
Modified:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java
==============================================================================
---
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java
Thu Nov 2 19:19:33 2006
@@ -10,6 +10,8 @@
package ch.qos.logback.core.joran.action;
+import java.util.Stack;
+
import org.xml.sax.Attributes;
import ch.qos.logback.core.joran.spi.InterpretationContext;
@@ -21,8 +23,6 @@
import ch.qos.logback.core.util.OptionHelper;
import ch.qos.logback.core.util.PropertySetter;
-import java.util.Stack;
-
/**
* This action is responsible for tying together a parent object with a child
* element for which there is no explicit rule.
Modified:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java
==============================================================================
---
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java
Thu Nov 2 19:19:33 2006
@@ -10,7 +10,6 @@
package ch.qos.logback.core.spi;
import ch.qos.logback.core.filter.Filter;
-import ch.qos.logback.core.filter.FilterReply;
/**
* Interface for attaching filters to objects.
Modified:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java
==============================================================================
---
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java
Thu Nov 2 19:19:33 2006
@@ -10,7 +10,6 @@
package ch.qos.logback.core.spi;
import ch.qos.logback.core.filter.Filter;
-import ch.qos.logback.core.filter.FilterReply;
/**
* Implementation of FilterAttachable.
Copied:
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterReply.java
(from r852,
/logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/FilterReply.java)
==============================================================================
---
/logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/FilterReply.java
(original)
+++
logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterReply.java
Thu Nov 2 19:19:33 2006
@@ -1,4 +1,6 @@
-package ch.qos.logback.core.filter;
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.filter.Filter;
/**
*
_______________________________________________
logback-dev mailing list
[email protected]
http://qos.ch/mailman/listinfo/logback-dev
