API changes for JSP/EL 2.2 changes. Dummy implementations where implmentation is...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@894688 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/el/BeanELResolver.java b/java/javax/el/BeanELResolver.java
index 77c4822..3304204 100644 (file)
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -350,4 +350,12 @@ public class BeanELResolver extends ELResolver {
                }
 
        }
+       
+       @Override
+    public Object invoke(ELContext context, Object base, Object method,
+            Class<?>[] paramTypes, Object[] params) {
+        // TODO 
+        return null;
+    }
+
 }

diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java
index b731c7a..5da448c 100644 (file)
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -124,6 +124,13 @@ public class CompositeELResolver extends ELResolver {
         return null;
     }
 
+    @Override
+    public Object invoke(ELContext context, Object base, Object method,
+            Class<?>[] paramTypes, Object[] params) {
+        // TODO 
+        return null;
+    }
+
     private final static class FeatureIterator implements Iterator<FeatureDescriptor> {
 
         private final ELContext context;

diff --git a/java/javax/el/ELResolver.java b/java/javax/el/ELResolver.java
index 0b3b90a..08d1cfb 100644 (file)
--- a/java/javax/el/ELResolver.java
+++ b/java/javax/el/ELResolver.java
@@ -66,4 +66,12 @@ public abstract class ELResolver {
     public abstract Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base);
     
     public abstract Class<?> getCommonPropertyType(ELContext context, Object base);
+    
+    public Object invoke(@SuppressWarnings("unused") ELContext context,
+            @SuppressWarnings("unused") Object base,
+            @SuppressWarnings("unused") Object method,
+            @SuppressWarnings("unused") Class<?>[] paramTypes,
+            @SuppressWarnings("unused") Object[] params) {
+        return null;
+    }
 }

diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java
index 16d51ed..cc8b810 100644 (file)
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -17,6 +17,8 @@
 
 package javax.el;
 
+import java.util.Properties;
+
 /**
  * 
  * @since 2.1
@@ -37,4 +39,13 @@ public abstract class ExpressionFactory {
             String expression, Class<?> expectedReturnType,
             Class<?>[] expectedParamTypes) throws ELException,
             NullPointerException;
+    
+    public static ExpressionFactory newInstance() {
+        return newInstance(null);
+    }
+
+    public static ExpressionFactory newInstance(Properties properties) {
+        // TODO
+        return null;
+    }
 }