Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51155
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
diff --git a/java/javax/servlet/jsp/el/ELException.java b/java/javax/servlet/jsp/el/ELException.java
index f6bdd5c..cf3bd19 100644
--- a/java/javax/servlet/jsp/el/ELException.java
+++ b/java/javax/servlet/jsp/el/ELException.java
@@ -22,7 +22,7 @@
* 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 35e4513..fdb0d1e 100644
--- a/java/javax/servlet/jsp/el/ELParseException.java
+++ b/java/javax/servlet/jsp/el/ELParseException.java
@@ -22,7 +22,7 @@
* 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 b1ceb35..8d446aa 100644
--- a/java/javax/servlet/jsp/el/Expression.java
+++ b/java/javax/servlet/jsp/el/Expression.java
@@ -30,7 +30,7 @@
* 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 785c6f8..52d41de 100644
--- a/java/javax/servlet/jsp/el/ExpressionEvaluator.java
+++ b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
@@ -52,7 +52,7 @@
* </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 5b8b83d..3a8e940 100644
--- a/java/javax/servlet/jsp/el/FunctionMapper.java
+++ b/java/javax/servlet/jsp/el/FunctionMapper.java
@@ -24,7 +24,7 @@
* 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 14f31d9..db0ef59 100644
--- a/java/javax/servlet/jsp/el/VariableResolver.java
+++ b/java/javax/servlet/jsp/el/VariableResolver.java
@@ -30,7 +30,7 @@
* </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 95bdc39..91ac9d5 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>
