Author: lukaszlenart
Date: Tue Jan 22 14:55:59 2013
New Revision: 1436984
URL: http://svn.apache.org/viewvc?rev=1436984&view=rev
Log:
Adds support for debug(String, Object...)
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java?rev=1436984&r1=1436983&r2=1436984&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
Tue Jan 22 14:55:59 2013
@@ -20,26 +20,40 @@ package com.opensymphony.xwork2.util.log
*/
public interface Logger {
void trace(String msg, String... args);
+
void trace(String msg, Throwable ex, String... args);
+
boolean isTraceEnabled();
-
+
void debug(String msg, String... args);
+
+ void debug(String msg, Object... args);
+
void debug(String msg, Throwable ex, String... args);
+
boolean isDebugEnabled();
-
+
void info(String msg, String... args);
+
void info(String msg, Throwable ex, String... args);
+
boolean isInfoEnabled();
-
+
void warn(String msg, String... args);
+
void warn(String msg, Throwable ex, String... args);
+
boolean isWarnEnabled();
-
+
void error(String msg, String... args);
+
void error(String msg, Throwable ex, String... args);
+
boolean isErrorEnabled();
-
+
void fatal(String msg, String... args);
+
void fatal(String msg, Throwable ex, String... args);
+
boolean isFatalEnabled();
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java?rev=1436984&r1=1436983&r2=1436984&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
Tue Jan 22 14:55:59 2013
@@ -15,6 +15,9 @@
*/
package com.opensymphony.xwork2.util.logging;
+import java.util.LinkedList;
+import java.util.List;
+
/**
* Logging utility methods
*/
@@ -69,4 +72,12 @@ public class LoggerUtils {
}
+ public static String format(String msg, Object[] args) {
+ List<String> strArgs = new LinkedList<String>();
+ for (Object arg : args) {
+ strArgs.add(arg != null ? arg.toString() : "(null)");
+ }
+ return format(msg, strArgs.toArray(new String[strArgs.size()]));
+ }
+
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java?rev=1436984&r1=1436983&r2=1436984&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
Tue Jan 22 14:55:59 2013
@@ -68,6 +68,10 @@ public class CommonsLogger implements Lo
log.debug(LoggerUtils.format(msg, args));
}
+ public void debug(String msg, Object... args) {
+ log.debug(LoggerUtils.format(msg, args));
+ }
+
public void debug(String msg, Throwable ex, String... args) {
log.debug(LoggerUtils.format(msg, args), ex);
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java?rev=1436984&r1=1436983&r2=1436984&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
Tue Jan 22 14:55:59 2013
@@ -75,6 +75,10 @@ public class JdkLogger implements Logger
log.log(Level.FINE, LoggerUtils.format(msg, args));
}
+ public void debug(String msg, Object... args) {
+ log.log(Level.FINE, LoggerUtils.format(msg, args));
+ }
+
public void debug(String msg, Throwable ex, String... args) {
log.log(Level.FINE, LoggerUtils.format(msg, args), ex);
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java?rev=1436984&r1=1436983&r2=1436984&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
Tue Jan 22 14:55:59 2013
@@ -45,8 +45,6 @@ public class Slf4jLogger implements Logg
log.info(LoggerUtils.format(msg, args), ex);
}
-
-
public boolean isInfoEnabled() {
return log.isInfoEnabled();
}
@@ -67,6 +65,10 @@ public class Slf4jLogger implements Logg
log.debug(LoggerUtils.format(msg, args));
}
+ public void debug(String msg, Object... args) {
+ log.debug(LoggerUtils.format(msg, args));
+ }
+
public void debug(String msg, Throwable ex, String... args) {
log.debug(LoggerUtils.format(msg, args), ex);
}
