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 e540ea746cb1cf748343bdd8c3ce3bd364f50ff8 (commit)
from 114e8b1da6d072b06900f9015c8e8db0c5f8b273 (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=e540ea746cb1cf748343bdd8c3ce3bd364f50ff8
http://github.com/ceki/logback/commit/e540ea746cb1cf748343bdd8c3ce3bd364f50ff8
commit e540ea746cb1cf748343bdd8c3ce3bd364f50ff8
Author: Ceki Gulcu <c...@qos.ch>
Date: Thu Mar 18 15:35:49 2010 +0100
- moved ContextSelectorStaticBinder from src/test to src/main. D'oh!
- MDCInsertingServletFilter now inserts xForwardedFor entry
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
index ec367ab..bdb2ec6 100644
--- a/logback-classic/pom.xml
+++ b/logback-classic/pom.xml
@@ -270,13 +270,15 @@ org.slf4j.test_osgi
config files). They won't be found by Bnd's analysis
of java code. -->
+ <!-- importing ch.qos.logback.classic.util is strange but
+ is required for the OSGi integration tests to pass
+ -->
<Import-Package>
sun.reflect;resolution:=optional,
javax.*;resolution:=optional,
org.xml.*;resolution:=optional,
ch.qos.logback.core.rolling,
ch.qos.logback.core.rolling.helper,
- ch.qos.logback.classic.util,
*
</Import-Package>
diff --git
a/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java
b/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java
index 8a19e96..492c8e4 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java
@@ -33,8 +33,9 @@ public class ClassicConstants {
*/
public static final int DEFAULT_MAX_CALLEDER_DATA_DEPTH = 8;
- public final static String REQUEST_REMOTE_HOST_MDC_KEY =
"request.remoteHost";
- public final static String REQUEST_USER_AGENT_MDC_KEY = "request.userAgent";
- public final static String REQUEST_REQUST_URI = "request.requestURI";
+ public final static String REQUEST_REMOTE_HOST_MDC_KEY = "req.remoteHost";
+ public final static String REQUEST_USER_AGENT_MDC_KEY = "req.userAgent";
+ public final static String REQUEST_REQUST_URI = "req.requestURI";
+ public final static String REQUEST_X_FORWARDED_FOR = "req.xForwardedFor";
}
diff --git
a/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
b/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
index 250c5c4..d9f25d6 100644
---
a/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
+++
b/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
@@ -64,6 +64,8 @@ public class MDCInsertingServletFilter implements Filter {
.getRequestURI());
MDC.put(ClassicConstants.REQUEST_USER_AGENT_MDC_KEY, httpServletRequest
.getHeader("User-Agent"));
+ MDC.put(ClassicConstants.REQUEST_X_FORWARDED_FOR, httpServletRequest
+ .getHeader("X-Forwarded-For"));
}
}
diff --git
a/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java
b/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java
similarity index 100%
rename from
logback-classic/src/test/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java
rename to
logback-classic/src/main/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java
diff --git a/logback-site/src/site/pages/news.html
b/logback-site/src/site/pages/news.html
index b6b13a3..8d5fb90 100644
--- a/logback-site/src/site/pages/news.html
+++ b/logback-site/src/site/pages/news.html
@@ -68,6 +68,13 @@
after the connection to the server is re-established.
</p>
+ <p>The packages under <code>ch.qos.logback.classic</code>
+ namespace no longer depend on <code>org.slf4j.impl</code>. This
+ fixes <a
+ href="http://jira.qos.ch/browse/LBCLASSIC-184";>LBCLASSIC-184</a>
+ reported by Gunnar Wagenknecht.
+ </p>
+
<p>Fixed <a
href="http://jira.qos.ch/browse/LBCLASSIC-193";>LBCLASSIC-193</a>.
<code>SyslogAppender</code> will no longer shutdown when messages
-----------------------------------------------------------------------
Summary of changes:
logback-classic/pom.xml | 4 +++-
.../ch/qos/logback/classic/ClassicConstants.java | 7 ++++---
.../classic/helpers/MDCInsertingServletFilter.java | 2 ++
.../classic/util/ContextSelectorStaticBinder.java | 0
logback-site/src/site/pages/news.html | 7 +++++++
5 files changed, 16 insertions(+), 4 deletions(-)
rename logback-classic/src/{test =>
main}/java/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java (100%)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
_______________________________________________
logback-dev mailing list
logback-dev@qos.ch
http://qos.ch/mailman/listinfo/logback-dev
