You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2009/12/10 13:05:47 UTC
svn commit: r889223 - in /commons/proper/jexl/trunk: ./
src/main/java/org/apache/commons/jexl2/
src/main/java/org/apache/commons/jexl2/internal/
src/main/java/org/apache/commons/jexl2/internal/introspection/
src/main/java/org/apache/commons/jexl2/intro...
Author: henrib
Date: Thu Dec 10 12:05:22 2009
New Revision: 889223
URL: http://svn.apache.org/viewvc?rev=889223&view=rev
Log:
renamed o.a.c.jexl2.util.* to o.a.c.jexl2.internal.* to better separate public api from internals
Added:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/AbstractExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayIterator.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayIterator.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayListWrapper.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/BooleanGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckSetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/EnumerationIterator.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MethodExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertyGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertySetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/ClassMap.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodKey.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java
- copied, changed from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodMap.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/package.html
- copied unchanged from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/package.html
- copied unchanged from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/package.html
Removed:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayIterator.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayListWrapper.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/BooleanGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckSetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/EnumerationIterator.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MethodExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertyGetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertySetExecutor.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/ClassMap.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodKey.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodMap.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/package.html
Modified:
commons/proper/jexl/trunk/pom.xml
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java
Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=889223&r1=889222&r2=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Thu Dec 10 12:05:22 2009
@@ -117,7 +117,7 @@
<commons.componentid>jexl</commons.componentid>
<commons.release.version>2.0</commons.release.version>
<!-- The RC version used in the staging repository URL. -->
- <commons.rc.version>RC3</commons.rc.version>
+ <commons.rc.version>RC4</commons.rc.version>
<commons.binary.suffix />
<commons.jira.id>JEXL</commons.jira.id>
<commons.jira.pid>12310479</commons.jira.pid>
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/AbstractExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/AbstractExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/AbstractExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/AbstractExecutor.java Thu Dec 10 12:05:22 2009
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
-import org.apache.commons.jexl2.util.introspection.MethodKey;
+package org.apache.commons.jexl2.internal;
+import org.apache.commons.jexl2.internal.introspection.MethodKey;
import org.apache.commons.jexl2.introspection.JexlMethod;
import org.apache.commons.jexl2.introspection.JexlPropertySet;
import org.apache.commons.jexl2.introspection.JexlPropertyGet;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayIterator.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayIterator.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayIterator.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayIterator.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayIterator.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayIterator.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayIterator.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.util.Iterator;
import java.util.NoSuchElementException;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayListWrapper.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayListWrapper.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ArrayListWrapper.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java Thu Dec 10 12:05:22 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.reflect.Array;
import java.util.AbstractList;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/BooleanGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/BooleanGetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/BooleanGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.reflect.InvocationTargetException;
/**
* Specialized executor to get a boolean property from an object.
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckGetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java Thu Dec 10 12:05:22 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.reflect.InvocationTargetException;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckSetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckSetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/DuckSetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java Thu Dec 10 12:05:22 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.reflect.InvocationTargetException;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/EnumerationIterator.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/EnumerationIterator.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/EnumerationIterator.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.util.Iterator;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java Thu Dec 10 12:05:22 2009
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.ref.SoftReference;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
-import org.apache.commons.jexl2.util.introspection.IntrospectorBase;
-import org.apache.commons.jexl2.util.introspection.MethodKey;
+import org.apache.commons.jexl2.internal.introspection.IntrospectorBase;
+import org.apache.commons.jexl2.internal.introspection.MethodKey;
import org.apache.commons.logging.Log;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListGetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.util.List;
import java.lang.reflect.Array;
/**
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.util.List;
import java.lang.reflect.Array;
/**
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.util.Map;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.util.Map;
import java.lang.reflect.InvocationTargetException;
/**
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MethodExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MethodExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MethodExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java Thu Dec 10 12:05:22 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.jexl2.util.introspection.MethodKey;
+import org.apache.commons.jexl2.internal.introspection.MethodKey;
/**
* Specialized executor to invoke a method on an object.
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertyGetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertyGetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertyGetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.reflect.InvocationTargetException;
/**
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertySetExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertySetExecutor.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/PropertySetExecutor.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util;
+package org.apache.commons.jexl2.internal;
import java.lang.reflect.InvocationTargetException;
/**
* Specialized executor to set a property in an object.
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/ClassMap.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/ClassMap.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/ClassMap.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java Thu Dec 10 12:05:22 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util.introspection;
+package org.apache.commons.jexl2.internal.introspection;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util.introspection;
+package org.apache.commons.jexl2.internal.introspection;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodKey.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodKey.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodKey.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java Thu Dec 10 12:05:22 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util.introspection;
+package org.apache.commons.jexl2.internal.introspection;
import java.util.List;
import java.util.LinkedList;
import java.util.Iterator;
Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java (from r889085, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodMap.java)
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodMap.java&r1=889085&r2=889223&rev=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/MethodMap.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java Thu Dec 10 12:05:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl2.util.introspection;
+package org.apache.commons.jexl2.internal.introspection;
import java.lang.reflect.Method;
import java.util.ArrayList;
Modified: 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/jexl2/introspection/UberspectImpl.java?rev=889223&r1=889222&r2=889223&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/jexl2/introspection/UberspectImpl.java Thu Dec 10 12:05:22 2009
@@ -17,7 +17,7 @@
package org.apache.commons.jexl2.introspection;
-import org.apache.commons.jexl2.util.Introspector;
+import org.apache.commons.jexl2.internal.Introspector;
import java.lang.reflect.Constructor;
import java.util.Enumeration;
import java.util.Iterator;
@@ -25,9 +25,9 @@
import java.util.Map;
import org.apache.commons.jexl2.JexlInfo;
import org.apache.commons.jexl2.JexlException;
-import org.apache.commons.jexl2.util.AbstractExecutor;
-import org.apache.commons.jexl2.util.ArrayIterator;
-import org.apache.commons.jexl2.util.EnumerationIterator;
+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.logging.Log;
/**
Modified: 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/jexl2/package.html?rev=889223&r1=889222&r2=889223&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/jexl2/package.html Thu Dec 10 12:05:22 2009
@@ -86,8 +86,8 @@
<ul>
<li>org.apache.commons.jexl2.parser</li>
<li>org.apache.commons.jexl2.scripting</li>
- <li>org.apache.commons.jexl2.util</li>
- <li>org.apache.commons.jexl2.util.introspection</li>
+ <li>org.apache.commons.jexl2.internal</li>
+ <li>org.apache.commons.jexl2.internal.introspection</li>
</ul>
<h3><a name="usage_api">Dynamic invocation</a></h3>
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java?rev=889223&r1=889222&r2=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java Thu Dec 10 12:05:22 2009
@@ -16,7 +16,7 @@
*/
package org.apache.commons.jexl2;
import org.apache.commons.jexl2.introspection.Uberspect;
-import org.apache.commons.jexl2.util.Introspector;
+import org.apache.commons.jexl2.internal.Introspector;
import java.util.HashMap;
import java.util.Map;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java?rev=889223&r1=889222&r2=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java Thu Dec 10 12:05:22 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util.introspection;
+package org.apache.commons.jexl2.internal.introspection;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,16 +26,16 @@
import org.apache.commons.jexl2.JexlTestCase;
import org.apache.commons.jexl2.introspection.Uberspect;
-import org.apache.commons.jexl2.util.Introspector;
-import org.apache.commons.jexl2.util.AbstractExecutor;
-import org.apache.commons.jexl2.util.PropertyGetExecutor;
-import org.apache.commons.jexl2.util.PropertySetExecutor;
-import org.apache.commons.jexl2.util.DuckGetExecutor;
-import org.apache.commons.jexl2.util.DuckSetExecutor;
-import org.apache.commons.jexl2.util.ListGetExecutor;
-import org.apache.commons.jexl2.util.ListSetExecutor;
-import org.apache.commons.jexl2.util.MapGetExecutor;
-import org.apache.commons.jexl2.util.MapSetExecutor;
+import org.apache.commons.jexl2.internal.Introspector;
+import org.apache.commons.jexl2.internal.AbstractExecutor;
+import org.apache.commons.jexl2.internal.PropertyGetExecutor;
+import org.apache.commons.jexl2.internal.PropertySetExecutor;
+import org.apache.commons.jexl2.internal.DuckGetExecutor;
+import org.apache.commons.jexl2.internal.DuckSetExecutor;
+import org.apache.commons.jexl2.internal.ListGetExecutor;
+import org.apache.commons.jexl2.internal.ListSetExecutor;
+import org.apache.commons.jexl2.internal.MapGetExecutor;
+import org.apache.commons.jexl2.internal.MapSetExecutor;
/**
* Tests for checking introspection discovery.
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java?rev=889223&r1=889222&r2=889223&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java Thu Dec 10 12:05:22 2009
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.jexl2.util.introspection;
+package org.apache.commons.jexl2.internal.introspection;
+import org.apache.commons.jexl2.internal.introspection.MethodKey;
+import org.apache.commons.jexl2.internal.introspection.ClassMap;
import junit.framework.TestCase;
/**
* Checks the CacheMap.MethodKey implementation