Author: ceki Date: Thu Jul 12 21:38:09 2007 New Revision: 842 Removed: slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/BasicConfigurator.java Modified: slf4j/trunk/log4j-over-slf4j/ (props changed) slf4j/trunk/log4j-over-slf4j/pom.xml slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java slf4j/trunk/log4j-over-slf4j/src/test/java/org/apache/log4j/LoggerTest.java slf4j/trunk/slf4j-site/src/site/pages/index.html slf4j/trunk/slf4j-site/src/site/pages/news.html
Log: - continued work on log4j-over-slf4j Modified: slf4j/trunk/log4j-over-slf4j/pom.xml ============================================================================== --- slf4j/trunk/log4j-over-slf4j/pom.xml (original) +++ slf4j/trunk/log4j-over-slf4j/pom.xml Thu Jul 12 21:38:09 2007 @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.4.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -38,6 +38,12 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>0.9.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> </dependencies> @@ -51,13 +57,20 @@ <id>bundle-test-jar</id> <phase>package</phase> <goals> - <goal>jar</goal> - <goal>test-jar</goal> + <goal>jar</goal> </goals> </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> </plugins> </build> Modified: slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java ============================================================================== --- slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java (original) +++ slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java Thu Jul 12 21:38:09 2007 @@ -20,8 +20,6 @@ import org.slf4j.MarkerFactory; import org.slf4j.spi.LocationAwareLogger; -import ch.qos.logback.classic.Level; - /** * <p> * This class is a minimal implementation of the origianl @@ -119,7 +117,7 @@ } public boolean isEnabledFor(Level l) { - switch (l.levelInt) { + switch (l.level) { case Level.TRACE_INT: return lbLogger.isTraceEnabled(); case Level.DEBUG_INT: Modified: slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java ============================================================================== --- slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java (original) +++ slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java Thu Jul 12 21:38:09 2007 @@ -29,7 +29,8 @@ */ class Log4jLoggerFactory { - private static Hashtable<String, Logger> log4jLoggers = new Hashtable<String, Logger>(); + // String, Logger + private static Hashtable log4jLoggers = new Hashtable(); public static synchronized Logger getLogger(String name) { if (log4jLoggers.containsKey(name)) { Modified: slf4j/trunk/log4j-over-slf4j/src/test/java/org/apache/log4j/LoggerTest.java ============================================================================== --- slf4j/trunk/log4j-over-slf4j/src/test/java/org/apache/log4j/LoggerTest.java (original) +++ slf4j/trunk/log4j-over-slf4j/src/test/java/org/apache/log4j/LoggerTest.java Thu Jul 12 21:38:09 2007 @@ -44,7 +44,7 @@ context.stop(); appender = null; context = null; - logbackLogger = null; + logbackLogger = null; log4jLogger = null; super.tearDown(); } Modified: slf4j/trunk/slf4j-site/src/site/pages/index.html ============================================================================== --- slf4j/trunk/slf4j-site/src/site/pages/index.html (original) +++ slf4j/trunk/slf4j-site/src/site/pages/index.html Thu Jul 12 21:38:09 2007 @@ -31,10 +31,9 @@ </p> <p>SLF4J API offers an advanced abstraction of various logging - systems, including JDK 1.4 logging, log4j and logback. Advacned - features include <a - href="faq.html#logging_performance">parameterized logging</a> and <a - href="manual.html#mdc">MDC support</a>. + systems, including JDK 1.4 logging, log4j and logback. Features + include <a href="faq.html#logging_performance">parameterized + logging</a> and <a href="manual.html#mdc">MDC support</a>. </p> <p>Logging systems can either choose to implement the the SLF4J Modified: slf4j/trunk/slf4j-site/src/site/pages/news.html ============================================================================== --- slf4j/trunk/slf4j-site/src/site/pages/news.html (original) +++ slf4j/trunk/slf4j-site/src/site/pages/news.html Thu Jul 12 21:38:09 2007 @@ -32,11 +32,17 @@ <h3>July 9th, 2007 - Release of SLF4J 1.4.2</h3> - <p>The log4j-over-slf4j project has been moved + <p>With the addition of MDC support in version 1.4.1, the + log4j-over-slf4j module has been moved back into SLF4J. Originally, + this module was part of SLF4J and was moved into logback due to the + lack of MDC support in SLF4J. With version 1.4.2, log4j-over-slf4j + returns to its original home. Note that the previous name of the + module was "log4j-bridge". + </p> <p>Addition of the <code>getMDCAdapter</code> method to org.slf4j.MDC class. This allows access to the actual MDC - implementation which can occasionally come in handly. + implementation which can on occasion come in very handy. </p> <hr noshade="noshade" size="1"/> _______________________________________________ dev mailing list [email protected] http://www.slf4j.org/mailman/listinfo/dev
