Author: ceki Date: Wed Mar 5 14:02:32 2008 New Revision: 1632 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadEndAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/IncAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/SoccerPlayer.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ - copied from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/ Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/ Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java 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/TrivialcConfiguratorTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContext.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContextAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java Log: - Moved certain test actions into c/q/l/core/joran/action/ext - renamed c.q.l.c.j.action.ia as c.q.l.c.j.action.implicitAction Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java Wed Mar 5 14:02:32 2008 @@ -23,7 +23,7 @@ suite.addTest(ch.qos.logback.core.joran.event.PackageTest.suite()); suite.addTest(ch.qos.logback.core.joran.spi.PackageTest.suite()); suite.addTest(ch.qos.logback.core.joran.replay.PackageTest.suite()); - suite.addTest(ch.qos.logback.core.joran.ia.PackageTest.suite()); + suite.addTest(ch.qos.logback.core.joran.implicitAction.PackageTest.suite()); return suite; } } 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 Wed Mar 5 14:02:32 2008 @@ -20,11 +20,11 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.Action; -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.action.ext.BadBeginAction; +import ch.qos.logback.core.joran.action.ext.BadEndAction; +import ch.qos.logback.core.joran.action.ext.HelloAction; +import ch.qos.logback.core.joran.action.ext.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/TrivialcConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Wed Mar 5 14:02:32 2008 @@ -16,7 +16,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.Action; -import ch.qos.logback.core.joran.action.IncAction; +import ch.qos.logback.core.joran.action.ext.IncAction; 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/action/IncludeActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Wed Mar 5 14:02:32 2008 @@ -16,6 +16,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.TrivialConfigurator; +import ch.qos.logback.core.joran.action.ext.IncAction; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.status.Status; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadEndAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadEndAction.java Wed Mar 5 14:02:32 2008 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java Wed Mar 5 14:02:32 2008 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/IncAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/IncAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/SoccerPlayer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/SoccerPlayer.java Wed Mar 5 14:02:32 2008 @@ -0,0 +1,21 @@ +package ch.qos.logback.core.joran.action.ext; + +public class SoccerPlayer { + String name; + int age; + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public int getAge() { + return age; + } + public void setAge(int age) { + this.age = age; + } + + +} Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/Fruit.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java Wed Mar 5 14:02:32 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import java.util.ArrayList; import java.util.List; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContext.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/FruitContext.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContext.java Wed Mar 5 14:02:32 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import java.util.ArrayList; import java.util.List; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContextAction.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/FruitContextAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContextAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import org.xml.sax.Attributes; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java Wed Mar 5 14:02:32 2008 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import junit.framework.Test; import junit.framework.TestCase; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/SimplePropertyIATest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java Wed Mar 5 14:02:32 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import java.util.HashMap; import java.util.List;