From cbeaa6d3c1c1c070790e05887687292aab0bece4 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 6 May 2011 08:05:42 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51154
 Add missing comments to @deprecated code Patch provided by sebb

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1100125 13f79535-47bb-0310-9956-ffa450edef68
---
 java/javax/servlet/jsp/el/ELException.java         | 2 +-
 java/javax/servlet/jsp/el/ELParseException.java    | 2 +-
 java/javax/servlet/jsp/el/Expression.java          | 2 +-
 java/javax/servlet/jsp/el/ExpressionEvaluator.java | 2 +-
 java/javax/servlet/jsp/el/FunctionMapper.java      | 2 +-
 java/javax/servlet/jsp/el/VariableResolver.java    | 2 +-
 webapps/docs/changelog.xml                         | 4 ++++
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/java/javax/servlet/jsp/el/ELException.java b/java/javax/servlet/jsp/el/ELException.java
index f6bdd5c8a..cf3bd195a 100644
--- a/java/javax/servlet/jsp/el/ELException.java
+++ b/java/javax/servlet/jsp/el/ELException.java
@@ -22,7 +22,7 @@ package javax.servlet.jsp.el;
  * evaluation of the evaluator.
  * 
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ELException
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELException extends Exception {
diff --git a/java/javax/servlet/jsp/el/ELParseException.java b/java/javax/servlet/jsp/el/ELParseException.java
index 35e45136f..fdb0d1edb 100644
--- a/java/javax/servlet/jsp/el/ELParseException.java
+++ b/java/javax/servlet/jsp/el/ELParseException.java
@@ -22,7 +22,7 @@ package javax.servlet.jsp.el;
  * Represents a parsing error encountered while parsing an EL expression.
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ELException
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELParseException extends ELException {
diff --git a/java/javax/servlet/jsp/el/Expression.java b/java/javax/servlet/jsp/el/Expression.java
index b1ceb35ce..8d446aacb 100644
--- a/java/javax/servlet/jsp/el/Expression.java
+++ b/java/javax/servlet/jsp/el/Expression.java
@@ -30,7 +30,7 @@ package javax.servlet.jsp.el;
  * where ELParseException exceptions are raised. </p>
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ValueExpression
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class Expression {
diff --git a/java/javax/servlet/jsp/el/ExpressionEvaluator.java b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
index 785c6f8c1..52d41dead 100644
--- a/java/javax/servlet/jsp/el/ExpressionEvaluator.java
+++ b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
@@ -52,7 +52,7 @@ package javax.servlet.jsp.el;
  * </p>
  * 
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ExpressionFactory
  */
 @SuppressWarnings("dep-ann")
 // TCK signature test fails with annotation
diff --git a/java/javax/servlet/jsp/el/FunctionMapper.java b/java/javax/servlet/jsp/el/FunctionMapper.java
index 5b8b83da6..3a8e940ef 100644
--- a/java/javax/servlet/jsp/el/FunctionMapper.java
+++ b/java/javax/servlet/jsp/el/FunctionMapper.java
@@ -24,7 +24,7 @@ package javax.servlet.jsp.el;
  * information to resolve the map. </p>
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.FunctionMapper
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public interface FunctionMapper {
diff --git a/java/javax/servlet/jsp/el/VariableResolver.java b/java/javax/servlet/jsp/el/VariableResolver.java
index 14f31d99c..db0ef59db 100644
--- a/java/javax/servlet/jsp/el/VariableResolver.java
+++ b/java/javax/servlet/jsp/el/VariableResolver.java
@@ -30,7 +30,7 @@ package javax.servlet.jsp.el;
  * </p>
  * 
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ELResolver
  */
 @SuppressWarnings("dep-ann")
 // TCK signature test fails with annotation
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 95bdc394e..91ac9d5a8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -241,6 +241,10 @@
         <bug>51154</bug>: Remove duplicate @deprecated tags in ServletContext
         Javadoc. Patch provided by sebb. (markt)
       </fix>
+      <fix>
+        <bug>51155</bug>: Add comments to @deprecated tags that have none. Patch
+        provided by sebb. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0