[slf4j-dev] svn commit: r723 - in slf4j/trunk: slf4j-api/src/main/java/org/slf4j/helpers slf4j-api/src/main/java/org/slf4j/impl slf4j-api/src/test/java/org/slf4j slf4j-api/src/test/java/org/slf4j/helpers slf4j-api/src/test/java/org/slf4j/impl slf4j-jcl/src/main/java/org/slf4j slf4j-jcl/src/main/java/org/slf4j/impl slf4j-jdk14/src/main/java/org/slf4j slf4j-jdk14/src/main/java/org/slf4j/impl slf4j-log4j12/src/main/java/org/slf4j slf4j-log4j12/src/main/java/org/slf4j/impl slf4j-nop/src/main/java/org/slf4j slf4j-nop/src/main/java/org/slf4j/impl slf4j-simple/src/main/java/org/slf4j slf4j-simple/src/main/java/org/slf4j/impl
seb at slf4j.org
seb at slf4j.org
Fri Feb 16 15:50:10 CET 2007
Author: seb
Date: Fri Feb 16 15:50:08 2007
New Revision: 723
Added:
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
- copied, changed from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarker.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java
- copied, changed from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarkerFactory.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java
- copied, changed from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MarkerIgnoringBase.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
- copied, changed from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MessageFormatter.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
- copied, changed from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/Util.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/package.html
- copied unchanged from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/package.html
slf4j/trunk/slf4j-api/src/test/java/org/slf4j/helpers/
slf4j/trunk/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java
- copied, changed from r722, /slf4j/trunk/slf4j-api/src/test/java/org/slf4j/impl/MessageFormatterTest.java
Removed:
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarker.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarkerFactory.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MarkerIgnoringBase.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MessageFormatter.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/Util.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/package.html
slf4j/trunk/slf4j-api/src/test/java/org/slf4j/impl/MessageFormatterTest.java
Modified:
slf4j/trunk/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java
slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java
slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java
slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java
slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java
slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java
slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
Log:
Moved BasicMarker.java, BasicMarkerTest.java, BasicMarkerFactory.java, MarkerIgnoringBase.java, MessageFormatter.java and Util.java to the org.slf4j.helpers package.
Updated other modules classes accordingly
Copied: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java (from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarker.java)
==============================================================================
--- /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarker.java (original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java Fri Feb 16 15:50:08 2007
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
import java.util.Collections;
import java.util.Iterator;
Copied: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java (from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarkerFactory.java)
==============================================================================
--- /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/BasicMarkerFactory.java (original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java Fri Feb 16 15:50:08 2007
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
import java.util.HashMap;
import java.util.Map;
Copied: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java (from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MarkerIgnoringBase.java)
==============================================================================
--- /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MarkerIgnoringBase.java (original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java Fri Feb 16 15:50:08 2007
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
import org.slf4j.Logger;
import org.slf4j.Marker;
Copied: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java (from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MessageFormatter.java)
==============================================================================
--- /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/MessageFormatter.java (original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java Fri Feb 16 15:50:08 2007
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
/**
Copied: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/Util.java (from r722, /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/Util.java)
==============================================================================
--- /slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/Util.java (original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/Util.java Fri Feb 16 15:50:08 2007
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
/**
Modified: slf4j/trunk/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java (original)
+++ slf4j/trunk/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java Fri Feb 16 15:50:08 2007
@@ -34,7 +34,7 @@
import junit.framework.TestCase;
-import org.slf4j.impl.BasicMarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
/**
Copied: slf4j/trunk/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java (from r722, /slf4j/trunk/slf4j-api/src/test/java/org/slf4j/impl/MessageFormatterTest.java)
==============================================================================
--- /slf4j/trunk/slf4j-api/src/test/java/org/slf4j/impl/MessageFormatterTest.java (original)
+++ slf4j/trunk/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java Fri Feb 16 15:50:08 2007
@@ -31,9 +31,9 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
-import org.slf4j.impl.MessageFormatter;
+import org.slf4j.helpers.MessageFormatter;
import junit.framework.TestCase;
Modified: slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java (original)
+++ slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java Fri Feb 16 15:50:08 2007
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
Modified: slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java (original)
+++ slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java Fri Feb 16 15:50:08 2007
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
Modified: slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java (original)
+++ slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java Fri Feb 16 15:50:08 2007
@@ -35,6 +35,8 @@
import org.apache.commons.logging.Log;
import org.slf4j.Logger;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
/**
* A wrapper over {@link org.apache.commons.logging.Log
Modified: slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (original)
+++ slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Fri Feb 16 15:50:08 2007
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
Modified: slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java (original)
+++ slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java Fri Feb 16 15:50:08 2007
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
Modified: slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java (original)
+++ slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java Fri Feb 16 15:50:08 2007
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
Modified: slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java (original)
+++ slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java Fri Feb 16 15:50:08 2007
@@ -38,6 +38,8 @@
import org.slf4j.Logger;
import org.slf4j.Marker;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
import org.slf4j.spi.LocationAwareLogger;
/**
Modified: slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (original)
+++ slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Fri Feb 16 15:50:08 2007
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
Modified: slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java (original)
+++ slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java Fri Feb 16 15:50:08 2007
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
Modified: slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java (original)
+++ slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java Fri Feb 16 15:50:08 2007
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
Modified: slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java (original)
+++ slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java Fri Feb 16 15:50:08 2007
@@ -37,6 +37,8 @@
import org.apache.log4j.Level;
import org.slf4j.Logger;
import org.slf4j.Marker;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
import org.slf4j.spi.LocationAwareLogger;
Modified: slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (original)
+++ slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Fri Feb 16 15:50:08 2007
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
Modified: slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java (original)
+++ slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java Fri Feb 16 15:50:08 2007
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
Modified: slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java (original)
+++ slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java Fri Feb 16 15:50:08 2007
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
Modified: slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java (original)
+++ slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java Fri Feb 16 15:50:08 2007
@@ -34,6 +34,7 @@
package org.slf4j.impl;
import org.slf4j.Logger;
+import org.slf4j.helpers.MarkerIgnoringBase;
/**
Modified: slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (original)
+++ slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Fri Feb 16 15:50:08 2007
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
Modified: slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java (original)
+++ slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java Fri Feb 16 15:50:08 2007
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
Modified: slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java (original)
+++ slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java Fri Feb 16 15:50:08 2007
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
Modified: slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java (original)
+++ slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java Fri Feb 16 15:50:08 2007
@@ -33,6 +33,9 @@
package org.slf4j.impl;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
+
/**
* A simple (and direct) implementation that logs messages of level
* INFO or higher on the console (<code>System.err<code>).
Modified: slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (original)
+++ slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Fri Feb 16 15:50:08 2007
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
More information about the slf4j-dev
mailing list