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, master has been updated via d411638322b2a2291ac1c85e5a596aeb16c8de64 (commit) from 3c12be5cf378d4ab92d182e1a539132cfa13d6cb (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=d411638322b2a2291ac1c85e5... http://github.com/ceki/logback/commit/d411638322b2a2291ac1c85e5a596aeb16c8de... commit d411638322b2a2291ac1c85e5a596aeb16c8de64 Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Jan 24 22:44:17 2011 +0100 fixing LBCLASSIC-245 diff --git a/logback-classic/src/test/input/turbo/inclusion/inner0.xml b/logback-classic/src/test/input/turbo/inclusion/inner0.xml new file mode 100644 index 0000000..feeab30 --- /dev/null +++ b/logback-classic/src/test/input/turbo/inclusion/inner0.xml @@ -0,0 +1,3 @@ +<included> + <root level="ERROR"/> +</included> diff --git a/logback-classic/src/test/input/turbo/inclusion/topByResource.xml b/logback-classic/src/test/input/turbo/inclusion/topByResource.xml new file mode 100644 index 0000000..82f5590 --- /dev/null +++ b/logback-classic/src/test/input/turbo/inclusion/topByResource.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE x> + + +<configuration scan="true" scanPeriod="50 millisecond"> + <include resource="asResource/inner1.xml"/> +</configuration> + diff --git a/logback-classic/src/test/input/turbo/inclusion/topLevel0.xml b/logback-classic/src/test/input/turbo/inclusion/topLevel0.xml new file mode 100644 index 0000000..48ac9f7 --- /dev/null +++ b/logback-classic/src/test/input/turbo/inclusion/topLevel0.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration scan="true" scanPeriod="50 millisecond"> + + <include file="src/test/input/turbo/inclusion/inner0.xml"/> + +</configuration> + \ No newline at end of file diff --git a/logback-classic/src/test/resources/asResource/inner1.xml b/logback-classic/src/test/resources/asResource/inner1.xml new file mode 100644 index 0000000..feeab30 --- /dev/null +++ b/logback-classic/src/test/resources/asResource/inner1.xml @@ -0,0 +1,3 @@ +<included> + <root level="ERROR"/> +</included> ----------------------------------------------------------------------- Summary of changes: .../src/test/input/turbo/inclusion/inner0.xml | 3 +++ .../{scan 1.xml => inclusion/topByResource.xml} | 9 ++++----- .../turbo/{scan 1.xml => inclusion/topLevel0.xml} | 2 +- .../src/test/resources/asResource/inner1.xml | 3 +++ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 logback-classic/src/test/input/turbo/inclusion/inner0.xml copy logback-classic/src/test/input/turbo/{scan 1.xml => inclusion/topByResource.xml} (63%) copy logback-classic/src/test/input/turbo/{scan 1.xml => inclusion/topLevel0.xml} (67%) create mode 100644 logback-classic/src/test/resources/asResource/inner1.xml hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.