[slf4j-dev] [GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.6.5-2-g7f88804
Gitbot
git-noreply at pixie.qos.ch
Mon Jun 4 22:25:53 CEST 2012
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 7f888049bc1f266d73645c09647608633cc82629 (commit)
from 1d518fd925183869994bd4b4e89aeefd1f10c715 (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=7f888049bc1f266d73645c09647608633cc82629
http://github.com/ceki/slf4j/commit/7f888049bc1f266d73645c09647608633cc82629
commit 7f888049bc1f266d73645c09647608633cc82629
Author: Ceki Gulcu <ceki at qos.ch>
Date: Mon Jun 4 22:24:31 2012 +0200
start work on 1.6.6. Fix bug #234
diff --git a/integration/pom.xml b/integration/pom.xml
index fadec39..390fc0c 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index a6a13c0..2599f41 100644
--- a/jcl-over-slf4j/pom.xml
+++ b/jcl-over-slf4j/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index 9b93e97..7e49d1b 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index 51e0d17..6730a55 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 bcab830..0738092 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,22 +16,24 @@
package org.apache.log4j;
+import org.apache.log4j.spi.LoggerFactory;
+
import java.util.Enumeration;
import java.util.Vector;
/**
- * <p>
+ * <p/>
* This class is a minimal implementation of the original
* <code>org.apache.log4j.LogManager</code> class (as found in log4j 1.2)
* delegating all calls to SLF4J.
- *
- * <p>
+ * <p/>
+ * <p/>
* This implementation does <b>NOT</b> implement the setRepositorySelector(),
* getLoggerRepository(), exists(), getCurrentLoggers(), shutdown() and
* resetConfiguration() methods which do not have SLF4J equivalents.
- *
+ *
* @author Ceki Gülcü
- * */
+ */
public class LogManager {
public static Logger getRootLogger() {
@@ -45,10 +47,25 @@ public class LogManager {
public static Logger getLogger(final Class clazz) {
return Log4jLoggerFactory.getLogger(clazz.getName());
}
-
+
+ /**
+ * Returns a logger instance created by loggerFactory. This method was requested in
+ * <a href="http://bugzilla.slf4j.org/show_bug.cgi?id=234">bug #234</a>. Note that
+ * log4j-over-slf4j does not ship with a LoggerFactory implementation. If this
+ * method is called, the caller must provide his/her own implementation.
+ *
+ * @param name the name of the desired logger
+ * @param loggerFactory an instance of {@link LoggerFactory}
+ * @return returns a logger instance created by loggerFactory
+ * @since 1.6.6
+ */
+ public static Logger getLogger(String name, LoggerFactory loggerFactory) {
+ return loggerFactory.makeNewLoggerInstance(name);
+ }
/**
* This bogus implementation returns an empty enumeration.
+ *
* @return
*/
public static Enumeration getCurrentLoggers() {
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
index 7d3c6ca..98c1d64 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
@@ -31,7 +31,7 @@ public class Logger extends Category {
private static final String LOGGER_FQCN = Logger.class.getName();
- Logger(String name) {
+ protected Logger(String name) {
super(name);
}
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index e034e30..23ec0ca 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index d3bacfa..c3a1d98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SLF4J</name>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 5454cd7..eeb0335 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index c409606..f331f0a 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
index e04fe02..42df659 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index a66d977..62817b7 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
index 5c95754..e1d70a0 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
index 0d7555b..c4f5f48 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index aa5158d..9d2f182 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.6.5</version>
+ <version>1.6.6-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 403ebda..ec4519b 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.6.5</version>
+ <version>1.6.6-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 60cfcbd..d6da1ab 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index 9025037..b9a131f 100644
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
index 123a7c8..7ff8d72 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.6.5</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index ca5430b..4ad5429 100644
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -29,6 +29,14 @@
<hr noshade="noshade" size="1"/>
+ <h3> ... - Release of SLF4J 1.6.6</h3>
+
+ <p>The log4j-over-slf4j module now supports legacy projects
+ providing their own log4j <code>LoggerFactory</code>. This fixes <a
+ href="http://bugzilla.slf4j.org/show_bug.cgi?id=234">bug #234</a>
+ reported by Laurent Pellegrino with Piotr Jagielski providing the
+ appropriate patch.</p>
+
<h3>4th of June, 2012 - Release of SLF4J 1.6.5</h3>
<p>In the slf4j-log4j12 module, upgraded the log4j dependency to
-----------------------------------------------------------------------
Summary of changes:
integration/pom.xml | 2 +-
jcl-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 | 29 +++++++++++++++----
.../src/main/java/org/apache/log4j/Logger.java | 2 +-
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/news.html | 8 +++++
20 files changed, 49 insertions(+), 24 deletions(-)
hooks/post-receive
--
SLF4J: Simple Logging Facade for Java
More information about the slf4j-dev
mailing list