You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/06/23 12:21:26 UTC
struts git commit: WW-4518 Adds since marker to things marked as
deprecated in this release
Repository: struts
Updated Branches:
refs/heads/master c50605a94 -> 52b478f59
WW-4518 Adds since marker to things marked as deprecated in this release
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/52b478f5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/52b478f5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/52b478f5
Branch: refs/heads/master
Commit: 52b478f59a3627d79ab2546354158e184d52e0ae
Parents: c50605a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Jun 23 12:21:19 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Jun 23 12:21:19 2015 +0200
----------------------------------------------------------------------
.../main/java/com/opensymphony/xwork2/util/logging/Logger.java | 2 ++
.../java/com/opensymphony/xwork2/util/logging/LoggerFactory.java | 2 ++
.../java/com/opensymphony/xwork2/util/logging/LoggerUtils.java | 2 ++
.../opensymphony/xwork2/util/logging/commons/CommonsLogger.java | 2 ++
.../xwork2/util/logging/commons/CommonsLoggerFactory.java | 2 ++
.../java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java | 2 ++
.../opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java | 2 ++
.../com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java | 2 ++
.../xwork2/util/logging/log4j2/Log4j2LoggerFactory.java | 2 ++
.../com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java | 2 ++
.../xwork2/util/logging/slf4j/Slf4jLoggerFactory.java | 2 ++
.../main/java/org/apache/struts2/dispatcher/FilterDispatcher.java | 3 +++
.../java/org/apache/struts2/dispatcher/ng/InitOperations.java | 2 ++
13 files changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
index e7da798..b166055 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
@@ -17,6 +17,8 @@ package com.opensymphony.xwork2.util.logging;
/**
* Main logger interface for logging things
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public interface Logger {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
index 29b70df..79e7e59 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
@@ -29,6 +29,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Creates loggers. Static accessor will lazily try to decide on the best factory if none specified.
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public abstract class LoggerFactory {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
index a513ed2..47fe339 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
@@ -20,6 +20,8 @@ import java.util.List;
/**
* Logging utility methods
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class LoggerUtils {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
index 6ee4e0f..ff96d50 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
@@ -21,6 +21,8 @@ import org.apache.commons.logging.Log;
/**
* Simple logger that delegates to commons logging
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class CommonsLogger implements Logger {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java
index 0e02293..06e39b1 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java
@@ -21,6 +21,8 @@ import org.apache.commons.logging.LogFactory;
/**
* Creates commons-logging-backed loggers
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class CommonsLoggerFactory extends LoggerFactory {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
index 1a11346..acab3a8 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
@@ -22,6 +22,8 @@ import java.util.logging.Level;
/**
* Delegates to jdk logger. Maps fatal to Level.SEVERE along with error.
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class JdkLogger implements Logger {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java
index dbf719c..268ccce 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java
@@ -20,6 +20,8 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Creates jdk loggers
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class JdkLoggerFactory extends LoggerFactory {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
index 228a860..1e0cda5 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
@@ -20,6 +20,8 @@ import com.opensymphony.xwork2.util.logging.LoggerUtils;
/**
* Simple logger that delegates to log4j2 logging
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class Log4j2Logger implements Logger {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java
index dd2799d..04cae80 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java
@@ -25,6 +25,8 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
* <pre>
* -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory
* </pre>
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class Log4j2LoggerFactory extends LoggerFactory {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
index a303032..4dea191 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
@@ -20,6 +20,8 @@ import com.opensymphony.xwork2.util.logging.LoggerUtils;
/**
* Simple logger that delegates to slf4j logging
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class Slf4jLogger implements Logger {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
index 6e3e6d5..aba7d86 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
@@ -25,6 +25,8 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
* <pre>
* -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.slf4j.Slf4jLoggerFactory
* </pre>
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public class Slf4jLoggerFactory extends LoggerFactory {
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
index 210451f..eab9acb 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
@@ -194,6 +194,9 @@ public class FilterDispatcher implements StrutsStatics, Filter {
}
}
+ /**
+ * @deprecated since 2.5
+ */
@Deprecated
private void initLogging() {
String factoryName = filterConfig.getInitParameter("loggerFactory");
http://git-wip-us.apache.org/repos/asf/struts/blob/52b478f5/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
index 470753e..d913b71 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
@@ -40,6 +40,8 @@ public class InitOperations {
/**
* Initializes the internal Struts logging
+ *
+ * @deprecated since 2.5
*/
@Deprecated
public void initLogging( HostConfig filterConfig ) {