Author: ceki
Date: Thu Apr 5 11:57:16 2007
New Revision: 785
Added:
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java
- copied, changed from r784,
/slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java
Removed:
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java
Modified:
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java
Log:
- Corrected bug 46, http://bugzilla.slf4j.org/show_bug.cgi?id=46
- SLF4FLogFactory renamed as SLF4JLogFactory
Modified:
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java
==
---
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java
(original)
+++
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java
Thu Apr 5 11:57:16 2007
@@ -16,12 +16,12 @@
package org.apache.commons.logging;
-import org.apache.commons.logging.impl.SLF4FLogFactory;
+import org.apache.commons.logging.impl.SLF4JLogFactory;
/**
*
* Factory for creating [EMAIL PROTECTED] Log} instances, which always
delegates to an instance of
- * [EMAIL PROTECTED] SLF4FLogFactory}.
+ * [EMAIL PROTECTED] SLF4JLogFactory}.
*
*
*
@@ -33,7 +33,7 @@
public abstract class LogFactory {
- static LogFactory logFactory = new SLF4FLogFactory();
+ static LogFactory logFactory = new SLF4JLogFactory();
/**
* The name of the property used to identify the LogFactory implementation
@@ -51,7 +51,7 @@
* This property is not used but preserved here for compatibility.
*/
public static final String FACTORY_DEFAULT =
- "org.apache.commons.logging.impl.SLF4FLogFactory";
+ "org.apache.commons.logging.impl.SLF4JLogFactory";
/**
* The name of the properties file to search for.
Modified:
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java
==
---
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java
(original)
+++
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java
Thu Apr 5 11:57:16 2007
@@ -171,7 +171,6 @@
*/
public void error(Object message, Throwable t) {
logger.log(null, FQCN, LocationAwareLogger.ERROR_INT,
String.valueOf(message), t);
-logger.error(String.valueOf(message), t);
}
Copied:
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java
(from r784,
/slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java)
==
---
/slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java
(original)
+++
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java
Thu Apr 5 11:57:16 2007
@@ -49,7 +49,7 @@
* @author Ceki Gülcü
*/
-public class SLF4FLogFactory extends LogFactory {
+public class SLF4JLogFactory extends LogFactory {
// --- Constructors
@@ -62,7 +62,7 @@
/**
* Public no-arguments constructor required by the lookup mechanism.
*/
- public SLF4FLogFactory() {
+ public SLF4JLogFactory() {
loggerMap = new HashMap();
}
@@ -181,7 +181,7 @@
// possible
// for the parent class loader to mask the classes shipping in
// jcl104-over-slf4j.jar.
-System.out.println("WARN: The method " + SLF4FLogFactory.class
+System.out.println("WARN: The method " + SLF4JLogFactory.class
+ "#release() was invoked.");
System.out
.println("WARN: Please see http://www.slf4j.org/codes.html for an
explanation.");
___
dev mailing list
dev@slf4j.org
http://www.slf4j.org/mailman/listinfo/dev
