Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update old net.spy.compat.log class names #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/net/spy/memcached/compat/log/Log4JLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public boolean isInfoEnabled() {
/**
* Wrapper around log4j.
*
* @param level net.spy.compat.log.Level level.
* @param level net.spy.memcached.compat.log.Level level.
* @param message object message
* @param e optional throwable
*/
Expand Down Expand Up @@ -93,9 +93,9 @@ public void log(Level level, Object message, Throwable e) {
default:
// I don't know what this is, so consider it fatal
pLevel = org.apache.log4j.Level.FATAL;
l4jLogger.log("net.spy.compat.log.AbstractLogger", pLevel, "Unhandled "
l4jLogger.log("net.spy.memcached.compat.log.AbstractLogger", pLevel, "Unhandled "
+ "log level: " + level + " for the following message", null);
}
l4jLogger.log("net.spy.compat.log.AbstractLogger", pLevel, message, e);
l4jLogger.log("net.spy.memcached.compat.log.AbstractLogger", pLevel, message, e);
}
}
6 changes: 3 additions & 3 deletions src/main/java/net/spy/memcached/compat/log/LoggerFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* Factory to get logger instances.
*
* The system property <code>net.spy.log.LoggerImpl</code> should point
* to an implementation of net.spy.compat.log.Logger to use.
* to an implementation of net.spy.memcached.compat.log.Logger to use.
*
* <p>
* Depending on how and where this was compiled, a sun logger (jdk 1.4) and/or
Expand Down Expand Up @@ -132,13 +132,13 @@ private void getConstructor() {
} catch (NoClassDefFoundError e) {
System.err.println("Warning: " + className
+ " not found while initializing"
+ " net.spy.compat.log.LoggerFactory");
+ " net.spy.memcached.compat.log.LoggerFactory");
e.printStackTrace();
c = DefaultLogger.class;
} catch (ClassNotFoundException e) {
System.err.println("Warning: " + className
+ " not found while initializing"
+ " net.spy.compat.log.LoggerFactory");
+ " net.spy.memcached.compat.log.LoggerFactory");
e.printStackTrace();
c = DefaultLogger.class;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public boolean isInfoEnabled() {
/**
* Wrapper around SLF4J logger facade.
*
* @param level net.spy.compat.log.Level level.
* @param level net.spy.memcached.compat.log.Level level.
* @param message object message
* @param e optional throwable
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/spy/memcached/compat/log/SunLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public boolean isInfoEnabled() {
/**
* Wrapper around sun logger.
*
* @param level net.spy.compat.log.AbstractLogger level.
* @param level net.spy.memcached.compat.log.AbstractLogger level.
* @param message object message
* @param e optional throwable
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void testOtherLogging() {
*/
public void testLog4j() {
// Logger l=LoggerFactory.getLogger(getClass());
// assertEquals("net.spy.compat.log.Log4JLogger", l.getClass().getName());
// assertEquals("net.spy.memcached.compat.log.Log4JLogger", l.getClass().getName());
}

/**
Expand Down