Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 33189 invoked from network); 29 Aug 2002 02:04:34 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 29 Aug 2002 02:04:34 -0000 Received: (qmail 29815 invoked by uid 97); 29 Aug 2002 02:05:05 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 29765 invoked by uid 97); 29 Aug 2002 02:05:04 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 29750 invoked by uid 97); 29 Aug 2002 02:05:03 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 29 Aug 2002 02:04:22 -0000 Message-ID: <20020829020422.61196.qmail@icarus.apache.org> From: horwat@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime ExpressionEvaluatorImpl.java PageContextImpl.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N horwat 2002/08/28 19:04:22 Modified: jasper2/lib jsp20el.jar jasper2/src/share/org/apache/jasper/runtime ExpressionEvaluatorImpl.java PageContextImpl.java Log: EL package renaming to avoid potential JSTL 1.0 conflict. Revision Changes Path 1.2 +384 -385 jakarta-tomcat-jasper/jasper2/lib/jsp20el.jar <> 1.5 +9 -9 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ExpressionEvaluatorImpl.java Index: ExpressionEvaluatorImpl.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ExpressionEvaluatorImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ExpressionEvaluatorImpl.java 21 Aug 2002 16:21:56 -0000 1.4 +++ ExpressionEvaluatorImpl.java 29 Aug 2002 02:04:21 -0000 1.5 @@ -58,7 +58,7 @@ import java.util.Map; import javax.servlet.jsp.*; import javax.servlet.jsp.el.*; -import org.apache.taglibs.standard.lang.jstl.ELEvaluator; +import org.apache.jasper.runtime.el.jstl.ELEvaluator; /** *

An adapter for the JSTL Expression Evaluator.

@@ -93,7 +93,7 @@ String defaultPrefix) throws ELException { - org.apache.taglibs.standard.lang.jstl.VariableResolver + org.apache.jasper.runtime.el.jstl.VariableResolver resolver = new JSTLVariableResolverWrapper( vResolver ); Map fMapperMap = new FunctionMapperMap( fMapper ); @@ -106,7 +106,7 @@ expression, this.pageContext, expectedType, fMapperMap, defaultPrefix ); } - catch( org.apache.taglibs.standard.lang.jstl.ELException e ) { + catch( org.apache.jasper.runtime.el.jstl.ELException e ) { throw new ELException( e ); } } @@ -119,7 +119,7 @@ { // Validate and then create an Expression object. String errorMessage = - new org.apache.taglibs.standard.lang.jstl.Evaluator().validate( + new org.apache.jasper.runtime.el.jstl.Evaluator().validate( "", expression ); if( errorMessage != null ) { // Failed validation. Tell user why. @@ -139,7 +139,7 @@ * can be moved out of JSTL into its own project. */ private static class JSTLVariableResolverWrapper - implements org.apache.taglibs.standard.lang.jstl.VariableResolver + implements org.apache.jasper.runtime.el.jstl.VariableResolver { private VariableResolver delegate; @@ -148,7 +148,7 @@ } public Object resolveVariable( String pName, Object pContext ) - throws org.apache.taglibs.standard.lang.jstl.ELException + throws org.apache.jasper.runtime.el.jstl.ELException { // pContext parameter is going away in JSP 2.0 Object result; @@ -156,7 +156,7 @@ result = delegate.resolveVariable( pName, null ); } catch( ELException e ) { - throw new org.apache.taglibs.standard.lang.jstl.ELException( + throw new org.apache.jasper.runtime.el.jstl.ELException( e.getMessage() ); } return result; @@ -274,7 +274,7 @@ public Object evaluate( VariableResolver vResolver ) throws ELException { - org.apache.taglibs.standard.lang.jstl.VariableResolver + org.apache.jasper.runtime.el.jstl.VariableResolver resolver = new JSTLVariableResolverWrapper( vResolver ); // XXX - This is currently inefficient. A new evaluator and @@ -287,7 +287,7 @@ this.expectedType, this.fMapperMap, this.defaultPrefix ); } - catch( org.apache.taglibs.standard.lang.jstl.ELException e ) { + catch( org.apache.jasper.runtime.el.jstl.ELException e ) { throw new ELException( e ); } } 1.19 +7 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java Index: PageContextImpl.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- PageContextImpl.java 21 Aug 2002 16:21:56 -0000 1.18 +++ PageContextImpl.java 29 Aug 2002 02:04:21 -0000 1.19 @@ -94,7 +94,7 @@ import org.apache.jasper.Constants; import org.apache.jasper.logging.Logger; -import org.apache.taglibs.standard.lang.jstl.JSTLVariableResolver; +import org.apache.jasper.runtime.el.jstl.JSTLVariableResolver; /** * Implementation of the PageContext class from the JSP spec. @@ -129,9 +129,9 @@ * XXX - This should be going away once the EL evaluator moves from * the JSTL implementation to its own project. */ - private static org.apache.taglibs.standard.lang.jstl.Evaluator + private static org.apache.jasper.runtime.el.jstl.Evaluator proprietaryEvaluator = new - org.apache.taglibs.standard.lang.jstl.Evaluator(); + org.apache.jasper.runtime.el.jstl.Evaluator(); PageContextImpl(JspFactory factory) { this.factory = factory; @@ -568,7 +568,7 @@ return PageContextImpl.variableResolver.resolveVariable( pName, this ); } - catch( org.apache.taglibs.standard.lang.jstl.ELException e ) { + catch( org.apache.jasper.runtime.el.jstl.ELException e ) { throw new ELException( e ); } } -- To unsubscribe, e-mail: For additional commands, e-mail: