[slf4j-dev] svn commit: r220 - in slf4j/trunk: . src/filtered-java/org/slf4j src/java/org/slf4j src/java/org/slf4j/impl src/java/org/slf4j/spi
ceki at slf4j.org
ceki at slf4j.org
Sun Aug 28 14:45:12 CEST 2005
Author: ceki
Date: Sun Aug 28 14:45:10 2005
New Revision: 220
Added:
slf4j/trunk/src/filtered-java/org/slf4j/StaticBinder.java
- copied, changed from r219, slf4j/trunk/src/filtered-java/org/slf4j/StaticLoggerFactoryBinder.java
slf4j/trunk/src/java/org/slf4j/impl/SystemPropBinder.java
- copied, changed from r219, slf4j/trunk/src/java/org/slf4j/SystemPropBinder.java
slf4j/trunk/src/java/org/slf4j/impl/Util.java
- copied, changed from r208, slf4j/trunk/src/java/org/slf4j/Util.java
slf4j/trunk/src/java/org/slf4j/spi/package.html
Removed:
slf4j/trunk/src/filtered-java/org/slf4j/StaticLoggerFactoryBinder.java
slf4j/trunk/src/java/org/slf4j/SystemPropBinder.java
slf4j/trunk/src/java/org/slf4j/Util.java
Modified:
slf4j/trunk/build.xml
slf4j/trunk/src/filtered-java/org/slf4j/MarkerFactory.java
slf4j/trunk/src/java/org/slf4j/LoggerFactory.java
slf4j/trunk/src/java/org/slf4j/spi/LoggerFactoryBinder.java
Log:
- minor changes in code
- javadoc enhancements
Modified: slf4j/trunk/build.xml
==============================================================================
--- slf4j/trunk/build.xml (original)
+++ slf4j/trunk/build.xml Sun Aug 28 14:45:10 2005
@@ -220,6 +220,7 @@
<title>SLF4J</title>
<package name="org.slf4j"/>
<package name="org.slf4j.impl"/>
+ <package name="org.slf4j.spi"/>
</group>
<group>
Modified: slf4j/trunk/src/filtered-java/org/slf4j/MarkerFactory.java
==============================================================================
--- slf4j/trunk/src/filtered-java/org/slf4j/MarkerFactory.java (original)
+++ slf4j/trunk/src/filtered-java/org/slf4j/MarkerFactory.java Sun Aug 28 14:45:10 2005
@@ -31,6 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.impl.Util;
+
// WARNING
// WARNING Modifications MUST be made to the original file found at
// WARNING $SLF4J_HOME/src/filtered-java/org/slf4j/MarkerFactory.java
Copied: slf4j/trunk/src/filtered-java/org/slf4j/StaticBinder.java (from r219, slf4j/trunk/src/filtered-java/org/slf4j/StaticLoggerFactoryBinder.java)
==============================================================================
--- slf4j/trunk/src/filtered-java/org/slf4j/StaticLoggerFactoryBinder.java (original)
+++ slf4j/trunk/src/filtered-java/org/slf4j/StaticBinder.java Sun Aug 28 14:45:10 2005
@@ -37,10 +37,10 @@
//WARNING
//WARNING Modifications MUST be made to the original file found at
-//WARNING $SLF4J_HOME/src/filtered-java/org/slf4j/StaticLoggerFactoryBinder.java
+//WARNING $SLF4J_HOME/src/filtered-java/org/slf4j/StaticBinder.java
//WARNING
-public class StaticLoggerFactoryBinder implements LoggerFactoryBinder {
+public class StaticBinder implements LoggerFactoryBinder {
//
@@ -51,7 +51,7 @@
// Note: @IMPL@ gets substituted at build time by an appropriate Ant task
String loggerFactoryClassStr ="org.slf4j.impl. at IMPL@LoggerFactory";
- StaticLoggerFactoryBinder() {
+ StaticBinder() {
}
// package private
Modified: slf4j/trunk/src/java/org/slf4j/LoggerFactory.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/LoggerFactory.java (original)
+++ slf4j/trunk/src/java/org/slf4j/LoggerFactory.java Sun Aug 28 14:45:10 2005
@@ -32,6 +32,9 @@
*/
package org.slf4j;
+import org.slf4j.impl.SystemPropBinder;
+import org.slf4j.impl.Util;
+
// WARNING
// WARNING Modifications MUST be made to the original file found at
// WARNING $SLF4J_HOME/src/filtered-java/org/slf4j/LoggerFactory.java
@@ -54,7 +57,7 @@
*/
public final class LoggerFactory {
- static StaticLoggerFactoryBinder staticBinder = new StaticLoggerFactoryBinder();
+ static StaticBinder staticBinder = new StaticBinder();
static ILoggerFactory loggerFactory;
// private constructor prevents instantiation
@@ -121,7 +124,7 @@
return loggerFactory;
}
- public static StaticLoggerFactoryBinder getStaticBinder() {
+ public static StaticBinder getStaticBinder() {
return staticBinder;
}
Copied: slf4j/trunk/src/java/org/slf4j/impl/SystemPropBinder.java (from r219, slf4j/trunk/src/java/org/slf4j/SystemPropBinder.java)
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/SystemPropBinder.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/SystemPropBinder.java Sun Aug 28 14:45:10 2005
@@ -1,7 +1,9 @@
// TOTO
-package org.slf4j;
+package org.slf4j.impl;
+import org.slf4j.Constants;
+import org.slf4j.ILoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;
/**
@@ -10,7 +12,7 @@
* TODO To change the template for this generated type comment go to Window -
* Preferences - Java - Code Style - Code Templates
*/
-class SystemPropBinder implements LoggerFactoryBinder {
+public class SystemPropBinder implements LoggerFactoryBinder {
String factoryFactoryClassName = null;
/**
Copied: slf4j/trunk/src/java/org/slf4j/impl/Util.java (from r208, slf4j/trunk/src/java/org/slf4j/Util.java)
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/Util.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/Util.java Sun Aug 28 14:45:10 2005
@@ -31,18 +31,18 @@
*
*/
-package org.slf4j;
+package org.slf4j.impl;
/**
*
- * A package internal utility class.
+ * An internal utility class.
*
* @author Ceki Gulcu
*/
-class Util {
+public class Util {
- static void reportFailure(String msg, Throwable t) {
+ static public void reportFailure(String msg, Throwable t) {
System.err.println(msg);
System.err.println("Reported exception follows.");
t.printStackTrace();
Modified: slf4j/trunk/src/java/org/slf4j/spi/LoggerFactoryBinder.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/spi/LoggerFactoryBinder.java (original)
+++ slf4j/trunk/src/java/org/slf4j/spi/LoggerFactoryBinder.java Sun Aug 28 14:45:10 2005
@@ -36,19 +36,19 @@
import org.slf4j.ILoggerFactory;
/**
- * An internal interface which helps the static {@link LoggerFactory} class
- * bind with the appropriate {@link ILoggerFactory} instance.
+ * An internal interface which helps the static {@link org.slf4j.LoggerFactory}
+ * class bind with the appropriate {@link ILoggerFactory} instance.
*
* @author <a href="http://www.qos.ch/log4j/">Ceki Gülcü</a>
*/
public interface LoggerFactoryBinder {
/**
- * Return the instance of {@link ILoggerFactory} that {@link LoggerFactory}
- * should bind to.
+ * Return the instance of {@link ILoggerFactory} that
+ * {@link org.slf4j.LoggerFactory} class should bind to.
*
- * @return the instance of {@link ILoggerFactory} that {@link LoggerFactory}
- * should bind to.
+ * @return the instance of {@link ILoggerFactory} that
+ * {@link org.slf4j.LoggerFactory} class should bind to.
*/
public ILoggerFactory getLoggerFactory();
Added: slf4j/trunk/src/java/org/slf4j/spi/package.html
==============================================================================
--- (empty file)
+++ slf4j/trunk/src/java/org/slf4j/spi/package.html Sun Aug 28 14:45:10 2005
@@ -0,0 +1,8 @@
+
+<body>
+
+
+Classes and interfaces which are internal to SLF4J. Under most
+circumstances SLF4J users should be oblivious even to the existence of
+this package.
+</body>
\ No newline at end of file
More information about the slf4j-dev
mailing list