[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, encoder, updated. v0.9.18-45-gde7d934
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Tue Feb 23 22:13:50 CET 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Logback: the generic, reliable, fast and flexible logging framework.".
The branch, encoder has been updated
via de7d9343186256b18e4419302923ff024022e638 (commit)
from adae89397fcecee04c69f241db87427cc218d254 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=de7d9343186256b18e4419302923ff024022e638
http://github.com/ceki/logback/commit/de7d9343186256b18e4419302923ff024022e638
commit de7d9343186256b18e4419302923ff024022e638
Author: Ceki Gulcu <ceki at qos.ch>
Date: Tue Feb 23 22:12:34 2010 +0100
- changing the way chapters are named in preparation for inserting a
chapter on Encoders. Naming chapters by their number was a bas idea...
diff --git a/logback-examples/src/main/java/chapter4/ConfigurationTester.java b/logback-examples/src/main/java/chapters/appenders/ConfigurationTester.java
similarity index 96%
rename from logback-examples/src/main/java/chapter4/ConfigurationTester.java
rename to logback-examples/src/main/java/chapters/appenders/ConfigurationTester.java
index 7403030..07ffcf4 100644
--- a/logback-examples/src/main/java/chapter4/ConfigurationTester.java
+++ b/logback-examples/src/main/java/chapters/appenders/ConfigurationTester.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4;
+package chapters.appenders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@ import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.joran.JoranConfigurator;
import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.util.StatusPrinter;
-import chapter4.sub.sample.Bar;
+import chapters.appenders.sub.sample.Bar;
/**
*
diff --git a/logback-examples/src/main/java/chapter4/CountingConsoleAppender.java b/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java
similarity index 98%
rename from logback-examples/src/main/java/chapter4/CountingConsoleAppender.java
rename to logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java
index 5e18f14..0766960 100644
--- a/logback-examples/src/main/java/chapter4/CountingConsoleAppender.java
+++ b/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4;
+package chapters.appenders;
import java.io.IOException;
diff --git a/logback-examples/src/main/java/chapter4/ExitWoes1.java b/logback-examples/src/main/java/chapters/appenders/ExitWoes1.java
similarity index 98%
rename from logback-examples/src/main/java/chapter4/ExitWoes1.java
rename to logback-examples/src/main/java/chapters/appenders/ExitWoes1.java
index e99234c..9641379 100644
--- a/logback-examples/src/main/java/chapter4/ExitWoes1.java
+++ b/logback-examples/src/main/java/chapters/appenders/ExitWoes1.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4;
+package chapters.appenders;
import java.io.FileOutputStream;
import java.io.OutputStream;
diff --git a/logback-examples/src/main/java/chapter4/ExitWoes2.java b/logback-examples/src/main/java/chapters/appenders/ExitWoes2.java
similarity index 98%
rename from logback-examples/src/main/java/chapter4/ExitWoes2.java
rename to logback-examples/src/main/java/chapters/appenders/ExitWoes2.java
index 121e89a..09be353 100644
--- a/logback-examples/src/main/java/chapter4/ExitWoes2.java
+++ b/logback-examples/src/main/java/chapters/appenders/ExitWoes2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4;
+package chapters.appenders;
import java.io.FileOutputStream;
import java.io.OutputStream;
diff --git a/logback-examples/src/main/java/chapter4/IO.java b/logback-examples/src/main/java/chapters/appenders/IO.java
similarity index 99%
rename from logback-examples/src/main/java/chapter4/IO.java
rename to logback-examples/src/main/java/chapters/appenders/IO.java
index 3618774..cec7686 100644
--- a/logback-examples/src/main/java/chapter4/IO.java
+++ b/logback-examples/src/main/java/chapters/appenders/IO.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4;
+package chapters.appenders;
import org.slf4j.Logger;
diff --git a/logback-examples/src/main/java/chapter4/conf/access/logback-DB.xml b/logback-examples/src/main/java/chapters/appenders/conf/access/logback-DB.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/access/logback-DB.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/access/logback-DB.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/access/logback-SMTP.xml b/logback-examples/src/main/java/chapters/appenders/conf/access/logback-SMTP.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/access/logback-SMTP.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/access/logback-SMTP.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-Console.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-Console.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-Console.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-Console.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-HtmlToConsole.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-HtmlToConsole.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-HtmlToConsole.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-HtmlToConsole.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-JMSQueue.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-JMSQueue.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-JMSQueue.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-JMSQueue.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-JMSTopic.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-JMSTopic.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-JMSTopic.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-JMSTopic.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-MDC.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-MDC.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-MDC.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-MDC.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-PrudentTimeBasedRolling.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-PrudentTimeBasedRolling.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-PrudentTimeBasedRolling.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-PrudentTimeBasedRolling.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-RollingFixedWindow.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-RollingFixedWindow.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-RollingFixedWindow.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-RollingFixedWindow.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-RollingSizeBased.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-RollingSizeBased.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-RollingSizeBased.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-RollingSizeBased.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-RollingTimeBased.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-RollingTimeBased.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-RollingTimeBased.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-RollingTimeBased.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-SMTP.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-SMTP.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-SMTP.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-SMTP.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-SMTPWithHtml.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-SMTPWithHtml.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-SMTPWithHtml.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-SMTPWithHtml.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-fileAppender.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-fileAppender.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-fileAppender.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-fileAppender.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-syslog.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-syslog.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-syslog.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-syslog.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logback-timestamp.xml b/logback-examples/src/main/java/chapters/appenders/conf/logback-timestamp.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logback-timestamp.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logback-timestamp.xml
diff --git a/logback-examples/src/main/java/chapter4/conf/logbback-sizeAndTime.xml b/logback-examples/src/main/java/chapters/appenders/conf/logbback-sizeAndTime.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/conf/logbback-sizeAndTime.xml
rename to logback-examples/src/main/java/chapters/appenders/conf/logbback-sizeAndTime.xml
diff --git a/logback-examples/src/main/java/chapter4/countingConsole.xml b/logback-examples/src/main/java/chapters/appenders/countingConsole.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/countingConsole.xml
rename to logback-examples/src/main/java/chapters/appenders/countingConsole.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-and-share-with-jndi.xml b/logback-examples/src/main/java/chapters/appenders/db/append-and-share-with-jndi.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-and-share-with-jndi.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-and-share-with-jndi.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource-and-pooling.xml b/logback-examples/src/main/java/chapters/appenders/db/append-toMySQL-with-datasource-and-pooling.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource-and-pooling.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-toMySQL-with-datasource-and-pooling.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource.xml b/logback-examples/src/main/java/chapters/appenders/db/append-toMySQL-with-datasource.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-toMySQL-with-datasource.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-toMySQL-with-driverManager.xml b/logback-examples/src/main/java/chapters/appenders/db/append-toMySQL-with-driverManager.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-toMySQL-with-driverManager.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-toMySQL-with-driverManager.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-with-c3p0.xml b/logback-examples/src/main/java/chapters/appenders/db/append-with-c3p0.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-with-c3p0.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-with-c3p0.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-with-datasource.xml b/logback-examples/src/main/java/chapters/appenders/db/append-with-datasource.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-with-datasource.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-with-datasource.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-with-drivermanager.xml b/logback-examples/src/main/java/chapters/appenders/db/append-with-drivermanager.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-with-drivermanager.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-with-drivermanager.xml
diff --git a/logback-examples/src/main/java/chapter4/db/append-with-pooled-datasource.xml b/logback-examples/src/main/java/chapters/appenders/db/append-with-pooled-datasource.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/db/append-with-pooled-datasource.xml
rename to logback-examples/src/main/java/chapters/appenders/db/append-with-pooled-datasource.xml
diff --git a/logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java b/logback-examples/src/main/java/chapters/appenders/mail/CounterBasedEvaluator.java
similarity index 97%
rename from logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java
rename to logback-examples/src/main/java/chapters/appenders/mail/CounterBasedEvaluator.java
index f55aaf8..9628bea 100644
--- a/logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java
+++ b/logback-examples/src/main/java/chapters/appenders/mail/CounterBasedEvaluator.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4.mail;
+package chapters.appenders.mail;
import ch.qos.logback.core.boolex.EvaluationException;
import ch.qos.logback.core.boolex.EventEvaluator;
diff --git a/logback-examples/src/main/java/chapter4/mail/EMail.java b/logback-examples/src/main/java/chapters/appenders/mail/EMail.java
similarity index 98%
rename from logback-examples/src/main/java/chapter4/mail/EMail.java
rename to logback-examples/src/main/java/chapters/appenders/mail/EMail.java
index e592035..5ac9e05 100644
--- a/logback-examples/src/main/java/chapter4/mail/EMail.java
+++ b/logback-examples/src/main/java/chapters/appenders/mail/EMail.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4.mail;
+package chapters.appenders.mail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter4/mail/Marked_EMail.java b/logback-examples/src/main/java/chapters/appenders/mail/Marked_EMail.java
similarity index 98%
rename from logback-examples/src/main/java/chapter4/mail/Marked_EMail.java
rename to logback-examples/src/main/java/chapters/appenders/mail/Marked_EMail.java
index 113eecd..bf7f44c 100644
--- a/logback-examples/src/main/java/chapter4/mail/Marked_EMail.java
+++ b/logback-examples/src/main/java/chapters/appenders/mail/Marked_EMail.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4.mail;
+package chapters.appenders.mail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter4/mail/gmailSSL.xml b/logback-examples/src/main/java/chapters/appenders/mail/gmailSSL.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/mail/gmailSSL.xml
rename to logback-examples/src/main/java/chapters/appenders/mail/gmailSSL.xml
diff --git a/logback-examples/src/main/java/chapter4/mail/gmailSTARTTLS.xml b/logback-examples/src/main/java/chapters/appenders/mail/gmailSTARTTLS.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/mail/gmailSTARTTLS.xml
rename to logback-examples/src/main/java/chapters/appenders/mail/gmailSTARTTLS.xml
diff --git a/logback-examples/src/main/java/chapter4/mail/mail1.xml b/logback-examples/src/main/java/chapters/appenders/mail/mail1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/mail/mail1.xml
rename to logback-examples/src/main/java/chapters/appenders/mail/mail1.xml
diff --git a/logback-examples/src/main/java/chapter4/mail/mail2.xml b/logback-examples/src/main/java/chapters/appenders/mail/mail2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/mail/mail2.xml
rename to logback-examples/src/main/java/chapters/appenders/mail/mail2.xml
diff --git a/logback-examples/src/main/java/chapter4/mail/mail3.xml b/logback-examples/src/main/java/chapters/appenders/mail/mail3.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/mail/mail3.xml
rename to logback-examples/src/main/java/chapters/appenders/mail/mail3.xml
diff --git a/logback-examples/src/main/java/chapter4/mail/mailWithMarker.xml b/logback-examples/src/main/java/chapters/appenders/mail/mailWithMarker.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/mail/mailWithMarker.xml
rename to logback-examples/src/main/java/chapters/appenders/mail/mailWithMarker.xml
diff --git a/logback-examples/src/main/java/chapter10/SimpleConfigurator.java b/logback-examples/src/main/java/chapters/appenders/onJoran/SimpleConfigurator.java
similarity index 97%
rename from logback-examples/src/main/java/chapter10/SimpleConfigurator.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/SimpleConfigurator.java
index 398d72e..b715b60 100644
--- a/logback-examples/src/main/java/chapter10/SimpleConfigurator.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/SimpleConfigurator.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10;
+package chapters.appenders.onJoran;
import java.util.List;
import java.util.Map;
diff --git a/logback-examples/src/main/java/chapter10/calculator/AddAction.java b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/AddAction.java
similarity index 97%
rename from logback-examples/src/main/java/chapter10/calculator/AddAction.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/AddAction.java
index 815ce63..3d6c7e2 100644
--- a/logback-examples/src/main/java/chapter10/calculator/AddAction.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/AddAction.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.calculator;
+package chapters.appenders.onJoran.calculator;
import java.util.EmptyStackException;
diff --git a/logback-examples/src/main/java/chapter10/calculator/Calculator1.java b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator1.java
similarity index 94%
rename from logback-examples/src/main/java/chapter10/calculator/Calculator1.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator1.java
index 5d44c18..dbe4fbf 100644
--- a/logback-examples/src/main/java/chapter10/calculator/Calculator1.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator1.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.calculator;
+package chapters.appenders.onJoran.calculator;
import java.util.HashMap;
import java.util.Map;
@@ -21,7 +21,7 @@ import ch.qos.logback.core.ContextBase;
import ch.qos.logback.core.joran.action.Action;
import ch.qos.logback.core.joran.spi.Pattern;
import ch.qos.logback.core.util.StatusPrinter;
-import chapter10.SimpleConfigurator;
+import chapters.appenders.onJoran.SimpleConfigurator;
/**
* This examples illustrates collaboration between multiple actions through the
diff --git a/logback-examples/src/main/java/chapter10/calculator/Calculator2.java b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator2.java
similarity index 95%
rename from logback-examples/src/main/java/chapter10/calculator/Calculator2.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator2.java
index 8b9acb0..9b04aad 100644
--- a/logback-examples/src/main/java/chapter10/calculator/Calculator2.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.calculator;
+package chapters.appenders.onJoran.calculator;
import java.util.HashMap;
import java.util.Map;
@@ -22,7 +22,7 @@ import ch.qos.logback.core.joran.action.Action;
import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.joran.spi.Pattern;
import ch.qos.logback.core.util.StatusPrinter;
-import chapter10.SimpleConfigurator;
+import chapters.appenders.onJoran.SimpleConfigurator;
/**
diff --git a/logback-examples/src/main/java/chapter10/calculator/ComputationAction1.java b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction1.java
similarity index 97%
rename from logback-examples/src/main/java/chapter10/calculator/ComputationAction1.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction1.java
index 64b876f..7ea7ade 100644
--- a/logback-examples/src/main/java/chapter10/calculator/ComputationAction1.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction1.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.calculator;
+package chapters.appenders.onJoran.calculator;
diff --git a/logback-examples/src/main/java/chapter10/calculator/ComputationAction2.java b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction2.java
similarity index 98%
rename from logback-examples/src/main/java/chapter10/calculator/ComputationAction2.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction2.java
index 6f95b08..749aabe 100644
--- a/logback-examples/src/main/java/chapter10/calculator/ComputationAction2.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.calculator;
+package chapters.appenders.onJoran.calculator;
import java.util.Stack;
diff --git a/logback-examples/src/main/java/chapter10/calculator/LiteralAction.java b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/LiteralAction.java
similarity index 97%
rename from logback-examples/src/main/java/chapter10/calculator/LiteralAction.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/LiteralAction.java
index a994cbe..72f4859 100644
--- a/logback-examples/src/main/java/chapter10/calculator/LiteralAction.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/LiteralAction.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.calculator;
+package chapters.appenders.onJoran.calculator;
import org.xml.sax.Attributes;
diff --git a/logback-examples/src/main/java/chapter10/calculator/MultiplyAction.java b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/MultiplyAction.java
similarity index 97%
rename from logback-examples/src/main/java/chapter10/calculator/MultiplyAction.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/MultiplyAction.java
index c35d79a..89dfcc6 100644
--- a/logback-examples/src/main/java/chapter10/calculator/MultiplyAction.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/MultiplyAction.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.calculator;
+package chapters.appenders.onJoran.calculator;
import org.xml.sax.Attributes;
diff --git a/logback-examples/src/main/java/chapter10/calculator/calculator1.xml b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/calculator1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter10/calculator/calculator1.xml
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/calculator1.xml
diff --git a/logback-examples/src/main/java/chapter10/calculator/calculator2.xml b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/calculator2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter10/calculator/calculator2.xml
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/calculator2.xml
diff --git a/logback-examples/src/main/java/chapter10/calculator/calculator3.xml b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/calculator3.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter10/calculator/calculator3.xml
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/calculator3.xml
diff --git a/logback-examples/src/main/java/chapter10/calculator/readme.txt b/logback-examples/src/main/java/chapters/appenders/onJoran/calculator/readme.txt
similarity index 100%
rename from logback-examples/src/main/java/chapter10/calculator/readme.txt
rename to logback-examples/src/main/java/chapters/appenders/onJoran/calculator/readme.txt
diff --git a/logback-examples/src/main/java/chapter10/helloWorld/HelloWorld.java b/logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorld.java
similarity index 93%
rename from logback-examples/src/main/java/chapter10/helloWorld/HelloWorld.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorld.java
index d310da6..a23400e 100644
--- a/logback-examples/src/main/java/chapter10/helloWorld/HelloWorld.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorld.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.helloWorld;
+package chapters.appenders.onJoran.helloWorld;
import java.util.HashMap;
import java.util.Map;
@@ -21,7 +21,7 @@ import ch.qos.logback.core.ContextBase;
import ch.qos.logback.core.joran.action.Action;
import ch.qos.logback.core.joran.spi.Pattern;
import ch.qos.logback.core.util.StatusPrinter;
-import chapter10.SimpleConfigurator;
+import chapters.appenders.onJoran.SimpleConfigurator;
/**
*
diff --git a/logback-examples/src/main/java/chapter10/helloWorld/HelloWorldAction.java b/logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorldAction.java
similarity index 95%
rename from logback-examples/src/main/java/chapter10/helloWorld/HelloWorldAction.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorldAction.java
index 9265bfc..6911df8 100644
--- a/logback-examples/src/main/java/chapter10/helloWorld/HelloWorldAction.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorldAction.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.helloWorld;
+package chapters.appenders.onJoran.helloWorld;
import org.xml.sax.Attributes;
diff --git a/logback-examples/src/main/java/chapter10/helloWorld/hello.xml b/logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/hello.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter10/helloWorld/hello.xml
rename to logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/hello.xml
diff --git a/logback-examples/src/main/java/chapter10/helloWorld/readme.txt b/logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/readme.txt
similarity index 100%
rename from logback-examples/src/main/java/chapter10/helloWorld/readme.txt
rename to logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/readme.txt
diff --git a/logback-examples/src/main/java/chapter10/implicit/NOPAction.java b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/NOPAction.java
similarity index 95%
rename from logback-examples/src/main/java/chapter10/implicit/NOPAction.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/implicit/NOPAction.java
index 7860860..b5018b8 100644
--- a/logback-examples/src/main/java/chapter10/implicit/NOPAction.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/NOPAction.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.implicit;
+package chapters.appenders.onJoran.implicit;
import org.xml.sax.Attributes;
diff --git a/logback-examples/src/main/java/chapter10/implicit/PrintMe.java b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMe.java
similarity index 95%
rename from logback-examples/src/main/java/chapter10/implicit/PrintMe.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMe.java
index e56df58..1a190f5 100644
--- a/logback-examples/src/main/java/chapter10/implicit/PrintMe.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMe.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.implicit;
+package chapters.appenders.onJoran.implicit;
import java.util.ArrayList;
import java.util.HashMap;
@@ -24,7 +24,7 @@ import ch.qos.logback.core.joran.action.Action;
import ch.qos.logback.core.joran.action.ImplicitAction;
import ch.qos.logback.core.joran.spi.Pattern;
import ch.qos.logback.core.util.StatusPrinter;
-import chapter10.SimpleConfigurator;
+import chapters.appenders.onJoran.SimpleConfigurator;
/**
* This example illustrates the usage of implicit actions.
diff --git a/logback-examples/src/main/java/chapter10/implicit/PrintMeImplicitAction.java b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMeImplicitAction.java
similarity index 96%
rename from logback-examples/src/main/java/chapter10/implicit/PrintMeImplicitAction.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMeImplicitAction.java
index aad3067..3a473b2 100644
--- a/logback-examples/src/main/java/chapter10/implicit/PrintMeImplicitAction.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMeImplicitAction.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.implicit;
+package chapters.appenders.onJoran.implicit;
import org.xml.sax.Attributes;
diff --git a/logback-examples/src/main/java/chapter10/implicit/implicit1.xml b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/implicit1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter10/implicit/implicit1.xml
rename to logback-examples/src/main/java/chapters/appenders/onJoran/implicit/implicit1.xml
diff --git a/logback-examples/src/main/java/chapter10/implicit/readme.txt b/logback-examples/src/main/java/chapters/appenders/onJoran/implicit/readme.txt
similarity index 100%
rename from logback-examples/src/main/java/chapter10/implicit/readme.txt
rename to logback-examples/src/main/java/chapters/appenders/onJoran/implicit/readme.txt
diff --git a/logback-examples/src/main/java/chapter10/newRule/NewRuleCalculator.java b/logback-examples/src/main/java/chapters/appenders/onJoran/newRule/NewRuleCalculator.java
similarity index 92%
rename from logback-examples/src/main/java/chapter10/newRule/NewRuleCalculator.java
rename to logback-examples/src/main/java/chapters/appenders/onJoran/newRule/NewRuleCalculator.java
index a1c6a82..8fe880f 100644
--- a/logback-examples/src/main/java/chapter10/newRule/NewRuleCalculator.java
+++ b/logback-examples/src/main/java/chapters/appenders/onJoran/newRule/NewRuleCalculator.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter10.newRule;
+package chapters.appenders.onJoran.newRule;
import java.util.HashMap;
import java.util.Map;
@@ -22,8 +22,8 @@ import ch.qos.logback.core.joran.action.Action;
import ch.qos.logback.core.joran.action.NewRuleAction;
import ch.qos.logback.core.joran.spi.Pattern;
import ch.qos.logback.core.util.StatusPrinter;
-import chapter10.SimpleConfigurator;
-import chapter10.calculator.ComputationAction1;
+import chapters.appenders.onJoran.SimpleConfigurator;
+import chapters.appenders.onJoran.calculator.ComputationAction1;
/**
* This example illustrates the usage of NewRuleAction which allows the Joran
diff --git a/logback-examples/src/main/java/chapter10/newRule/new-rule.xml b/logback-examples/src/main/java/chapters/appenders/onJoran/newRule/new-rule.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter10/newRule/new-rule.xml
rename to logback-examples/src/main/java/chapters/appenders/onJoran/newRule/new-rule.xml
diff --git a/logback-examples/src/main/java/chapter10/newRule/readme.txt b/logback-examples/src/main/java/chapters/appenders/onJoran/newRule/readme.txt
similarity index 100%
rename from logback-examples/src/main/java/chapter10/newRule/readme.txt
rename to logback-examples/src/main/java/chapters/appenders/onJoran/newRule/readme.txt
diff --git a/logback-examples/src/main/java/chapter4/sift/SiftExample.java b/logback-examples/src/main/java/chapters/appenders/sift/SiftExample.java
similarity index 97%
rename from logback-examples/src/main/java/chapter4/sift/SiftExample.java
rename to logback-examples/src/main/java/chapters/appenders/sift/SiftExample.java
index ec2f3c4..69227d2 100644
--- a/logback-examples/src/main/java/chapter4/sift/SiftExample.java
+++ b/logback-examples/src/main/java/chapters/appenders/sift/SiftExample.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4.sift;
+package chapters.appenders.sift;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter4/sift/access-siftingFile.xml b/logback-examples/src/main/java/chapters/appenders/sift/access-siftingFile.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/sift/access-siftingFile.xml
rename to logback-examples/src/main/java/chapters/appenders/sift/access-siftingFile.xml
diff --git a/logback-examples/src/main/java/chapter4/sift/byUserid.xml b/logback-examples/src/main/java/chapters/appenders/sift/byUserid.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/sift/byUserid.xml
rename to logback-examples/src/main/java/chapters/appenders/sift/byUserid.xml
diff --git a/logback-examples/src/main/java/chapter4/socket/SocketClient1.java b/logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java
similarity index 98%
rename from logback-examples/src/main/java/chapter4/socket/SocketClient1.java
rename to logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java
index d31e120..4c6bc2f 100644
--- a/logback-examples/src/main/java/chapter4/socket/SocketClient1.java
+++ b/logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4.socket;
+package chapters.appenders.socket;
import java.io.BufferedReader;
diff --git a/logback-examples/src/main/java/chapter4/socket/SocketClient2.java b/logback-examples/src/main/java/chapters/appenders/socket/SocketClient2.java
similarity index 98%
rename from logback-examples/src/main/java/chapter4/socket/SocketClient2.java
rename to logback-examples/src/main/java/chapters/appenders/socket/SocketClient2.java
index afc0378..53a0323 100644
--- a/logback-examples/src/main/java/chapter4/socket/SocketClient2.java
+++ b/logback-examples/src/main/java/chapters/appenders/socket/SocketClient2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4.socket;
+package chapters.appenders.socket;
import java.io.BufferedReader;
import java.io.InputStreamReader;
diff --git a/logback-examples/src/main/java/chapter4/socket/client1.xml b/logback-examples/src/main/java/chapters/appenders/socket/client1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/socket/client1.xml
rename to logback-examples/src/main/java/chapters/appenders/socket/client1.xml
diff --git a/logback-examples/src/main/java/chapter4/socket/server1.xml b/logback-examples/src/main/java/chapters/appenders/socket/server1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/socket/server1.xml
rename to logback-examples/src/main/java/chapters/appenders/socket/server1.xml
diff --git a/logback-examples/src/main/java/chapter4/socket/server2.xml b/logback-examples/src/main/java/chapters/appenders/socket/server2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter4/socket/server2.xml
rename to logback-examples/src/main/java/chapters/appenders/socket/server2.xml
diff --git a/logback-examples/src/main/java/chapter4/sub/sample/Bar.java b/logback-examples/src/main/java/chapters/appenders/sub/sample/Bar.java
similarity index 95%
rename from logback-examples/src/main/java/chapter4/sub/sample/Bar.java
rename to logback-examples/src/main/java/chapters/appenders/sub/sample/Bar.java
index 6c23233..3bc335d 100644
--- a/logback-examples/src/main/java/chapter4/sub/sample/Bar.java
+++ b/logback-examples/src/main/java/chapters/appenders/sub/sample/Bar.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter4.sub.sample;
+package chapters.appenders.sub.sample;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter2/Bar.java b/logback-examples/src/main/java/chapters/architecture/Bar.java
similarity index 95%
rename from logback-examples/src/main/java/chapter2/Bar.java
rename to logback-examples/src/main/java/chapters/architecture/Bar.java
index 146ead3..4f18b46 100644
--- a/logback-examples/src/main/java/chapter2/Bar.java
+++ b/logback-examples/src/main/java/chapters/architecture/Bar.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter2;
+package chapters.architecture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter2/HelloWorld2.java b/logback-examples/src/main/java/chapters/architecture/HelloWorld2.java
similarity index 87%
rename from logback-examples/src/main/java/chapter2/HelloWorld2.java
rename to logback-examples/src/main/java/chapters/architecture/HelloWorld2.java
index 127ad1f..3480847 100644
--- a/logback-examples/src/main/java/chapter2/HelloWorld2.java
+++ b/logback-examples/src/main/java/chapters/architecture/HelloWorld2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter2;
+package chapters.architecture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@ import ch.qos.logback.classic.util.LoggerStatusPrinter;
public class HelloWorld2 {
public static void main(String[] args) {
- Logger logger = LoggerFactory.getLogger("chapter2.HelloWorld2");
+ Logger logger = LoggerFactory.getLogger("manual.architecture.HelloWorld2");
logger.debug("Hello world.");
LoggerStatusPrinter.printStatusInDefaultContext();
}
diff --git a/logback-examples/src/main/java/chapter2/MyAppWithConfigFile.java b/logback-examples/src/main/java/chapters/architecture/MyAppWithConfigFile.java
similarity index 97%
rename from logback-examples/src/main/java/chapter2/MyAppWithConfigFile.java
rename to logback-examples/src/main/java/chapters/architecture/MyAppWithConfigFile.java
index c47da68..4940b49 100644
--- a/logback-examples/src/main/java/chapter2/MyAppWithConfigFile.java
+++ b/logback-examples/src/main/java/chapters/architecture/MyAppWithConfigFile.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter2;
+package chapters.architecture;
//Import SLF4J classes.
import org.slf4j.Logger;
diff --git a/logback-examples/src/main/java/chapter2/sample-config-1.xml b/logback-examples/src/main/java/chapters/architecture/sample-config-1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter2/sample-config-1.xml
rename to logback-examples/src/main/java/chapters/architecture/sample-config-1.xml
diff --git a/logback-examples/src/main/java/chapter2/sample-config-2.xml b/logback-examples/src/main/java/chapters/architecture/sample-config-2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter2/sample-config-2.xml
rename to logback-examples/src/main/java/chapters/architecture/sample-config-2.xml
diff --git a/logback-examples/src/main/java/chapter2/sample-config-3.xml b/logback-examples/src/main/java/chapters/architecture/sample-config-3.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter2/sample-config-3.xml
rename to logback-examples/src/main/java/chapters/architecture/sample-config-3.xml
diff --git a/logback-examples/src/main/java/chapter3/AddStatusListenerApp.java b/logback-examples/src/main/java/chapters/configuration/AddStatusListenerApp.java
similarity index 97%
rename from logback-examples/src/main/java/chapter3/AddStatusListenerApp.java
rename to logback-examples/src/main/java/chapters/configuration/AddStatusListenerApp.java
index d67239b..736d06c 100644
--- a/logback-examples/src/main/java/chapter3/AddStatusListenerApp.java
+++ b/logback-examples/src/main/java/chapters/configuration/AddStatusListenerApp.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter3;
+package chapters.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter3/Foo.java b/logback-examples/src/main/java/chapters/configuration/Foo.java
similarity index 95%
rename from logback-examples/src/main/java/chapter3/Foo.java
rename to logback-examples/src/main/java/chapters/configuration/Foo.java
index cb4befc..1ff7abd 100644
--- a/logback-examples/src/main/java/chapter3/Foo.java
+++ b/logback-examples/src/main/java/chapters/configuration/Foo.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter3;
+package chapters.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter3/MyApp1.java b/logback-examples/src/main/java/chapters/configuration/MyApp1.java
similarity index 96%
rename from logback-examples/src/main/java/chapter3/MyApp1.java
rename to logback-examples/src/main/java/chapters/configuration/MyApp1.java
index 6fa82d5..7cf1506 100644
--- a/logback-examples/src/main/java/chapter3/MyApp1.java
+++ b/logback-examples/src/main/java/chapters/configuration/MyApp1.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter3;
+package chapters.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter3/MyApp2.java b/logback-examples/src/main/java/chapters/configuration/MyApp2.java
similarity index 97%
rename from logback-examples/src/main/java/chapter3/MyApp2.java
rename to logback-examples/src/main/java/chapters/configuration/MyApp2.java
index 5de4075..eab221b 100644
--- a/logback-examples/src/main/java/chapter3/MyApp2.java
+++ b/logback-examples/src/main/java/chapters/configuration/MyApp2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter3;
+package chapters.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter3/MyApp3.java b/logback-examples/src/main/java/chapters/configuration/MyApp3.java
similarity index 98%
rename from logback-examples/src/main/java/chapter3/MyApp3.java
rename to logback-examples/src/main/java/chapters/configuration/MyApp3.java
index fa73aa1..2cc3199 100644
--- a/logback-examples/src/main/java/chapter3/MyApp3.java
+++ b/logback-examples/src/main/java/chapters/configuration/MyApp3.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter3;
+package chapters.configuration;
/**
* Demonstrates programmatic invocation of Joran.
diff --git a/logback-examples/src/main/java/chapter3/additivityFlag.xml b/logback-examples/src/main/java/chapters/configuration/additivityFlag.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/additivityFlag.xml
rename to logback-examples/src/main/java/chapters/configuration/additivityFlag.xml
diff --git a/logback-examples/src/main/java/chapter3/containingConfig.xml b/logback-examples/src/main/java/chapters/configuration/containingConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/containingConfig.xml
rename to logback-examples/src/main/java/chapters/configuration/containingConfig.xml
diff --git a/logback-examples/src/main/java/chapter3/contextName.xml b/logback-examples/src/main/java/chapters/configuration/contextName.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/contextName.xml
rename to logback-examples/src/main/java/chapters/configuration/contextName.xml
diff --git a/logback-examples/src/main/java/chapter3/duplicate.xml b/logback-examples/src/main/java/chapters/configuration/duplicate.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/duplicate.xml
rename to logback-examples/src/main/java/chapters/configuration/duplicate.xml
diff --git a/logback-examples/src/main/java/chapter3/includedConfig.xml b/logback-examples/src/main/java/chapters/configuration/includedConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/includedConfig.xml
rename to logback-examples/src/main/java/chapters/configuration/includedConfig.xml
diff --git a/logback-examples/src/main/java/chapter3/insertFromJNDI.xml b/logback-examples/src/main/java/chapters/configuration/insertFromJNDI.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/insertFromJNDI.xml
rename to logback-examples/src/main/java/chapters/configuration/insertFromJNDI.xml
diff --git a/logback-examples/src/main/java/chapter3/multiple.xml b/logback-examples/src/main/java/chapters/configuration/multiple.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/multiple.xml
rename to logback-examples/src/main/java/chapters/configuration/multiple.xml
diff --git a/logback-examples/src/main/java/chapter3/onConsoleStatusListener.xml b/logback-examples/src/main/java/chapters/configuration/onConsoleStatusListener.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/onConsoleStatusListener.xml
rename to logback-examples/src/main/java/chapters/configuration/onConsoleStatusListener.xml
diff --git a/logback-examples/src/main/java/chapter3/restricted.xml b/logback-examples/src/main/java/chapters/configuration/restricted.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/restricted.xml
rename to logback-examples/src/main/java/chapters/configuration/restricted.xml
diff --git a/logback-examples/src/main/java/chapter3/sample0.xml b/logback-examples/src/main/java/chapters/configuration/sample0.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/sample0.xml
rename to logback-examples/src/main/java/chapters/configuration/sample0.xml
diff --git a/logback-examples/src/main/java/chapter3/sample1.xml b/logback-examples/src/main/java/chapters/configuration/sample1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/sample1.xml
rename to logback-examples/src/main/java/chapters/configuration/sample1.xml
diff --git a/logback-examples/src/main/java/chapter3/sample2.xml b/logback-examples/src/main/java/chapters/configuration/sample2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/sample2.xml
rename to logback-examples/src/main/java/chapters/configuration/sample2.xml
diff --git a/logback-examples/src/main/java/chapter3/sample3.xml b/logback-examples/src/main/java/chapters/configuration/sample3.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/sample3.xml
rename to logback-examples/src/main/java/chapters/configuration/sample3.xml
diff --git a/logback-examples/src/main/java/chapter3/sample4.xml b/logback-examples/src/main/java/chapters/configuration/sample4.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/sample4.xml
rename to logback-examples/src/main/java/chapters/configuration/sample4.xml
diff --git a/logback-examples/src/main/java/chapter3/scan1.xml b/logback-examples/src/main/java/chapters/configuration/scan1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/scan1.xml
rename to logback-examples/src/main/java/chapters/configuration/scan1.xml
diff --git a/logback-examples/src/main/java/chapter3/scan2.xml b/logback-examples/src/main/java/chapters/configuration/scan2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/scan2.xml
rename to logback-examples/src/main/java/chapters/configuration/scan2.xml
diff --git a/logback-examples/src/main/java/chapter3/variableSubstitution1.xml b/logback-examples/src/main/java/chapters/configuration/variableSubstitution1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/variableSubstitution1.xml
rename to logback-examples/src/main/java/chapters/configuration/variableSubstitution1.xml
diff --git a/logback-examples/src/main/java/chapter3/variableSubstitution2.xml b/logback-examples/src/main/java/chapters/configuration/variableSubstitution2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/variableSubstitution2.xml
rename to logback-examples/src/main/java/chapters/configuration/variableSubstitution2.xml
diff --git a/logback-examples/src/main/java/chapter3/variableSubstitution3.xml b/logback-examples/src/main/java/chapters/configuration/variableSubstitution3.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/variableSubstitution3.xml
rename to logback-examples/src/main/java/chapters/configuration/variableSubstitution3.xml
diff --git a/logback-examples/src/main/java/chapter3/variableSubstitution4.xml b/logback-examples/src/main/java/chapters/configuration/variableSubstitution4.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter3/variableSubstitution4.xml
rename to logback-examples/src/main/java/chapters/configuration/variableSubstitution4.xml
diff --git a/logback-examples/src/main/java/chapter3/variables1.properties b/logback-examples/src/main/java/chapters/configuration/variables1.properties
similarity index 100%
rename from logback-examples/src/main/java/chapter3/variables1.properties
rename to logback-examples/src/main/java/chapters/configuration/variables1.properties
diff --git a/logback-examples/src/main/java/chapter3/variables2.properties b/logback-examples/src/main/java/chapters/configuration/variables2.properties
similarity index 100%
rename from logback-examples/src/main/java/chapter3/variables2.properties
rename to logback-examples/src/main/java/chapters/configuration/variables2.properties
diff --git a/logback-examples/src/main/java/chapter6/FilterEvents.java b/logback-examples/src/main/java/chapters/filters/FilterEvents.java
similarity index 98%
rename from logback-examples/src/main/java/chapter6/FilterEvents.java
rename to logback-examples/src/main/java/chapters/filters/FilterEvents.java
index a6658e0..232f889 100644
--- a/logback-examples/src/main/java/chapter6/FilterEvents.java
+++ b/logback-examples/src/main/java/chapters/filters/FilterEvents.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter6;
+package chapters.filters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter6/GoMDC.java b/logback-examples/src/main/java/chapters/filters/GoMDC.java
similarity index 98%
rename from logback-examples/src/main/java/chapter6/GoMDC.java
rename to logback-examples/src/main/java/chapters/filters/GoMDC.java
index 9ce9a27..3fef335 100644
--- a/logback-examples/src/main/java/chapter6/GoMDC.java
+++ b/logback-examples/src/main/java/chapters/filters/GoMDC.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter6;
+package chapters.filters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter6/SampleFilter.java b/logback-examples/src/main/java/chapters/filters/SampleFilter.java
similarity index 97%
rename from logback-examples/src/main/java/chapter6/SampleFilter.java
rename to logback-examples/src/main/java/chapters/filters/SampleFilter.java
index d70d280..f63e0ee 100644
--- a/logback-examples/src/main/java/chapter6/SampleFilter.java
+++ b/logback-examples/src/main/java/chapters/filters/SampleFilter.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter6;
+package chapters.filters;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
diff --git a/logback-examples/src/main/java/chapter6/SampleTurboFilter.java b/logback-examples/src/main/java/chapters/filters/SampleTurboFilter.java
similarity index 98%
rename from logback-examples/src/main/java/chapter6/SampleTurboFilter.java
rename to logback-examples/src/main/java/chapters/filters/SampleTurboFilter.java
index 9406840..c75ce45 100644
--- a/logback-examples/src/main/java/chapter6/SampleTurboFilter.java
+++ b/logback-examples/src/main/java/chapters/filters/SampleTurboFilter.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter6;
+package chapters.filters;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
diff --git a/logback-examples/src/main/java/chapter6/accessEventEvaluator.xml b/logback-examples/src/main/java/chapters/filters/accessEventEvaluator.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/accessEventEvaluator.xml
rename to logback-examples/src/main/java/chapters/filters/accessEventEvaluator.xml
diff --git a/logback-examples/src/main/java/chapter6/accessEventEvaluator2.xml b/logback-examples/src/main/java/chapters/filters/accessEventEvaluator2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/accessEventEvaluator2.xml
rename to logback-examples/src/main/java/chapters/filters/accessEventEvaluator2.xml
diff --git a/logback-examples/src/main/java/chapter6/basicConfiguration.xml b/logback-examples/src/main/java/chapters/filters/basicConfiguration.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/basicConfiguration.xml
rename to logback-examples/src/main/java/chapters/filters/basicConfiguration.xml
diff --git a/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml b/logback-examples/src/main/java/chapters/filters/basicEventEvaluator.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/basicEventEvaluator.xml
rename to logback-examples/src/main/java/chapters/filters/basicEventEvaluator.xml
diff --git a/logback-examples/src/main/java/chapter6/duplicateMessage.xml b/logback-examples/src/main/java/chapters/filters/duplicateMessage.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/duplicateMessage.xml
rename to logback-examples/src/main/java/chapters/filters/duplicateMessage.xml
diff --git a/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml b/logback-examples/src/main/java/chapters/filters/evaluatorWithMatcher.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml
rename to logback-examples/src/main/java/chapters/filters/evaluatorWithMatcher.xml
diff --git a/logback-examples/src/main/java/chapter6/levelFilterConfig.xml b/logback-examples/src/main/java/chapters/filters/levelFilterConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/levelFilterConfig.xml
rename to logback-examples/src/main/java/chapters/filters/levelFilterConfig.xml
diff --git a/logback-examples/src/main/java/chapter6/mdcfilter.xml b/logback-examples/src/main/java/chapters/filters/mdcfilter.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/mdcfilter.xml
rename to logback-examples/src/main/java/chapters/filters/mdcfilter.xml
diff --git a/logback-examples/src/main/java/chapter6/sampleFilterConfig.xml b/logback-examples/src/main/java/chapters/filters/sampleFilterConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/sampleFilterConfig.xml
rename to logback-examples/src/main/java/chapters/filters/sampleFilterConfig.xml
diff --git a/logback-examples/src/main/java/chapter6/sampleTurboFilterConfig.xml b/logback-examples/src/main/java/chapters/filters/sampleTurboFilterConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/sampleTurboFilterConfig.xml
rename to logback-examples/src/main/java/chapters/filters/sampleTurboFilterConfig.xml
diff --git a/logback-examples/src/main/java/chapter6/thresholdFilterConfig.xml b/logback-examples/src/main/java/chapters/filters/thresholdFilterConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/thresholdFilterConfig.xml
rename to logback-examples/src/main/java/chapters/filters/thresholdFilterConfig.xml
diff --git a/logback-examples/src/main/java/chapter6/turboFilters.xml b/logback-examples/src/main/java/chapters/filters/turboFilters.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter6/turboFilters.xml
rename to logback-examples/src/main/java/chapters/filters/turboFilters.xml
diff --git a/logback-examples/src/main/java/chapter1/HelloWorld1.java b/logback-examples/src/main/java/chapters/introduction/HelloWorld1.java
similarity index 85%
rename from logback-examples/src/main/java/chapter1/HelloWorld1.java
rename to logback-examples/src/main/java/chapters/introduction/HelloWorld1.java
index 10f2651..739aa7a 100644
--- a/logback-examples/src/main/java/chapter1/HelloWorld1.java
+++ b/logback-examples/src/main/java/chapters/introduction/HelloWorld1.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter1;
+package chapters.introduction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,7 +20,7 @@ public class HelloWorld1 {
public static void main(String[] args) {
- Logger logger = LoggerFactory.getLogger("chapter1.HelloWorld1");
+ Logger logger = LoggerFactory.getLogger("chapters.introduction.HelloWorld1");
logger.debug("Hello world.");
}
}
diff --git a/logback-examples/src/main/java/chapter1/HelloWorld2.java b/logback-examples/src/main/java/chapters/introduction/HelloWorld2.java
similarity index 88%
rename from logback-examples/src/main/java/chapter1/HelloWorld2.java
rename to logback-examples/src/main/java/chapters/introduction/HelloWorld2.java
index a67018f..e0e8216 100644
--- a/logback-examples/src/main/java/chapter1/HelloWorld2.java
+++ b/logback-examples/src/main/java/chapters/introduction/HelloWorld2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter1;
+package chapters.introduction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@ import ch.qos.logback.core.util.StatusPrinter;
public class HelloWorld2 {
public static void main(String[] args) {
- Logger logger = LoggerFactory.getLogger("chapter1.HelloWorld2");
+ Logger logger = LoggerFactory.getLogger("chapters.introduction.HelloWorld2");
logger.debug("Hello world.");
// print internal state
diff --git a/logback-examples/src/main/java/chapter5/CallerEvaluatorExample.java b/logback-examples/src/main/java/chapters/layouts/CallerEvaluatorExample.java
similarity index 98%
rename from logback-examples/src/main/java/chapter5/CallerEvaluatorExample.java
rename to logback-examples/src/main/java/chapters/layouts/CallerEvaluatorExample.java
index 2cd2dd5..87e2117 100644
--- a/logback-examples/src/main/java/chapter5/CallerEvaluatorExample.java
+++ b/logback-examples/src/main/java/chapters/layouts/CallerEvaluatorExample.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter5/ExceptionEvaluatorExample.java b/logback-examples/src/main/java/chapters/layouts/ExceptionEvaluatorExample.java
similarity index 98%
rename from logback-examples/src/main/java/chapter5/ExceptionEvaluatorExample.java
rename to logback-examples/src/main/java/chapters/layouts/ExceptionEvaluatorExample.java
index 6ba79bf..fac16d7 100644
--- a/logback-examples/src/main/java/chapter5/ExceptionEvaluatorExample.java
+++ b/logback-examples/src/main/java/chapters/layouts/ExceptionEvaluatorExample.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter5/MySampleConverter.java b/logback-examples/src/main/java/chapters/layouts/MySampleConverter.java
similarity index 98%
rename from logback-examples/src/main/java/chapter5/MySampleConverter.java
rename to logback-examples/src/main/java/chapters/layouts/MySampleConverter.java
index ac91980..57721be 100644
--- a/logback-examples/src/main/java/chapter5/MySampleConverter.java
+++ b/logback-examples/src/main/java/chapters/layouts/MySampleConverter.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.pattern.ClassicConverter;
diff --git a/logback-examples/src/main/java/chapter5/MySampleLayout.java b/logback-examples/src/main/java/chapters/layouts/MySampleLayout.java
similarity index 97%
rename from logback-examples/src/main/java/chapter5/MySampleLayout.java
rename to logback-examples/src/main/java/chapters/layouts/MySampleLayout.java
index 38caefd..6e88ff2 100644
--- a/logback-examples/src/main/java/chapter5/MySampleLayout.java
+++ b/logback-examples/src/main/java/chapters/layouts/MySampleLayout.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.CoreConstants;
diff --git a/logback-examples/src/main/java/chapter5/MySampleLayout2.java b/logback-examples/src/main/java/chapters/layouts/MySampleLayout2.java
similarity index 98%
rename from logback-examples/src/main/java/chapter5/MySampleLayout2.java
rename to logback-examples/src/main/java/chapters/layouts/MySampleLayout2.java
index 87b1c43..be8ba9b 100644
--- a/logback-examples/src/main/java/chapter5/MySampleLayout2.java
+++ b/logback-examples/src/main/java/chapters/layouts/MySampleLayout2.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.CoreConstants;
diff --git a/logback-examples/src/main/java/chapter5/PatternSample.java b/logback-examples/src/main/java/chapters/layouts/PatternSample.java
similarity index 97%
rename from logback-examples/src/main/java/chapter5/PatternSample.java
rename to logback-examples/src/main/java/chapters/layouts/PatternSample.java
index 07b1ede..d4d7786 100644
--- a/logback-examples/src/main/java/chapter5/PatternSample.java
+++ b/logback-examples/src/main/java/chapters/layouts/PatternSample.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter5/SampleLogging.java b/logback-examples/src/main/java/chapters/layouts/SampleLogging.java
similarity index 98%
rename from logback-examples/src/main/java/chapter5/SampleLogging.java
rename to logback-examples/src/main/java/chapters/layouts/SampleLogging.java
index e62cd93..8a694cc 100644
--- a/logback-examples/src/main/java/chapter5/SampleLogging.java
+++ b/logback-examples/src/main/java/chapters/layouts/SampleLogging.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter5/TestException.java b/logback-examples/src/main/java/chapters/layouts/TestException.java
similarity index 96%
rename from logback-examples/src/main/java/chapter5/TestException.java
rename to logback-examples/src/main/java/chapters/layouts/TestException.java
index 4eb054f..84257a1 100644
--- a/logback-examples/src/main/java/chapter5/TestException.java
+++ b/logback-examples/src/main/java/chapters/layouts/TestException.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter5;
+package chapters.layouts;
public class TestException extends Exception {
diff --git a/logback-examples/src/main/java/chapter5/callerEvaluatorConfig.xml b/logback-examples/src/main/java/chapters/layouts/callerEvaluatorConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter5/callerEvaluatorConfig.xml
rename to logback-examples/src/main/java/chapters/layouts/callerEvaluatorConfig.xml
diff --git a/logback-examples/src/main/java/chapter5/exceptionEvaluatorConfig.xml b/logback-examples/src/main/java/chapters/layouts/exceptionEvaluatorConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter5/exceptionEvaluatorConfig.xml
rename to logback-examples/src/main/java/chapters/layouts/exceptionEvaluatorConfig.xml
diff --git a/logback-examples/src/main/java/chapter5/mySampleConverterConfig.xml b/logback-examples/src/main/java/chapters/layouts/mySampleConverterConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter5/mySampleConverterConfig.xml
rename to logback-examples/src/main/java/chapters/layouts/mySampleConverterConfig.xml
diff --git a/logback-examples/src/main/java/chapter5/sampleLayoutConfig.xml b/logback-examples/src/main/java/chapters/layouts/sampleLayoutConfig.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter5/sampleLayoutConfig.xml
rename to logback-examples/src/main/java/chapters/layouts/sampleLayoutConfig.xml
diff --git a/logback-examples/src/main/java/chapter5/sampleLayoutConfig2.xml b/logback-examples/src/main/java/chapters/layouts/sampleLayoutConfig2.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter5/sampleLayoutConfig2.xml
rename to logback-examples/src/main/java/chapters/layouts/sampleLayoutConfig2.xml
diff --git a/logback-examples/src/main/java/chapter7/NumberCruncher.java b/logback-examples/src/main/java/chapters/mdc/NumberCruncher.java
similarity index 97%
rename from logback-examples/src/main/java/chapter7/NumberCruncher.java
rename to logback-examples/src/main/java/chapters/mdc/NumberCruncher.java
index 4ae4151..504ebfe 100644
--- a/logback-examples/src/main/java/chapter7/NumberCruncher.java
+++ b/logback-examples/src/main/java/chapters/mdc/NumberCruncher.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter7;
+package chapters.mdc;
import java.rmi.Remote;
import java.rmi.RemoteException;
diff --git a/logback-examples/src/main/java/chapter7/NumberCruncherClient.java b/logback-examples/src/main/java/chapters/mdc/NumberCruncherClient.java
similarity index 99%
rename from logback-examples/src/main/java/chapter7/NumberCruncherClient.java
rename to logback-examples/src/main/java/chapters/mdc/NumberCruncherClient.java
index 2a06829..5c58943 100644
--- a/logback-examples/src/main/java/chapter7/NumberCruncherClient.java
+++ b/logback-examples/src/main/java/chapters/mdc/NumberCruncherClient.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter7;
+package chapters.mdc;
import java.io.BufferedReader;
import java.io.InputStreamReader;
diff --git a/logback-examples/src/main/java/chapter7/NumberCruncherServer.java b/logback-examples/src/main/java/chapters/mdc/NumberCruncherServer.java
similarity index 99%
rename from logback-examples/src/main/java/chapter7/NumberCruncherServer.java
rename to logback-examples/src/main/java/chapters/mdc/NumberCruncherServer.java
index 6977152..47fa237 100644
--- a/logback-examples/src/main/java/chapter7/NumberCruncherServer.java
+++ b/logback-examples/src/main/java/chapters/mdc/NumberCruncherServer.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter7;
+package chapters.mdc;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
diff --git a/logback-examples/src/main/java/chapter7/SimpleMDC.java b/logback-examples/src/main/java/chapters/mdc/SimpleMDC.java
similarity index 99%
rename from logback-examples/src/main/java/chapter7/SimpleMDC.java
rename to logback-examples/src/main/java/chapters/mdc/SimpleMDC.java
index 228ae70..a2fa7ae 100644
--- a/logback-examples/src/main/java/chapter7/SimpleMDC.java
+++ b/logback-examples/src/main/java/chapters/mdc/SimpleMDC.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter7;
+package chapters.mdc;
import java.net.URL;
diff --git a/logback-examples/src/main/java/chapter7/UserServletFilter.java b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java
similarity index 99%
rename from logback-examples/src/main/java/chapter7/UserServletFilter.java
rename to logback-examples/src/main/java/chapters/mdc/UserServletFilter.java
index abd5d1a..5feed3f 100644
--- a/logback-examples/src/main/java/chapter7/UserServletFilter.java
+++ b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter7;
+package chapters.mdc;
import java.io.IOException;
import java.security.Principal;
diff --git a/logback-examples/src/main/java/chapter7/mdc1.xml b/logback-examples/src/main/java/chapters/mdc/mdc1.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter7/mdc1.xml
rename to logback-examples/src/main/java/chapters/mdc/mdc1.xml
diff --git a/logback-examples/src/main/java/chapter7/simpleMDC.xml b/logback-examples/src/main/java/chapters/mdc/simpleMDC.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter7/simpleMDC.xml
rename to logback-examples/src/main/java/chapters/mdc/simpleMDC.xml
diff --git a/logback-examples/src/main/java/chapter11/Log4jMain.java b/logback-examples/src/main/java/chapters/migrationFromLog4j/Log4jMain.java
similarity index 96%
rename from logback-examples/src/main/java/chapter11/Log4jMain.java
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/Log4jMain.java
index b5aeda9..281fd6e 100644
--- a/logback-examples/src/main/java/chapter11/Log4jMain.java
+++ b/logback-examples/src/main/java/chapters/migrationFromLog4j/Log4jMain.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter11;
+package chapters.migrationFromLog4j;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
diff --git a/logback-examples/src/main/java/chapter11/LogbackMain.java b/logback-examples/src/main/java/chapters/migrationFromLog4j/LogbackMain.java
similarity index 97%
rename from logback-examples/src/main/java/chapter11/LogbackMain.java
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/LogbackMain.java
index 6ec22bd..feb8532 100644
--- a/logback-examples/src/main/java/chapter11/LogbackMain.java
+++ b/logback-examples/src/main/java/chapters/migrationFromLog4j/LogbackMain.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter11;
+package chapters.migrationFromLog4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/logback-examples/src/main/java/chapter11/TrivialLog4jAppender.java b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jAppender.java
similarity index 95%
rename from logback-examples/src/main/java/chapter11/TrivialLog4jAppender.java
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jAppender.java
index 9ccafce..2dc1d5e 100644
--- a/logback-examples/src/main/java/chapter11/TrivialLog4jAppender.java
+++ b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jAppender.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter11;
+package chapters.migrationFromLog4j;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.spi.LoggingEvent;
diff --git a/logback-examples/src/main/java/chapter11/TrivialLog4jLayout.java b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jLayout.java
similarity index 96%
rename from logback-examples/src/main/java/chapter11/TrivialLog4jLayout.java
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jLayout.java
index cc2726a..67105ef 100644
--- a/logback-examples/src/main/java/chapter11/TrivialLog4jLayout.java
+++ b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jLayout.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter11;
+package chapters.migrationFromLog4j;
import org.apache.log4j.Layout;
import org.apache.log4j.spi.LoggingEvent;
diff --git a/logback-examples/src/main/java/chapter11/TrivialLogbackAppender.java b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackAppender.java
similarity index 97%
rename from logback-examples/src/main/java/chapter11/TrivialLogbackAppender.java
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackAppender.java
index bbcad79..3579a04 100644
--- a/logback-examples/src/main/java/chapter11/TrivialLogbackAppender.java
+++ b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackAppender.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter11;
+package chapters.migrationFromLog4j;
import java.io.IOException;
diff --git a/logback-examples/src/main/java/chapter11/TrivialLogbackLayout.java b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackLayout.java
similarity index 96%
rename from logback-examples/src/main/java/chapter11/TrivialLogbackLayout.java
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackLayout.java
index 5f032bb..5fa2b43 100644
--- a/logback-examples/src/main/java/chapter11/TrivialLogbackLayout.java
+++ b/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackLayout.java
@@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
-package chapter11;
+package chapters.migrationFromLog4j;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.LayoutBase;
diff --git a/logback-examples/src/main/java/chapter11/log4jTrivial.properties b/logback-examples/src/main/java/chapters/migrationFromLog4j/log4jTrivial.properties
similarity index 100%
rename from logback-examples/src/main/java/chapter11/log4jTrivial.properties
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/log4jTrivial.properties
diff --git a/logback-examples/src/main/java/chapter11/logback-trivial.xml b/logback-examples/src/main/java/chapters/migrationFromLog4j/logback-trivial.xml
similarity index 100%
rename from logback-examples/src/main/java/chapter11/logback-trivial.xml
rename to logback-examples/src/main/java/chapters/migrationFromLog4j/logback-trivial.xml
diff --git a/logback-site/src/site/pages/manual/architecture.html b/logback-site/src/site/pages/manual/architecture.html
index 782d36a..19ba1f9 100644
--- a/logback-site/src/site/pages/manual/architecture.html
+++ b/logback-site/src/site/pages/manual/architecture.html
@@ -633,7 +633,7 @@ Logger y = LoggerFactory.getLogger("wombat");</pre>
something akin to:
</p>
- <div class="prettyprint source"><pre>176 [main] DEBUG chapter2.HelloWorld2 - Hello world.</pre></div>
+ <div class="prettyprint source"><pre>176 [main] DEBUG manual.architecture.HelloWorld2 - Hello world.</pre></div>
<p>The first field is the number of milliseconds elapsed since the
start of the program. The second field is the thread making the
@@ -677,9 +677,9 @@ Logger y = LoggerFactory.getLogger("wombat");</pre>
hand, if the logger is enabled for the DEBUG level, you will incur
the cost of evaluating whether the logger is enabled or not,
twice: once in <code>debugEnabled</code> and once in
- <code>debug</code>. This is an insignificant overhead because
- evaluating a logger takes less than 1% of the time it takes to
- actually log a request.
+ <code>debug</code>. In practice, this overhead is insignificant
+ because evaluating a logger takes less than 1% of the time it
+ takes to actually log a request.
</p>
<h4>Better alternative</h4>
@@ -815,7 +815,7 @@ logger.debug("Value {} was inserted between {} and {}.", paramArray);</pre>
want to click on the image to display its bigger version.
</p>
- <a href="underTheHood.html"><img src="images/chapter2/underTheHoodSequence2_small.gif" alt="underTheHoodSequence2_small.gif"/></a>
+ <a href="underTheHood.html"><img src="images/manual/architecture/underTheHoodSequence2_small.gif" alt="underTheHoodSequence2_small.gif"/></a>
<a name="Performance"></a>
<h3>Performance</h3>
diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html
index d3a135e..ae25f6e 100644
--- a/logback-site/src/site/pages/manual/configuration.html
+++ b/logback-site/src/site/pages/manual/configuration.html
@@ -131,9 +131,9 @@
<em>Example 3.<span class="autoEx"/>: Simple example of
<code>BasicConfigurator</code> usage <a
- href="../xref/chapter3/MyApp1.html">(logback-examples/src/main/java/chapter3/MyApp1.java)</a></em>
+ href="../xref/chapters/configuration/MyApp1.html">(logback-examples/src/main/java/chapters/configuration/MyApp1.java)</a></em>
- <pre class="prettyprint source">package chapter3;
+ <pre class="prettyprint source">package manual.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -155,10 +155,10 @@ public class MyApp1 {
</p>
<em>Example 3.<span class="autoEx"/>: Small class doing logging
- <a href="../xref/chapter3/Foo.html">(logback-examples/src/main/java/chapter3/Foo.java)</a>
+ <a href="../xref/chapters/configuration/Foo.html">(logback-examples/src/main/java/chapters/configuration/Foo.java)</a>
</em>
- <pre class="prettyprint source">package chapter3;
+ <pre class="prettyprint source">package chapters.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -192,13 +192,13 @@ public class Foo {
the root logger is assigned the <code>DEBUG</code> level.
</p>
- <p>Thus, the output of the command <em>java chapter3.MyApp1</em>
+ <p>Thus, the output of the command <em>java chapters.configuration.MyApp1</em>
should be similar to:
</p>
- <p class="source">16:06:09.031 [main] INFO chapter3.MyApp1 - Entering application.
-16:06:09.046 [main] DEBUG chapter3.Foo - Did it again!
-16:06:09.046 [main] INFO chapter3.MyApp1 - Exiting application.</p>
+ <p class="source">16:06:09.031 [main] INFO chapters.configuration.MyApp1 - Entering application.
+16:06:09.046 [main] DEBUG chapters.configuration.Foo - Did it again!
+16:06:09.046 [main] INFO chapters.configuration.MyApp1 - Exiting application.</p>
<div class="highlight">
@@ -234,7 +234,7 @@ public class Foo {
</p>
<p><em>Example 3.<span class="autoEx"/>: Basic configuration file
- (logback-examples/src/main/java/chapter3/sample0.xml)</em></p>
+ (logback-examples/src/main/java/chapters/configuration/sample0.xml)</em></p>
<pre class="prettyprint source"><configuration>
@@ -276,7 +276,7 @@ public class Foo {
<em>Example 3.<span class="autoEx"/>: Print logback's internal status information
<a
- href="../xref/chapter3/MyApp2.html">(logback-examples/src/main/java/chapter3/MyApp2.java)</a></em>
+ href="../xref/chapters/configuration/MyApp2.html">(logback-examples/src/main/java/chapters/configuration/MyApp2.java)</a></em>
<pre class="prettyprint lang-java source">
@@ -298,9 +298,9 @@ public class Foo {
17:44:58,812 |-INFO in ch.qos.logback.classic.joran.action.LevelAction - root level set to DEBUG
17:44:58,812 |-INFO in ch.qos.logback.core.joran.action.AppenderRefAction - Attaching appender named [STDOUT] to Logger[root]
-17:44:58.828 [main] INFO chapter3.MyApp2 - Entering application.
-17:44:58.828 [main] DEBUG chapter3.Foo - Did it again!
-17:44:58.828 [main] INFO chapter3.MyApp2 - Exiting application.
+17:44:58.828 [main] INFO chapters.configuration.MyApp2 - Entering application.
+17:44:58.828 [main] DEBUG chapters.configuration.Foo - Did it again!
+17:44:58.828 [main] INFO chapters.configuration.MyApp2 - Exiting application.
</pre></div>
<p>At the end of this output, you can recognize the lines that were
@@ -325,7 +325,7 @@ public class Foo {
<em>Example 3.<span class="autoEx"/>: Basic configuration file
using debug mode
- (logback-examples/src/main/java/chapter3/sample1.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/sample1.xml)</em>
<pre class="prettyprint source">
<configuration <b>debug="true"</b>>
@@ -373,7 +373,7 @@ public class Foo {
file external to the application.
</p>
- <p class="source">java <b>-Dlogback.configurationFile=/path/to/config.xml</b> chapter3.MyApp1</p>
+ <p class="source">java <b>-Dlogback.configurationFile=/path/to/config.xml</b> chapters.configuration.MyApp1</p>
<h3><a name="autoScan" href="#autoScan">Automatically reloading
@@ -397,7 +397,7 @@ public class Foo {
</p>
<em>Example 3.<span class="autoEx"/>: Scanning for changes in
configuration file and automatic re-configuraion
- (logback-examples/src/main/java/chapter3/scan1.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/scan1.xml)</em>
<pre class="prettyprint source">
<configuration <b>scan="true"</b>>
@@ -414,7 +414,7 @@ public class Foo {
<em>Example 3.<span class="autoEx"/>: Specifying a different
scanning period
- (logback-examples/src/main/java/chapter3/scan2.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/scan2.xml)</em>
<pre class="prettyprint source">
<configuration scan="true" <b>scanPeriod="30 seconds"</b> >
@@ -466,9 +466,9 @@ public class Foo {
<p><em>Example 3.<span class="autoEx"/>: Invoking
<code>JoranConfigurator</code> directly <a
- href="../xref/chapter3/MyApp3.html">(logback-examples/src/main/java/chapter3/MyApp3.java)</a></em></p>
+ href="../xref/chapters/configuration/MyApp3.html">(logback-examples/src/main/java/chapters/configuration/MyApp3.java)</a></em></p>
-<pre class="prettyprint source">package chapter3;
+<pre class="prettyprint source">package chapters.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -540,8 +540,8 @@ public class MyApp3 {
<code>LoggerContext</code> as an HTML table. Here is sample output.
</p>
- <a href="images/chapter3/lbClassicStatus.jpg">
- <img src="images/chapter3/lbClassicStatus.jpg" alt="click to enlarge" width="90%"/>
+ <a href="images/chapters/configuration/lbClassicStatus.jpg">
+ <img src="images/chapters/configuration/lbClassicStatus.jpg" alt="click to enlarge" width="90%"/>
</a>
<p>To add this servlet to your web-application, add the following
@@ -584,7 +584,7 @@ public class MyApp3 {
</p>
<p>Here is <a
- href="../xref/chapter3/AddStatusListenerApp.html">sample code</a>
+ href="../xref/chapters/configuration/AddStatusListenerApp.html">sample code</a>
to register an OnConsoleStatusListener instance with the
StatusManager.
</p>
@@ -601,7 +601,7 @@ public class MyApp3 {
<p>It is also possible to register one or more status listeners
within a configuration file. Here is an example.</p>
- <p><em>Example 3.<span class="autoEx"/>: Registering a status listener (logback-examples/src/main/java/chapter3/onConsoleStatusListener.xml)</em></p>
+ <p><em>Example 3.<span class="autoEx"/>: Registering a status listener (logback-examples/src/main/java/chapters/configuration/onConsoleStatusListener.xml)</em></p>
<pre class="prettyprint source"><configuration>
<b><statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /></b>
@@ -647,7 +647,7 @@ public class MyApp3 {
<p align="left">
- <img src="images/chapter3/basicSyntax.png"
+ <img src="images/chapters/configuration/basicSyntax.png"
alt="basic Syntax" title="Basic configuration file structure"/>
</p>
@@ -738,11 +738,11 @@ public class MyApp3 {
<p>Setting the level of a logger or root logger is as simple as
declaring it and setting its level, as the next example
illustrates. Suppose we are no longer interested in seeing any DEBUG
- messages from any component belonging to the "chapter3" package. The
+ messages from any component belonging to the "chapters.configuration" package. The
following configuration file shows how to achieve that.
</p>
-<em>Example 3.<span class="autoEx"/>: Setting the level of a logger (logback-examples/src/main/java/chapter3/sample2.xml)</em>
+<em>Example 3.<span class="autoEx"/>: Setting the level of a logger (logback-examples/src/main/java/chapters/configuration/sample2.xml)</em>
<pre class="prettyprint source"><configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -751,7 +751,7 @@ public class MyApp3 {
</layout>
</appender>
- <b><logger name="chapter3" level="INFO"/></b>
+ <b><logger name="chapters.configuration" level="INFO"/></b>
<!-- Strictly speaking, the level attribute is not necessary since -->
<!-- the level of the root level is set to DEBUG by default. -->
@@ -765,16 +765,16 @@ public class MyApp3 {
invoked with the <em>MyApp3</em> application.
</p>
-<pre class="source">17:34:07.578 [main] INFO chapter3.MyApp3 - Entering application.
-17:34:07.578 [main] INFO chapter3.MyApp3 - Exiting application.</pre>
+<pre class="source">17:34:07.578 [main] INFO chapters.configuration.MyApp3 - Entering application.
+17:34:07.578 [main] INFO chapters.configuration.MyApp3 - Exiting application.</pre>
<p>You can configure the levels of as many loggers as you wish. In
the next configuration file, we set the level of the
- <em>chapter3</em> logger to INFO but at the same time set the level
- of the <em>chapter3.Foo</em> logger to <code>DEBUG</code>.
+ <em>chapters.configuration</em> logger to INFO but at the same time set the level
+ of the <em>chapters.configuration.Foo</em> logger to <code>DEBUG</code>.
</p>
-<em>Example 3.<span class="autoEx"/>: Setting the level of multiple loggers (logback-examples/src/main/java/chapter3/sample3.xml)</em>
+<em>Example 3.<span class="autoEx"/>: Setting the level of multiple loggers (logback-examples/src/main/java/chapters/configuration/sample3.xml)</em>
<pre class="source prettyprint"><configuration>
<appender name="STDOUT"
@@ -786,8 +786,8 @@ public class MyApp3 {
</layout>
</appender>
- <b><logger name="chapter3" level="INFO" />
- <logger name="chapter3.Foo" level="DEBUG" /></b>
+ <b><logger name="chapters.configuration" level="INFO" />
+ <logger name="chapters.configuration.Foo" level="DEBUG" /></b>
<root level="DEBUG">
<appender-ref ref="STDOUT" />
@@ -799,9 +799,9 @@ public class MyApp3 {
result in the following output on the console:
</p>
-<p class="prettyprint source">17:39:27.593 [main] INFO chapter3.MyApp3 - Entering application.
-17:39:27.593 [main] DEBUG chapter3.Foo - Did it again!
-17:39:27.593 [main] INFO chapter3.MyApp3 - Exiting application.</p>
+<p class="prettyprint source">17:39:27.593 [main] INFO chapters.configuration.MyApp3 - Entering application.
+17:39:27.593 [main] DEBUG chapters.configuration.Foo - Did it again!
+17:39:27.593 [main] INFO chapters.configuration.MyApp3 - Exiting application.</p>
<p>The table below list the loggers and their levels, after
<code>JoranConfigurator</code> has configured logback with the
@@ -820,17 +820,17 @@ public class MyApp3 {
<td><code>DEBUG</code></td>
</tr>
<tr class="alt">
- <td>chapter3</td>
+ <td>chapters.configuration</td>
<td><code>INFO</code></td>
<td><code>INFO</code></td>
</tr>
<tr>
- <td>chapter3.MyApp3</td>
+ <td>chapters.configuration.MyApp3</td>
<td><code>null</code></td>
<td><code>INFO</code></td>
</tr>
<tr class="alt">
- <td>chapter3.Foo</td>
+ <td>chapters.configuration.Foo</td>
<td><code>DEBUG</code></td>
<td><code>DEBUG</code></td>
</tr>
@@ -854,7 +854,7 @@ public class MyApp3 {
</p>
<em>Example 3.<span class="autoEx"/>: Logger level sample
- (logback-examples/src/main/java/chapter3/sample4.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/sample4.xml)</em>
<pre class="prettyprint source"><configuration>
<appender name="STDOUT"
@@ -866,7 +866,7 @@ public class MyApp3 {
</layout>
</appender>
- <b><logger name="chapter3" level="INFO" /></b>
+ <b><logger name="chapters.configuration" level="INFO" /></b>
<!-- turn OFF all logging (children can override) -->
<root <b>level="OFF"</b>>
@@ -891,17 +891,17 @@ public class MyApp3 {
<td><code>OFF</code></td>
</tr>
<tr class="alt">
- <td>chapter3</td>
+ <td>chapters.configuration</td>
<td><code>INFO</code></td>
<td><code>INFO</code></td>
</tr>
<tr>
- <td>chapter3.MyApp3</td>
+ <td>chapters.configuration.MyApp3</td>
<td><code>null</code></td>
<td><code>INFO</code></td>
</tr>
<tr class="alt">
- <td>chapter3.Foo</td>
+ <td>chapters.configuration.Foo</td>
<td><code>null</code></td>
<td><code>INFO</code></td>
</tr>
@@ -914,13 +914,13 @@ public class MyApp3 {
yield:
</p>
- <div class="source"><pre>17:52:23.609 [main] INFO chapter3.MyApp3 - Entering application.
-17:52:23.609 [main] INFO chapter3.MyApp3 - Exiting application.</pre></div>
+ <div class="source"><pre>17:52:23.609 [main] INFO chapters.configuration.MyApp3 - Entering application.
+17:52:23.609 [main] INFO chapters.configuration.MyApp3 - Exiting application.</pre></div>
<p>Thus, the level of the root logger has no apparent effect because
- the loggers in <code>chapter3.MyApp3</code> and
- <code>chapter3.Foo</code> classes are all enabled for the
- <code>INFO</code> level. As a side note, the <em>chapter3</em>
+ the loggers in <code>chapters.configuration.MyApp3</code> and
+ <code>chapters.configuration.Foo</code> classes are all enabled for the
+ <code>INFO</code> level. As a side note, the <em>chapters.configuration</em>
logger exists by virtue of its declaration in the configuration file
- even if the Java source code does not directly refer to it.
</p>
@@ -945,7 +945,7 @@ public class MyApp3 {
</p>
<p align="left">
- <img src="images/chapter3/appenderSyntax.png"
+ <img src="images/chapters/configuration/appenderSyntax.png"
alt="Appender Syntax" title="Appender element syntax"/>
</p>
@@ -961,7 +961,7 @@ public class MyApp3 {
configuration file illustrates:
</p>
-<em>Example 3.<span class="autoEx"/>: Multiple loggers (logback-examples/src/main/java/chapter3/multiple.xml)</em>
+<em>Example 3.<span class="autoEx"/>: Multiple loggers (logback-examples/src/main/java/chapters/configuration/multiple.xml)</em>
<pre class="prettyprint source"><configuration>
<appender name="<b>FILE</b>" class="ch.qos.logback.core.FileAppender">
@@ -1011,7 +1011,7 @@ public class MyApp3 {
</p>
<em>Example 3.<span class="autoEx"/>: Duplicate appender
- (logback-examples/src/main/java/chapter3/duplicate.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/duplicate.xml)</em>
<pre class="prettyprint source"><configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -1020,7 +1020,7 @@ public class MyApp3 {
</layout>
</appender>
- <logger name="chapter3">
+ <logger name="chapters.configuration">
<appender-ref ref="STDOUT" />
</logger>
@@ -1033,19 +1033,19 @@ public class MyApp3 {
yield the following output:
</p>
-<p class="source">14:25:36.343 [main] INFO chapter3.MyApp3 - Entering application.
-14:25:36.343 [main] INFO chapter3.MyApp3 - Entering application.
-14:25:36.359 [main] DEBUG chapter3.Foo - Did it again!
-14:25:36.359 [main] DEBUG chapter3.Foo - Did it again!
-14:25:36.359 [main] INFO chapter3.MyApp3 - Exiting application.
-14:25:36.359 [main] INFO chapter3.MyApp3 - Exiting application.</p>
+<p class="source">14:25:36.343 [main] INFO chapters.configuration.MyApp3 - Entering application.
+14:25:36.343 [main] INFO chapters.configuration.MyApp3 - Entering application.
+14:25:36.359 [main] DEBUG chapters.configuration.Foo - Did it again!
+14:25:36.359 [main] DEBUG chapters.configuration.Foo - Did it again!
+14:25:36.359 [main] INFO chapters.configuration.MyApp3 - Exiting application.
+14:25:36.359 [main] INFO chapters.configuration.MyApp3 - Exiting application.</p>
<p>Notice the duplicated output. The appender named <em>STDOUT</em>
- is attached to two loggers, to root and to <em>chapter3</em>. Since
- the root logger is the ancestor of all loggers and <em>chapter3</em>
- is the parent of <em>chapter3.MyApp3</em> and <em>chapter3.Foo</em>,
+ is attached to two loggers, to root and to <em>chapters.configuration</em>. Since
+ the root logger is the ancestor of all loggers and <em>chapters.configuration</em>
+ is the parent of <em>chapters.configuration.MyApp3</em> and <em>chapters.configuration.Foo</em>,
logging request made with these two loggers will be output twice,
- once because <em>STDOUT</em> is attached to <em>chapter3</em> and
+ once because <em>STDOUT</em> is attached to <em>chapters.configuration</em> and
once because it is attached to <em>root</em>.
</p>
@@ -1057,7 +1057,7 @@ public class MyApp3 {
</p>
<em>Example 3.<span class="autoEx"/>: Multiple appender
- (logback-examples/src/main/java/chapter3/restricted.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/restricted.xml)</em>
<pre class="prettyprint source"><configuration>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
@@ -1073,7 +1073,7 @@ public class MyApp3 {
</layout>
</appender>
- <logger name="chapter3">
+ <logger name="chapters.configuration">
<appender-ref ref="FILE" />
</logger>
@@ -1084,7 +1084,7 @@ public class MyApp3 {
<p>In this example, the console appender will log all the messages
(for all loggers in the system) whereas only logging request
- originating from loggers <em>chapter3</em> and below go into the
+ originating from loggers <em>chapters.configuration</em> and below go into the
<em>myApp.log</em> file.
</p>
@@ -1097,7 +1097,7 @@ public class MyApp3 {
of the tree.
</p>
-<em>Example 3.<span class="autoEx"/>: Additivity flag (logback-examples/src/main/java/chapter3/additivityFlag.xml)</em>
+<em>Example 3.<span class="autoEx"/>: Additivity flag (logback-examples/src/main/java/chapters/configuration/additivityFlag.xml)</em>
<pre class="prettyprint source"><configuration>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
@@ -1113,7 +1113,7 @@ public class MyApp3 {
</layout>
</appender>
- <logger name="chapter3.Foo" <b>additivity="false"</b>>
+ <logger name="chapters.configuration.Foo" <b>additivity="false"</b>>
<appender-ref ref="FILE" />
</logger>
@@ -1123,15 +1123,15 @@ public class MyApp3 {
</configuration></pre>
<p>This example, the appender named <em>FILE</em> is attached to the
- <em>chapter3.Foo</em> logger. Moreover, the <em>chapter3.Foo</em>
+ <em>chapters.configuration.Foo</em> logger. Moreover, the <em>chapters.configuration.Foo</em>
logger has its additivity flag set to false such that its logging
output will be sent to the appender named <em>FILE</em> but not to
any appender attached higher in the hierarchy. Other loggers remain
- oblivious to the additivity setting of the <em>chapter3.Foo</em>
+ oblivious to the additivity setting of the <em>chapters.configuration.Foo</em>
logger. Running the <code>MyApp3</code> application with the
<em>additivityFlag.xml</em> configuration file will output results
- on the console from the <em>chapter3.MyApp3</em> logger. However,
- output from the <em>chapter3.Foo</em> logger will appear in the
+ on the console from the <em>chapters.configuration.MyApp3</em> logger. However,
+ output from the <em>chapters.configuration.Foo</em> logger will appear in the
<em>foo.log</em> file and only in that file.
</p>
@@ -1166,7 +1166,7 @@ public class MyApp3 {
</p>
<em>Example 3.<span class="autoEx"/>: Simple Variable substitution
- (logback-examples/src/main/java/chapter3/variableSubstitution1.xml)
+ (logback-examples/src/main/java/chapters/configuration/variableSubstitution1.xml)
</em>
<pre class="prettyprint source"><configuration>
@@ -1196,7 +1196,7 @@ public class MyApp3 {
<p class="source">java -DUSER_HOME="/home/sebastien" MyApp2</p>
<em>Example 3.<span class="autoEx"/>: System Variable substitution
- (logback-examples/src/main/java/chapter3/variableSubstitution2.xml)
+ (logback-examples/src/main/java/chapters/configuration/variableSubstitution2.xml)
</em>
<pre class="prettyprint source"><configuration>
@@ -1222,12 +1222,12 @@ public class MyApp3 {
<em>Example 3.<span class="autoEx"/>: Variable substitution using a
separate file
- (logback-examples/src/main/java/chapter3/variableSubstitution3.xml)
+ (logback-examples/src/main/java/chapters/configuration/variableSubstitution3.xml)
</em>
<pre class="prettyprint source"><configuration>
- <b><property file="src/main/java/chapter3/variables1.properties" /></b>
+ <b><property file="src/main/java/chapters/configuration/variables1.properties" /></b>
<appender name="FILE"
class="ch.qos.logback.core.FileAppender">
@@ -1250,7 +1250,7 @@ public class MyApp3 {
</p>
<em>Example 3.<span class="autoEx"/>: Variable file
- (logback-examples/src/main/java/chapter3/variables1.properties)</em>
+ (logback-examples/src/main/java/chapters/configuration/variables1.properties)</em>
<pre class="source">USER_HOME=/home/sebastien</pre>
@@ -1286,7 +1286,7 @@ public class MyApp3 {
<em>Example 3.<span class="autoEx"/>: Nested variable references
- (logback-examples/src/main/java/chapter3/variables2.properties)</em>
+ (logback-examples/src/main/java/chapters/configuration/variables2.properties)</em>
<pre class="source">USER_HOME=/home/sebastien
fileName=myApp.log
@@ -1299,7 +1299,7 @@ fileName=myApp.log
<em>Example 3.<span class="autoEx"/>: Variable substitution using
a separate file
- (logback-examples/src/main/java/chapter3/variableSubstitution4.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/variableSubstitution4.xml)</em>
<pre class="prettyprint source"><configuration>
@@ -1342,10 +1342,10 @@ fileName=myApp.log
</p>
<em>Example 3.<span class="autoEx"/>: File include
- (logback-examples/src/main/java/chapter3/containingConfig.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/containingConfig.xml)</em>
<pre class="prettyprint source"><configuration>
- <b><include file="src/main/java/chapter3/includedConfig.xml"/></b>
+ <b><include file="src/main/java/chapters/configuration/includedConfig.xml"/></b>
<root level="DEBUG">
<appender-ref ref="includedConsole" />
@@ -1359,7 +1359,7 @@ fileName=myApp.log
</p>
<em>Example 3.<span class="autoEx"/>: File include
- (logback-examples/src/main/java/chapter3/includedConfig.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/includedConfig.xml)</em>
<pre class="source"><b class="green big"><included></b>
<appender name="includedConsole" class="ch.qos.logback.core.ConsoleAppender">
@@ -1392,7 +1392,7 @@ fileName=myApp.log
</p>
<em>Example 3.<span class="autoEx"/>: Set the context name and display it
- (logback-examples/src/main/java/chapter3/contextName.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/contextName.xml)</em>
<pre class="prettyprint source"><configuration>
<b><contextName>myAppName</contextName></b>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -1422,7 +1422,7 @@ fileName=myApp.log
</p>
<em>Example 3.<span class="autoEx"/>: Insert as properties env-entries obtained via JNDI
- (logback-examples/src/main/java/chapter3/insertFromJNDI.xml)</em>
+ (logback-examples/src/main/java/chapters/configuration/insertFromJNDI.xml)</em>
<pre class="prettyprint source"><configuration>
<b><insertFromJNDI env-entry-name="java:comp/env/appName" as="<span class="green">appName"</span> /></b>
<b><contextName><span class="green">${appName}</span></contextName></b>
diff --git a/logback-site/src/site/pages/manual/introduction.html b/logback-site/src/site/pages/manual/introduction.html
index 909a40d..45748ec 100644
--- a/logback-site/src/site/pages/manual/introduction.html
+++ b/logback-site/src/site/pages/manual/introduction.html
@@ -78,8 +78,8 @@
<p>Let us now begin experimenting with logback.</p>
-<em>Example 1.1: Basic template for logging (<a href="../xref/chapter1/HelloWorld1.html">logback-examples/src/main/java/chapter1/HelloWorld1.java</a>)</em>
-<pre class="prettyprint source">package chapter1;
+<em>Example 1.1: Basic template for logging (<a href="../xref/chapters/introduction/HelloWorld1.html">logback-examples/src/main/java/chapters/introduction/HelloWorld1.java</a>)</em>
+<pre class="prettyprint source">package chapters.introduction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,14 +88,14 @@ public class HelloWorld1 {
public static void main(String[] args) {
- Logger logger = LoggerFactory.getLogger("chapter1.HelloWorld1");
+ Logger logger = LoggerFactory.getLogger("chapters.introduction.HelloWorld1");
logger.debug("Hello world.");
}
}</pre>
<p><code>HelloWorld</code> class is defined in the
- <code>chapter1</code> package. It starts by importing the <a
+ <code>chapters.introduction</code> package. It starts by importing the <a
href="http://slf4j.org/api/org/slf4j/Logger.html"><code>Logger</code></a>
and <a
href="http://slf4j.org/api/org/slf4j/LoggerFactory.html"><code>LoggerFactory</code></a>
@@ -108,7 +108,7 @@ public class HelloWorld1 {
<code>logger</code> is assigned a <code>Logger</code> instance
retrieved by invoking the static <code>getLogger</code> method
from the <code>LoggerFactory</code> class. This logger is named
- "chapter1.HelloWorld1". The main method proceeds to call the
+ "chapters.introduction.HelloWorld1". The main method proceeds to call the
<code>debug</code> method of this logger passing "Hello World" as
an argument. We say that the main method contains a logging
statement of level DEBUG with the message "Hello world".
@@ -123,9 +123,9 @@ public class HelloWorld1 {
<p>You can launch the first
- sample application, <em>chapter1.HelloWorld1</em> with the command:
+ sample application, <em>chapters.introduction.HelloWorld1</em> with the command:
</p>
- <div class="source"><pre>java chapter1.HelloWorld1</pre></div>
+ <div class="source"><pre>java chapters.introduction.HelloWorld1</pre></div>
<p>Launching the <code>HelloWorld1</code> application will output
a single line on the console. By virtue of logback's default
@@ -134,7 +134,7 @@ public class HelloWorld1 {
logger.
</p>
- <p class="source">20:49:07.962 [main] DEBUG chapter1.HelloWorld1 - Hello world.</p>
+ <p class="source">20:49:07.962 [main] DEBUG chapters.introduction.HelloWorld1 - Hello world.</p>
<p>Logback can report information about its internal state using a
built-in status system. Important events occuring during logback's
@@ -144,8 +144,8 @@ public class HelloWorld1 {
<code>LoggerStatusPrinter</code> class.
</p>
-<em>Example 1.2: Printing Logger Status (<a href="../xref/chapter1/HelloWorld2.html">logback-examples/src/main/java/chapter1/HelloWorld2.java</a>)</em>
-<pre class="prettyprint source">package chapter1;
+<em>Example 1.2: Printing Logger Status (<a href="../xref/chapters/introduction/HelloWorld2.html">logback-examples/src/main/java/chapters/introduction/HelloWorld2.java</a>)</em>
+<pre class="prettyprint source">package chapters.introduction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -155,7 +155,7 @@ import ch.qos.logback.core.util.StatusPrinter;</b>
public class HelloWorld2 {
public static void main(String[] args) {
- Logger logger = LoggerFactory.getLogger("chapter1.HelloWorld2");
+ Logger logger = LoggerFactory.getLogger("chapters.introduction.HelloWorld2");
logger.debug("Hello world.");
// print internal state
@@ -168,7 +168,7 @@ public class HelloWorld2 {
<p>Running the <code>HelloWorld2</code> application will produce
the following output:</p>
-<div class="source longline"><pre>12:49:22.203 [main] DEBUG chapter1.HelloWorld2 - Hello world.
+<div class="source longline"><pre>12:49:22.203 [main] DEBUG chapters.introduction.HelloWorld2 - Hello world.
12:49:22,078 |-INFO in ch.qos.logback.classic.LoggerContext[default] - Could NOT find resource [logback-test.xml]
12:49:22,093 |-INFO in ch.qos.logback.classic.LoggerContext[default] - Could NOT find resource [logback.xml]
12:49:22,093 |-INFO in ch.qos.logback.classic.LoggerContext[default] - Setting up default configuration.
@@ -253,7 +253,7 @@ public class HelloWorld2 {
<p>Logback distributions contain complete source code such that you
can modify parts of logback library and build your own version of
it. You may even redistribute the modified version, as long as you
- adhere to the conditions of the LGPL License.
+ adhere to the conditions of the LGPL license or the EPL license.
</p>
<p>Logback has been built and tested with the follwing JDKs.</p>
@@ -283,6 +283,12 @@ public class HelloWorld2 {
<td>IBM JDK 1.6.0.1</td>
<td>Linux 64bit AMD</td>
</tr>
+
+ <tr>
+ <td>Sun JDK 1.6.0.16 (64 bit)</td>
+ <td>Windows 7 (64 bit)</td>
+ </tr>
+
</table>
diff --git a/logback-site/src/site/pages/manual/onJoran.html b/logback-site/src/site/pages/manual/onJoran.html
index 8d70b3b..386c54d 100644
--- a/logback-site/src/site/pages/manual/onJoran.html
+++ b/logback-site/src/site/pages/manual/onJoran.html
@@ -567,7 +567,7 @@ Element [abc] asked to be printed.
<p>The respective Joran configurators of logback-classic and
logback-access include just two implicit actions, namely <a
href="../xref/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.html">
- <code>NestedComplexPropertyIA</code></a> and <a
+ <code>NestedBasicPropertyIA</code></a> and <a
href="../xref/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.html">
<code>NestedComplexPropertyIA</code></a>.
</p>
diff --git a/logback-site/src/site/pages/manual/underTheHood.html b/logback-site/src/site/pages/manual/underTheHood.html
index c68fdcf..063334a 100644
--- a/logback-site/src/site/pages/manual/underTheHood.html
+++ b/logback-site/src/site/pages/manual/underTheHood.html
@@ -9,7 +9,7 @@
<body>
<h2>Under The Hood Sequence Diagram</h2>
- <img src="images/chapter2/underTheHoodSequence2.gif" alt="underTheHoodSequence2.gif"/>
+ <img src="images/manual/architecture/underTheHoodSequence2.gif" alt="underTheHoodSequence2.gif"/>
</body>
</html>
diff --git a/logback-site/src/site/pages/templates/footer.js b/logback-site/src/site/pages/templates/footer.js
index c548cab..c94810b 100644
--- a/logback-site/src/site/pages/templates/footer.js
+++ b/logback-site/src/site/pages/templates/footer.js
@@ -17,9 +17,11 @@ document.write(' </td>')
document.write('<td valign="top">Copyright © 2010 <a href="http://www.qos.ch/">QOS.ch</a></td>')
document.write('</tr>')
+AAT = '@'
+DOOTT = '.'
document.write('<tr>')
document.write('<td align="left" colspan="2">')
-document.write('We are actively looking for volunteers to proofread the documentation. Please send your corrections or suggestions for improvement to "corrections at qos.ch".');
+document.write('We are actively looking for volunteers to proofread the documentation. Please send your corrections or suggestions for improvement to "corrections' + AAT +'qos'+DOOTT+'ch".');
document.write('</td>')
document.write('</table>')
diff --git a/logback-site/src/site/resources/manual/images/chapter2/underTheHoodSequence2.gif b/logback-site/src/site/resources/manual/images/chapters/architecture/underTheHoodSequence2.gif
similarity index 100%
rename from logback-site/src/site/resources/manual/images/chapter2/underTheHoodSequence2.gif
rename to logback-site/src/site/resources/manual/images/chapters/architecture/underTheHoodSequence2.gif
diff --git a/logback-site/src/site/resources/manual/images/chapter2/underTheHoodSequence2_small.gif b/logback-site/src/site/resources/manual/images/chapters/architecture/underTheHoodSequence2_small.gif
similarity index 100%
rename from logback-site/src/site/resources/manual/images/chapter2/underTheHoodSequence2_small.gif
rename to logback-site/src/site/resources/manual/images/chapters/architecture/underTheHoodSequence2_small.gif
diff --git a/logback-site/src/site/resources/manual/images/chapter3/appenderSyntax.png b/logback-site/src/site/resources/manual/images/chapters/configuration/appenderSyntax.png
similarity index 100%
rename from logback-site/src/site/resources/manual/images/chapter3/appenderSyntax.png
rename to logback-site/src/site/resources/manual/images/chapters/configuration/appenderSyntax.png
diff --git a/logback-site/src/site/resources/manual/images/chapter3/basicSyntax.png b/logback-site/src/site/resources/manual/images/chapters/configuration/basicSyntax.png
similarity index 100%
rename from logback-site/src/site/resources/manual/images/chapter3/basicSyntax.png
rename to logback-site/src/site/resources/manual/images/chapters/configuration/basicSyntax.png
diff --git a/logback-site/src/site/resources/manual/images/chapter3/lbClassicStatus.jpg b/logback-site/src/site/resources/manual/images/chapters/configuration/lbClassicStatus.jpg
similarity index 100%
rename from logback-site/src/site/resources/manual/images/chapter3/lbClassicStatus.jpg
rename to logback-site/src/site/resources/manual/images/chapters/configuration/lbClassicStatus.jpg
diff --git a/logback-site/src/site/resources/manual/images/chapter3/sample.xml b/logback-site/src/site/resources/manual/images/chapters/configuration/sample.xml
similarity index 100%
rename from logback-site/src/site/resources/manual/images/chapter3/sample.xml
rename to logback-site/src/site/resources/manual/images/chapters/configuration/sample.xml
-----------------------------------------------------------------------
Summary of changes:
.../src/main/java/chapter1/HelloWorld1.java | 26 ---
.../src/main/java/chapter1/HelloWorld2.java | 31 ----
.../main/java/chapter10/SimpleConfigurator.java | 64 -------
.../main/java/chapter10/calculator/AddAction.java | 69 --------
.../java/chapter10/calculator/Calculator1.java | 55 ------
.../java/chapter10/calculator/Calculator2.java | 64 -------
.../chapter10/calculator/ComputationAction1.java | 61 -------
.../chapter10/calculator/ComputationAction2.java | 86 ---------
.../java/chapter10/calculator/LiteralAction.java | 58 -------
.../java/chapter10/calculator/MultiplyAction.java | 66 -------
.../main/java/chapter10/helloWorld/HelloWorld.java | 48 -----
.../chapter10/helloWorld/HelloWorldAction.java | 35 ----
.../main/java/chapter10/implicit/NOPAction.java | 34 ----
.../src/main/java/chapter10/implicit/PrintMe.java | 61 -------
.../chapter10/implicit/PrintMeImplicitAction.java | 44 -----
.../java/chapter10/newRule/NewRuleCalculator.java | 63 -------
.../src/main/java/chapter11/Log4jMain.java | 34 ----
.../src/main/java/chapter11/LogbackMain.java | 48 -----
.../main/java/chapter11/TrivialLog4jAppender.java | 34 ----
.../main/java/chapter11/TrivialLog4jLayout.java | 43 -----
.../java/chapter11/TrivialLogbackAppender.java | 60 -------
.../main/java/chapter11/TrivialLogbackLayout.java | 33 ----
logback-examples/src/main/java/chapter2/Bar.java | 25 ---
.../src/main/java/chapter2/HelloWorld2.java | 28 ---
.../main/java/chapter2/MyAppWithConfigFile.java | 45 -----
.../main/java/chapter3/AddStatusListenerApp.java | 41 -----
logback-examples/src/main/java/chapter3/Foo.java | 26 ---
.../src/main/java/chapter3/MyApp1.java | 30 ----
.../src/main/java/chapter3/MyApp2.java | 36 ----
.../src/main/java/chapter3/MyApp3.java | 53 ------
.../main/java/chapter4/ConfigurationTester.java | 67 -------
.../java/chapter4/CountingConsoleAppender.java | 78 ---------
.../src/main/java/chapter4/ExitWoes1.java | 46 -----
.../src/main/java/chapter4/ExitWoes2.java | 51 ------
logback-examples/src/main/java/chapter4/IO.java | 181 --------------------
.../java/chapter4/mail/CounterBasedEvaluator.java | 63 -------
.../src/main/java/chapter4/mail/EMail.java | 69 --------
.../src/main/java/chapter4/mail/Marked_EMail.java | 70 --------
.../src/main/java/chapter4/sift/SiftExample.java | 55 ------
.../main/java/chapter4/socket/SocketClient1.java | 80 ---------
.../main/java/chapter4/socket/SocketClient2.java | 73 --------
.../src/main/java/chapter4/sub/sample/Bar.java | 34 ----
.../main/java/chapter5/CallerEvaluatorExample.java | 48 -----
.../java/chapter5/ExceptionEvaluatorExample.java | 47 -----
.../src/main/java/chapter5/MySampleConverter.java | 50 ------
.../src/main/java/chapter5/MySampleLayout.java | 36 ----
.../src/main/java/chapter5/MySampleLayout2.java | 54 ------
.../src/main/java/chapter5/PatternSample.java | 42 -----
.../src/main/java/chapter5/SampleLogging.java | 44 -----
.../src/main/java/chapter5/TestException.java | 23 ---
.../src/main/java/chapter6/FilterEvents.java | 59 -------
logback-examples/src/main/java/chapter6/GoMDC.java | 48 -----
.../src/main/java/chapter6/SampleFilter.java | 30 ----
.../src/main/java/chapter6/SampleTurboFilter.java | 59 -------
.../src/main/java/chapter7/NumberCruncher.java | 29 ---
.../main/java/chapter7/NumberCruncherClient.java | 86 ---------
.../main/java/chapter7/NumberCruncherServer.java | 162 -----------------
.../src/main/java/chapter7/SimpleMDC.java | 94 ----------
.../src/main/java/chapter7/UserServletFilter.java | 98 -----------
.../chapters/appenders/ConfigurationTester.java | 67 +++++++
.../appenders/CountingConsoleAppender.java | 78 +++++++++
.../main/java/chapters/appenders/ExitWoes1.java | 46 +++++
.../main/java/chapters/appenders/ExitWoes2.java | 51 ++++++
.../src/main/java/chapters/appenders/IO.java | 181 ++++++++++++++++++++
.../appenders}/conf/access/logback-DB.xml | 0
.../appenders}/conf/access/logback-SMTP.xml | 0
.../appenders}/conf/logback-Console.xml | 0
.../appenders}/conf/logback-HtmlToConsole.xml | 0
.../appenders}/conf/logback-JMSQueue.xml | 0
.../appenders}/conf/logback-JMSTopic.xml | 0
.../appenders}/conf/logback-MDC.xml | 0
.../conf/logback-PrudentTimeBasedRolling.xml | 0
.../appenders}/conf/logback-RollingFixedWindow.xml | 0
.../appenders}/conf/logback-RollingSizeBased.xml | 0
.../appenders}/conf/logback-RollingTimeBased.xml | 0
.../appenders}/conf/logback-SMTP.xml | 0
.../appenders}/conf/logback-SMTPWithHtml.xml | 0
.../appenders}/conf/logback-fileAppender.xml | 0
.../appenders}/conf/logback-syslog.xml | 0
.../appenders}/conf/logback-timestamp.xml | 0
.../appenders}/conf/logbback-sizeAndTime.xml | 0
.../appenders}/countingConsole.xml | 0
.../appenders}/db/append-and-share-with-jndi.xml | 0
.../append-toMySQL-with-datasource-and-pooling.xml | 0
.../db/append-toMySQL-with-datasource.xml | 0
.../db/append-toMySQL-with-driverManager.xml | 0
.../appenders}/db/append-with-c3p0.xml | 0
.../appenders}/db/append-with-datasource.xml | 0
.../appenders}/db/append-with-drivermanager.xml | 0
.../db/append-with-pooled-datasource.xml | 0
.../appenders/mail/CounterBasedEvaluator.java | 63 +++++++
.../main/java/chapters/appenders/mail/EMail.java | 69 ++++++++
.../java/chapters/appenders/mail/Marked_EMail.java | 70 ++++++++
.../appenders}/mail/gmailSSL.xml | 0
.../appenders}/mail/gmailSTARTTLS.xml | 0
.../appenders}/mail/mail1.xml | 0
.../appenders}/mail/mail2.xml | 0
.../appenders}/mail/mail3.xml | 0
.../appenders}/mail/mailWithMarker.xml | 0
.../appenders/onJoran/SimpleConfigurator.java | 64 +++++++
.../appenders/onJoran/calculator/AddAction.java | 69 ++++++++
.../appenders/onJoran/calculator/Calculator1.java | 55 ++++++
.../appenders/onJoran/calculator/Calculator2.java | 64 +++++++
.../onJoran/calculator/ComputationAction1.java | 61 +++++++
.../onJoran/calculator/ComputationAction2.java | 86 +++++++++
.../onJoran/calculator/LiteralAction.java | 58 +++++++
.../onJoran/calculator/MultiplyAction.java | 66 +++++++
.../appenders/onJoran}/calculator/calculator1.xml | 0
.../appenders/onJoran}/calculator/calculator2.xml | 0
.../appenders/onJoran}/calculator/calculator3.xml | 0
.../appenders/onJoran}/calculator/readme.txt | 0
.../appenders/onJoran/helloWorld/HelloWorld.java | 48 +++++
.../onJoran/helloWorld/HelloWorldAction.java | 35 ++++
.../appenders/onJoran}/helloWorld/hello.xml | 0
.../appenders/onJoran}/helloWorld/readme.txt | 0
.../appenders/onJoran/implicit/NOPAction.java | 34 ++++
.../appenders/onJoran/implicit/PrintMe.java | 61 +++++++
.../onJoran/implicit/PrintMeImplicitAction.java | 44 +++++
.../appenders/onJoran}/implicit/implicit1.xml | 0
.../appenders/onJoran}/implicit/readme.txt | 0
.../onJoran/newRule/NewRuleCalculator.java | 63 +++++++
.../appenders/onJoran}/newRule/new-rule.xml | 0
.../appenders/onJoran}/newRule/readme.txt | 0
.../java/chapters/appenders/sift/SiftExample.java | 55 ++++++
.../appenders}/sift/access-siftingFile.xml | 0
.../appenders}/sift/byUserid.xml | 0
.../chapters/appenders/socket/SocketClient1.java | 80 +++++++++
.../chapters/appenders/socket/SocketClient2.java | 73 ++++++++
.../appenders}/socket/client1.xml | 0
.../appenders}/socket/server1.xml | 0
.../appenders}/socket/server2.xml | 0
.../java/chapters/appenders/sub/sample/Bar.java | 34 ++++
.../src/main/java/chapters/architecture/Bar.java | 25 +++
.../java/chapters/architecture/HelloWorld2.java | 28 +++
.../chapters/architecture/MyAppWithConfigFile.java | 45 +++++
.../architecture}/sample-config-1.xml | 0
.../architecture}/sample-config-2.xml | 0
.../architecture}/sample-config-3.xml | 0
.../configuration/AddStatusListenerApp.java | 41 +++++
.../src/main/java/chapters/configuration/Foo.java | 26 +++
.../main/java/chapters/configuration/MyApp1.java | 30 ++++
.../main/java/chapters/configuration/MyApp2.java | 36 ++++
.../main/java/chapters/configuration/MyApp3.java | 53 ++++++
.../configuration}/additivityFlag.xml | 0
.../configuration}/containingConfig.xml | 0
.../configuration}/contextName.xml | 0
.../configuration}/duplicate.xml | 0
.../configuration}/includedConfig.xml | 0
.../configuration}/insertFromJNDI.xml | 0
.../configuration}/multiple.xml | 0
.../configuration}/onConsoleStatusListener.xml | 0
.../configuration}/restricted.xml | 0
.../configuration}/sample0.xml | 0
.../configuration}/sample1.xml | 0
.../configuration}/sample2.xml | 0
.../configuration}/sample3.xml | 0
.../configuration}/sample4.xml | 0
.../{chapter3 => chapters/configuration}/scan1.xml | 0
.../{chapter3 => chapters/configuration}/scan2.xml | 0
.../configuration}/variableSubstitution1.xml | 0
.../configuration}/variableSubstitution2.xml | 0
.../configuration}/variableSubstitution3.xml | 0
.../configuration}/variableSubstitution4.xml | 0
.../configuration}/variables1.properties | 0
.../configuration}/variables2.properties | 0
.../main/java/chapters/filters/FilterEvents.java | 59 +++++++
.../src/main/java/chapters/filters/GoMDC.java | 48 +++++
.../main/java/chapters/filters/SampleFilter.java | 30 ++++
.../java/chapters/filters/SampleTurboFilter.java | 59 +++++++
.../filters}/accessEventEvaluator.xml | 0
.../filters}/accessEventEvaluator2.xml | 0
.../filters}/basicConfiguration.xml | 0
.../filters}/basicEventEvaluator.xml | 0
.../filters}/duplicateMessage.xml | 0
.../filters}/evaluatorWithMatcher.xml | 0
.../filters}/levelFilterConfig.xml | 0
.../{chapter6 => chapters/filters}/mdcfilter.xml | 0
.../filters}/sampleFilterConfig.xml | 0
.../filters}/sampleTurboFilterConfig.xml | 0
.../filters}/thresholdFilterConfig.xml | 0
.../filters}/turboFilters.xml | 0
.../java/chapters/introduction/HelloWorld1.java | 26 +++
.../java/chapters/introduction/HelloWorld2.java | 31 ++++
.../chapters/layouts/CallerEvaluatorExample.java | 48 +++++
.../layouts/ExceptionEvaluatorExample.java | 47 +++++
.../java/chapters/layouts/MySampleConverter.java | 50 ++++++
.../main/java/chapters/layouts/MySampleLayout.java | 36 ++++
.../java/chapters/layouts/MySampleLayout2.java | 54 ++++++
.../main/java/chapters/layouts/PatternSample.java | 42 +++++
.../main/java/chapters/layouts/SampleLogging.java | 44 +++++
.../main/java/chapters/layouts/TestException.java | 23 +++
.../layouts}/callerEvaluatorConfig.xml | 0
.../layouts}/exceptionEvaluatorConfig.xml | 0
.../layouts}/mySampleConverterConfig.xml | 0
.../layouts}/sampleLayoutConfig.xml | 0
.../layouts}/sampleLayoutConfig2.xml | 0
.../src/main/java/chapters/mdc/NumberCruncher.java | 29 +++
.../java/chapters/mdc/NumberCruncherClient.java | 86 +++++++++
.../java/chapters/mdc/NumberCruncherServer.java | 162 +++++++++++++++++
.../src/main/java/chapters/mdc/SimpleMDC.java | 94 ++++++++++
.../main/java/chapters/mdc/UserServletFilter.java | 98 +++++++++++
.../main/java/{chapter7 => chapters/mdc}/mdc1.xml | 0
.../java/{chapter7 => chapters/mdc}/simpleMDC.xml | 0
.../chapters/migrationFromLog4j/Log4jMain.java | 34 ++++
.../chapters/migrationFromLog4j/LogbackMain.java | 48 +++++
.../migrationFromLog4j/TrivialLog4jAppender.java | 34 ++++
.../migrationFromLog4j/TrivialLog4jLayout.java | 43 +++++
.../migrationFromLog4j/TrivialLogbackAppender.java | 60 +++++++
.../migrationFromLog4j/TrivialLogbackLayout.java | 33 ++++
.../migrationFromLog4j}/log4jTrivial.properties | 0
.../migrationFromLog4j}/logback-trivial.xml | 0
.../src/site/pages/manual/architecture.html | 10 +-
.../src/site/pages/manual/configuration.html | 170 +++++++++---------
.../src/site/pages/manual/introduction.html | 32 ++--
logback-site/src/site/pages/manual/onJoran.html | 2 +-
.../src/site/pages/manual/underTheHood.html | 2 +-
logback-site/src/site/pages/templates/footer.js | 4 +-
.../architecture}/underTheHoodSequence2.gif | Bin 71138 -> 71138 bytes
.../architecture}/underTheHoodSequence2_small.gif | Bin 23063 -> 23063 bytes
.../configuration}/appenderSyntax.png | Bin 4541 -> 4541 bytes
.../configuration}/basicSyntax.png | Bin 2950 -> 2950 bytes
.../configuration}/lbClassicStatus.jpg | Bin 176313 -> 176313 bytes
.../configuration}/sample.xml | 0
223 files changed, 3391 insertions(+), 3383 deletions(-)
delete mode 100644 logback-examples/src/main/java/chapter1/HelloWorld1.java
delete mode 100644 logback-examples/src/main/java/chapter1/HelloWorld2.java
delete mode 100644 logback-examples/src/main/java/chapter10/SimpleConfigurator.java
delete mode 100644 logback-examples/src/main/java/chapter10/calculator/AddAction.java
delete mode 100644 logback-examples/src/main/java/chapter10/calculator/Calculator1.java
delete mode 100644 logback-examples/src/main/java/chapter10/calculator/Calculator2.java
delete mode 100644 logback-examples/src/main/java/chapter10/calculator/ComputationAction1.java
delete mode 100644 logback-examples/src/main/java/chapter10/calculator/ComputationAction2.java
delete mode 100644 logback-examples/src/main/java/chapter10/calculator/LiteralAction.java
delete mode 100644 logback-examples/src/main/java/chapter10/calculator/MultiplyAction.java
delete mode 100644 logback-examples/src/main/java/chapter10/helloWorld/HelloWorld.java
delete mode 100644 logback-examples/src/main/java/chapter10/helloWorld/HelloWorldAction.java
delete mode 100644 logback-examples/src/main/java/chapter10/implicit/NOPAction.java
delete mode 100644 logback-examples/src/main/java/chapter10/implicit/PrintMe.java
delete mode 100644 logback-examples/src/main/java/chapter10/implicit/PrintMeImplicitAction.java
delete mode 100644 logback-examples/src/main/java/chapter10/newRule/NewRuleCalculator.java
delete mode 100644 logback-examples/src/main/java/chapter11/Log4jMain.java
delete mode 100644 logback-examples/src/main/java/chapter11/LogbackMain.java
delete mode 100644 logback-examples/src/main/java/chapter11/TrivialLog4jAppender.java
delete mode 100644 logback-examples/src/main/java/chapter11/TrivialLog4jLayout.java
delete mode 100644 logback-examples/src/main/java/chapter11/TrivialLogbackAppender.java
delete mode 100644 logback-examples/src/main/java/chapter11/TrivialLogbackLayout.java
delete mode 100644 logback-examples/src/main/java/chapter2/Bar.java
delete mode 100644 logback-examples/src/main/java/chapter2/HelloWorld2.java
delete mode 100644 logback-examples/src/main/java/chapter2/MyAppWithConfigFile.java
delete mode 100644 logback-examples/src/main/java/chapter3/AddStatusListenerApp.java
delete mode 100644 logback-examples/src/main/java/chapter3/Foo.java
delete mode 100644 logback-examples/src/main/java/chapter3/MyApp1.java
delete mode 100644 logback-examples/src/main/java/chapter3/MyApp2.java
delete mode 100644 logback-examples/src/main/java/chapter3/MyApp3.java
delete mode 100644 logback-examples/src/main/java/chapter4/ConfigurationTester.java
delete mode 100644 logback-examples/src/main/java/chapter4/CountingConsoleAppender.java
delete mode 100644 logback-examples/src/main/java/chapter4/ExitWoes1.java
delete mode 100644 logback-examples/src/main/java/chapter4/ExitWoes2.java
delete mode 100644 logback-examples/src/main/java/chapter4/IO.java
delete mode 100644 logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java
delete mode 100644 logback-examples/src/main/java/chapter4/mail/EMail.java
delete mode 100644 logback-examples/src/main/java/chapter4/mail/Marked_EMail.java
delete mode 100644 logback-examples/src/main/java/chapter4/sift/SiftExample.java
delete mode 100644 logback-examples/src/main/java/chapter4/socket/SocketClient1.java
delete mode 100644 logback-examples/src/main/java/chapter4/socket/SocketClient2.java
delete mode 100644 logback-examples/src/main/java/chapter4/sub/sample/Bar.java
delete mode 100644 logback-examples/src/main/java/chapter5/CallerEvaluatorExample.java
delete mode 100644 logback-examples/src/main/java/chapter5/ExceptionEvaluatorExample.java
delete mode 100644 logback-examples/src/main/java/chapter5/MySampleConverter.java
delete mode 100644 logback-examples/src/main/java/chapter5/MySampleLayout.java
delete mode 100644 logback-examples/src/main/java/chapter5/MySampleLayout2.java
delete mode 100644 logback-examples/src/main/java/chapter5/PatternSample.java
delete mode 100644 logback-examples/src/main/java/chapter5/SampleLogging.java
delete mode 100644 logback-examples/src/main/java/chapter5/TestException.java
delete mode 100644 logback-examples/src/main/java/chapter6/FilterEvents.java
delete mode 100644 logback-examples/src/main/java/chapter6/GoMDC.java
delete mode 100644 logback-examples/src/main/java/chapter6/SampleFilter.java
delete mode 100644 logback-examples/src/main/java/chapter6/SampleTurboFilter.java
delete mode 100644 logback-examples/src/main/java/chapter7/NumberCruncher.java
delete mode 100644 logback-examples/src/main/java/chapter7/NumberCruncherClient.java
delete mode 100644 logback-examples/src/main/java/chapter7/NumberCruncherServer.java
delete mode 100644 logback-examples/src/main/java/chapter7/SimpleMDC.java
delete mode 100644 logback-examples/src/main/java/chapter7/UserServletFilter.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/ConfigurationTester.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/ExitWoes1.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/ExitWoes2.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/IO.java
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/access/logback-DB.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/access/logback-SMTP.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-Console.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-HtmlToConsole.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-JMSQueue.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-JMSTopic.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-MDC.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-PrudentTimeBasedRolling.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-RollingFixedWindow.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-RollingSizeBased.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-RollingTimeBased.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-SMTP.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-SMTPWithHtml.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-fileAppender.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-syslog.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logback-timestamp.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/conf/logbback-sizeAndTime.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/countingConsole.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-and-share-with-jndi.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-toMySQL-with-datasource-and-pooling.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-toMySQL-with-datasource.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-toMySQL-with-driverManager.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-with-c3p0.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-with-datasource.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-with-drivermanager.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/db/append-with-pooled-datasource.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/mail/CounterBasedEvaluator.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/mail/EMail.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/mail/Marked_EMail.java
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/mail/gmailSSL.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/mail/gmailSTARTTLS.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/mail/mail1.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/mail/mail2.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/mail/mail3.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/mail/mailWithMarker.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/SimpleConfigurator.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/calculator/AddAction.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator1.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/calculator/Calculator2.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction1.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/calculator/ComputationAction2.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/calculator/LiteralAction.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/calculator/MultiplyAction.java
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/calculator/calculator1.xml (100%)
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/calculator/calculator2.xml (100%)
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/calculator/calculator3.xml (100%)
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/calculator/readme.txt (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorld.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/helloWorld/HelloWorldAction.java
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/helloWorld/hello.xml (100%)
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/helloWorld/readme.txt (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/implicit/NOPAction.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMe.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/implicit/PrintMeImplicitAction.java
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/implicit/implicit1.xml (100%)
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/implicit/readme.txt (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/onJoran/newRule/NewRuleCalculator.java
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/newRule/new-rule.xml (100%)
rename logback-examples/src/main/java/{chapter10 => chapters/appenders/onJoran}/newRule/readme.txt (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/sift/SiftExample.java
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/sift/access-siftingFile.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/sift/byUserid.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java
create mode 100644 logback-examples/src/main/java/chapters/appenders/socket/SocketClient2.java
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/socket/client1.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/socket/server1.xml (100%)
rename logback-examples/src/main/java/{chapter4 => chapters/appenders}/socket/server2.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/appenders/sub/sample/Bar.java
create mode 100644 logback-examples/src/main/java/chapters/architecture/Bar.java
create mode 100644 logback-examples/src/main/java/chapters/architecture/HelloWorld2.java
create mode 100644 logback-examples/src/main/java/chapters/architecture/MyAppWithConfigFile.java
rename logback-examples/src/main/java/{chapter2 => chapters/architecture}/sample-config-1.xml (100%)
rename logback-examples/src/main/java/{chapter2 => chapters/architecture}/sample-config-2.xml (100%)
rename logback-examples/src/main/java/{chapter2 => chapters/architecture}/sample-config-3.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/configuration/AddStatusListenerApp.java
create mode 100644 logback-examples/src/main/java/chapters/configuration/Foo.java
create mode 100644 logback-examples/src/main/java/chapters/configuration/MyApp1.java
create mode 100644 logback-examples/src/main/java/chapters/configuration/MyApp2.java
create mode 100644 logback-examples/src/main/java/chapters/configuration/MyApp3.java
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/additivityFlag.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/containingConfig.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/contextName.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/duplicate.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/includedConfig.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/insertFromJNDI.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/multiple.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/onConsoleStatusListener.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/restricted.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/sample0.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/sample1.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/sample2.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/sample3.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/sample4.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/scan1.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/scan2.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/variableSubstitution1.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/variableSubstitution2.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/variableSubstitution3.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/variableSubstitution4.xml (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/variables1.properties (100%)
rename logback-examples/src/main/java/{chapter3 => chapters/configuration}/variables2.properties (100%)
create mode 100644 logback-examples/src/main/java/chapters/filters/FilterEvents.java
create mode 100644 logback-examples/src/main/java/chapters/filters/GoMDC.java
create mode 100644 logback-examples/src/main/java/chapters/filters/SampleFilter.java
create mode 100644 logback-examples/src/main/java/chapters/filters/SampleTurboFilter.java
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/accessEventEvaluator.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/accessEventEvaluator2.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/basicConfiguration.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/basicEventEvaluator.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/duplicateMessage.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/evaluatorWithMatcher.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/levelFilterConfig.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/mdcfilter.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/sampleFilterConfig.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/sampleTurboFilterConfig.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/thresholdFilterConfig.xml (100%)
rename logback-examples/src/main/java/{chapter6 => chapters/filters}/turboFilters.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/introduction/HelloWorld1.java
create mode 100644 logback-examples/src/main/java/chapters/introduction/HelloWorld2.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/CallerEvaluatorExample.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/ExceptionEvaluatorExample.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/MySampleConverter.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/MySampleLayout.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/MySampleLayout2.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/PatternSample.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/SampleLogging.java
create mode 100644 logback-examples/src/main/java/chapters/layouts/TestException.java
rename logback-examples/src/main/java/{chapter5 => chapters/layouts}/callerEvaluatorConfig.xml (100%)
rename logback-examples/src/main/java/{chapter5 => chapters/layouts}/exceptionEvaluatorConfig.xml (100%)
rename logback-examples/src/main/java/{chapter5 => chapters/layouts}/mySampleConverterConfig.xml (100%)
rename logback-examples/src/main/java/{chapter5 => chapters/layouts}/sampleLayoutConfig.xml (100%)
rename logback-examples/src/main/java/{chapter5 => chapters/layouts}/sampleLayoutConfig2.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/mdc/NumberCruncher.java
create mode 100644 logback-examples/src/main/java/chapters/mdc/NumberCruncherClient.java
create mode 100644 logback-examples/src/main/java/chapters/mdc/NumberCruncherServer.java
create mode 100644 logback-examples/src/main/java/chapters/mdc/SimpleMDC.java
create mode 100644 logback-examples/src/main/java/chapters/mdc/UserServletFilter.java
rename logback-examples/src/main/java/{chapter7 => chapters/mdc}/mdc1.xml (100%)
rename logback-examples/src/main/java/{chapter7 => chapters/mdc}/simpleMDC.xml (100%)
create mode 100644 logback-examples/src/main/java/chapters/migrationFromLog4j/Log4jMain.java
create mode 100644 logback-examples/src/main/java/chapters/migrationFromLog4j/LogbackMain.java
create mode 100644 logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jAppender.java
create mode 100644 logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLog4jLayout.java
create mode 100644 logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackAppender.java
create mode 100644 logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackLayout.java
rename logback-examples/src/main/java/{chapter11 => chapters/migrationFromLog4j}/log4jTrivial.properties (100%)
rename logback-examples/src/main/java/{chapter11 => chapters/migrationFromLog4j}/logback-trivial.xml (100%)
rename logback-site/src/site/resources/manual/images/{chapter2 => chapters/architecture}/underTheHoodSequence2.gif (100%)
rename logback-site/src/site/resources/manual/images/{chapter2 => chapters/architecture}/underTheHoodSequence2_small.gif (100%)
rename logback-site/src/site/resources/manual/images/{chapter3 => chapters/configuration}/appenderSyntax.png (100%)
rename logback-site/src/site/resources/manual/images/{chapter3 => chapters/configuration}/basicSyntax.png (100%)
rename logback-site/src/site/resources/manual/images/{chapter3 => chapters/configuration}/lbClassicStatus.jpg (100%)
rename logback-site/src/site/resources/manual/images/{chapter3 => chapters/configuration}/sample.xml (100%)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
More information about the logback-dev
mailing list