kinman 2002/12/18 10:46:59
Modified: jasper2/src/share/org/apache/jasper/runtime
ExpressionEvaluatorImpl.java JspContextWrapper.java
PageContextImpl.java
Log:
- Patch by Mark Roth
Attached is a patch to bring Japser2 up to date with the latest APIs
from the JSR-152 Expert Group.
jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java
- Updated to conform to new VariableResolver API
jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
- Updated to conform to new VariableResolver API
jasper2/src/share/org/apache/jasper/runtime/ExpressionEvaluatorImpl.java
- Updated to conform to new VariableResolver API
- Updated to conform to new ExpressionEvaluator API (which is now an
abstract class instead of an interface)
- Updated to conform to new Exrpression API (which is now an
abstract class instead of an interface)
Revision Changes Path
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExpressionEvaluatorImpl.java 29 Aug 2002 02:04:21 -0000 1.5
+++ ExpressionEvaluatorImpl.java 18 Dec 2002 18:46:59 -0000 1.6
@@ -74,7 +74,7 @@
*/
public class ExpressionEvaluatorImpl
- implements ExpressionEvaluator
+ extends ExpressionEvaluator
{
private PageContextImpl pageContext;
@@ -153,7 +153,7 @@
// pContext parameter is going away in JSP 2.0
Object result;
try {
- result = delegate.resolveVariable( pName, null );
+ result = delegate.resolveVariable( pName );
}
catch( ELException e ) {
throw new org.apache.jasper.runtime.el.jstl.ELException(
@@ -255,7 +255,7 @@
* can be moved out of JSTL into its own project.
*/
private class JSTLExpression
- implements Expression
+ extends Expression
{
private String expression;
private Class expectedType;
1.10 +6 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java
Index: JspContextWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JspContextWrapper.java 3 Dec 2002 23:17:48 -0000 1.9
+++ JspContextWrapper.java 18 Dec 2002 18:46:59 -0000 1.10
@@ -303,16 +303,14 @@
/**
* VariableResolver interface
*/
- public Object resolveVariable( String pName, Object pContext )
+ public Object resolveVariable( String pName )
throws ELException
{
if (invokingJspCtxt instanceof PageContextImpl) {
- return ((PageContextImpl) invokingJspCtxt).resolveVariable(pName,
- pContext);
+ return ((PageContextImpl) invokingJspCtxt).resolveVariable(pName);
}
- return ((JspContextWrapper) invokingJspCtxt).resolveVariable(pName,
- pContext);
+ return ((JspContextWrapper) invokingJspCtxt).resolveVariable(pName);
}
/**
1.38 +6 -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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- PageContextImpl.java 3 Dec 2002 01:58:36 -0000 1.37
+++ PageContextImpl.java 18 Dec 2002 18:46:59 -0000 1.38
@@ -640,13 +640,12 @@
/**
* VariableResolver interface
*/
- public Object resolveVariable( String pName, Object pContext )
+ public Object resolveVariable( String pName )
throws ELException
{
- // Note: pContext will be going away.
try {
- return PageContextImpl.variableResolver.resolveVariable(
- pName, this );
+ return PageContextImpl.variableResolver.resolveVariable( pName,
+ this );
}
catch( org.apache.jasper.runtime.el.jstl.ELException e ) {
throw new ELException( e );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
