commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hen...@apache.org
Subject svn commit: r884175 [1/2] - in /commons/proper/jexl/trunk: ./ src/main/java/org/apache/commons/jexl/ src/main/java/org/apache/commons/jexl2/ src/main/java/org/apache/commons/jexl2/context/ src/main/java/org/apache/commons/jexl2/parser/ src/main/java/or...
Date Wed, 25 Nov 2009 16:23:45 GMT
Author: henrib
Date: Wed Nov 25 16:23:41 2009
New Revision: 884175

URL: http://svn.apache.org/viewvc?rev=884175&view=rev
Log:
JEXL-91: renaming o.a.c.jexl to o.a.c.jexl2

Added:
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/
      - copied from r884008, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/
      - copied from r884008, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/
Removed:
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/
Modified:
    commons/proper/jexl/trunk/PROPOSAL.html
    commons/proper/jexl/trunk/pom.xml
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Expression.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionFactory.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlHelper.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Script.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ScriptFactory.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/HashMapContext.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/StringParser.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptObject.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/Main.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/package.html
    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/DebugInfo.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Introspector.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/JexlMethod.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.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/Uberspect.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.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
    commons/proper/jexl/trunk/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BitwiseOperatorTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreator.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Foo.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTestCase.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.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
    commons/proper/jexl/trunk/xdocs/reference/examples.xml
    commons/proper/jexl/trunk/xdocs/reference/jsr223.xml

Modified: commons/proper/jexl/trunk/PROPOSAL.html
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/PROPOSAL.html?rev=884175&r1=884174&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/PROPOSAL.html (original)
+++ commons/proper/jexl/trunk/PROPOSAL.html Wed Nov 25 16:23:41 2009
@@ -60,7 +60,7 @@
 </p>
 
 <p>The proposed package name for the new component is
-<code>org.apache.commons.jexl</code>.</p>
+<code>org.apache.commons.jexl2</code>.</p>
 
 
 <h3>(3)  Required Jakarta-Commons Resources</h3>

Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=884175&r1=884174&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Wed Nov 25 16:23:41 2009
@@ -170,10 +170,10 @@
                     <execution>
                         <id>jexl-jjtree</id>
                         <configuration>
-                            <sourceDirectory>${basedir}/src/main/java/org/apache/commons/jexl/parser</sourceDirectory>
+                            <sourceDirectory>${basedir}/src/main/java/org/apache/commons/jexl2/parser</sourceDirectory>
                             <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
                             <timestampDirectory>${project.build.directory}/generated-sources/javacc-timestamp</timestampDirectory>
-                            <packageName>org.apache.commons.jexl.parser</packageName>
+                            <packageName>org.apache.commons.jexl2.parser</packageName>
                         </configuration>
                         <goals>
                             <goal>jjtree-javacc</goal>

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java Wed Nov 25 16:23:41 2009
@@ -14,57 +14,57 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
-import org.apache.commons.jexl.parser.ASTAdditiveNode;
-import org.apache.commons.jexl.parser.ASTAdditiveOperator;
-import org.apache.commons.jexl.parser.ASTAndNode;
-import org.apache.commons.jexl.parser.ASTAmbiguous;
-import org.apache.commons.jexl.parser.ASTArrayAccess;
-import org.apache.commons.jexl.parser.ASTArrayLiteral;
-import org.apache.commons.jexl.parser.ASTAssignment;
-import org.apache.commons.jexl.parser.ASTBitwiseAndNode;
-import org.apache.commons.jexl.parser.ASTBitwiseComplNode;
-import org.apache.commons.jexl.parser.ASTBitwiseOrNode;
-import org.apache.commons.jexl.parser.ASTBitwiseXorNode;
-import org.apache.commons.jexl.parser.ASTBlock;
-import org.apache.commons.jexl.parser.ASTConstructorNode;
-import org.apache.commons.jexl.parser.ASTDivNode;
-import org.apache.commons.jexl.parser.ASTEQNode;
-import org.apache.commons.jexl.parser.ASTEmptyFunction;
-import org.apache.commons.jexl.parser.ASTFalseNode;
-import org.apache.commons.jexl.parser.ASTFloatLiteral;
-import org.apache.commons.jexl.parser.ASTForeachStatement;
-import org.apache.commons.jexl.parser.ASTFunctionNode;
-import org.apache.commons.jexl.parser.ASTGENode;
-import org.apache.commons.jexl.parser.ASTGTNode;
-import org.apache.commons.jexl.parser.ASTIdentifier;
-import org.apache.commons.jexl.parser.ASTIfStatement;
-import org.apache.commons.jexl.parser.ASTIntegerLiteral;
-import org.apache.commons.jexl.parser.ASTJexlScript;
-import org.apache.commons.jexl.parser.ASTLENode;
-import org.apache.commons.jexl.parser.ASTLTNode;
-import org.apache.commons.jexl.parser.ASTMapEntry;
-import org.apache.commons.jexl.parser.ASTMapLiteral;
-import org.apache.commons.jexl.parser.ASTMethodNode;
-import org.apache.commons.jexl.parser.ASTModNode;
-import org.apache.commons.jexl.parser.ASTMulNode;
-import org.apache.commons.jexl.parser.ASTNENode;
-import org.apache.commons.jexl.parser.ASTNotNode;
-import org.apache.commons.jexl.parser.ASTNullLiteral;
-import org.apache.commons.jexl.parser.ASTOrNode;
-import org.apache.commons.jexl.parser.ASTReference;
-import org.apache.commons.jexl.parser.ASTSizeFunction;
-import org.apache.commons.jexl.parser.ASTSizeMethod;
-import org.apache.commons.jexl.parser.ASTStringLiteral;
-import org.apache.commons.jexl.parser.ASTTernaryNode;
-import org.apache.commons.jexl.parser.ASTTrueNode;
-import org.apache.commons.jexl.parser.ASTUnaryMinusNode;
-import org.apache.commons.jexl.parser.ASTWhileStatement;
-import org.apache.commons.jexl.parser.JexlNode;
-import org.apache.commons.jexl.parser.SimpleNode;
+import org.apache.commons.jexl2.parser.ASTAdditiveNode;
+import org.apache.commons.jexl2.parser.ASTAdditiveOperator;
+import org.apache.commons.jexl2.parser.ASTAndNode;
+import org.apache.commons.jexl2.parser.ASTAmbiguous;
+import org.apache.commons.jexl2.parser.ASTArrayAccess;
+import org.apache.commons.jexl2.parser.ASTArrayLiteral;
+import org.apache.commons.jexl2.parser.ASTAssignment;
+import org.apache.commons.jexl2.parser.ASTBitwiseAndNode;
+import org.apache.commons.jexl2.parser.ASTBitwiseComplNode;
+import org.apache.commons.jexl2.parser.ASTBitwiseOrNode;
+import org.apache.commons.jexl2.parser.ASTBitwiseXorNode;
+import org.apache.commons.jexl2.parser.ASTBlock;
+import org.apache.commons.jexl2.parser.ASTConstructorNode;
+import org.apache.commons.jexl2.parser.ASTDivNode;
+import org.apache.commons.jexl2.parser.ASTEQNode;
+import org.apache.commons.jexl2.parser.ASTEmptyFunction;
+import org.apache.commons.jexl2.parser.ASTFalseNode;
+import org.apache.commons.jexl2.parser.ASTFloatLiteral;
+import org.apache.commons.jexl2.parser.ASTForeachStatement;
+import org.apache.commons.jexl2.parser.ASTFunctionNode;
+import org.apache.commons.jexl2.parser.ASTGENode;
+import org.apache.commons.jexl2.parser.ASTGTNode;
+import org.apache.commons.jexl2.parser.ASTIdentifier;
+import org.apache.commons.jexl2.parser.ASTIfStatement;
+import org.apache.commons.jexl2.parser.ASTIntegerLiteral;
+import org.apache.commons.jexl2.parser.ASTJexlScript;
+import org.apache.commons.jexl2.parser.ASTLENode;
+import org.apache.commons.jexl2.parser.ASTLTNode;
+import org.apache.commons.jexl2.parser.ASTMapEntry;
+import org.apache.commons.jexl2.parser.ASTMapLiteral;
+import org.apache.commons.jexl2.parser.ASTMethodNode;
+import org.apache.commons.jexl2.parser.ASTModNode;
+import org.apache.commons.jexl2.parser.ASTMulNode;
+import org.apache.commons.jexl2.parser.ASTNENode;
+import org.apache.commons.jexl2.parser.ASTNotNode;
+import org.apache.commons.jexl2.parser.ASTNullLiteral;
+import org.apache.commons.jexl2.parser.ASTOrNode;
+import org.apache.commons.jexl2.parser.ASTReference;
+import org.apache.commons.jexl2.parser.ASTSizeFunction;
+import org.apache.commons.jexl2.parser.ASTSizeMethod;
+import org.apache.commons.jexl2.parser.ASTStringLiteral;
+import org.apache.commons.jexl2.parser.ASTTernaryNode;
+import org.apache.commons.jexl2.parser.ASTTrueNode;
+import org.apache.commons.jexl2.parser.ASTUnaryMinusNode;
+import org.apache.commons.jexl2.parser.ASTWhileStatement;
+import org.apache.commons.jexl2.parser.JexlNode;
+import org.apache.commons.jexl2.parser.SimpleNode;
 
-import org.apache.commons.jexl.parser.ParserVisitor;
+import org.apache.commons.jexl2.parser.ParserVisitor;
 
 /**
  * Helps pinpoint the cause of problems in expressions that fail during evaluation.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Expression.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Expression.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Expression.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Expression.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 
 /**

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionFactory.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionFactory.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionFactory.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 /**
  * Creates Expression objects. 

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java Wed Nov 25 16:23:41 2009
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
-import org.apache.commons.jexl.parser.ASTJexlScript;
+import org.apache.commons.jexl2.parser.ASTJexlScript;
 
 /**
  * Instances of ExpressionImpl are created by the {@link JexlEngine},

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Array;
@@ -26,63 +26,63 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.jexl.parser.SimpleNode;
+import org.apache.commons.jexl2.parser.SimpleNode;
 import org.apache.commons.logging.Log;
 
-import org.apache.commons.jexl.parser.JexlNode;
-import org.apache.commons.jexl.parser.ASTAdditiveNode;
-import org.apache.commons.jexl.parser.ASTAdditiveOperator;
-import org.apache.commons.jexl.parser.ASTAndNode;
-import org.apache.commons.jexl.parser.ASTAmbiguous;
-import org.apache.commons.jexl.parser.ASTArrayAccess;
-import org.apache.commons.jexl.parser.ASTArrayLiteral;
-import org.apache.commons.jexl.parser.ASTAssignment;
-import org.apache.commons.jexl.parser.ASTBitwiseAndNode;
-import org.apache.commons.jexl.parser.ASTBitwiseComplNode;
-import org.apache.commons.jexl.parser.ASTBitwiseOrNode;
-import org.apache.commons.jexl.parser.ASTBitwiseXorNode;
-import org.apache.commons.jexl.parser.ASTBlock;
-import org.apache.commons.jexl.parser.ASTConstructorNode;
-import org.apache.commons.jexl.parser.ASTDivNode;
-import org.apache.commons.jexl.parser.ASTEQNode;
-import org.apache.commons.jexl.parser.ASTEmptyFunction;
-import org.apache.commons.jexl.parser.ASTFalseNode;
-import org.apache.commons.jexl.parser.ASTFunctionNode;
-import org.apache.commons.jexl.parser.ASTFloatLiteral;
-import org.apache.commons.jexl.parser.ASTForeachStatement;
-import org.apache.commons.jexl.parser.ASTGENode;
-import org.apache.commons.jexl.parser.ASTGTNode;
-import org.apache.commons.jexl.parser.ASTIdentifier;
-import org.apache.commons.jexl.parser.ASTIfStatement;
-import org.apache.commons.jexl.parser.ASTIntegerLiteral;
-import org.apache.commons.jexl.parser.ASTJexlScript;
-import org.apache.commons.jexl.parser.ASTLENode;
-import org.apache.commons.jexl.parser.ASTLTNode;
-import org.apache.commons.jexl.parser.ASTMapEntry;
-import org.apache.commons.jexl.parser.ASTMapLiteral;
-import org.apache.commons.jexl.parser.ASTMethodNode;
-import org.apache.commons.jexl.parser.ASTModNode;
-import org.apache.commons.jexl.parser.ASTMulNode;
-import org.apache.commons.jexl.parser.ASTNENode;
-import org.apache.commons.jexl.parser.ASTNotNode;
-import org.apache.commons.jexl.parser.ASTNullLiteral;
-import org.apache.commons.jexl.parser.ASTOrNode;
-import org.apache.commons.jexl.parser.ASTReference;
-import org.apache.commons.jexl.parser.ASTSizeFunction;
-import org.apache.commons.jexl.parser.ASTSizeMethod;
-import org.apache.commons.jexl.parser.ASTStringLiteral;
-import org.apache.commons.jexl.parser.ASTTernaryNode;
-import org.apache.commons.jexl.parser.ASTTrueNode;
-import org.apache.commons.jexl.parser.ASTUnaryMinusNode;
-import org.apache.commons.jexl.parser.ASTWhileStatement;
-import org.apache.commons.jexl.parser.Node;
-import org.apache.commons.jexl.parser.ParserVisitor;
-
-import org.apache.commons.jexl.util.AbstractExecutor;
-import org.apache.commons.jexl.util.introspection.Uberspect;
-import org.apache.commons.jexl.util.introspection.JexlMethod;
-import org.apache.commons.jexl.util.introspection.JexlPropertyGet;
-import org.apache.commons.jexl.util.introspection.JexlPropertySet;
+import org.apache.commons.jexl2.parser.JexlNode;
+import org.apache.commons.jexl2.parser.ASTAdditiveNode;
+import org.apache.commons.jexl2.parser.ASTAdditiveOperator;
+import org.apache.commons.jexl2.parser.ASTAndNode;
+import org.apache.commons.jexl2.parser.ASTAmbiguous;
+import org.apache.commons.jexl2.parser.ASTArrayAccess;
+import org.apache.commons.jexl2.parser.ASTArrayLiteral;
+import org.apache.commons.jexl2.parser.ASTAssignment;
+import org.apache.commons.jexl2.parser.ASTBitwiseAndNode;
+import org.apache.commons.jexl2.parser.ASTBitwiseComplNode;
+import org.apache.commons.jexl2.parser.ASTBitwiseOrNode;
+import org.apache.commons.jexl2.parser.ASTBitwiseXorNode;
+import org.apache.commons.jexl2.parser.ASTBlock;
+import org.apache.commons.jexl2.parser.ASTConstructorNode;
+import org.apache.commons.jexl2.parser.ASTDivNode;
+import org.apache.commons.jexl2.parser.ASTEQNode;
+import org.apache.commons.jexl2.parser.ASTEmptyFunction;
+import org.apache.commons.jexl2.parser.ASTFalseNode;
+import org.apache.commons.jexl2.parser.ASTFunctionNode;
+import org.apache.commons.jexl2.parser.ASTFloatLiteral;
+import org.apache.commons.jexl2.parser.ASTForeachStatement;
+import org.apache.commons.jexl2.parser.ASTGENode;
+import org.apache.commons.jexl2.parser.ASTGTNode;
+import org.apache.commons.jexl2.parser.ASTIdentifier;
+import org.apache.commons.jexl2.parser.ASTIfStatement;
+import org.apache.commons.jexl2.parser.ASTIntegerLiteral;
+import org.apache.commons.jexl2.parser.ASTJexlScript;
+import org.apache.commons.jexl2.parser.ASTLENode;
+import org.apache.commons.jexl2.parser.ASTLTNode;
+import org.apache.commons.jexl2.parser.ASTMapEntry;
+import org.apache.commons.jexl2.parser.ASTMapLiteral;
+import org.apache.commons.jexl2.parser.ASTMethodNode;
+import org.apache.commons.jexl2.parser.ASTModNode;
+import org.apache.commons.jexl2.parser.ASTMulNode;
+import org.apache.commons.jexl2.parser.ASTNENode;
+import org.apache.commons.jexl2.parser.ASTNotNode;
+import org.apache.commons.jexl2.parser.ASTNullLiteral;
+import org.apache.commons.jexl2.parser.ASTOrNode;
+import org.apache.commons.jexl2.parser.ASTReference;
+import org.apache.commons.jexl2.parser.ASTSizeFunction;
+import org.apache.commons.jexl2.parser.ASTSizeMethod;
+import org.apache.commons.jexl2.parser.ASTStringLiteral;
+import org.apache.commons.jexl2.parser.ASTTernaryNode;
+import org.apache.commons.jexl2.parser.ASTTrueNode;
+import org.apache.commons.jexl2.parser.ASTUnaryMinusNode;
+import org.apache.commons.jexl2.parser.ASTWhileStatement;
+import org.apache.commons.jexl2.parser.Node;
+import org.apache.commons.jexl2.parser.ParserVisitor;
+
+import org.apache.commons.jexl2.util.AbstractExecutor;
+import org.apache.commons.jexl2.util.introspection.Uberspect;
+import org.apache.commons.jexl2.util.introspection.JexlMethod;
+import org.apache.commons.jexl2.util.introspection.JexlPropertyGet;
+import org.apache.commons.jexl2.util.introspection.JexlPropertySet;
 
 /**
  * An interpreter of JEXL syntax.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.util.Map;
 

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -34,15 +34,15 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.commons.jexl.parser.ParseException;
-import org.apache.commons.jexl.parser.Parser;
-import org.apache.commons.jexl.parser.JexlNode;
-import org.apache.commons.jexl.parser.TokenMgrError;
-import org.apache.commons.jexl.parser.ASTJexlScript;
-import org.apache.commons.jexl.util.Introspector;
-import org.apache.commons.jexl.util.introspection.Uberspect;
-import org.apache.commons.jexl.util.introspection.Info;
-import org.apache.commons.jexl.util.introspection.JexlMethod;
+import org.apache.commons.jexl2.parser.ParseException;
+import org.apache.commons.jexl2.parser.Parser;
+import org.apache.commons.jexl2.parser.JexlNode;
+import org.apache.commons.jexl2.parser.TokenMgrError;
+import org.apache.commons.jexl2.parser.ASTJexlScript;
+import org.apache.commons.jexl2.util.Introspector;
+import org.apache.commons.jexl2.util.introspection.Uberspect;
+import org.apache.commons.jexl2.util.introspection.Info;
+import org.apache.commons.jexl2.util.introspection.JexlMethod;
 
 /**
  * <p>

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java Wed Nov 25 16:23:41 2009
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
-import org.apache.commons.jexl.parser.JexlNode;
-import org.apache.commons.jexl.util.introspection.Info;
+import org.apache.commons.jexl2.parser.JexlNode;
+import org.apache.commons.jexl2.util.introspection.Info;
 
 /**
  * Wraps any error that might occur during interpretation of a script or expression.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlHelper.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlHelper.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlHelper.java Wed Nov 25 16:23:41 2009
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
-import org.apache.commons.jexl.context.HashMapContext;
+import org.apache.commons.jexl2.context.HashMapContext;
 
 /**
  *  Helper to create a context.  In the current implementation of JEXL, there

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java Wed Nov 25 16:23:41 2009
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStreamReader;
 
-import org.apache.commons.jexl.context.HashMapContext;
+import org.apache.commons.jexl2.context.HashMapContext;
 
 /**
  * Test application for JEXL.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Script.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Script.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Script.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Script.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 /**
  * <p>A JEXL Script.</p>

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ScriptFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ScriptFactory.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ScriptFactory.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ScriptFactory.java Wed Nov 25 16:23:41 2009
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.io.File;
 import java.net.URL;
-import org.apache.commons.jexl.parser.JexlNode;
+import org.apache.commons.jexl2.parser.JexlNode;
 /**
  * <p>
  * Creates {@link Script}s.  To create a JEXL Script, pass

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java Wed Nov 25 16:23:41 2009
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.util.ArrayList;
-import org.apache.commons.jexl.parser.JexlNode;
-import org.apache.commons.jexl.parser.StringParser;
-import org.apache.commons.jexl.util.introspection.Info;
+import org.apache.commons.jexl2.parser.JexlNode;
+import org.apache.commons.jexl2.parser.StringParser;
+import org.apache.commons.jexl2.util.introspection.Info;
 
 /**
  * An evaluator similar to the Unified EL evaluator used in JSP/JSF based on JEXL.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/HashMapContext.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/HashMapContext.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/HashMapContext.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/HashMapContext.java Wed Nov 25 16:23:41 2009
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.context;
+package org.apache.commons.jexl2.context;
 
-import org.apache.commons.jexl.JexlContext;
+import org.apache.commons.jexl2.JexlContext;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/package.html
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/package.html?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/package.html Wed Nov 25 16:23:41 2009
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
  <head>
-  <title>Package Documentation for org.apache.commons.jexl.context Package</title>
+  <title>Package Documentation for org.apache.commons.jexl2.context Package</title>
  </head>
  <body bgcolor="white">
   Simple JexlContext implementations.

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=884175&r1=884008&r2=884175&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 Wed Nov 25 16:23:41 2009
@@ -16,7 +16,7 @@
        limitations under the License.
     -->
     <head>
-        <title>Package Documentation for org.apache.commons.jexl Package</title>
+        <title>Package Documentation for org.apache.commons.jexl2 Package</title>
     </head>
     <body bgcolor="white">
         Provides a framework for evaluating JEXL expressions.
@@ -38,15 +38,15 @@
         <h2><a name="example">A Brief Example</a></h2>
         <p>
             When evaluating expressions, JEXL merges an
-            {@link org.apache.commons.jexl.Expression}
+            {@link org.apache.commons.jexl2.Expression}
             with a
-            {@link org.apache.commons.jexl.JexlContext}.
+            {@link org.apache.commons.jexl2.JexlContext}.
             An Expression is created using
-            {@link org.apache.commons.jexl.JexlEngine#createExpression(java.lang.String)},
+            {@link org.apache.commons.jexl2.JexlEngine#createExpression(java.lang.String)},
             passing a String containing valid JEXL syntax.  A JexlContext is created using
-            {@link org.apache.commons.jexl.JexlHelper#createContext()},
+            {@link org.apache.commons.jexl2.JexlHelper#createContext()},
             and variables are put into a map exposed through the
-            {@link org.apache.commons.jexl.JexlContext#getVars()}
+            {@link org.apache.commons.jexl2.JexlContext#getVars()}
             method on JexlContext.  The following example, takes a variable named foo, and
             invokes the bar() method on the property innerFoo:
         </p>
@@ -81,10 +81,10 @@
             set of methods:
         </p>
         <ul>
-            <li>{@link org.apache.commons.jexl.JexlEngine#newInstance}</li>
-            <li>{@link org.apache.commons.jexl.JexlEngine#setProperty}</li>
-            <li>{@link org.apache.commons.jexl.JexlEngine#getProperty}</li>
-            <li>{@link org.apache.commons.jexl.JexlEngine#invokeMethod}</li>
+            <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>
         </ul>
         The following example illustrate their usage:
         <pre>
@@ -126,9 +126,9 @@
             The main methods are:
         </p>
         <ul>
-            <li>{@link org.apache.commons.jexl.JexlEngine#createExpression}</li>
-            <li>{@link org.apache.commons.jexl.JexlEngine#createScript}</li>
-            <li>{@link org.apache.commons.jexl.Expression#evaluate}</li>
+            <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>
         </ul>
         The following example illustrates their usage:
         <pre>
@@ -154,9 +154,9 @@
         </p>
         The main methods are:
         <ul>
-            <li>{@link org.apache.commons.jexl.UnifiedJEXL#parse}</li>
-            <li>{@link org.apache.commons.jexl.UnifiedJEXL.Expression#evaluate}</li>
-            <li>{@link org.apache.commons.jexl.UnifiedJEXL.Expression#prepare}</li>
+            <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>
         </ul>
         The following example illustrates their usage:
         <pre>
@@ -173,21 +173,21 @@
             is recommended to derive from JexlEngine to call those in a constructor.
         </p>
         <p>
-            {@link org.apache.commons.jexl.JexlEngine#setLenient} configures when JEXL considers 'null' as an error or not in various situations;
+            {@link org.apache.commons.jexl2.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.jexl.JexlEngine#setSilent} configures how JEXL reacts to errors; if silent, the engine will not throw exceptions
+            {@link org.apache.commons.jexl2.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.jexl.JexlEngine#setDebug} makes stacktraces carried by JExlException more meaningfull; in particular, these
+           {@link org.apache.commons.jexl2.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.jexl.JexlEngine#setClassLoader} indicates to a JexlEngine which class loader to use to solve a class name; this affects
+        {@link org.apache.commons.jexl2.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.
         This
@@ -201,10 +201,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.jexl.JexlEngine#setCache} will set how many expressions can be simultaneously cached by the
+        <p>{@link org.apache.commons.jexl2.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.jexl.JexlEngine#setFunctions} extend JEXL scripting by registering functions in
+            {@link org.apache.commons.jexl2.JexlEngine#setFunctions} extend JEXL scripting by registering functions in
             namespaces.
         </p>
             This can be used as in:
@@ -231,25 +231,25 @@
         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.
         <p>
-           {@link org.apache.commons.jexl.JexlEngine} is meant to be
+           {@link org.apache.commons.jexl2.JexlEngine} is meant to be
            extended and let 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.jexl.JexlArithmetic}
+            {@link org.apache.commons.jexl2.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.jexl.Interpreter}
+            {@link org.apache.commons.jexl2.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.jexl.util.introspection.UberspectImpl}
+            {@link org.apache.commons.jexl2.util.introspection.UberspectImpl}
             is the class to derive if you need to add introspection or reflection capabilities for some objects.
             For instance, being able to expose and manipulate public fields instead of Java-beans conventions.
         </p>

Modified: 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/jexl2/parser/JexlNode.java?rev=884175&r1=884008&r2=884175&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/jexl2/parser/JexlNode.java Wed Nov 25 16:23:41 2009
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.parser;
+package org.apache.commons.jexl2.parser;
 
-import org.apache.commons.jexl.util.introspection.Info;
-import org.apache.commons.jexl.util.introspection.DebugInfo;
+import org.apache.commons.jexl2.util.introspection.Info;
+import org.apache.commons.jexl2.util.introspection.DebugInfo;
 
 /**
  * Base class for parser nodes - holds an 'image' of the token for later use.

Modified: 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/jexl2/parser/Parser.jjt?rev=884175&r1=884008&r2=884175&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/jexl2/parser/Parser.jjt Wed Nov 25 16:23:41 2009
@@ -36,10 +36,10 @@
 
 PARSER_BEGIN(Parser)
 
-package org.apache.commons.jexl.parser;
+package org.apache.commons.jexl2.parser;
 
 import java.io.Reader;
-import org.apache.commons.jexl.util.introspection.Info;
+import org.apache.commons.jexl2.util.introspection.Info;
 
 public class Parser extends StringParser
 {

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.parser;
+package org.apache.commons.jexl2.parser;
 
 /**
  * A class originally generated by JJTree:

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/StringParser.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/StringParser.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/StringParser.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/StringParser.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.parser;
+package org.apache.commons.jexl2.parser;
 
 /**
  * Common constant strings utilities.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/package.html
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/package.html?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/package.html Wed Nov 25 16:23:41 2009
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
  <head>
-  <title>Package Documentation for org.apache.commons.jexl.parser Package</title>
+  <title>Package Documentation for org.apache.commons.jexl2.parser Package</title>
  </head>
  <body bgcolor="white">
   Contains the Parser for JEXL script.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.scripting;
+package org.apache.commons.jexl2.scripting;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -31,9 +31,9 @@
 import javax.script.ScriptException;
 import javax.script.SimpleBindings;
 
-import org.apache.commons.jexl.JexlContext;
-import org.apache.commons.jexl.JexlEngine;
-import org.apache.commons.jexl.Script;
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.Script;
 
 /**
  * Implements the Jexl ScriptEngine for JSF-223.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.scripting;
+package org.apache.commons.jexl2.scripting;
 
 import java.util.Arrays;
 import java.util.Collections;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptObject.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptObject.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptObject.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptObject.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.scripting;
+package org.apache.commons.jexl2.scripting;
 
 import java.io.PrintStream;
 

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/Main.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/Main.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/Main.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/Main.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.scripting;
+package org.apache.commons.jexl2.scripting;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/package.html
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/package.html?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/package.html Wed Nov 25 16:23:41 2009
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
  <head>
-  <title>Package Documentation for org.apache.commons.jexl.scripting Package</title>
+  <title>Package Documentation for org.apache.commons.jexl2.scripting Package</title>
  </head>
  <body bgcolor="white">
   Contains the JSR-223 Scripting Engine for JEXL script.

Modified: 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/util/AbstractExecutor.java?rev=884175&r1=884008&r2=884175&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/util/AbstractExecutor.java Wed Nov 25 16:23:41 2009
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util;
-import org.apache.commons.jexl.util.introspection.MethodKey;
-import org.apache.commons.jexl.util.introspection.JexlMethod;
-import org.apache.commons.jexl.util.introspection.JexlPropertySet;
-import org.apache.commons.jexl.util.introspection.JexlPropertyGet;
+package org.apache.commons.jexl2.util;
+import org.apache.commons.jexl2.util.introspection.MethodKey;
+import org.apache.commons.jexl2.util.introspection.JexlMethod;
+import org.apache.commons.jexl2.util.introspection.JexlPropertySet;
+import org.apache.commons.jexl2.util.introspection.JexlPropertyGet;
 import java.lang.reflect.InvocationTargetException;
 
 /**

Modified: 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/util/ArrayIterator.java?rev=884175&r1=884008&r2=884175&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/util/ArrayIterator.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

Modified: 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/util/ArrayListWrapper.java?rev=884175&r1=884008&r2=884175&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/util/ArrayListWrapper.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 import java.lang.reflect.Array;
 import java.util.AbstractList;

Modified: 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/util/BooleanGetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/BooleanGetExecutor.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 import java.lang.reflect.InvocationTargetException;
 /**
  * Specialized executor to get a boolean property from an object.

Modified: 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/util/DuckGetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/DuckGetExecutor.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 import java.lang.reflect.InvocationTargetException;
 

Modified: 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/util/DuckSetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/DuckSetExecutor.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 import java.lang.reflect.InvocationTargetException;
 

Modified: 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/util/EnumerationIterator.java?rev=884175&r1=884008&r2=884175&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/util/EnumerationIterator.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 
 import java.util.Iterator;

Modified: 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/util/Introspector.java?rev=884175&r1=884008&r2=884175&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/util/Introspector.java Wed Nov 25 16:23:41 2009
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;
 
-import org.apache.commons.jexl.util.introspection.Uberspect;
-import org.apache.commons.jexl.util.introspection.UberspectImpl;
-import org.apache.commons.jexl.util.introspection.MethodKey;
+import org.apache.commons.jexl2.util.introspection.Uberspect;
+import org.apache.commons.jexl2.util.introspection.UberspectImpl;
+import org.apache.commons.jexl2.util.introspection.MethodKey;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -55,15 +55,15 @@
         /**
          * The soft reference to the introspector currently in use.
          */
-        private volatile SoftReference<org.apache.commons.jexl.util.introspection.Introspector> ref;
+        private volatile SoftReference<org.apache.commons.jexl2.util.introspection.Introspector> ref;
         /**
          * Creates a new instance.
          * @param theLogger logger used by the underlying introspector instance
          * @param is the underlying introspector instance
          */
-        protected Reference(Log theLogger, org.apache.commons.jexl.util.introspection.Introspector is) {
+        protected Reference(Log theLogger, org.apache.commons.jexl2.util.introspection.Introspector is) {
             logger = theLogger;
-            ref = new SoftReference<org.apache.commons.jexl.util.introspection.Introspector>(is);
+            ref = new SoftReference<org.apache.commons.jexl2.util.introspection.Introspector>(is);
         }
 
         /**
@@ -71,7 +71,7 @@
          * @param theLogger logger used by the underlying introspector instance
          */
         protected Reference(Log theLogger) {
-            this(theLogger, new org.apache.commons.jexl.util.introspection.Introspector(theLogger));
+            this(theLogger, new org.apache.commons.jexl2.util.introspection.Introspector(theLogger));
         }
 
         /**
@@ -80,15 +80,15 @@
          * @return the introspector
          */
         // CSOFF: DoubleCheckedLocking
-        public org.apache.commons.jexl.util.introspection.Introspector get() {
-            org.apache.commons.jexl.util.introspection.Introspector intro = ref.get();
+        public org.apache.commons.jexl2.util.introspection.Introspector get() {
+            org.apache.commons.jexl2.util.introspection.Introspector intro = ref.get();
             if (intro == null) {
                 // double checked locking (fixed by Java 5 memory model).
                 synchronized(this) {
                     intro = ref.get();
                     if (intro == null) {
-                        intro = new org.apache.commons.jexl.util.introspection.Introspector(logger);
-                        ref = new SoftReference<org.apache.commons.jexl.util.introspection.Introspector>(intro);
+                        intro = new org.apache.commons.jexl2.util.introspection.Introspector(logger);
+                        ref = new SoftReference<org.apache.commons.jexl2.util.introspection.Introspector>(intro);
                     }
                 }
             }
@@ -134,7 +134,7 @@
      * @param log the logger to use for warnings.
      * @param is the low level introspector.
      */
-    public Introspector(Log log, org.apache.commons.jexl.util.introspection.Introspector is) {
+    public Introspector(Log log, org.apache.commons.jexl2.util.introspection.Introspector is) {
         rlog = log;
         introspector = new Reference(log, is);
     }

Modified: 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/util/ListGetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/ListGetExecutor.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 import java.util.List;
 import java.lang.reflect.Array;
 /**

Modified: 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/util/ListSetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/ListSetExecutor.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 import java.util.List;
 import java.lang.reflect.Array;
 /**

Modified: 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/util/MapGetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/MapGetExecutor.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 import java.util.Map;
 

Modified: 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/util/MapSetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/MapSetExecutor.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 import java.util.Map;
 import java.lang.reflect.InvocationTargetException;
 /**

Modified: 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/util/MethodExecutor.java?rev=884175&r1=884008&r2=884175&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/util/MethodExecutor.java Wed Nov 25 16:23:41 2009
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.jexl.util.introspection.MethodKey;
+import org.apache.commons.jexl2.util.introspection.MethodKey;
 
 /**
  * Specialized executor to invoke a method on an object.

Modified: 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/util/PropertyGetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/PropertyGetExecutor.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 import java.lang.reflect.InvocationTargetException;
 
 /**

Modified: 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/util/PropertySetExecutor.java?rev=884175&r1=884008&r2=884175&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/util/PropertySetExecutor.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util;
+package org.apache.commons.jexl2.util;
 import java.lang.reflect.InvocationTargetException;
 /**
  * Specialized executor to set a property in an object.

Modified: 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/util/introspection/ClassMap.java?rev=884175&r1=884008&r2=884175&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/util/introspection/ClassMap.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 /**
  * A little class to abstract debugging info.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 /**
  * Little class to carry in info such as a file or template name, line and column for

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Introspector.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Introspector.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Introspector.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Introspector.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;

Modified: 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/util/introspection/IntrospectorBase.java?rev=884175&r1=884008&r2=884175&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/util/introspection/IntrospectorBase.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 /**
  * Interface used for regular method invocation.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 /**
  * Interface for getting values that appear to be properties.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 /**
  * Interface used for setting values that appear to be properties.

Modified: 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/util/introspection/MethodKey.java?rev=884175&r1=884008&r2=884175&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/util/introspection/MethodKey.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 import java.util.List;
 import java.util.LinkedList;
 import java.util.Iterator;

Modified: 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/util/introspection/MethodMap.java?rev=884175&r1=884008&r2=884175&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/util/introspection/MethodMap.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 import java.util.Iterator;
 import java.lang.reflect.Constructor;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl.util.introspection;
+package org.apache.commons.jexl2.util.introspection;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -25,8 +25,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.jexl.util.ArrayIterator;
-import org.apache.commons.jexl.util.EnumerationIterator;
+import org.apache.commons.jexl2.util.ArrayIterator;
+import org.apache.commons.jexl2.util.EnumerationIterator;
 import org.apache.commons.logging.Log;
 
 /**
@@ -39,7 +39,7 @@
  * @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a>
  * @version $Id$
  */
-public class UberspectImpl extends org.apache.commons.jexl.util.Introspector implements Uberspect {
+public class UberspectImpl extends org.apache.commons.jexl2.util.Introspector implements Uberspect {
     /** {@inheritDoc} */
     public Introspector getIntrospector() {
         return introspector.get();

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html Wed Nov 25 16:23:41 2009
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
  <head>
-  <title>Package Documentation for org.apache.commons.jexl.introspection Package</title>
+  <title>Package Documentation for org.apache.commons.jexl2.introspection Package</title>
  </head>
  <body bgcolor="white">
   Provides low &amp; high-level introspective services.

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/package.html
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/package.html?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/package.html (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/package.html Wed Nov 25 16:23:41 2009
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
  <head>
-  <title>Package Documentation for org.apache.commons.jexl Package</title>
+  <title>Package Documentation for org.apache.commons.jexl2 Package</title>
  </head>
  <body bgcolor="white">
   Provides utilities for introspection services.

Modified: commons/proper/jexl/trunk/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory?rev=884175&r1=884174&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory (original)
+++ commons/proper/jexl/trunk/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory Wed Nov 25 16:23:41 2009
@@ -16,4 +16,4 @@
 #  
 # 
 
-org.apache.commons.jexl.scripting.JexlScriptEngineFactory
+org.apache.commons.jexl2.scripting.JexlScriptEngineFactory

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java Wed Nov 25 16:23:41 2009
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.util.Map;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.apache.commons.jexl.junit.Asserter;
+import org.apache.commons.jexl2.junit.Asserter;
 
 
 public class ArithmeticTest extends JexlTestCase {

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java Wed Nov 25 16:23:41 2009
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.jexl.junit.Asserter;
+import org.apache.commons.jexl2.junit.Asserter;
 
 
 /**

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 import java.util.Arrays;
 

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
 
 /**
  * Test cases for assignment.

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BitwiseOperatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BitwiseOperatorTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BitwiseOperatorTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BitwiseOperatorTest.java Wed Nov 25 16:23:41 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl;
-import org.apache.commons.jexl.junit.Asserter;
+package org.apache.commons.jexl2;
+import org.apache.commons.jexl2.junit.Asserter;
 
 /**
  * Tests for the bitwise operators.



Mime
View raw message