Author: kkolinko
Date: Tue May 17 20:40:12 2011
New Revision: 1104539
URL: http://svn.apache.org/viewvc?rev=1104539&view=rev
Log:
Add comments to @deprecated tags that have none in javax.servlet.jsp.el.*
Its backport of r1100125, r1104528
The patch for trunk was provided by sebb
CTR: javadoc
Modified:
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java Tue May 17
20:40:12 2011
@@ -23,7 +23,7 @@ package javax.servlet.jsp.el;
* operation 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 {
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java Tue
May 17 20:40:12 2011
@@ -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 {
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java Tue May 17
20:40:12 2011
@@ -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 {
Modified:
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Tue
May 17 20:40:12 2011
@@ -51,7 +51,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
public abstract class ExpressionEvaluator {
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java Tue May
17 20:40:12 2011
@@ -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 {
Modified:
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
(original)
+++
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
Tue May 17 20:40:12 2011
@@ -32,6 +32,10 @@ import javax.el.PropertyNotWritableExcep
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.PageContext;
+/**
+*
+* @since 2.1
+*/
public class ScopedAttributeELResolver extends ELResolver {
public ScopedAttributeELResolver() {
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java Tue
May 17 20:40:12 2011
@@ -29,7 +29,7 @@ package javax.servlet.jsp.el;
* will happen</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
public interface VariableResolver
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1104539&r1=1104538&r2=1104539&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 17 20:40:12 2011
@@ -153,6 +153,14 @@
</fix>
</changelog>
</subsection>
+ <subsection>
+ <changelog>
+ <fix>
+ <bug>51155</bug>: Add comments to @deprecated tags that have none.
Patch
+ provided by sebb. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.32 (jfclere)" rtext="released 2011-02-03">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
