You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/02/18 10:48:01 UTC
svn commit: r911298 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/javax/servlet/jsp/JspContext.java webapps/docs/changelog.xml
Author: markt
Date: Thu Feb 18 09:48:01 2010
New Revision: 911298
URL: http://svn.apache.org/viewvc?rev=911298&view=rev
Log:
Don't use @Deprecated as spec doesn't
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=911298&r1=911297&r2=911298&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 18 09:48:01 2010
@@ -68,12 +68,6 @@
-1: remm: no for TC 6.0
-1: funkman : api change in Session.java for .x.x release
-* Remove @Deprecated annotations from javax.servlet.jsp.JspContext
- Part of http://svn.apache.org/viewvc?rev=899635&view=rev
- http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspContext.java?view=diff&r1=899634&r2=899635&pathrev=899635
- +1: kkolinko, markt, mturk
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
Only attempt APR initialization if the <Listener> has been specified
http://svn.apache.org/viewvc?rev=904224&view=rev
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspContext.java?rev=911298&r1=911297&r2=911298&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspContext.java Thu Feb 18 09:48:01 2010
@@ -225,7 +225,7 @@
* @deprecated As of JSP 2.1, replaced by
* JspApplicationContext.getExpressionFactory()
*/
- @Deprecated
+ @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public abstract ExpressionEvaluator getExpressionEvaluator();
@@ -243,7 +243,7 @@
* which can be obtained by
* jspContext.getELContext().getELResolver()
*/
- @Deprecated
+ @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public abstract VariableResolver getVariableResolver();
/**
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=911298&r1=911297&r2=911298&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Feb 18 09:48:01 2010
@@ -62,6 +62,11 @@
be present in the names of CATALINA_HOME/_BASE and the current directory
used to call the Tomcat scripts. (kkolinko)
</fix>
+ <fix>
+ Don't use @Deprecated annotations in
+ <code>javax.servlet.jsp.JspContext</code> since the specification does
+ not include them in the API definition. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org