[slf4j-dev] svn commit: r96 - in slf4j/branches/marker-experiment: . src src/docs src/filtered-java/org/slf4j src/java src/java/org/slf4j src/java/org/slf4j/impl tests tests/input tests/input/nlog4j1212 tests/lib tests/src/java/org/slf4j tests/src/java/org/slf4j/impl
ceki at slf4j.org
ceki at slf4j.org
Thu Jun 30 13:11:04 CEST 2005
Author: ceki
Date: Thu Jun 30 13:11:02 2005
New Revision: 96
Added:
slf4j/branches/marker-experiment/
- copied from r8, slf4j/trunk/
slf4j/branches/marker-experiment/build.properties.sample
- copied unchanged from r79, slf4j/trunk/build.properties.sample
slf4j/branches/marker-experiment/build.xml
- copied unchanged from r86, slf4j/trunk/build.xml
slf4j/branches/marker-experiment/src/
- copied from r7, slf4j/trunk/src/
slf4j/branches/marker-experiment/src/docs/
- copied from r16, slf4j/trunk/src/docs/
slf4j/branches/marker-experiment/src/docs/overview.html
- copied unchanged from r68, slf4j/trunk/src/docs/overview.html
slf4j/branches/marker-experiment/src/filtered-java/org/slf4j/LoggerFactory.java
- copied, changed from r81, slf4j/trunk/src/filtered-java/org/slf4j/LoggerFactory.java
slf4j/branches/marker-experiment/src/java/
- copied from r94, slf4j/trunk/src/java/
slf4j/branches/marker-experiment/src/java/org/slf4j/Constants.java
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/Constants.java
slf4j/branches/marker-experiment/src/java/org/slf4j/Logger.java
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/Logger.java
slf4j/branches/marker-experiment/src/java/org/slf4j/LoggerAdapterFactory.java
- copied, changed from r95, slf4j/trunk/src/java/org/slf4j/LoggerFactoryAdapter.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/JDK14Logger.java
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/impl/JDK14Logger.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/JDK14LoggerFA.java
- copied, changed from r95, slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerFA.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/MessageFormatter.java
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/impl/MessageFormatter.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/NOPLogger.java
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/NOPLoggerFA.java
- copied, changed from r95, slf4j/trunk/src/java/org/slf4j/impl/NOPLoggerFA.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/SimpleLogger.java
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/SimpleLoggerFA.java
- copied, changed from r95, slf4j/trunk/src/java/org/slf4j/impl/SimpleLoggerFA.java
slf4j/branches/marker-experiment/src/java/org/slf4j/impl/package.html
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/impl/package.html
slf4j/branches/marker-experiment/src/java/org/slf4j/package.html
- copied unchanged from r95, slf4j/trunk/src/java/org/slf4j/package.html
slf4j/branches/marker-experiment/tests/
- copied from r14, slf4j/trunk/tests/
slf4j/branches/marker-experiment/tests/build.xml
- copied unchanged from r79, slf4j/trunk/tests/build.xml
slf4j/branches/marker-experiment/tests/input/
- copied from r21, slf4j/trunk/tests/input/
slf4j/branches/marker-experiment/tests/input/nlog4j1212/
- copied from r69, slf4j/trunk/tests/input/nlog4j1212/
slf4j/branches/marker-experiment/tests/lib/
- copied from r23, slf4j/trunk/tests/lib/
slf4j/branches/marker-experiment/tests/lib/nlog4j-1.2.12.jar
- copied unchanged from r70, slf4j/trunk/tests/lib/nlog4j-1.2.12.jar
slf4j/branches/marker-experiment/tests/src/java/org/slf4j/InvokingSLF4J.java
- copied unchanged from r68, slf4j/trunk/tests/src/java/org/slf4j/InvokingSLF4J.java
slf4j/branches/marker-experiment/tests/src/java/org/slf4j/SimpleLoggerFAFactory.java
- copied, changed from r80, slf4j/trunk/tests/src/java/org/slf4j/SimpleLoggerFAFactory.java
slf4j/branches/marker-experiment/tests/src/java/org/slf4j/XLoggerBySystemPropsTest.java
- copied, changed from r80, slf4j/trunk/tests/src/java/org/slf4j/XLoggerBySystemPropsTest.java
slf4j/branches/marker-experiment/tests/src/java/org/slf4j/XLoggerFAFactory.java
- copied, changed from r80, slf4j/trunk/tests/src/java/org/slf4j/XLoggerFAFactory.java
slf4j/branches/marker-experiment/tests/src/java/org/slf4j/impl/XLogger.java
- copied, changed from r80, slf4j/trunk/tests/src/java/org/slf4j/impl/XLogger.java
slf4j/branches/marker-experiment/tests/src/java/org/slf4j/impl/XLoggerFA.java
- copied, changed from r79, slf4j/trunk/tests/src/java/org/slf4j/impl/XLoggerFA.java
Log:
Copied: slf4j/branches/marker-experiment/src/filtered-java/org/slf4j/LoggerFactory.java (from r81, slf4j/trunk/src/filtered-java/org/slf4j/LoggerFactory.java)
==============================================================================
--- slf4j/trunk/src/filtered-java/org/slf4j/LoggerFactory.java (original)
+++ slf4j/branches/marker-experiment/src/filtered-java/org/slf4j/LoggerFactory.java Thu Jun 30 13:11:02 2005
@@ -46,29 +46,29 @@
* @author Ceki Gülcü
*/
public class LoggerFactory {
- static LoggerFactoryAdapter adapter;
+ static LoggerAdapterFactory adapterFactory;
//
// WARNING Do not modify copies but the original in
// $SLF4J_HOME/src/filtered-java/org/slf4j/
//
static {
- String adapterClassStr = "org.slf4j.impl. at IMPL@LoggerFA";
- System.out.println("SLF4J built for " + adapterClassStr);
+ String adapterFactoryClassStr = "org.slf4j.impl. at IMPL@LoggerFA";
+ System.out.println("SLF4J built for " + adapterFactoryClassStr);
- adapter = getFactoryAdapterFromSystemProperties();
+ adapterFactory = getFactoryAdapterFromSystemProperties();
// if could not get an adapter from the system properties, bind statically
- if (adapter != null) {
- System.out.println("However, SLF4J will use ["+adapter.getClass().getName()
- + "] adapter from system properties.");
+ if (adapterFactory != null) {
+ System.out.println("However, SLF4J will use ["+adapterFactory.getClass().getName()
+ + "] adapter factory from system properties.");
} else {
try {
- adapter = new org.slf4j.impl. at IMPL@LoggerFA();
+ adapterFactory = new org.slf4j.impl. at IMPL@LoggerFA();
} catch (Exception e) {
// we should never get here
reportFailure(
- "Could not instantiate instance of class [" + adapterClassStr + "]",
+ "Could not instantiate instance of class [" + adapterFactoryClassStr + "]",
e);
}
}
@@ -80,7 +80,7 @@
* @return The appropriate LoggerFactoryAdapter as directed from the
* system properties
*/
- private static LoggerFactoryAdapter getFactoryAdapterFromSystemProperties() {
+ private static LoggerAdapterFactory getAdapterFactoryFromSystemProperties() {
String faFactoryClassName = null;
try {
@@ -129,15 +129,7 @@
return adapter.getLogger(name);
}
- public static Logger getLogger(String domainName, String subDomainName) {
- return adapter.getLogger(domainName, subDomainName);
- }
-
public static Logger getLogger(Class clazz) {
return adapter.getLogger(clazz.getName());
}
-
- public static Logger getLogger(Class clazz, String subDomainName) {
- return adapter.getLogger(clazz.getName(), subDomainName);
- }
}
Copied: slf4j/branches/marker-experiment/src/java/org/slf4j/LoggerAdapterFactory.java (from r95, slf4j/trunk/src/java/org/slf4j/LoggerFactoryAdapter.java)
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/LoggerFactoryAdapter.java (original)
+++ slf4j/branches/marker-experiment/src/java/org/slf4j/LoggerAdapterFactory.java Thu Jun 30 13:11:02 2005
@@ -33,7 +33,7 @@
package org.slf4j;
/**
- * LoggerFactoryAdapter interface is used internally by {@link
+ * LoggerAdapterFactory interface is used internally by {@link
* LoggerFactory}.
*
* <p>Only developers wishing to write new SLF4J adapters need to
@@ -42,7 +42,7 @@
* @author Ceki Gülcü
*
*/
-public interface LoggerFactoryAdapter {
+public interface LoggerAdapterFactory {
/**
* Return the appropriate named {@link Logger} instance.
Copied: slf4j/branches/marker-experiment/src/java/org/slf4j/impl/JDK14LoggerFA.java (from r95, slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerFA.java)
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerFA.java (original)
+++ slf4j/branches/marker-experiment/src/java/org/slf4j/impl/JDK14LoggerFA.java Thu Jun 30 13:11:02 2005
@@ -33,19 +33,19 @@
package org.slf4j.impl;
-import org.slf4j.LoggerFactoryAdapter;
+import org.slf4j.LoggerAdapterFactory;
import org.slf4j.Logger;
import java.util.HashMap;
import java.util.Map;
/**
- * JDK14LoggerFA is an implementation of {@link LoggerFactoryAdapter}
+ * JDK14LoggerFA is an implementation of {@link LoggerAdapterFactory}
* returning the appropriate named {@link JDK14Logger} instance.
*
* @author Ceki Gülcü
*/
-public class JDK14LoggerFA implements LoggerFactoryAdapter {
+public class JDK14LoggerFA implements LoggerAdapterFactory {
// key: name (String), value: a JDK14Logger;
Map loggerMap;
@@ -55,7 +55,7 @@
}
/* (non-Javadoc)
- * @see org.slf4j.LoggerFactoryAdapter#getLogger(java.lang.String)
+ * @see org.slf4j.LoggerAdapterFactory#getLogger(java.lang.String)
*/
public Logger getLogger(String name) {
Logger ulogger = (Logger) loggerMap.get(name);
@@ -68,7 +68,7 @@
}
/* (non-Javadoc)
- * @see org.slf4j.LoggerFactoryAdapter#getLogger(java.lang.String, java.lang.String)
+ * @see org.slf4j.LoggerAdapterFactory#getLogger(java.lang.String, java.lang.String)
*/
public Logger getLogger(String domainName, String subDomainName) {
return getLogger(domainName);
Copied: slf4j/branches/marker-experiment/src/java/org/slf4j/impl/NOPLoggerFA.java (from r95, slf4j/trunk/src/java/org/slf4j/impl/NOPLoggerFA.java)
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/NOPLoggerFA.java (original)
+++ slf4j/branches/marker-experiment/src/java/org/slf4j/impl/NOPLoggerFA.java Thu Jun 30 13:11:02 2005
@@ -33,18 +33,18 @@
package org.slf4j.impl;
-import org.slf4j.LoggerFactoryAdapter;
+import org.slf4j.LoggerAdapterFactory;
import org.slf4j.Logger;
/**
* NOPLoggerFA is an trivial implementation of {@link
- * LoggerFactoryAdapter} which always returns the unique instance of
+ * LoggerAdapterFactory} which always returns the unique instance of
* NOPLogger.
*
* @author Ceki Gulcu
*/
-public class NOPLoggerFA implements LoggerFactoryAdapter {
+public class NOPLoggerFA implements LoggerAdapterFactory {
public NOPLoggerFA() {
// nothing to do
Copied: slf4j/branches/marker-experiment/src/java/org/slf4j/impl/SimpleLoggerFA.java (from r95, slf4j/trunk/src/java/org/slf4j/impl/SimpleLoggerFA.java)
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/SimpleLoggerFA.java (original)
+++ slf4j/branches/marker-experiment/src/java/org/slf4j/impl/SimpleLoggerFA.java Thu Jun 30 13:11:02 2005
@@ -36,17 +36,17 @@
import java.util.HashMap;
import java.util.Map;
-import org.slf4j.LoggerFactoryAdapter;
+import org.slf4j.LoggerAdapterFactory;
import org.slf4j.Logger;
/**
- * An implementation of {@link LoggerFactoryAdapter} which always returns
+ * An implementation of {@link LoggerAdapterFactory} which always returns
* {@link SimpleLogger} instances.
*
* @author Ceki Gülcü
*/
-public class SimpleLoggerFA implements LoggerFactoryAdapter {
+public class SimpleLoggerFA implements LoggerAdapterFactory {
Map map;
@@ -70,7 +70,7 @@
/*
* (non-Javadoc)
- * @see org.slf4j.LoggerFactoryAdapter#getLogger(java.lang.String, java.lang.String)
+ * @see org.slf4j.LoggerAdapterFactory#getLogger(java.lang.String, java.lang.String)
*/
public Logger getLogger(String domainName, String subDomainName) {
return getLogger(domainName);
Copied: slf4j/branches/marker-experiment/tests/src/java/org/slf4j/SimpleLoggerFAFactory.java (from r80, slf4j/trunk/tests/src/java/org/slf4j/SimpleLoggerFAFactory.java)
==============================================================================
--- slf4j/trunk/tests/src/java/org/slf4j/SimpleLoggerFAFactory.java (original)
+++ slf4j/branches/marker-experiment/tests/src/java/org/slf4j/SimpleLoggerFAFactory.java Thu Jun 30 13:11:02 2005
@@ -35,7 +35,7 @@
public class SimpleLoggerFAFactory {
- public static LoggerFactoryAdapter getInstance() {
+ public static LoggerAdapterFactory getInstance() {
return new SimpleLoggerFA();
}
}
Copied: slf4j/branches/marker-experiment/tests/src/java/org/slf4j/XLoggerBySystemPropsTest.java (from r80, slf4j/trunk/tests/src/java/org/slf4j/XLoggerBySystemPropsTest.java)
==============================================================================
--- slf4j/trunk/tests/src/java/org/slf4j/XLoggerBySystemPropsTest.java (original)
+++ slf4j/branches/marker-experiment/tests/src/java/org/slf4j/XLoggerBySystemPropsTest.java Thu Jun 30 13:11:02 2005
@@ -39,7 +39,7 @@
public class XLoggerBySystemPropsTest extends TestCase {
public void testBasic() {
- System.setProperty(Constants.LOGGER_FA_FACTORY, "org.slf4j.XLoggerFAFactory");
+ System.setProperty(Constants.LOGGER_FA_FACTORY_PROPERTY, "org.slf4j.XLoggerFAFactory");
Logger logger = LoggerFactory.getLogger("foo");
if(! (logger instanceof XLogger)) {
Copied: slf4j/branches/marker-experiment/tests/src/java/org/slf4j/XLoggerFAFactory.java (from r80, slf4j/trunk/tests/src/java/org/slf4j/XLoggerFAFactory.java)
==============================================================================
--- slf4j/trunk/tests/src/java/org/slf4j/XLoggerFAFactory.java (original)
+++ slf4j/branches/marker-experiment/tests/src/java/org/slf4j/XLoggerFAFactory.java Thu Jun 30 13:11:02 2005
@@ -37,7 +37,7 @@
public class XLoggerFAFactory {
- public static LoggerFactoryAdapter getInstance() {
+ public static LoggerAdapterFactory getInstance() {
return new XLoggerFA();
}
}
Copied: slf4j/branches/marker-experiment/tests/src/java/org/slf4j/impl/XLogger.java (from r80, slf4j/trunk/tests/src/java/org/slf4j/impl/XLogger.java)
==============================================================================
--- slf4j/trunk/tests/src/java/org/slf4j/impl/XLogger.java (original)
+++ slf4j/branches/marker-experiment/tests/src/java/org/slf4j/impl/XLogger.java Thu Jun 30 13:11:02 2005
@@ -51,91 +51,67 @@
public boolean isDebugEnabled() { return false; }
- public void debug(Object msg) {
+ public void debug(String msg) {
}
- public void debug(Object parameterizedMsg, Object param1) { }
+ public void debug(String parameterizedMsg, Object arg) { }
- public void debug(String parameterizedMsg, Object param1, Object param2) { }
+ public void debug(String parameterizedMsg, Object arg1, Object arg2) { }
- public void debug(Object msg, Throwable t) { }
+ public void debug(String msg, Throwable t) { }
public boolean isInfoEnabled() { return false;
}
- /* A NOP implementation.
- * @see org.slf4j.Logger#info(java.lang.Object)
- */
- public void info(Object msg) {
+ public void info(String msg) {
// NOP
}
- /* A NOP implementation.
- * @see org.slf4j.Logger#info(java.lang.Object, java.lang.Object)
- */
- public void info(Object parameterizedMsg, Object param1) {
+ public void info(String format, Object arg) {
// NOP
}
- /* A NOP implementation.
- * @see org.slf4j.Logger#info(java.lang.Object, java.lang.Object, java.lang.Object)
- */
- public void info(String parameterizedMsg, Object param1, Object param2) {
+ public void info(String format, Object arg1, Object arg2) {
// NOP
}
- /* A NOP implementation.
- * @see org.slf4j.Logger#info(java.lang.Object, java.lang.Throwable)
- */
- public void info(Object msg, Throwable t) {
+ public void info(String msg, Throwable t) {
// NOP
}
- /* Always returns false.
- * @see org.slf4j.Logger#isWarnEnabled()
- */
public boolean isWarnEnabled() {
return false;
}
- /* A NOP implementation.
- * @see org.slf4j.Logger#warn(java.lang.Object)
- */
- public void warn(Object msg) {
+ public void warn(String msg) {
// NOP
}
- /* A NOP implementation.
- * @see org.slf4j.Logger#warn(java.lang.Object, java.lang.Object)
- */
- public void warn(Object parameterizedMsg, Object param1) {
+ public void warn(String format, Object arg) {
// NOP
}
- /* A NOP implementation.
- * @see org.slf4j.Logger#warn(java.lang.Object, java.lang.Object, java.lang.Object)
- */
- public void warn(String parameterizedMsg, Object param1, Object param2) {
+ public void warn(String format, Object arg1, Object arg2) {
// NOP
}
- public void warn(Object msg, Throwable t) {
+ public void warn(String msg, Throwable t) {
}
public boolean isErrorEnabled() {
return false;
}
- public void error(Object msg) {
+ public void error(String msg) {
}
- public void error(Object parameterizedMsg, Object param1) {
+ public void error(String format, Object arg) {
}
- public void error(String parameterizedMsg, Object param1, Object param2) {
+ public void error(String format, Object arg1, Object arg2) {
}
- public void error(Object msg, Throwable t) {
+ public void error(String msg, Throwable t) {
}
}
Copied: slf4j/branches/marker-experiment/tests/src/java/org/slf4j/impl/XLoggerFA.java (from r79, slf4j/trunk/tests/src/java/org/slf4j/impl/XLoggerFA.java)
==============================================================================
--- slf4j/trunk/tests/src/java/org/slf4j/impl/XLoggerFA.java (original)
+++ slf4j/branches/marker-experiment/tests/src/java/org/slf4j/impl/XLoggerFA.java Thu Jun 30 13:11:02 2005
@@ -1,17 +1,17 @@
package org.slf4j.impl;
-import org.slf4j.LoggerFactoryAdapter;
+import org.slf4j.LoggerAdapterFactory;
import org.slf4j.Logger;
/**
- * NOPLoggerFA is am implementation of {@link LoggerFactoryAdapter}
+ * NOPLoggerFA is am implementation of {@link LoggerAdapterFactory}
* which always returns the unique instance of NOPLogger.
*
* @author Ceki Gulcu
*/
-public class XLoggerFA implements LoggerFactoryAdapter {
+public class XLoggerFA implements LoggerAdapterFactory {
public XLoggerFA() {
// nothing to do
More information about the slf4j-dev
mailing list