Author: markt
Date: Wed Dec 30 18:21:26 2009
New Revision: 894688
URL: http://svn.apache.org/viewvc?rev=894688&view=rev
Log:
API changes for JSP/EL 2.2 changes. Dummy implementations where implmentation
is required.
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/CompositeELResolver.java
tomcat/trunk/java/javax/el/ELResolver.java
tomcat/trunk/java/javax/el/ExpressionFactory.java
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=894688&r1=894687&r2=894688&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Wed Dec 30 18:21:26 2009
@@ -350,4 +350,12 @@
}
}
+
+ @Override
+ public Object invoke(ELContext context, Object base, Object method,
+ Class<?>[] paramTypes, Object[] params) {
+ // TODO
+ return null;
+ }
+
}
Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=894688&r1=894687&r2=894688&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Wed Dec 30 18:21:26 2009
@@ -124,6 +124,13 @@
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;
Modified: tomcat/trunk/java/javax/el/ELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELResolver.java?rev=894688&r1=894687&r2=894688&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ELResolver.java Wed Dec 30 18:21:26 2009
@@ -66,4 +66,12 @@
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;
+ }
}
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=894688&r1=894687&r2=894688&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Wed Dec 30 18:21:26 2009
@@ -17,6 +17,8 @@
package javax.el;
+import java.util.Properties;
+
/**
*
* @since 2.1
@@ -37,4 +39,13 @@
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;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
