You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/01/14 09:50:28 UTC
svn commit: r899119 -
/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/
Author: xuhaihong
Date: Thu Jan 14 08:50:28 2010
New Revision: 899119
URL: http://svn.apache.org/viewvc?rev=899119&view=rev
Log:
Update el according to latest 2.2 spec
Added:
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java (with props)
Modified:
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ArrayELResolver.java
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELContextEvent.java
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELResolver.java
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ListELResolver.java
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MapELResolver.java
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MethodExpression.java
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ResourceBundleELResolver.java
geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueExpression.java
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ArrayELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ArrayELResolver.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ArrayELResolver.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ArrayELResolver.java Thu Jan 14 08:50:28 2010
@@ -155,9 +155,4 @@
throw new IllegalArgumentException(property != null ? property
.toString() : "null");
}
-
- public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELContextEvent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELContextEvent.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELContextEvent.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELContextEvent.java Thu Jan 14 08:50:28 2010
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
public ELContextEvent(ELContext source) {
super(source);
}
-
+
public ELContext getELContext() {
return (ELContext) this.getSource();
}
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELResolver.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELResolver.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ELResolver.java Thu Jan 14 08:50:28 2010
@@ -67,5 +67,7 @@
public abstract Class<?> getCommonPropertyType(ELContext context, Object base);
- public abstract Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params);
+ public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
+ return null;
+ }
}
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ListELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ListELResolver.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ListELResolver.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ListELResolver.java Thu Jan 14 08:50:28 2010
@@ -169,8 +169,4 @@
.toString() : "null");
}
- public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MapELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MapELResolver.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MapELResolver.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MapELResolver.java Thu Jan 14 08:50:28 2010
@@ -138,9 +138,4 @@
return null;
}
- public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MethodExpression.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MethodExpression.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MethodExpression.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/MethodExpression.java Thu Jan 14 08:50:28 2010
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,11 @@
public abstract class MethodExpression extends Expression {
public abstract MethodInfo getMethodInfo(ELContext context) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException;
-
+
public abstract Object invoke(ELContext context, Object[] params) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException;
+
+ public boolean isParameterProvided() {
+ //TODO
+ return false;
+ }
}
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ResourceBundleELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ResourceBundleELResolver.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ResourceBundleELResolver.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ResourceBundleELResolver.java Thu Jan 14 08:50:28 2010
@@ -125,8 +125,4 @@
return null;
}
- public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueExpression.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueExpression.java?rev=899119&r1=899118&r2=899119&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueExpression.java (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueExpression.java Thu Jan 14 08:50:28 2010
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,13 +23,17 @@
public abstract class ValueExpression extends Expression {
public abstract Class<?> getExpectedType();
-
+
public abstract Class<?> getType(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract boolean isReadOnly(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract void setValue(ELContext context, Object value) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException;
-
+
public abstract Object getValue(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
+ public ValueReference getValueReference(ELContext context) {
+ //TODO
+ return null;
+ }
}
Added: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java?rev=899119&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java (added)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java Thu Jan 14 08:50:28 2010
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.el;
+
+import java.io.Serializable;
+
+/**
+ * @since 2.2
+ */
+public class ValueReference implements Serializable {
+
+ private Object base;
+
+ private Object property;
+
+ public ValueReference(Object base, Object property) {
+ this.base = base;
+ this.property = property;
+ }
+
+ public Object getBase() {
+ return base;
+ }
+
+ public Object getProperty() {
+ return property;
+ }
+}
Propchange: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/ValueReference.java
------------------------------------------------------------------------------
svn:mime-type = text/plain