diff -Nru logback-0.9.30/debian/changelog logback-1.0.0/debian/changelog --- logback-0.9.30/debian/changelog 2011-09-22 11:59:32.000000000 +0000 +++ logback-1.0.0/debian/changelog 2011-11-01 22:34:08.000000000 +0000 @@ -1,3 +1,9 @@ +logback (1:1.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Damien Raude-Morvan Tue, 01 Nov 2011 23:33:55 +0100 + logback (1:0.9.30-1) unstable; urgency=low * New upstream release. diff -Nru logback-0.9.30/docs/access.html logback-1.0.0/docs/access.html --- logback-0.9.30/docs/access.html 2011-09-20 22:18:24.000000000 +0000 +++ logback-1.0.0/docs/access.html 2011-11-01 17:16:12.000000000 +0000 @@ -50,16 +50,17 @@ level of a web-application.

- -

Logback-access under Tomcat

+

Logback-access under Tomcat

To use logback-access with Tomcat, after downloading the logback distribution, place the files - logback-core-0.9.30.jar and - logback-access-0.9.30.jar under + logback-core-1.0.0.jar and + logback-access-1.0.0.jar under $TOMCAT_HOME/lib/ directory, where $TOMCAT_HOME is the folder - where you have installed Tomcat. We have tested logback-access - with Tomcat version 6.0.20. + where you have installed Tomcat. This version of logback-access + has been tested with Tomcat version 7.0.21. It will not work with + Tomcat 6.x. However, the target platform for logback-access + version 0.9.30 is Tomcat 6.x.

+

Appenders must + be definied before they are referenced. +

+ +

In a configuration file, at the point where an appender is + referenced by name, it must be defined earlier in the configuration + file. Referencing an appender defined later in the file is not + allowed. Below are examples of correct and incorrect order of + definition and referece. +

+ + +

Below is an example of a correct ordering, where appender + definition precedes references made to it. +

+ +

CORRECT ORDER

+
<configuration>
+  <!-- definition of appender STDOUT -->
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="DEBUG">
+    <!-- appender referenced after it is defined -->
+    <appender-ref ref="STDOUT"/>
+  </root> 
+</configuration>
+ +

Below is an example of an incorrect ordering, where appender + definition follows references made to it. +

+ +

INCORRECT ORDER

+
<configuration>
+  <root level="DEBUG">
+    <!-- appender INCORRECTLY referenced before it is defined -->
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+  <!-- definition of appender STDOUT -->
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
+    </encoder>
+  </appender>
+</configuration>
+   
+ diff -Nru logback-0.9.30/docs/css/maven-base.css logback-1.0.0/docs/css/maven-base.css --- logback-0.9.30/docs/css/maven-base.css 2011-09-20 22:16:23.000000000 +0000 +++ logback-1.0.0/docs/css/maven-base.css 2011-11-01 17:12:44.000000000 +0000 @@ -141,3 +141,11 @@ margin: 0px; padding: 0px; } +#navcolumn img.imageLink, .imageLink { + padding-left: 0px; + padding-bottom: 0px; + padding-top: 0px; + padding-right: 2px; + border: 0px; + margin: 0px; +} diff -Nru logback-0.9.30/docs/css/screen.css logback-1.0.0/docs/css/screen.css --- logback-0.9.30/docs/css/screen.css 2011-09-20 22:18:24.000000000 +0000 +++ logback-1.0.0/docs/css/screen.css 2011-11-01 17:16:12.000000000 +0000 @@ -13,7 +13,6 @@ } .footer { - text-align: right; color: #564b47; background-color: #fff; padding:0px; diff -Nru logback-0.9.30/docs/css/site.css logback-1.0.0/docs/css/site.css --- logback-0.9.30/docs/css/site.css 2011-09-20 22:16:11.000000000 +0000 +++ logback-1.0.0/docs/css/site.css 2011-11-01 17:12:35.000000000 +0000 @@ -0,0 +1 @@ +/* You can override this file with your own styles */ \ No newline at end of file diff -Nru logback-0.9.30/docs/dependencies.html logback-1.0.0/docs/dependencies.html --- logback-0.9.30/docs/dependencies.html 2011-09-20 22:18:24.000000000 +0000 +++ logback-1.0.0/docs/dependencies.html 2011-11-01 17:16:12.000000000 +0000 @@ -44,16 +44,6 @@ - JMSAppender - - - - - JaninoEventEvaluatorBase and derived classes