From: markt Date: Fri, 1 Jan 2010 18:33:13 +0000 (+0000) Subject: Mark the implementations of deprecated javax.servlet.jsp.el classes as deprecated X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4ed4c9488df6c65ad8d9f166a084858e3d26a706;p=tomcat7.0 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 4260cc7f4..6eea32b1b 100644 --- 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 82623fd3a..eb221f364 100644 --- 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 7e69332bf..a70ad4e53 100644 --- 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 7808e0f5e..0ae1b188f 100644 --- 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;