[PATCH] jakarta-tomcat-jasper

[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)

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.

Index: jasper2/src/share/org/apache/jasper/runtime/ExpressionEvaluatorImpl.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ExpressionEvaluatorImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ExpressionEvaluatorImpl.java
--- jasper2/src/share/org/apache/jasper/runtime/ExpressionEvaluatorImpl.java    29 Aug 
2002 02:04:21 -0000      1.5
+++ jasper2/src/share/org/apache/jasper/runtime/ExpressionEvaluatorImpl.java    18 Dec 
+2002 02:37:36 -0000
@@ -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;
Index: jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java,v
retrieving revision 1.9
diff -u -r1.9 JspContextWrapper.java
--- jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java  3 Dec 2002 
23:17:48 -0000       1.9
+++ jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java  18 Dec 2002 
+02:37:37 -0000
@@ -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);
     }
 
     /**
Index: jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.37
diff -u -r1.37 PageContextImpl.java
--- jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java    3 Dec 2002 
01:58:36 -0000       1.37
+++ jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java    18 Dec 2002 
+02:37:45 -0000
@@ -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]>