@@ -41,7 +41,7 @@ public class Log4JLogger extends AbstractLogger { /** * Wrapper around log4j. * - * @param level net.spy.log.AbstractLogger level. + * @param level net.spy.compat.log.AbstractLogger level. * @param message object message * @param e optional throwable */ @@ -68,12 +68,12 @@ public class Log4JLogger extends AbstractLogger { default: // I don't know what this is, so consider it fatal pLevel=org.apache.log4j.Level.FATAL; - l4jLogger.log("net.spy.log.AbstractLogger", pLevel, + l4jLogger.log("net.spy.compat.log.AbstractLogger", pLevel, "Unhandled log level: " + level + " for the following message", null); } - l4jLogger.log("net.spy.log.AbstractLogger", pLevel, message, e); + l4jLogger.log("net.spy.compat.log.AbstractLogger", pLevel, message, e); } } src/main/java/net/spy/memcached/compat/log/Log4JLogger.java @@ -9,8 +9,10 @@ import java.util.concurrent.ConcurrentMap; /** * Factory to get logger instances. - * The system property <code>net.spy.log.LoggerImpl</code> should point to - * an implementation of net.spy.log.Logger to use. + * + * The system property <code>net.spy.compat.log.LoggerImpl</code> + * should point to an implementation of net.spy.compat.log.Logger to + * use. * * <p> * Depending on how and where this was compiled, a sun logger (jdk 1.4) @@ -114,13 +116,13 @@ public final class LoggerFactory extends Object { } catch(NoClassDefFoundError e) { System.err.println("Warning: " + className + " not found while initializing" - + " net.spy.log.LoggerFactory"); + + " net.spy.compat.log.LoggerFactory"); e.printStackTrace(); c=DefaultLogger.class; } catch(ClassNotFoundException e) { System.err.println("Warning: " + className + " not found while initializing" - + " net.spy.log.LoggerFactory"); + + " net.spy.compat.log.LoggerFactory"); e.printStackTrace(); c=DefaultLogger.class; } src/main/java/net/spy/memcached/compat/log/LoggerFactory.java @@ -40,7 +40,7 @@ public class SunLogger extends AbstractLogger { /** * Wrapper around sun logger. * - * @param level net.spy.log.AbstractLogger level. + * @param level net.spy.compat.log.AbstractLogger level. * @param message object message * @param e optional throwable */ src/main/java/net/spy/memcached/compat/log/SunLogger.java @@ -63,7 +63,7 @@ public class LoggingTest extends TestCase { */ public void testLog4j() { // Logger l=LoggerFactory.getLogger(getClass()); -// assertEquals("net.spy.log.Log4JLogger", l.getClass().getName()); +// assertEquals("net.spy.compat.log.Log4JLogger", l.getClass().getName()); } /** src/test/java/net/spy/memcached/compat/log/LoggingTest.java c6f8a9783af431c5f9ec4f8d178f10c4698fb46c Dustin Sallings dustin@spy.net http://github.com/dustin/java-memcached-client/commit/d5643e7ba5d825dda6002b61194fe079702b18ed d5643e7ba5d825dda6002b61194fe079702b18ed 2009-04-02T08:28:17-07:00 2009-04-02T08:28:17-07:00 Update compat docs and errors to reflect compat packaging. 0fc236fdfc0e0bd848c83732a3723e0e7dc19967 Dustin Sallings dustin@spy.net