[slf4j-dev] [GIT] SLF4J: Simple Logging Facade for Java branch, master, updated. v1.5.11-3-gce80c41
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Sun Apr 4 21:09:48 CEST 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 "SLF4J: Simple Logging Facade for Java".
The branch, master has been updated
via ce80c41d794f025b9230045232f27c52e4b801a8 (commit)
via cbdf935de3ec4159fcc67a3c1ab0b05b621c5126 (commit)
from bc8b8f8eae7b16ff0227165e6e477f983f0f27eb (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=slf4j.git;a=commit;h=ce80c41d794f025b9230045232f27c52e4b801a8
http://github.com/ceki/slf4j/commit/ce80c41d794f025b9230045232f27c52e4b801a8
commit ce80c41d794f025b9230045232f27c52e4b801a8
Author: Ceki Gulcu <ceki at qos.ch>
Date: Sun Apr 4 20:59:46 2010 +0200
Fixed bug 150 by implementing missing resetConfiguration() and
shutdown() methods in LogManager (in log4j-over-slf4j) as nop. In
addition, the getCurrentLoggers() method has been implemented by
returning an empty enumeration.
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
index 3c498be..fc0332e 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
@@ -16,6 +16,9 @@
*/
package org.apache.log4j;
+import java.util.Enumeration;
+import java.util.Vector;
+
/**
* <p>
* This class is a minimal implementation of the original
@@ -42,4 +45,25 @@ public class LogManager {
public static Logger getLogger(final Class clazz) {
return Log4jLoggerFactory.getLogger(clazz.getName());
}
+
+
+ /**
+ * This bogus implementation returns an empty enumeration.
+ * @return
+ */
+ public static Enumeration getCurrentLoggers() {
+ return new Vector().elements();
+ }
+
+ /**
+ * Implemented as NOP.
+ */
+ public static void shutdown() {
+ }
+
+ /**
+ * Implemented as NOP.
+ */
+ public static void resetConfiguration() {
+ }
}
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index b5a8c71..32626ae 100644
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -27,7 +27,22 @@
<hr noshade="noshade" size="1"/>
- <h3>February 25th, 2010 - Release of SLF4J 1.5.11</h3>
+ <h3>April Xth, 2010 - Release of SLF4J 1.6.0</h3>
+
+ <p>Fixed <a
+ href="http://bugzilla.slf4j.org/show_bug.cgi?id=150">bug 150</a> by
+ implementing missing <code>resetConfiguration()</code> and
+ <code>shutdown()</code> methods in <code>LogManager</code> (in
+ log4j-over-slf4j) as nop. In addition, the
+ <code>getCurrentLoggers()</code> method has been implemented by
+ returning an empty enumeration.
+ </p>
+
+
+
+ <hr noshade="noshade" size="1"/>
+
+ <h3>February 25th, 2010 - Release of SLF4J 1.5.11</h3>
<p>Users yet unfamiliar with SLF4J sometimes unknowingly place both
http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=cbdf935de3ec4159fcc67a3c1ab0b05b621c5126
http://github.com/ceki/slf4j/commit/cbdf935de3ec4159fcc67a3c1ab0b05b621c5126
commit cbdf935de3ec4159fcc67a3c1ab0b05b621c5126
Author: Ceki Gulcu <ceki at qos.ch>
Date: Sun Apr 4 19:11:09 2010 +0200
- starting work on 1.6.0
diff --git a/integration/pom.xml b/integration/pom.xml
index baff429..2db3e77 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index 0d67bbb..8ed9f5c 100644
--- a/jcl-over-slf4j/pom.xml
+++ b/jcl-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml
index f8f8d4e..42603e5 100644
--- a/jcl104-over-slf4j/pom.xml
+++ b/jcl104-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index a5b759b..d22f08d 100644
--- a/jul-to-slf4j/pom.xml
+++ b/jul-to-slf4j/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index 2f6d2d3..0aa10cb 100644
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index 84197ba..0b4ac7f 100644
--- a/osgi-over-slf4j/pom.xml
+++ b/osgi-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 192f5e8..d2f5526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SLF4J</name>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index c272650..b63ed1f 100644
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index 8c16a11..1b5fbd8 100644
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
index 088560b..450d816 100644
--- a/slf4j-jcl/pom.xml
+++ b/slf4j-jcl/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index 1cc86d1..1a93ac2 100644
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
index 070e32f..de5c9c9 100644
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
index 768a9b0..bcc9964 100644
--- a/slf4j-migrator/pom.xml
+++ b/slf4j-migrator/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index 01f7781..a4f6de8 100644
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml
index 8951a13..cacda52 100644
--- a/slf4j-osgi-integration-test/pom.xml
+++ b/slf4j-osgi-integration-test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml
index 97c09a2..c8d4d37 100644
--- a/slf4j-osgi-test-bundle/pom.xml
+++ b/slf4j-osgi-test-bundle/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index f582310..61e866e 100644
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
index 68116ff..565cbbb 100644
--- a/slf4j-site/pom.xml
+++ b/slf4j-site/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.11</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-site/src/site/pages/docs.html b/slf4j-site/src/site/pages/docs.html
index d1fc77c..c3ad212 100644
--- a/slf4j-site/src/site/pages/docs.html
+++ b/slf4j-site/src/site/pages/docs.html
@@ -59,10 +59,8 @@
<li><a href="http://blog.frankel.ch/tech/dev/java/thoughts-on-java-logging-and-slf4j">Thoughts on Java logging and SLF4J</a> by Nicolas Frankel
</li>
- <li><a
- href="http://glauche.de/2009/08/24/logging-with-slf4j-and-guice/">Logging
- with SLF4J and Guice</a>, by Michael Glauche
- </li>
+ <li><a href="http://glauche.de/2009/08/24/">Logging with SLF4J and
+ Guice</a>, by Michael Glauche </li>
<li>
<a href="slf4j-in-10-slides.ppt">JUnit 4 Test Logging Tips using
diff --git a/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html
index 0ae95f7..9125dc2 100644
--- a/slf4j-site/src/site/pages/download.html
+++ b/slf4j-site/src/site/pages/download.html
@@ -24,8 +24,9 @@
<h3>Would you like to subscribe to the QOS.CH announcements mailing
list?</h3>
+
<p>The list is reserved for announcements related to QOS.CH
- projects.</p>
+ projects such as cal10n, logback, mistletoe and SLF4J.</p>
<br/>
<table width="100%">
<tr>
@@ -61,23 +62,33 @@
<ul>
+ <li><a href="http://code.google.com/p/jdbcdslog/">jdbcdslog</a> a
+ tracing tool for JDBC, by Andriy Kolyadenko</li>
+
<li><a href="http://www.jwaresoftware.org/wiki/log4ant/home">Log4Ant</a>, by JWare Software
</li>
- <li><a href="http://code.google.com/p/log4jdbc/">log4jdbc</a>, a JDBC driver which logs SQL information before delegating to an underlying JDBC driver, by Arthur Blake
+ <li><a href="http://code.google.com/p/log4jdbc/">log4jdbc</a>, a
+ JDBC driver which logs SQL information before delegating to an
+ underlying JDBC driver, by Arthur Blake
</li>
<li><a href="http://code.google.com/p/slf4fx/">SLF4Fx</a>, an open
source logging suite for Flex, by Dmitry Motylev
</li>
+
<li><a
href="http://svn.codehaus.org/sonar/trunk/sonar-web/src/main/webapp/WEB-INF/lib/slf4j_logger.rb">SLF4J
logger for JRuby on Rails</a> and <a
href="http://svn.codehaus.org/sonar/trunk/sonar-web/src/main/webapp/WEB-INF/config/environments/production.rb">settings
file</a>, by SonarSource </li>
+
</ul>
+ </p>
+
+
<script src="templates/footer.js" type="text/javascript"></script>
</div>
</body>
diff --git a/slf4j-site/src/site/pages/faq.html b/slf4j-site/src/site/pages/faq.html
index fec33de..aad3d9f 100644
--- a/slf4j-site/src/site/pages/faq.html
+++ b/slf4j-site/src/site/pages/faq.html
@@ -565,7 +565,7 @@ org.slf4j.impl.StaticLoggerBinder.SINGLETON from class org.slf4j.LoggerFactory
the real caller. Then there is the question of API coverage as
SLF4J support MDC and markers in addition to parameterized
logging. While one can come up with a seemingly working
- SLF4J-wrapper within hours, many qtechnical issues will emerge
+ SLF4J-wrapper within hours, many technical issues will emerge
over time which Wombat developers will have to deal with. Note
that SLF4J has evolved over several years and has 170 bug
reports filed against it.</p>
-----------------------------------------------------------------------
Summary of changes:
integration/pom.xml | 2 +-
jcl-over-slf4j/pom.xml | 2 +-
jcl104-over-slf4j/pom.xml | 2 +-
jul-to-slf4j/pom.xml | 2 +-
log4j-over-slf4j/pom.xml | 2 +-
.../src/main/java/org/apache/log4j/LogManager.java | 24 ++++++++++++++++++++
osgi-over-slf4j/pom.xml | 2 +-
pom.xml | 2 +-
slf4j-api/pom.xml | 2 +-
slf4j-ext/pom.xml | 2 +-
slf4j-jcl/pom.xml | 2 +-
slf4j-jdk14/pom.xml | 2 +-
slf4j-log4j12/pom.xml | 2 +-
slf4j-migrator/pom.xml | 2 +-
slf4j-nop/pom.xml | 2 +-
slf4j-osgi-integration-test/pom.xml | 2 +-
slf4j-osgi-test-bundle/pom.xml | 2 +-
slf4j-simple/pom.xml | 2 +-
slf4j-site/pom.xml | 2 +-
slf4j-site/src/site/pages/docs.html | 6 +---
slf4j-site/src/site/pages/download.html | 15 ++++++++++-
slf4j-site/src/site/pages/faq.html | 2 +-
slf4j-site/src/site/pages/news.html | 17 +++++++++++++-
23 files changed, 74 insertions(+), 26 deletions(-)
hooks/post-receive
--
SLF4J: Simple Logging Facade for Java
More information about the slf4j-dev
mailing list