commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hen...@apache.org
Subject svn commit: r1207941 [3/5] - in /commons/proper/jexl/trunk: ./ src/main/assembly/ src/main/config/ src/main/java/org/apache/commons/jexl3/ src/main/java/org/apache/commons/jexl3/internal/ src/main/java/org/apache/commons/jexl3/internal/introspection/ s...
Date Tue, 29 Nov 2011 16:19:43 GMT
Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayIterator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayListWrapper.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayListWrapper.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayListWrapper.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayListWrapper.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 
 import java.lang.reflect.Array;
 import java.util.AbstractList;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayListWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/BooleanGetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/BooleanGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/BooleanGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/BooleanGetExecutor.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 import java.lang.reflect.InvocationTargetException;
 /**
  * Specialized executor to get a boolean property from an object.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/BooleanGetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/BooleanGetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckGetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckGetExecutor.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 
 import java.lang.reflect.InvocationTargetException;
 

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckGetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckGetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckSetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckSetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckSetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckSetExecutor.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 
 import java.lang.reflect.InvocationTargetException;
 

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckSetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckSetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/EnumerationIterator.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/EnumerationIterator.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/EnumerationIterator.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/EnumerationIterator.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 
 
 import java.util.Iterator;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/EnumerationIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/EnumerationIterator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Introspector.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Introspector.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Introspector.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Introspector.java Tue Nov 29 16:18:59 2011
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 
 import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 
-import org.apache.commons.jexl2.internal.introspection.IntrospectorBase;
-import org.apache.commons.jexl2.internal.introspection.MethodKey;
+import org.apache.commons.jexl3.internal.introspection.IntrospectorBase;
+import org.apache.commons.jexl3.internal.introspection.MethodKey;
 
 import org.apache.commons.logging.Log;
 

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Introspector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Introspector.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListGetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListGetExecutor.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 import java.util.List;
 import java.lang.reflect.Array;
 /**

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListGetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListGetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListSetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListSetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListSetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListSetExecutor.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 import java.util.List;
 import java.lang.reflect.Array;
 /**

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListSetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListSetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapGetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapGetExecutor.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 
 import java.util.Map;
 

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapGetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapSetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapSetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapSetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapSetExecutor.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 import java.util.Map;
 import java.lang.reflect.InvocationTargetException;
 /**

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapSetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapSetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MethodExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MethodExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MethodExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MethodExecutor.java Tue Nov 29 16:18:59 2011
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.jexl2.internal.introspection.MethodKey;
+import org.apache.commons.jexl3.internal.introspection.MethodKey;
 
 /**
  * Specialized executor to invoke a method on an object.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MethodExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MethodExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertyGetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertyGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertyGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertyGetExecutor.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 import java.lang.reflect.InvocationTargetException;
 
 /**

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertyGetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertyGetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertySetExecutor.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertySetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertySetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertySetExecutor.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal;
+package org.apache.commons.jexl3.internal;
 import java.lang.reflect.InvocationTargetException;
 /**
  * Specialized executor to set a property in an object.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertySetExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertySetExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal.introspection;
+package org.apache.commons.jexl3.internal.introspection;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/IntrospectorBase.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/IntrospectorBase.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/IntrospectorBase.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/IntrospectorBase.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal.introspection;
+package org.apache.commons.jexl3.internal.introspection;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/IntrospectorBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/IntrospectorBase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.internal.introspection;
+package org.apache.commons.jexl3.internal.introspection;
 
 import java.util.List;
 import java.util.LinkedList;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodMap.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodMap.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodMap.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodMap.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.internal.introspection;
+package org.apache.commons.jexl3.internal.introspection;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodMap.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodMap.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/SandboxUberspectImpl.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/SandboxUberspectImpl.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/SandboxUberspectImpl.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java Tue Nov 29 16:18:59 2011
@@ -14,16 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.introspection;
+package org.apache.commons.jexl3.internal.introspection;
 
-import org.apache.commons.jexl2.JexlInfo;
+import org.apache.commons.jexl3.JexlInfo;
+import org.apache.commons.jexl3.introspection.JexlMethod;
+import org.apache.commons.jexl3.introspection.JexlPropertyGet;
+import org.apache.commons.jexl3.introspection.JexlPropertySet;
+import org.apache.commons.jexl3.introspection.Sandbox;
 import org.apache.commons.logging.Log;
 
 /**
  * An uberspect that controls usage of properties, methods and contructors through a sandbox.
- * @since 2.1
+ * @since 3.0
  */
-public class SandboxUberspectImpl extends UberspectImpl {
+public class SandboxUberspect extends Uberspect {
     /**  The sandbox. */
     protected final Sandbox sandbox;
 
@@ -32,7 +36,7 @@ public class SandboxUberspectImpl extend
      * @param runtimeLogger the logger to use or null to use default
      * @param theSandbox the sandbox instance to use
      */
-    public SandboxUberspectImpl(Log runtimeLogger, Sandbox theSandbox) {
+    public SandboxUberspect(Log runtimeLogger, Sandbox theSandbox) {
         super(runtimeLogger);
         if (theSandbox == null) {
             throw new NullPointerException("sandbox can not be null");
@@ -52,7 +56,7 @@ public class SandboxUberspectImpl extend
      * {@inheritDoc}
      */
     @Override
-    public JexlMethod getConstructor(Object ctorHandle, Object[] args, JexlInfo info) {
+    public JexlMethod getConstructor(Object ctorHandle, Object[] args, JexlInfo.Handle info) {
         final String className;
         if (ctorHandle instanceof Class<?>) {
             Class<?> clazz = (Class<?>) ctorHandle;
@@ -72,7 +76,7 @@ public class SandboxUberspectImpl extend
      * {@inheritDoc}
      */
     @Override
-    public JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo info) {
+    public JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo.Handle info) {
         if (obj != null && method != null) {
             String actual = sandbox.execute(obj.getClass().getName(), method);
             if (actual != null) {
@@ -86,7 +90,7 @@ public class SandboxUberspectImpl extend
      * {@inheritDoc}
      */
     @Override
-    public JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo info) {
+    public JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo.Handle info) {
         if (obj != null && identifier != null) {
             String actual = sandbox.read(obj.getClass().getName(), identifier.toString());
             if (actual != null) {
@@ -100,7 +104,7 @@ public class SandboxUberspectImpl extend
      * {@inheritDoc}
      */
     @Override
-    public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, JexlInfo info) {
+    public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, JexlInfo.Handle info) {
         if (obj != null && identifier != null) {
             String actual = sandbox.write(obj.getClass().getName(), identifier.toString());
             if (actual != null) {

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java Tue Nov 29 16:18:59 2011
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.introspection;
+package org.apache.commons.jexl3.internal.introspection;
 
 import java.beans.IntrospectionException;
-import org.apache.commons.jexl2.internal.Introspector;
+import org.apache.commons.jexl3.internal.Introspector;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -29,12 +29,14 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.jexl2.JexlInfo;
-import org.apache.commons.jexl2.JexlException;
-import org.apache.commons.jexl2.internal.AbstractExecutor;
-import org.apache.commons.jexl2.internal.ArrayIterator;
-import org.apache.commons.jexl2.internal.EnumerationIterator;
-import org.apache.commons.jexl2.internal.introspection.MethodKey;
+import org.apache.commons.jexl3.JexlInfo;
+import org.apache.commons.jexl3.JexlException;
+import org.apache.commons.jexl3.internal.AbstractExecutor;
+import org.apache.commons.jexl3.internal.ArrayIterator;
+import org.apache.commons.jexl3.internal.EnumerationIterator;
+import org.apache.commons.jexl3.introspection.JexlMethod;
+import org.apache.commons.jexl3.introspection.JexlPropertyGet;
+import org.apache.commons.jexl3.introspection.JexlPropertySet;
 import org.apache.commons.logging.Log;
 
 /**
@@ -44,7 +46,7 @@ import org.apache.commons.logging.Log;
  *
  * @since 1.0
  */
-public class UberspectImpl extends Introspector implements Uberspect {
+public class Uberspect extends Introspector implements org.apache.commons.jexl3.introspection.Uberspect {
     /**
      * Publicly exposed special failure object returned by tryInvoke.
      */
@@ -54,7 +56,7 @@ public class UberspectImpl extends Intro
      * Creates a new UberspectImpl.
      * @param runtimeLogger the logger used for all logging needs
      */
-    public UberspectImpl(Log runtimeLogger) {
+    public Uberspect(Log runtimeLogger) {
         super(runtimeLogger);
     }
 
@@ -70,7 +72,7 @@ public class UberspectImpl extends Intro
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Iterator<?> getIterator(Object obj, JexlInfo info) {
+    public Iterator<?> getIterator(Object obj, JexlInfo.Handle info) {
         if (obj instanceof Iterator<?>) {
             return ((Iterator<?>) obj);
         }
@@ -95,7 +97,7 @@ public class UberspectImpl extends Intro
                 return (Iterator<Object>) it.execute(obj, null);
             }
         } catch (Exception xany) {
-            throw new JexlException(info, "unable to generate iterator()", xany);
+            throw new JexlException(info.jexlInfo(), "unable to generate iterator()", xany);
         }
         return null;
     }
@@ -103,14 +105,14 @@ public class UberspectImpl extends Intro
     /**
      * {@inheritDoc}
      */
-    public JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo info) {
+    public JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo.Handle info) {
         return getMethodExecutor(obj, method, args);
     }
 
     /**
      * {@inheritDoc}
      */
-    public JexlMethod getConstructor(Object ctorHandle, Object[] args, JexlInfo info) {
+    public JexlMethod getConstructor(Object ctorHandle, Object[] args, JexlInfo.Handle info) {
         final Constructor<?> ctor = getConstructor(ctorHandle, args);
         if (ctor != null) {
             return new ConstructorMethod(ctor);
@@ -122,12 +124,12 @@ public class UberspectImpl extends Intro
     /**
      * {@inheritDoc}
      */
-    public JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo info) {
+    public JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo.Handle info) {
         JexlPropertyGet get = getGetExecutor(obj, identifier);
         if (get == null && obj != null && identifier != null) {
             get = getIndexedGet(obj, identifier.toString());
             if (get == null) {
-                Field field = getField(obj, identifier.toString(), info);
+                Field field = getField(obj, identifier.toString(), info.jexlInfo());
                 if (field != null) {
                     return new FieldPropertyGet(field);
                 }
@@ -139,10 +141,10 @@ public class UberspectImpl extends Intro
     /**
      * {@inheritDoc}
      */
-    public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, JexlInfo info) {
+    public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, JexlInfo.Handle info) {
         JexlPropertySet set = getSetExecutor(obj, identifier, arg);
         if (set == null && obj != null && identifier != null) {
-            Field field = getField(obj, identifier.toString(), info);
+            Field field = getField(obj, identifier.toString(), info.jexlInfo());
             if (field != null
                     && !Modifier.isFinal(field.getModifiers())
                     && (arg == null || MethodKey.isInvocationConvertible(field.getType(), arg.getClass(), false))) {
@@ -305,6 +307,7 @@ public class UberspectImpl extends Intro
     /**
      * A generic indexed property container, exposes get(key) and set(key, value) and solves method call dynamically
      * based on arguments.
+     * public for introspection purpose.
      */
     public static final class IndexedContainer {
         /** The instance owning the container. */

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/package.html&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html Tue Nov 29 16:18:59 2011
@@ -16,7 +16,7 @@
        limitations under the License.
     -->
     <head>
-        <title>Package Documentation for org.apache.commons.jexl2.introspection Package</title>
+        <title>Package Documentation for org.apache.commons.jexl3.introspection Package</title>
     </head>
     <body bgcolor="white">
         Provides low-level introspective services.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/package.html&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html Tue Nov 29 16:18:59 2011
@@ -16,7 +16,7 @@
        limitations under the License.
     -->
     <head>
-        <title>Package Documentation for org.apache.commons.jexl2 Package</title>
+        <title>Package Documentation for org.apache.commons.jexl3 Package</title>
     </head>
     <body bgcolor="white">
         <h2>Provides utilities for introspection services.</h2>

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.introspection;
+package org.apache.commons.jexl3.introspection;
 
 /**
  * Interface used for regular method invocation.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.introspection;
+package org.apache.commons.jexl3.introspection;
 
 /**
  * Interface for getting values that appear to be properties.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.introspection;
+package org.apache.commons.jexl3.introspection;
 
 /**
  * Interface used for setting values that appear to be properties.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Sandbox.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Sandbox.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Sandbox.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Sandbox.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Sandbox.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Sandbox.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Sandbox.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.introspection;
+package org.apache.commons.jexl3.introspection;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -54,7 +54,7 @@ import java.util.Set;
  * </ul>
  * </p>
  * 
- * @since 2.1
+ * @since 3.0
  */
 public final class Sandbox {
     /**

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Sandbox.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Uberspect.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Uberspect.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Uberspect.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Uberspect.java Tue Nov 29 16:18:59 2011
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2.introspection;
+package org.apache.commons.jexl3.introspection;
 
 import java.util.Iterator;
-import org.apache.commons.jexl2.JexlInfo;
+import org.apache.commons.jexl3.JexlInfo;
 
 /**
  * 'Federated' introspection/reflection interface to allow the introspection
@@ -38,9 +38,10 @@ public interface Uberspect {
      * @param ctorHandle a class or class name
      * @param args constructor arguments
      * @param info contextual information
-     * @return a {@link Constructor}
+     * @return a {@link JexlMethod}
+     * @since 3.0
      */
-    JexlMethod getConstructor(Object ctorHandle, Object[] args, JexlInfo info);
+    JexlMethod getConstructor(Object ctorHandle, Object[] args, JexlInfo.Handle info);
     /**
      * Returns a JexlMethod.
      * @param obj the object
@@ -49,7 +50,7 @@ public interface Uberspect {
      * @param info contextual information
      * @return a {@link JexlMethod}
      */
-    JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo info);
+    JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo.Handle info);
 
     /**
      * Property getter.
@@ -59,7 +60,7 @@ public interface Uberspect {
      * @param info contextual information
      * @return a {@link JexlPropertyGet}
      */
-    JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo info);
+    JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo.Handle info);
 
     /**
      * Property setter.
@@ -70,7 +71,7 @@ public interface Uberspect {
      * @param info contextual information
      * @return a {@link JexlPropertySet}.
      */
-    JexlPropertySet getPropertySet(Object obj, Object identifier, Object arg, JexlInfo info);
+    JexlPropertySet getPropertySet(Object obj, Object identifier, Object arg, JexlInfo.Handle info);
 
     /**
      * Gets an iterator from an object.
@@ -78,6 +79,6 @@ public interface Uberspect {
      * @param info contextual information
      * @return an iterator over obj
      */
-    Iterator<?> getIterator(Object obj, JexlInfo info);
+    Iterator<?> getIterator(Object obj, JexlInfo.Handle info);
 
 }
\ No newline at end of file

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Uberspect.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Uberspect.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/package.html (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/package.html?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/package.html&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/package.html Tue Nov 29 16:18:59 2011
@@ -16,7 +16,7 @@
        limitations under the License.
     -->
     <head>
-        <title>Package Documentation for org.apache.commons.jexl2.introspection Package</title>
+        <title>Package Documentation for org.apache.commons.jexl3.introspection Package</title>
     </head>
     <body bgcolor="white">
         <h2>Provides high-level introspective services.</h2>

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/package.html (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/package.html?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/package.html&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/package.html Tue Nov 29 16:18:59 2011
@@ -16,7 +16,7 @@
        limitations under the License.
     -->
     <head>
-        <title>Package Documentation for org.apache.commons.jexl2 Package</title>
+        <title>Package Documentation for org.apache.commons.jexl3 Package</title>
     </head>
     <body bgcolor="white">
         Provides a framework for evaluating JEXL expressions.
@@ -38,13 +38,13 @@
         <h2><a name="example">A Brief Example</a></h2>
         <p>
             When evaluating expressions, JEXL merges an
-            {@link org.apache.commons.jexl2.Expression}
+            {@link org.apache.commons.jexl3.Expression}
             with a
-            {@link org.apache.commons.jexl2.JexlContext}.
+            {@link org.apache.commons.jexl3.JexlContext}.
             An Expression is created using
-            {@link org.apache.commons.jexl2.JexlEngine#createExpression(java.lang.String)},
+            {@link org.apache.commons.jexl3.JexlEngine#createExpression(java.lang.String)},
             passing a String containing valid JEXL syntax.  A simple JexlContext can be created using
-            a {@link org.apache.commons.jexl2.MapContext} instance;
+            a {@link org.apache.commons.jexl3.MapContext} instance;
             a map of variables that will be internally wrapped can be optionally provided through its constructor.
             The following example, takes a variable named foo, and
             invokes the bar() method on the property innerFoo:
@@ -76,18 +76,18 @@
         <h3><a name="usage_note">Important note</a></h3>
         The only public packages you should use are:
         <ul>
-            <li>org.apache.commons.jexl2</li>
-            <li>org.apache.commons.jexl2.introspection</li>
+            <li>org.apache.commons.jexl3</li>
+            <li>org.apache.commons.jexl3.introspection</li>
         </ul>
         The following packages follow a "use at your own maintenance cost" policy.
         Their classes and methods are not guaranteed to remain compatible in subsequent versions.
         If you think you need to use some of their features, it might be a good idea to check with
         the community through the mailing list first.
         <ul>
-            <li>org.apache.commons.jexl2.parser</li>
-            <li>org.apache.commons.jexl2.scripting</li>
-            <li>org.apache.commons.jexl2.internal</li>
-            <li>org.apache.commons.jexl2.internal.introspection</li>
+            <li>org.apache.commons.jexl3.parser</li>
+            <li>org.apache.commons.jexl3.scripting</li>
+            <li>org.apache.commons.jexl3.internal</li>
+            <li>org.apache.commons.jexl3.internal.introspection</li>
         </ul>
 
         <h3><a name="usage_api">Dynamic invocation</a></h3>
@@ -98,10 +98,10 @@
             set of methods:
         </p>
         <ul>
-            <li>{@link org.apache.commons.jexl2.JexlEngine#newInstance}</li>
-            <li>{@link org.apache.commons.jexl2.JexlEngine#setProperty}</li>
-            <li>{@link org.apache.commons.jexl2.JexlEngine#getProperty}</li>
-            <li>{@link org.apache.commons.jexl2.JexlEngine#invokeMethod}</li>
+            <li>{@link org.apache.commons.jexl3.JexlEngine#newInstance}</li>
+            <li>{@link org.apache.commons.jexl3.JexlEngine#setProperty}</li>
+            <li>{@link org.apache.commons.jexl3.JexlEngine#getProperty}</li>
+            <li>{@link org.apache.commons.jexl3.JexlEngine#invokeMethod}</li>
         </ul>
         The following example illustrate their usage:
         <pre>
@@ -143,9 +143,9 @@
             The main methods are:
         </p>
         <ul>
-            <li>{@link org.apache.commons.jexl2.JexlEngine#createExpression}</li>
-            <li>{@link org.apache.commons.jexl2.JexlEngine#createScript}</li>
-            <li>{@link org.apache.commons.jexl2.Expression#evaluate}</li>
+            <li>{@link org.apache.commons.jexl3.JexlEngine#createExpression}</li>
+            <li>{@link org.apache.commons.jexl3.JexlEngine#createScript}</li>
+            <li>{@link org.apache.commons.jexl3.Expression#evaluate}</li>
         </ul>
         The following example illustrates their usage:
         <pre>
@@ -171,9 +171,9 @@
         </p>
         The main methods are:
         <ul>
-            <li>{@link org.apache.commons.jexl2.UnifiedJEXL#parse}</li>
-            <li>{@link org.apache.commons.jexl2.UnifiedJEXL.Expression#evaluate}</li>
-            <li>{@link org.apache.commons.jexl2.UnifiedJEXL.Expression#prepare}</li>
+            <li>{@link org.apache.commons.jexl3.UnifiedJEXL#parse}</li>
+            <li>{@link org.apache.commons.jexl3.UnifiedJEXL.Expression#evaluate}</li>
+            <li>{@link org.apache.commons.jexl3.UnifiedJEXL.Expression#prepare}</li>
         </ul>
         The following example illustrates their usage:
         <pre>
@@ -213,21 +213,21 @@
             is recommended to derive from JexlEngine to call those in a constructor.
         </p>
         <p>
-            {@link org.apache.commons.jexl2.JexlEngine#setLenient} configures when JEXL considers 'null' as an error or not in various situations;
+            {@link org.apache.commons.jexl3.JexlEngine#setLenient} configures when JEXL considers 'null' as an error or not in various situations;
             when facing an unreferenceable variable, using null as an argument to an arithmetic operator or failing to call
             a method or constructor. The lenient mode is close to JEXL-1.1 behavior.
         </p>
         <p>
-            {@link org.apache.commons.jexl2.JexlEngine#setSilent} configures how JEXL reacts to errors; if silent, the engine will not throw exceptions
+            {@link org.apache.commons.jexl3.JexlEngine#setSilent} configures how JEXL reacts to errors; if silent, the engine will not throw exceptions
             but will warn through loggers and return null in case of errors. Note that when non-silent, JEXL throws
             JexlException which are unchecked exception.
         </p>
         <p>
-            {@link org.apache.commons.jexl2.JexlEngine#setDebug} makes stacktraces carried by JExlException more meaningfull; in particular, these
+            {@link org.apache.commons.jexl3.JexlEngine#setDebug} makes stacktraces carried by JExlException more meaningfull; in particular, these
             traces will carry the exact caller location the Expression was created from.
         </p>
         <p>
-            {@link org.apache.commons.jexl2.JexlEngine#setClassLoader} indicates to a JexlEngine which class loader to use to solve a class name; this affects
+            {@link org.apache.commons.jexl3.JexlEngine#setClassLoader} indicates to a JexlEngine which class loader to use to solve a class name; this affects
             how JexlEngine.newInstance and the 'new' script method operates. This is mostly usefull in cases where
             you rely on JEXL to dynamically load and call plugins for your application.
         </p>
@@ -240,10 +240,10 @@
         </p>
         <p>Both JexlEngine and UnifiedJEXL are thread-safe; the same instance can be shared between different
             threads and proper synchronization is enforced in critical areas.</p>
-        <p>{@link org.apache.commons.jexl2.JexlEngine#setCache} will set how many expressions can be simultaneously cached by the
+        <p>{@link org.apache.commons.jexl3.JexlEngine#setCache} will set how many expressions can be simultaneously cached by the
             JEXL engine. UnifiedJEXL allows to define the cache size through its constructor.</p>
         <p>
-            {@link org.apache.commons.jexl2.JexlEngine#setFunctions} extends JEXL scripting by registering functions in
+            {@link org.apache.commons.jexl3.JexlEngine#setFunctions} extends JEXL scripting by registering functions in
             namespaces.
         </p>
         This can be used as in:
@@ -271,27 +271,28 @@
 
         <h2><a name="customization">JEXL Customization</a></h2>
         If you need to make JEXL treat some objects in a specialized manner or tweak how it
-        reacts to some settings, you can derive most of its inner-workings.
+        reacts to some settings, you can derive most of its inner-workings. However, using the protected methods
+        or internal package classes imply you might have to re-adapt your code when new JEXL versions are released.
         <p>
-            {@link org.apache.commons.jexl2.JexlEngine} is meant to be
+            {@link org.apache.commons.jexl3.JexlEngine} is meant to be
             extended and lets you capture your own configuration defaults wrt cache sizes and various flags.
             Implementing your own cache - instead of the basic LinkedHashMap based one - would be
             another possible extension.
         </p>
         <p>
-            {@link org.apache.commons.jexl2.JexlArithmetic}
+            {@link org.apache.commons.jexl3.JexlArithmetic}
             is the class to derive if you need to change how operators behave. For example, this would
             be the case if you wanted '+' to operate on arrays; you'd need to derive JexlArithmetic and
             implement your own version of Add.
         </p>
         <p>
-            {@link org.apache.commons.jexl2.Interpreter}
+            {@link org.apache.commons.jexl3.Interpreter}
             is the class to derive if you need to add more features to the evaluation
             itself; for instance, you want pre- and post- resolvers for variables or nested scopes for
             for variable contexts or add factory based support to the 'new' operator.
         </p>
         <p>
-            {@link org.apache.commons.jexl2.introspection.UberspectImpl}
+            {@link org.apache.commons.jexl3.internal.introspection.Uberspect}
             is the class to derive if you need to add introspection or reflection capabilities for some objects.
             The code already reflects public fields as properties on top of Java-beans conventions.
         </p>

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTArrayLiteral.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTArrayLiteral.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTArrayLiteral.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 public final class ASTArrayLiteral extends JexlNode implements JexlNode.Literal<Object> {
     /** The type literal value. */

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTIdentifier.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTIdentifier.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTIdentifier.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 /**
  * Identifiers, variables and registers.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTJexlScript.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTJexlScript.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTJexlScript.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java Tue Nov 29 16:18:59 2011
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
-import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl3.JexlEngine;
 
 /**
  * Enhanced script to allow parameters declaration.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTMapLiteral.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTMapLiteral.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTMapLiteral.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 import java.util.Collections;
 import java.util.Map;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTNumberLiteral.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTNumberLiteral.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTNumberLiteral.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTReferenceExpression.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTReferenceExpression.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTReferenceExpression.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 public final class ASTReferenceExpression extends ASTArrayAccess {
     public ASTReferenceExpression(int id) {

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTStringLiteral.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTStringLiteral.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTStringLiteral.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 public final class ASTStringLiteral extends JexlNode implements JexlNode.Literal<String> {
 

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTVar.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTVar.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTVar.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java Tue Nov 29 16:18:59 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 /**
  * Declares a local variable.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java Tue Nov 29 16:18:59 2011
@@ -14,17 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
-import org.apache.commons.jexl2.DebugInfo;
-import org.apache.commons.jexl2.JexlInfo;
+import org.apache.commons.jexl3.JexlInfo;
 
 /**
  * Base class for parser nodes - holds an 'image' of the token for later use.
  *
  * @since 2.0
  */
-public abstract class JexlNode extends SimpleNode implements JexlInfo {
+public abstract class JexlNode extends SimpleNode implements JexlInfo.Handle {
     /** A marker interface for literals.
      * @param <T> the literal type
      */
@@ -43,23 +42,17 @@ public abstract class JexlNode extends S
     }
 
     /** {@inheritDoc} */
-    public DebugInfo debugInfo() {
+    public JexlInfo jexlInfo() {
         JexlNode node = this;
         while (node != null) {
-            if (node.value instanceof DebugInfo) {
-                return (DebugInfo) node.value;
+            if (node.value instanceof JexlInfo) {
+                return (JexlInfo) node.value;
             }
             node = node.jjtGetParent();
         }
         return null;
     }
 
-    /** {@inheritDoc} */
-    public String debugString() {
-        DebugInfo info = debugInfo();
-        return info != null ? info.debugString() : "";
-    }
-
     /**
      * Whether this node is a constant node
      * Its value can not change after the first evaluation and can be cached indefinitely.

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlParser.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlParser.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlParser.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java Tue Nov 29 16:18:59 2011
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
-import org.apache.commons.jexl2.DebugInfo;
-import org.apache.commons.jexl2.JexlEngine;
-import org.apache.commons.jexl2.JexlException;
+import org.apache.commons.jexl3.JexlEngine;
+import org.apache.commons.jexl3.JexlException;
+import org.apache.commons.jexl3.JexlInfo;
 
 /**
  * The base class for parsing, manages the parameter/local variable frame.
@@ -37,7 +37,7 @@ public class JexlParser extends StringPa
      * <p>
      * This is used to allow parameters to be declared before parsing.
      * </p>
-     * @param registers the register map
+     * @param theFrame the register map
      */
     public void setFrame(JexlEngine.Scope theFrame) {
         frame = theFrame;
@@ -66,7 +66,7 @@ public class JexlParser extends StringPa
         if (frame != null) {
             Integer register = frame.getRegister(image);
             if (register != null) {
-                identifier.setRegister(register);
+                identifier.setRegister(register.intValue());
             }
         }
         return image;
@@ -85,7 +85,7 @@ public class JexlParser extends StringPa
             frame = new JexlEngine.Scope((String[])null);
         }
         Integer register = frame.declareVariable(image);
-        identifier.setRegister(register);
+        identifier.setRegister(register.intValue());
         identifier.image = image;
     }
 
@@ -116,12 +116,12 @@ public class JexlParser extends StringPa
      */
     void jjtreeCloseNodeScope(JexlNode n) throws ParseException {
         if (n instanceof ASTAmbiguous && n.jjtGetNumChildren() > 0) {
-            DebugInfo dbgInfo = null;
+            JexlInfo dbgInfo = null;
             Token tok = this.getToken(0);
             if (tok != null) {
-                dbgInfo = new DebugInfo(tok.image, tok.beginLine, tok.beginColumn);
+                dbgInfo = new JexlInfo(tok.image, tok.beginLine, tok.beginColumn);
             } else {
-                dbgInfo = n.debugInfo();
+                dbgInfo = n.jexlInfo();
             }
             throw new JexlException.Parsing(dbgInfo, "Ambiguous statement, missing ';' between expressions", null);
         }

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ParseException.java (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ParseException.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ParseException.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ParseException.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ParseException.java&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ParseException.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ParseException.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 /**
  * This exception is thrown when parse errors are encountered.
@@ -67,7 +67,7 @@ public class ParseException extends Exce
      * in the generated parser.  Calling this constructor generates
      * a new object of this type with the fields "currentToken",
      * "expectedTokenSequences", and "tokenImage" set.
-     * @param cuurentToken This is the last token that has been consumed successfully.  If
+     * @param currentToken This is the last token that has been consumed successfully.  If
      * this object has been created due to a parse error, the token
      * followng this token will (therefore) be the first error token.
      * @param expectedTokenSequences Each entry in this array is an array of integers.  Each array

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ParseException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt (from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt&r1=1206774&r2=1207941&rev=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt Tue Nov 29 16:18:59 2011
@@ -28,10 +28,10 @@ options
 
 PARSER_BEGIN(Parser)
 
-package org.apache.commons.jexl2.parser;
+package org.apache.commons.jexl3.parser;
 
 import java.io.Reader;
-import org.apache.commons.jexl2.JexlInfo;
+import org.apache.commons.jexl3.JexlInfo;
 
 public class Parser extends JexlParser
 {

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
------------------------------------------------------------------------------
    svn:keywords = author date id revision



Mime
View raw message