WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
- Mark current xwork logging implementation as deprecated so it can be removed with 3.0 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/26279424 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/26279424 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/26279424 Branch: refs/heads/master Commit: 26279424f00d4003db7b7bd749f71f6939fc3602 Parents: 93a307b Author: Johannes Geppert <joh...@gmail.com> Authored: Mon May 25 21:49:53 2015 +0200 Committer: Johannes Geppert <joh...@gmail.com> Committed: Mon May 25 21:49:53 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/com/opensymphony/xwork2/util/logging/Logger.java | 1 + .../java/com/opensymphony/xwork2/util/logging/LoggerFactory.java | 1 + .../main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java | 1 + .../com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java | 1 + .../xwork2/util/logging/commons/CommonsLoggerFactory.java | 1 + .../java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java | 1 + .../com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java | 1 + .../com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java | 1 + .../xwork2/util/logging/log4j2/Log4j2LoggerFactory.java | 1 + .../com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java | 1 + .../opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java | 1 + 11 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java index 408cb0a..e7da798 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java @@ -18,6 +18,7 @@ package com.opensymphony.xwork2.util.logging; /** * Main logger interface for logging things */ +@Deprecated public interface Logger { void trace(String msg, String... args); http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java index 0e7445b..29b70df 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java @@ -30,6 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; /** * Creates loggers. Static accessor will lazily try to decide on the best factory if none specified. */ +@Deprecated public abstract class LoggerFactory { private static final ReadWriteLock lock = new ReentrantReadWriteLock(); http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java index 876b2c7..a513ed2 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java @@ -21,6 +21,7 @@ import java.util.List; /** * Logging utility methods */ +@Deprecated public class LoggerUtils { /** http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java index a06f647..6ee4e0f 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.Log; /** * Simple logger that delegates to commons logging */ +@Deprecated public class CommonsLogger implements Logger { private Log log; http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java index 3979e9c..0e02293 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFactory; /** * Creates commons-logging-backed loggers */ +@Deprecated public class CommonsLoggerFactory extends LoggerFactory { @Override http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java index 38540ce..1a11346 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java @@ -23,6 +23,7 @@ import java.util.logging.Level; /** * Delegates to jdk logger. Maps fatal to Level.SEVERE along with error. */ +@Deprecated public class JdkLogger implements Logger { private java.util.logging.Logger log; http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java index af8b677..dbf719c 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java @@ -21,6 +21,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Creates jdk loggers */ +@Deprecated public class JdkLoggerFactory extends LoggerFactory { @Override http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java index 44a10fd..228a860 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java @@ -21,6 +21,7 @@ import com.opensymphony.xwork2.util.logging.LoggerUtils; /** * Simple logger that delegates to log4j2 logging */ +@Deprecated public class Log4j2Logger implements Logger { private org.apache.logging.log4j.Logger log; http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java index 73b8898..dd2799d 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java @@ -26,6 +26,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory; * -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory * </pre> */ +@Deprecated public class Log4j2LoggerFactory extends LoggerFactory { @Override http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java index 5374db3..10acaf8 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java @@ -21,6 +21,7 @@ import com.opensymphony.xwork2.util.logging.LoggerUtils; /** * Simple logger that delegates to slf4j logging */ +@Deprecated public class Slf4jLogger implements Logger { private org.slf4j.Logger log; http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java index 0b85fbd..77a8030 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java @@ -26,6 +26,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory; * -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.slf4j.Slf4jLoggerFactory * </pre> */ +@Deprecated public class Slf4jLoggerFactory extends LoggerFactory { @Override
