Author: ceki Date: Fri Oct 20 10:06:19 2006 New Revision: 723 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java - copied, changed from r722, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java Log: Moved NOPAction to main/ instead of test/ as it is comes handy in contexts other than tests. Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java (from r722, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java Fri Oct 20 10:06:19 2006 @@ -1,14 +1,14 @@ /** - * LOGBack: the generic, reliable, fast and flexible logging framework. + * Logback: the generic, reliable, fast and flexible logging framework for Java. * - * Copyright (C) 1999-2006, QOS.ch + * Copyright (C) 2000-2006, QOS.ch * * This library is free software, you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.joran; +package ch.qos.logback.core.joran.action; import org.xml.sax.Attributes; @@ -16,10 +16,10 @@ import ch.qos.logback.core.joran.spi.ExecutionContext; - - /** * No operation (NOP) action that does strictly nothing. + * Setting a rule to this pattern is sometimes useful in order + * to prevent implicit actions to kick in. * * @author Ceki Gülcü */ Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Fri Oct 20 10:06:19 2006 @@ -23,6 +23,7 @@ import ch.qos.logback.core.joran.action.BadBeginAction; import ch.qos.logback.core.joran.action.BadEndAction; import ch.qos.logback.core.joran.action.HelloAction; +import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.action.TouchAction; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.Constants; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java Fri Oct 20 10:06:19 2006 @@ -4,7 +4,7 @@ import java.util.List; import junit.framework.TestCase; -import ch.qos.logback.core.joran.NOPAction; +import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.Constants; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java Fri Oct 20 10:06:19 2006 @@ -12,7 +12,7 @@ import java.util.List; import ch.qos.logback.core.joran.GenericConfigurator; -import ch.qos.logback.core.joran.NOPAction; +import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.action.NestedComponentIA; import ch.qos.logback.core.joran.action.NestedSimplePropertyIA; import ch.qos.logback.core.joran.event.SaxEvent;