Fix signature test failures in javax.servlet.jsp package

Move deprecation javadoc to end of block

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@899635 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/servlet/jsp/JspContext.java b/java/javax/servlet/jsp/JspContext.java
index fe45ef5..0d94ec5 100644 (file)
--- a/java/javax/servlet/jsp/JspContext.java
+++ b/java/javax/servlet/jsp/JspContext.java
@@ -226,7 +226,7 @@ public abstract class JspContext {
      * @deprecated As of JSP 2.1, replaced by
      *             JspApplicationContext.getExpressionFactory()
      */
-    @Deprecated
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public abstract ExpressionEvaluator getExpressionEvaluator();
     
     
@@ -244,7 +244,7 @@ public abstract class JspContext {
      *             which can be obtained by
      *             jspContext.getELContext().getELResolver()
      */
-    @Deprecated
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public abstract VariableResolver getVariableResolver();
     
     /**

diff --git a/java/javax/servlet/jsp/JspException.java b/java/javax/servlet/jsp/JspException.java
index 80cfb77..54a28ac 100644 (file)
--- a/java/javax/servlet/jsp/JspException.java
+++ b/java/javax/servlet/jsp/JspException.java
@@ -21,7 +21,6 @@ package javax.servlet.jsp;
  * JspExceptions will result in an invocation of the errorpage
  * machinery.
  */
-
 public class JspException extends Exception {
 
     /**
@@ -85,15 +84,14 @@ public class JspException extends Exception {
 
     
     /**
-     * @deprecated As of JSP 2.1, replaced by
-     * <code>java.lang.Throwable.getCause()</code>
-     *  
      * Returns the exception that caused this JSP exception.
      *
      * @return  the <code>Throwable</code> that caused this JSP exception
+     * 
+     * @deprecated As of JSP 2.1, replaced by
+     * <code>java.lang.Throwable.getCause()</code>
      */
-    
-    @Deprecated
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public Throwable getRootCause() {
         return getCause();
     }