Mark the implementations of deprecated javax.servlet.jsp.el classes as deprecated

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

diff --git a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
index 4260cc7..6eea32b 100644 (file)
--- a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
+++ b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
@@ -25,7 +25,7 @@ import javax.servlet.jsp.el.ExpressionEvaluator;
 import javax.servlet.jsp.el.FunctionMapper;
 import javax.servlet.jsp.el.VariableResolver;
 
-
+@Deprecated
 public final class ExpressionEvaluatorImpl extends ExpressionEvaluator {
 
        private final ExpressionFactory factory;

diff --git a/java/org/apache/jasper/el/ExpressionImpl.java b/java/org/apache/jasper/el/ExpressionImpl.java
index 82623fd..eb221f3 100644 (file)
--- a/java/org/apache/jasper/el/ExpressionImpl.java
+++ b/java/org/apache/jasper/el/ExpressionImpl.java
@@ -22,6 +22,7 @@ import javax.servlet.jsp.el.ELException;
 import javax.servlet.jsp.el.Expression;
 import javax.servlet.jsp.el.VariableResolver;
 
+@Deprecated
 public final class ExpressionImpl extends Expression {
 
        private final ValueExpression ve;

diff --git a/java/org/apache/jasper/el/FunctionMapperImpl.java b/java/org/apache/jasper/el/FunctionMapperImpl.java
index 7e69332..a70ad4e 100644 (file)
--- a/java/org/apache/jasper/el/FunctionMapperImpl.java
+++ b/java/org/apache/jasper/el/FunctionMapperImpl.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 
 import javax.servlet.jsp.el.FunctionMapper;
 
+@Deprecated
 public final class FunctionMapperImpl extends javax.el.FunctionMapper {
        
        private final FunctionMapper fnMapper;

diff --git a/java/org/apache/jasper/el/VariableResolverImpl.java b/java/org/apache/jasper/el/VariableResolverImpl.java
index 7808e0f..0ae1b18 100644 (file)
--- a/java/org/apache/jasper/el/VariableResolverImpl.java
+++ b/java/org/apache/jasper/el/VariableResolverImpl.java
@@ -20,6 +20,7 @@ import javax.el.ELContext;
 import javax.servlet.jsp.el.ELException;
 import javax.servlet.jsp.el.VariableResolver;
 
+@Deprecated
 public final class VariableResolverImpl implements VariableResolver {
 
        private final ELContext ctx;