abandon SiftingAppedner in model based Joran

qos-ch · Mar 5, 2019 · 5f06352 · 5f06352
1 parent f90e00f
commit 5f06352
Show file tree

Hide file tree

Showing 38 changed files with 47 additions and 2,182 deletions.
diff --git a/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java b/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java
@@ -18,7 +18,6 @@
 import ch.qos.logback.access.boolex.JaninoEventEvaluator;
 import ch.qos.logback.access.joran.action.ConfigurationAction;
 import ch.qos.logback.access.joran.action.EvaluatorAction;
-import ch.qos.logback.access.sift.SiftAction;
 import ch.qos.logback.access.spi.IAccessEvent;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
@@ -49,7 +48,6 @@ public void addInstanceRules(RuleStore rs) {
         rs.addRule(new ElementSelector("configuration"), new ConfigurationAction());
         rs.addRule(new ElementSelector("configuration/appender-ref"), new AppenderRefAction<IAccessEvent>());
 
-        rs.addRule(new ElementSelector("configuration/appender/sift"), new SiftAction());
         rs.addRule(new ElementSelector("configuration/appender/sift/*"), new NOPAction());
 
         rs.addRule(new ElementSelector("configuration/evaluator"), new EvaluatorAction());

diff --git a/logback-access/src/main/java/ch/qos/logback/access/sift/AccessEventDiscriminator.java b/logback-access/src/main/java/ch/qos/logback/access/sift/AccessEventDiscriminator.java
diff --git a/logback-access/src/main/java/ch/qos/logback/access/sift/AppenderFactoryUsingJoran.java b/logback-access/src/main/java/ch/qos/logback/access/sift/AppenderFactoryUsingJoran.java
diff --git a/logback-access/src/main/java/ch/qos/logback/access/sift/SiftAction.java b/logback-access/src/main/java/ch/qos/logback/access/sift/SiftAction.java
diff --git a/logback-access/src/main/java/ch/qos/logback/access/sift/SiftingAppender.java b/logback-access/src/main/java/ch/qos/logback/access/sift/SiftingAppender.java