From a59eb986b557f4904b059b2b2d2e3df1ee15ef4a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 24 Sep 2009 15:31:10 +0000 Subject: [PATCH] removed Apache JSTL references completely git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1990 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../mock/web/MockExpressionEvaluator.java | 92 ------------------- .../mock/web/MockPageContext.java | 2 +- .../web-servlet.iml | 22 ++--- 3 files changed, 12 insertions(+), 104 deletions(-) delete mode 100644 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java b/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java deleted file mode 100644 index 073a5244e93..00000000000 --- a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockExpressionEvaluator.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2002-2009 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.mock.web; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.Expression; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.FunctionMapper; -import javax.servlet.jsp.el.VariableResolver; - -import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager; - -/** - * Mock implementation of the JSP 2.0 {@link javax.servlet.jsp.el.ExpressionEvaluator} - * interface, delegating to the Jakarta JSTL ExpressionEvaluatorManager. - * - *

Used for testing the web framework; only necessary for testing - * applications when testing custom JSP tags. - * - *

Note that the Jakarta JSTL implementation (jstl.jar, standard.jar) - * has to be available on the class path to use this expression evaluator. - * - * @author Juergen Hoeller - * @since 1.1.5 - * @see org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager - */ -public class MockExpressionEvaluator extends ExpressionEvaluator { - - private final PageContext pageContext; - - - /** - * Create a new MockExpressionEvaluator for the given PageContext. - * @param pageContext the JSP PageContext to run in - */ - public MockExpressionEvaluator(PageContext pageContext) { - this.pageContext = pageContext; - } - - public Expression parseExpression( - final String expression, final Class expectedType, final FunctionMapper functionMapper) - throws ELException { - - return new Expression() { - public Object evaluate(VariableResolver variableResolver) throws ELException { - return doEvaluate(expression, expectedType, functionMapper); - } - }; - } - - public Object evaluate( - String expression, Class expectedType, VariableResolver variableResolver, FunctionMapper functionMapper) - throws ELException { - - if (variableResolver != null) { - throw new IllegalArgumentException("Custom VariableResolver not supported"); - } - return doEvaluate(expression, expectedType, functionMapper); - } - - protected Object doEvaluate( - String expression, Class expectedType, FunctionMapper functionMapper) - throws ELException { - - if (functionMapper != null) { - throw new IllegalArgumentException("Custom FunctionMapper not supported"); - } - try { - return ExpressionEvaluatorManager.evaluate("JSP EL expression", expression, expectedType, this.pageContext); - } - catch (JspException ex) { - throw new ELException("Parsing of JSP EL expression \"" + expression + "\" failed", ex); - } - } - -} diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPageContext.java b/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPageContext.java index 6c1b7cc6a0f..3e554f2af33 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPageContext.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPageContext.java @@ -275,7 +275,7 @@ public class MockPageContext extends PageContext { } public ExpressionEvaluator getExpressionEvaluator() { - return new MockExpressionEvaluator(this); + throw new UnsupportedOperationException(); } public ELContext getELContext() { diff --git a/org.springframework.web.servlet/web-servlet.iml b/org.springframework.web.servlet/web-servlet.iml index 3904b019e2e..4cdaff26790 100644 --- a/org.springframework.web.servlet/web-servlet.iml +++ b/org.springframework.web.servlet/web-servlet.iml @@ -164,17 +164,6 @@ - - - - - - - - - - - @@ -318,6 +307,17 @@ + + + + + + + + + + +