WW-4518 Adds since marker to things marked as deprecated in this release

dddfans · Jun 23, 2015 · 52b478f · 52b478f
1 parent c50605a
commit 52b478f
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 0 deletions.
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
@@ -17,6 +17,8 @@
 
 /**
  * Main logger interface for logging things
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public interface Logger {

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
@@ -29,6 +29,8 @@
 
 /**
  * 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 {

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
@@ -20,6 +20,8 @@
 
 /**
  * Logging utility methods
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class LoggerUtils {

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
@@ -21,6 +21,8 @@
 
 /**
  * Simple logger that delegates to commons logging
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class CommonsLogger implements Logger {

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
@@ -21,6 +21,8 @@
 
 /**
  * Creates commons-logging-backed loggers
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class CommonsLoggerFactory extends LoggerFactory {

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
@@ -22,6 +22,8 @@
 
 /**
  * Delegates to jdk logger.  Maps fatal to Level.SEVERE along with error.
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class JdkLogger implements Logger {

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
@@ -20,6 +20,8 @@
 
 /**
  * Creates jdk loggers
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class JdkLoggerFactory extends LoggerFactory {

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
@@ -20,6 +20,8 @@
 
 /**
  * Simple logger that delegates to log4j2 logging
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class Log4j2Logger implements Logger {

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
@@ -25,6 +25,8 @@
  * <pre>
  *   -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory
  * </pre>
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class Log4j2LoggerFactory extends LoggerFactory {

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
@@ -20,6 +20,8 @@
 
 /**
  * Simple logger that delegates to slf4j logging
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class Slf4jLogger implements Logger {

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
@@ -25,6 +25,8 @@
  * <pre>
  *   -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.slf4j.Slf4jLoggerFactory
  * </pre>
+ *
+ * @deprecated since 2.5
  */
 @Deprecated
 public class Slf4jLoggerFactory extends LoggerFactory {

diff --git 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 void init(FilterConfig filterConfig) throws ServletException {
         }
     }
 
+    /**
+     * @deprecated since 2.5
+     */
     @Deprecated
     private void initLogging() {
         String factoryName = filterConfig.getInitParameter("loggerFactory");

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
@@ -40,6 +40,8 @@ public InitOperations() {
 
     /**
      * Initializes the internal Struts logging
+     *
+     * @deprecated since 2.5
      */
     @Deprecated
     public void initLogging( HostConfig filterConfig ) {