You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ho...@apache.org on 2002/08/29 04:04:22 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime ExpressionEvaluatorImpl.java PageContextImpl.java
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
<<Binary file>>
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;
/**
* <p>An adapter for the JSTL Expression Evaluator.</p>
@@ -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(
"<unknown>", 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: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>