Author: ceki Date: Mon Jan 26 17:57:29 2009 New Revision: 2134 Added: logback/trunk/logback-examples/src/main/java/chapter10/ logback/trunk/logback-examples/src/main/java/chapter10/calculator/ - copied from r2131, /logback/trunk/logback-examples/src/main/java/chapter3/calculator/ logback/trunk/logback-examples/src/main/java/chapter10/helloWorld/ - copied from r2131, /logback/trunk/logback-examples/src/main/java/chapter3/helloWorld/ logback/trunk/logback-examples/src/main/java/chapter10/implicit/ - copied from r2131, /logback/trunk/logback-examples/src/main/java/chapter3/implicit/ logback/trunk/logback-examples/src/main/java/chapter10/newRule/ - copied from r2131, /logback/trunk/logback-examples/src/main/java/chapter3/newRule/ Removed: logback/trunk/logback-examples/src/main/java/chapter3/calculator/ logback/trunk/logback-examples/src/main/java/chapter3/helloWorld/ logback/trunk/logback-examples/src/main/java/chapter3/implicit/ logback/trunk/logback-examples/src/main/java/chapter3/newRule/ Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/AddAction.java logback/trunk/logback-examples/src/main/java/chapter10/calculator/Calculator1.java logback/trunk/logback-examples/src/main/java/chapter10/calculator/Calculator2.java logback/trunk/logback-examples/src/main/java/chapter10/calculator/ComputationAction1.java logback/trunk/logback-examples/src/main/java/chapter10/calculator/ComputationAction2.java logback/trunk/logback-examples/src/main/java/chapter10/calculator/LiteralAction.java logback/trunk/logback-examples/src/main/java/chapter10/calculator/MultiplyAction.java logback/trunk/logback-examples/src/main/java/chapter10/helloWorld/HelloWorld.java logback/trunk/logback-examples/src/main/java/chapter10/helloWorld/HelloWorldAction.java logback/trunk/logback-examples/src/main/java/chapter10/implicit/NOPAction.java logback/trunk/logback-examples/src/main/java/chapter10/implicit/PrintMe.java logback/trunk/logback-examples/src/main/java/chapter10/implicit/PrintMeImplicitAction.java logback/trunk/logback-examples/src/main/java/chapter10/newRule/NewRuleCalculator.java Log: Moving joran related examples to chapter 10 Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/AddAction.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/calculator/AddAction.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/calculator/AddAction.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.calculator; +package chapter10.calculator; Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/Calculator1.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/calculator/Calculator1.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/calculator/Calculator1.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.calculator; +package chapter10.calculator; import java.util.HashMap; import java.util.Map; Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/Calculator2.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/calculator/Calculator2.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/calculator/Calculator2.java Mon Jan 26 17:57:29 2009 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package chapter3.calculator; +package chapter10.calculator; import java.util.HashMap; import java.util.Map; Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/ComputationAction1.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/calculator/ComputationAction1.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/calculator/ComputationAction1.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.calculator; +package chapter10.calculator; Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/ComputationAction2.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/calculator/ComputationAction2.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/calculator/ComputationAction2.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.calculator; +package chapter10.calculator; import java.util.Stack; Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/LiteralAction.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/calculator/LiteralAction.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/calculator/LiteralAction.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.calculator; +package chapter10.calculator; import org.xml.sax.Attributes; Modified: logback/trunk/logback-examples/src/main/java/chapter10/calculator/MultiplyAction.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/calculator/MultiplyAction.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/calculator/MultiplyAction.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.calculator; +package chapter10.calculator; import org.xml.sax.Attributes; Modified: logback/trunk/logback-examples/src/main/java/chapter10/helloWorld/HelloWorld.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/helloWorld/HelloWorld.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/helloWorld/HelloWorld.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.helloWorld; +package chapter10.helloWorld; import java.util.HashMap; import java.util.Map; Modified: logback/trunk/logback-examples/src/main/java/chapter10/helloWorld/HelloWorldAction.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/helloWorld/HelloWorldAction.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/helloWorld/HelloWorldAction.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.helloWorld; +package chapter10.helloWorld; Modified: logback/trunk/logback-examples/src/main/java/chapter10/implicit/NOPAction.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/implicit/NOPAction.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/implicit/NOPAction.java Mon Jan 26 17:57:29 2009 @@ -1,13 +1,13 @@ /** - * Logback: the reliable, fast and flexible logging library for Java. + * Logback: the generic, reliable, fast and flexible logging framework. * - * Copyright (C) 1999-2006, QOS.ch + * Copyright (C) 2000-2009, 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 chapter3.implicit; +package chapter10.implicit; import org.xml.sax.Attributes; @@ -15,7 +15,6 @@ import ch.qos.logback.core.joran.spi.InterpretationContext; - /** * No operation (NOP) action that does strictly nothing. * @@ -26,7 +25,6 @@ public void begin(InterpretationContext ec, String name, Attributes attributes) { } - public void end(InterpretationContext ec, String name) { } } Modified: logback/trunk/logback-examples/src/main/java/chapter10/implicit/PrintMe.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/implicit/PrintMe.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/implicit/PrintMe.java Mon Jan 26 17:57:29 2009 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package chapter3.implicit; +package chapter10.implicit; import java.util.ArrayList; import java.util.HashMap; Modified: logback/trunk/logback-examples/src/main/java/chapter10/implicit/PrintMeImplicitAction.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/implicit/PrintMeImplicitAction.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/implicit/PrintMeImplicitAction.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.implicit; +package chapter10.implicit; import org.xml.sax.Attributes; Modified: logback/trunk/logback-examples/src/main/java/chapter10/newRule/NewRuleCalculator.java ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter3/newRule/NewRuleCalculator.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter10/newRule/NewRuleCalculator.java Mon Jan 26 17:57:29 2009 @@ -8,7 +8,7 @@ * Software Foundation. */ -package chapter3.newRule; +package chapter10.newRule; import java.util.HashMap; import java.util.Map; @@ -21,7 +21,7 @@ import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.StatusPrinter; import chapter3.SimpleConfigurator; -import chapter3.calculator.ComputationAction2; +import chapter10.calculator.ComputationAction2; /**