[slf4j-dev] branch, master, updated. v1.5.9-RC0-4-g2861172
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Wed Sep 23 12:34:11 CEST 2009
The branch, master has been updated
via 286117228108fe77fc625c74c14dabc1861a1adf (commit)
from 68af3bbdbb882da5dc4bc75bbf945acc19ce54fd (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=286117228108fe77fc625c74c14dabc1861a1adf
http://github.com/ceki/slf4j/commit/286117228108fe77fc625c74c14dabc1861a1adf
commit 286117228108fe77fc625c74c14dabc1861a1adf
Author: Ceki Gulcu <ceki at qos.ch>
Date: Wed Sep 23 12:23:47 2009 +0200
- added missing LogManager class as requested by Rick Beton in bug report 150
http://bugzilla.slf4j.org/show_bug.cgi?id=150
- Added 1.5.10 to the list of compatible versions
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
index e5e56b9..175aa7d 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
@@ -24,7 +24,7 @@ import org.slf4j.spi.LocationAwareLogger;
* <p>
* This class is a minimal implementation of the original
* <code>org.apache.log4j.Category</code> class (as found in log4j 1.2) by
- * delegation of all calls to a {@link org.slf4j.Logger.Logger} instance.
+ * delegation of all calls to a {@link org.slf4j.Logger} instance.
* </p>
*
* <p>
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
index 0b02a08..0f925ad 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
@@ -20,7 +20,7 @@ import java.util.Hashtable;
/**
* This class is a factory that creates and maintains org.apache.log4j.Loggers
- * warpping org.slf4j.Loggers.
+ * wrapping org.slf4j.Loggers.
*
* It keeps a hashtable of all created org.apache.log4j.Logger instances so that
* all newly created instances are not dulpicates of existing loggers.
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
new file mode 100644
index 0000000..5fed6b2
--- /dev/null
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.log4j;
+
+/**
+ * <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>
+ * 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() {
+ return Log4jLoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+ }
+
+ public static Logger getLogger(final String name) {
+ return Log4jLoggerFactory.getLogger(name);
+ }
+
+ public static Logger getLogger(final Class clazz) {
+ return Log4jLoggerFactory.getLogger(clazz.getName());
+ }
+}
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 64fa66f..47bffc3 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
@@ -22,7 +22,7 @@ import org.slf4j.spi.LocationAwareLogger;
* <p>
* This class is a minimal implementation of the original
* <code>org.apache.log4j.Logger</code> class (as found in log4j 1.2)
- * by delegation of all calls to a {@link org.slf4j.Logger.Logger} instance.
+ * delegating all calls to a {@link org.slf4j.Logger} instance.
* </p>
*
* @author Ceki Gülcü
diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
index 1210c67..c0056ac 100644
--- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
@@ -83,7 +83,7 @@ public final class LoggerFactory {
* <p>
*/
static private final String[] API_COMPATIBILITY_LIST = new String[] {
- "1.5.5", "1.5.6", "1.5.7", "1.5.8", "1.5.9-RC0", "1.5.9" };
+ "1.5.5", "1.5.6", "1.5.7", "1.5.8", "1.5.9-RC0", "1.5.10" };
// private constructor prevents instantiation
private LoggerFactory() {
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index 45392c7..f33fd4c 100644
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -37,11 +37,16 @@
support as a thin layer built upon the <a
href="http://cal10n.qos.ch">CAL10N API</a>.</p>
- <p>In log4j-over-slf4j, added missing log(...) methods. These were
- requested by Zoltan Szel in <a
+ <p>In log4j-over-slf4j, added missing log(...) methods as requested
+ by Zoltan Szel in <a
href="http://bugzilla.slf4j.org/show_bug.cgi?id=139">bug report
139</a>.</p>
+ <p>In log4j-over-slf4j, added missing <code>LogManager</code> class
+ as requested by Rick Beton in <a
+ href="http://bugzilla.slf4j.org/show_bug.cgi?id=150">bug report
+ 150</a>.</p>
+
<p>In the slf4j-ext module, added
<code>getCopyOfChildTimeInstruments</code> and
<code>getCopyOfGlobalStopWatch</code> methods to the
@@ -66,6 +71,9 @@
href="http://bugzilla.slf4j.org/show_bug.cgi?id=151">bug 151</a> by
Jesse McConnell.</p>
+
+
+
<hr noshade="noshade" size="1"/>
<h3>June 11th, 2009 - Release of SLF4J 1.5.8</h3>
-----------------------------------------------------------------------
Summary of changes:
.../src/main/java/org/apache/log4j/Category.java | 2 +-
.../java/org/apache/log4j/Log4jLoggerFactory.java | 2 +-
.../src/main/java/org/apache/log4j/LogManager.java | 45 ++++++++++++++++++++
.../src/main/java/org/apache/log4j/Logger.java | 2 +-
.../src/main/java/org/slf4j/LoggerFactory.java | 2 +-
slf4j-site/src/site/pages/news.html | 12 ++++-
6 files changed, 59 insertions(+), 6 deletions(-)
create mode 100644 log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
hooks/post-receive
--
SLF4J: Simple Logging Facade for Java
More information about the slf4j-dev
mailing list