commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hen...@apache.org
Subject svn commit: r1207941 [1/5] - in /commons/proper/jexl/trunk: ./ src/main/assembly/ src/main/config/ src/main/java/org/apache/commons/jexl3/ src/main/java/org/apache/commons/jexl3/internal/ src/main/java/org/apache/commons/jexl3/internal/introspection/ s...
Date Tue, 29 Nov 2011 16:19:43 GMT
Author: henrib
Date: Tue Nov 29 16:18:59 2011
New Revision: 1207941

URL: http://svn.apache.org/viewvc?rev=1207941&view=rev
Log:
JEXL-122: moved code to o.a.c.jexl3

Added:
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Debugger.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Expression.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Expression.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/ExpressionImpl.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Interpreter.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlInfo.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlScript.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlThreadedArithmetic.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlThreadedArithmetic.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Main.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/MapContext.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/NamespaceResolver.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/NamespaceResolver.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/ObjectContext.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ObjectContext.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/ReadonlyContext.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ReadonlyContext.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Script.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Script.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/UnifiedJEXL.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/AbstractExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/AbstractExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayIterator.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayIterator.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ArrayListWrapper.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ArrayListWrapper.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/BooleanGetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/BooleanGetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckGetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckGetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/DuckSetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/DuckSetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/EnumerationIterator.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/EnumerationIterator.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Introspector.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/Introspector.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListGetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListGetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/ListSetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/ListSetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapGetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapGetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MapSetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MapSetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/MethodExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertyGetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertyGetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/PropertySetExecutor.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/PropertySetExecutor.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/ClassMap.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/IntrospectorBase.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/IntrospectorBase.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodKey.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodMap.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/MethodMap.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/SandboxUberspectImpl.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/package.html   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/introspection/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/package.html   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/internal/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlMethod.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertyGet.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlPropertySet.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Sandbox.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Sandbox.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/Uberspect.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/package.html   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/package.html   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTArrayLiteral.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTIdentifier.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTJexlScript.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTMapLiteral.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTNumberLiteral.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTReferenceExpression.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTStringLiteral.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTVar.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlParser.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ParseException.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ParseException.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ParserVisitor.java   (with props)
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/SimpleNode.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/StringParser.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/StringParser.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/TokenMgrError.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/TokenMgrError.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/package.html   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/package.html
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/Main.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/Main.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/package.html   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/package.html
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ArrayLiteralTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/AssignTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/BitwiseOperatorTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BitwiseOperatorTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/BlockTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/CacheTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ClassCreator.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreator.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/Foo.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Foo.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ForEachTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/IfTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/IssuesTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/Jexl.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JexlTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JexlTestCase.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTestCase.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/MethodTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/PublicFieldsTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/SandboxTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/SandboxTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptCallableTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/UnifiedJEXLTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/VarTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/WhileTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/Output.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/DiscoveryTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/MethodKeyTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/Asserter.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/package.html   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineOptionalTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java   (contents, props changed)
      - copied, changed from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java
Modified:
    commons/proper/jexl/trunk/RELEASE-NOTES.txt
    commons/proper/jexl/trunk/doap_jexl.rdf
    commons/proper/jexl/trunk/pom.xml
    commons/proper/jexl/trunk/src/main/assembly/src.xml
    commons/proper/jexl/trunk/src/main/config/findbugs-exclude-filter.xml
    commons/proper/jexl/trunk/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
    commons/proper/jexl/trunk/src/site/site.xml
    commons/proper/jexl/trunk/src/site/xdoc/changes.xml
    commons/proper/jexl/trunk/src/site/xdoc/download_jexl.xml
    commons/proper/jexl/trunk/src/site/xdoc/index.xml
    commons/proper/jexl/trunk/src/site/xdoc/reference/examples.xml
    commons/proper/jexl/trunk/src/site/xdoc/reference/jsr223.xml
    commons/proper/jexl/trunk/src/site/xdoc/reference/syntax.xml

Modified: commons/proper/jexl/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/RELEASE-NOTES.txt?rev=1207941&r1=1207940&r2=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/jexl/trunk/RELEASE-NOTES.txt Tue Nov 29 16:18:59 2011
@@ -17,7 +17,7 @@
 $Id$
 
                             Commons JEXL Package
-                                Version 2.1
+                                Version 3.0
                                Release Notes
 
 
@@ -36,7 +36,12 @@ Its goal is to expose scripting features
   http://commons.apache.org/jexl/
 
 
-What's new in 2.1:
+Due to binary and source incompatibilities and the scope of modifications, JEXL has moved to the org.apache.commons.jexl3
+package.
+However, this is a drop-in replacement through JSF-223 and casual code usage should find strict equivalence between
+jexl-2.x and 3.x (besides the package name).
+
+What's new in 3.0:
 ==================
 * A more thorough arithmetic (JexlArithmetic) that allows fine control over decimals (scale and precision), a
   new syntax for numeric literals (OGNL inspired Big and Huge notations) and a better type handling keeping the most
@@ -46,7 +51,7 @@ What's new in 2.1:
 * A sandoxing feature to restrict and rename what JEXL can access from the environment allowing tighter control over security.
 * Extensions to UnifiedJEXL that allow the creation of templates.
 
-New features in 2.1:
+New features in 3.0:
 ====================	
 * JEXL-114:     Allow scripts to create local variables // Add return keyword
 * JEXL-113:     Add functions to extract which variables, parameters and local variables are used to evaluate a script
@@ -58,7 +63,7 @@ New features in 2.1:
 * JEXL-106:     When divide two BigDecimal values in an expression it results in java.lang.ArithmeticException
 * JEXL-102:     Add "jexl2" as a supported name
 
-Bugs Fixed in 2.1:
+Bugs Fixed in 3.0:
 ==================
 * JEXL-83:      Make JexlArithmetic immutable (and threadsafe)
 * JEXL-24:      Support Long for integer literal instead of Integers

Modified: commons/proper/jexl/trunk/doap_jexl.rdf
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/doap_jexl.rdf?rev=1207941&r1=1207940&r2=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/doap_jexl.rdf (original)
+++ commons/proper/jexl/trunk/doap_jexl.rdf Tue Nov 29 16:18:59 2011
@@ -36,6 +36,11 @@
     <release>
       <version>
         <name>commons-jexl</name>
+        <created>2011-12-01</created>
+        <revision>3.0</revision>
+      </version>
+      <version>
+        <name>commons-jexl</name>
         <created>2010-04-07</created>
         <revision>2.0.1</revision>
       </version>

Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=1207941&r1=1207940&r2=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Tue Nov 29 16:18:59 2011
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-jexl</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <name>Commons JEXL</name>
     <inceptionYear>2001</inceptionYear>
     <description>The Commons Jexl library is an implementation of the JSTL Expression Language with extensions.</description>
@@ -123,7 +123,7 @@
         <maven.compile.source>1.5</maven.compile.source>
         <maven.compile.target>1.5</maven.compile.target>
         <commons.componentid>jexl</commons.componentid>
-        <commons.release.version>2.1</commons.release.version>
+        <commons.release.version>3.0</commons.release.version>
         <!-- The RC version used in the staging repository URL. -->
         <commons.rc.version>RC1</commons.rc.version>
         <commons.release.2.version>1.1</commons.release.2.version>
@@ -190,10 +190,10 @@
                     <execution>
                         <id>jexl-jjtree</id>
                         <configuration>
-                            <sourceDirectory>${basedir}/src/main/java/org/apache/commons/jexl2/parser</sourceDirectory>
+                            <sourceDirectory>${basedir}/src/main/java/org/apache/commons/jexl3/parser</sourceDirectory>
                             <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
                             <timestampDirectory>${project.build.directory}/generated-sources/javacc-timestamp</timestampDirectory>
-                            <packageName>org.apache.commons.jexl2.parser</packageName>
+                            <packageName>org.apache.commons.jexl3.parser</packageName>
                         </configuration>
                         <goals>
                             <goal>jjtree-javacc</goal>
@@ -230,7 +230,7 @@
                 <version>2.5</version>
                 <configuration>
                     <configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
-                    <excludes>org/apache/commons/jexl2/parser/*.java</excludes>
+                    <excludes>org/apache/commons/jexl3/parser/*.java</excludes>
                     <headerLocation>${basedir}/src/main/config/header.txt</headerLocation>
                     <enableRulesSummary>false</enableRulesSummary>
                 </configuration>
@@ -246,8 +246,8 @@
                         </ignores>
                         <excludes>
                             <exclude>**/generated-sources/**/*</exclude>
-                            <exclude>org/apache/commons/jexl2/parser/*.class</exclude>
-                            <exclude>org/apache/commons/jexl2/**/*Test.class</exclude>
+                            <exclude>org/apache/commons/jexl3/parser/*.class</exclude>
+                            <exclude>org/apache/commons/jexl3/**/*Test.class</exclude>
                         </excludes>
                     </instrumentation>
                 </configuration>
@@ -255,7 +255,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>2.3.2</version>
                 <configuration>
                     <excludeFilterFile>${basedir}/src/main/config/findbugs-exclude-filter.xml</excludeFilterFile>
                     <xmlOutput>true</xmlOutput>
@@ -266,7 +266,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
                 <configuration>
                     <targetJdk>1.5</targetJdk>
                     <excludes>
@@ -289,6 +289,8 @@
                 <!-- version is defined in commons-parent -->
                 <configuration>
                     <excludes>
+                      <exclude>org/apache/commons/jexl3/parser/**</exclude>
+                      <exclude>org/apache/commons/jexl3/internal/**</exclude>
                       <exclude>org/apache/commons/jexl2/parser/**</exclude>
                       <exclude>org/apache/commons/jexl2/internal/**</exclude>
                     </excludes>

Modified: commons/proper/jexl/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/assembly/src.xml?rev=1207941&r1=1207940&r2=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/assembly/src.xml (original)
+++ commons/proper/jexl/trunk/src/main/assembly/src.xml Tue Nov 29 16:18:59 2011
@@ -35,7 +35,7 @@
             <directory>src</directory>
         </fileSet>
         <fileSet>
-            <directory>jexl2-compat</directory>
+            <directory>jexl-compat</directory>
             <excludes>
                 <exclude>target/**</exclude>
             </excludes>

Modified: commons/proper/jexl/trunk/src/main/config/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/config/findbugs-exclude-filter.xml?rev=1207941&r1=1207940&r2=1207941&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/config/findbugs-exclude-filter.xml (original)
+++ commons/proper/jexl/trunk/src/main/config/findbugs-exclude-filter.xml Tue Nov 29 16:18:59 2011
@@ -22,21 +22,21 @@
 -->
 <FindBugsFilter>
     <Match>
-        <Class name="org.apache.commons.jexl2.parser.ParseException"/>
+        <Class name="org.apache.commons.jexl3.parser.ParseException"/>
     </Match>
     <Match>
-        <Class name="org.apache.commons.jexl2.parser.Parser"/>
+        <Class name="org.apache.commons.jexl3.parser.Parser"/>
     </Match>
     <Match>
-        <Class name="org.apache.commons.jexl2.parser.ParserConstants"/>
+        <Class name="org.apache.commons.jexl3.parser.ParserConstants"/>
     </Match>
     <Match>
-        <Class name="org.apache.commons.jexl2.parser.ParserTokenManager"/>
+        <Class name="org.apache.commons.jexl3.parser.ParserTokenManager"/>
     </Match>
     <Match>
-        <Class name="org.apache.commons.jexl2.parser.ParserTreeConstants"/>
+        <Class name="org.apache.commons.jexl3.parser.ParserTreeConstants"/>
     </Match>
     <Match>
-        <Class name="org.apache.commons.jexl2.parser.TokenMgrError"/>
+        <Class name="org.apache.commons.jexl3.parser.TokenMgrError"/>
     </Match>
 </FindBugsFilter>

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Debugger.java (from r1206774, 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/jexl3/Debugger.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Debugger.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java&r1=1206774&r2=1207941&rev=1207941&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/jexl3/Debugger.java Tue Nov 29 16:18:59 2011
@@ -14,62 +14,62 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2;
+package org.apache.commons.jexl3;
 
 import java.util.regex.Pattern;
-import org.apache.commons.jexl2.parser.ASTAdditiveNode;
-import org.apache.commons.jexl2.parser.ASTAdditiveOperator;
-import org.apache.commons.jexl2.parser.ASTAmbiguous;
-import org.apache.commons.jexl2.parser.ASTAndNode;
-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.ASTERNode;
-import org.apache.commons.jexl2.parser.ASTEmptyFunction;
-import org.apache.commons.jexl2.parser.ASTFalseNode;
-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.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.ASTNRNode;
-import org.apache.commons.jexl2.parser.ASTNotNode;
-import org.apache.commons.jexl2.parser.ASTNullLiteral;
-import org.apache.commons.jexl2.parser.ASTNumberLiteral;
-import org.apache.commons.jexl2.parser.ASTOrNode;
-import org.apache.commons.jexl2.parser.ASTReference;
-import org.apache.commons.jexl2.parser.ASTReferenceExpression;
-import org.apache.commons.jexl2.parser.ASTReturnStatement;
-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.ASTVar;
-import org.apache.commons.jexl2.parser.ASTWhileStatement;
-import org.apache.commons.jexl2.parser.JexlNode;
+import org.apache.commons.jexl3.parser.ASTAdditiveNode;
+import org.apache.commons.jexl3.parser.ASTAdditiveOperator;
+import org.apache.commons.jexl3.parser.ASTAmbiguous;
+import org.apache.commons.jexl3.parser.ASTAndNode;
+import org.apache.commons.jexl3.parser.ASTArrayAccess;
+import org.apache.commons.jexl3.parser.ASTArrayLiteral;
+import org.apache.commons.jexl3.parser.ASTAssignment;
+import org.apache.commons.jexl3.parser.ASTBitwiseAndNode;
+import org.apache.commons.jexl3.parser.ASTBitwiseComplNode;
+import org.apache.commons.jexl3.parser.ASTBitwiseOrNode;
+import org.apache.commons.jexl3.parser.ASTBitwiseXorNode;
+import org.apache.commons.jexl3.parser.ASTBlock;
+import org.apache.commons.jexl3.parser.ASTConstructorNode;
+import org.apache.commons.jexl3.parser.ASTDivNode;
+import org.apache.commons.jexl3.parser.ASTEQNode;
+import org.apache.commons.jexl3.parser.ASTERNode;
+import org.apache.commons.jexl3.parser.ASTEmptyFunction;
+import org.apache.commons.jexl3.parser.ASTFalseNode;
+import org.apache.commons.jexl3.parser.ASTForeachStatement;
+import org.apache.commons.jexl3.parser.ASTFunctionNode;
+import org.apache.commons.jexl3.parser.ASTGENode;
+import org.apache.commons.jexl3.parser.ASTGTNode;
+import org.apache.commons.jexl3.parser.ASTIdentifier;
+import org.apache.commons.jexl3.parser.ASTIfStatement;
+import org.apache.commons.jexl3.parser.ASTJexlScript;
+import org.apache.commons.jexl3.parser.ASTLENode;
+import org.apache.commons.jexl3.parser.ASTLTNode;
+import org.apache.commons.jexl3.parser.ASTMapEntry;
+import org.apache.commons.jexl3.parser.ASTMapLiteral;
+import org.apache.commons.jexl3.parser.ASTMethodNode;
+import org.apache.commons.jexl3.parser.ASTModNode;
+import org.apache.commons.jexl3.parser.ASTMulNode;
+import org.apache.commons.jexl3.parser.ASTNENode;
+import org.apache.commons.jexl3.parser.ASTNRNode;
+import org.apache.commons.jexl3.parser.ASTNotNode;
+import org.apache.commons.jexl3.parser.ASTNullLiteral;
+import org.apache.commons.jexl3.parser.ASTNumberLiteral;
+import org.apache.commons.jexl3.parser.ASTOrNode;
+import org.apache.commons.jexl3.parser.ASTReference;
+import org.apache.commons.jexl3.parser.ASTReferenceExpression;
+import org.apache.commons.jexl3.parser.ASTReturnStatement;
+import org.apache.commons.jexl3.parser.ASTSizeFunction;
+import org.apache.commons.jexl3.parser.ASTSizeMethod;
+import org.apache.commons.jexl3.parser.ASTStringLiteral;
+import org.apache.commons.jexl3.parser.ASTTernaryNode;
+import org.apache.commons.jexl3.parser.ASTTrueNode;
+import org.apache.commons.jexl3.parser.ASTUnaryMinusNode;
+import org.apache.commons.jexl3.parser.ASTVar;
+import org.apache.commons.jexl3.parser.ASTWhileStatement;
+import org.apache.commons.jexl3.parser.JexlNode;
 
-import org.apache.commons.jexl2.parser.ParserVisitor;
-import org.apache.commons.jexl2.parser.SimpleNode;
+import org.apache.commons.jexl3.parser.ParserVisitor;
+import org.apache.commons.jexl3.parser.SimpleNode;
 
 /**
  * Helps pinpoint the cause of problems in expressions that fail during evaluation.
@@ -81,7 +81,7 @@ import org.apache.commons.jexl2.parser.S
  * the error.
  * @since 2.0
  */
-final class Debugger implements ParserVisitor {
+final class Debugger extends ParserVisitor {
     /** The builder to compose messages. */
     private final StringBuilder builder;
     /** The cause of the issue to debug. */
@@ -134,6 +134,7 @@ final class Debugger implements ParserVi
      * Rebuilds an expression from a Jexl node.
      * @param node the node to rebuilt from
      * @return the rebuilt expression
+     * @since 3.0
      */
     public String data(JexlNode node) {
         start = 0;
@@ -268,7 +269,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTAdditiveNode node, Object data) {
+    protected Object visit(ASTAdditiveNode node, Object data) {
         // need parenthesis if not in operator precedence order
         boolean paren = node.jjtGetParent() instanceof ASTMulNode
                 || node.jjtGetParent() instanceof ASTDivNode
@@ -288,7 +289,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTAdditiveOperator node, Object data) {
+    protected Object visit(ASTAdditiveOperator node, Object data) {
         builder.append(' ');
         builder.append(node.image);
         builder.append(' ');
@@ -296,12 +297,12 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTAndNode node, Object data) {
+    protected Object visit(ASTAndNode node, Object data) {
         return infixChildren(node, " && ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTArrayAccess node, Object data) {
+    protected Object visit(ASTArrayAccess node, Object data) {
         accept(node.jjtGetChild(0), data);
         int num = node.jjtGetNumChildren();
         for (int i = 1; i < num; ++i) {
@@ -313,7 +314,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTArrayLiteral node, Object data) {
+    protected Object visit(ASTArrayLiteral node, Object data) {
         int num = node.jjtGetNumChildren();
         builder.append("[ ");
         if (num > 0) {
@@ -328,34 +329,34 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTAssignment node, Object data) {
+    protected Object visit(ASTAssignment node, Object data) {
         return infixChildren(node, " = ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTBitwiseAndNode node, Object data) {
+    protected Object visit(ASTBitwiseAndNode node, Object data) {
         return infixChildren(node, " & ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTBitwiseComplNode node, Object data) {
+    protected Object visit(ASTBitwiseComplNode node, Object data) {
         return prefixChild(node, "~", data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTBitwiseOrNode node, Object data) {
+    protected Object visit(ASTBitwiseOrNode node, Object data) {
         boolean paren = node.jjtGetParent() instanceof ASTBitwiseAndNode;
         return infixChildren(node, " | ", paren, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTBitwiseXorNode node, Object data) {
+    protected Object visit(ASTBitwiseXorNode node, Object data) {
         boolean paren = node.jjtGetParent() instanceof ASTBitwiseAndNode;
         return infixChildren(node, " ^ ", paren, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTBlock node, Object data) {
+    protected Object visit(ASTBlock node, Object data) {
         builder.append("{ ");
         int num = node.jjtGetNumChildren();
         for (int i = 0; i < num; ++i) {
@@ -367,12 +368,12 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTDivNode node, Object data) {
+    protected Object visit(ASTDivNode node, Object data) {
         return infixChildren(node, " / ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTEmptyFunction node, Object data) {
+    protected Object visit(ASTEmptyFunction node, Object data) {
         builder.append("empty(");
         accept(node.jjtGetChild(0), data);
         builder.append(")");
@@ -380,22 +381,22 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTEQNode node, Object data) {
+    protected Object visit(ASTEQNode node, Object data) {
         return infixChildren(node, " == ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTERNode node, Object data) {
+    protected Object visit(ASTERNode node, Object data) {
         return infixChildren(node, " =~ ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTFalseNode node, Object data) {
+    protected Object visit(ASTFalseNode node, Object data) {
         return check(node, "false", data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTForeachStatement node, Object data) {
+    protected Object visit(ASTForeachStatement node, Object data) {
         builder.append("for(");
         accept(node.jjtGetChild(0), data);
         builder.append(" : ");
@@ -410,12 +411,12 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTGENode node, Object data) {
+    protected Object visit(ASTGENode node, Object data) {
         return infixChildren(node, " >= ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTGTNode node, Object data) {
+    protected Object visit(ASTGTNode node, Object data) {
         return infixChildren(node, " > ", false, data);
     }
 
@@ -423,7 +424,7 @@ final class Debugger implements ParserVi
     private static final Pattern QUOTED_IDENTIFIER = Pattern.compile("['\"\\s\\\\]");
     
     /** {@inheritDoc} */
-    public Object visit(ASTIdentifier node, Object data) {
+    protected Object visit(ASTIdentifier node, Object data) {
         String image = node.image;
         if (QUOTED_IDENTIFIER.matcher(image).find()) {
             // quote it
@@ -433,7 +434,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTIfStatement node, Object data) {
+    protected Object visit(ASTIfStatement node, Object data) {
         builder.append("if (");
         accept(node.jjtGetChild(0), data);
         builder.append(") ");
@@ -452,12 +453,12 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTNumberLiteral node, Object data) {
+    protected Object visit(ASTNumberLiteral node, Object data) {
         return check(node, node.image, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTJexlScript node, Object data) {
+    protected Object visit(ASTJexlScript node, Object data) {
         int num = node.jjtGetNumChildren();
         for (int i = 0; i < num; ++i) {
             JexlNode child = node.jjtGetChild(i);
@@ -467,17 +468,17 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTLENode node, Object data) {
+    protected Object visit(ASTLENode node, Object data) {
         return infixChildren(node, " <= ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTLTNode node, Object data) {
+    protected Object visit(ASTLTNode node, Object data) {
         return infixChildren(node, " < ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTMapEntry node, Object data) {
+    protected Object visit(ASTMapEntry node, Object data) {
         accept(node.jjtGetChild(0), data);
         builder.append(" : ");
         accept(node.jjtGetChild(1), data);
@@ -485,7 +486,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTMapLiteral node, Object data) {
+    protected Object visit(ASTMapLiteral node, Object data) {
         int num = node.jjtGetNumChildren();
         builder.append("{ ");
         if (num > 0) {
@@ -502,7 +503,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTConstructorNode node, Object data) {
+    protected Object visit(ASTConstructorNode node, Object data) {
         int num = node.jjtGetNumChildren();
         builder.append("new ");
         builder.append("(");
@@ -516,7 +517,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTFunctionNode node, Object data) {
+    protected Object visit(ASTFunctionNode node, Object data) {
         int num = node.jjtGetNumChildren();
         accept(node.jjtGetChild(0), data);
         builder.append(":");
@@ -533,7 +534,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTMethodNode node, Object data) {
+    protected Object visit(ASTMethodNode node, Object data) {
         int num = node.jjtGetNumChildren();
         accept(node.jjtGetChild(0), data);
         builder.append("(");
@@ -548,47 +549,47 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTModNode node, Object data) {
+    protected Object visit(ASTModNode node, Object data) {
         return infixChildren(node, " % ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTMulNode node, Object data) {
+    protected Object visit(ASTMulNode node, Object data) {
         return infixChildren(node, " * ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTNENode node, Object data) {
+    protected Object visit(ASTNENode node, Object data) {
         return infixChildren(node, " != ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTNRNode node, Object data) {
+    protected Object visit(ASTNRNode node, Object data) {
         return infixChildren(node, " !~ ", false, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTNotNode node, Object data) {
+    protected Object visit(ASTNotNode node, Object data) {
         builder.append("!");
         accept(node.jjtGetChild(0), data);
         return data;
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTNullLiteral node, Object data) {
+    protected Object visit(ASTNullLiteral node, Object data) {
         check(node, "null", data);
         return data;
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTOrNode node, Object data) {
+    protected Object visit(ASTOrNode node, Object data) {
         // need parenthesis if not in operator precedence order
         boolean paren = node.jjtGetParent() instanceof ASTAndNode;
         return infixChildren(node, " || ", paren, data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTReference node, Object data) {
+    protected Object visit(ASTReference node, Object data) {
         int num = node.jjtGetNumChildren();
         accept(node.jjtGetChild(0), data);
         for (int i = 1; i < num; ++i) {
@@ -599,7 +600,7 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTReferenceExpression node, Object data) {
+    protected Object visit(ASTReferenceExpression node, Object data) {
         JexlNode first = node.jjtGetChild(0);
         builder.append('(');
         accept(first, data);
@@ -614,14 +615,14 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTReturnStatement node, Object data) {
+    protected Object visit(ASTReturnStatement node, Object data) {
         builder.append("return ");
         accept(node.jjtGetChild(0), data);
         return data;
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTSizeFunction node, Object data) {
+    protected Object visit(ASTSizeFunction node, Object data) {
         builder.append("size(");
         accept(node.jjtGetChild(0), data);
         builder.append(")");
@@ -629,19 +630,19 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTSizeMethod node, Object data) {
+    protected Object visit(ASTSizeMethod node, Object data) {
         check(node, "size()", data);
         return data;
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTStringLiteral node, Object data) {
+    protected Object visit(ASTStringLiteral node, Object data) {
         String img = node.image.replace("'", "\\'");
         return check(node, "'" + img + "'", data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTTernaryNode node, Object data) {
+    protected Object visit(ASTTernaryNode node, Object data) {
         accept(node.jjtGetChild(0), data);
         if (node.jjtGetNumChildren() > 2) {
             builder.append("? ");
@@ -657,25 +658,25 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTTrueNode node, Object data) {
+    protected Object visit(ASTTrueNode node, Object data) {
         check(node, "true", data);
         return data;
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTUnaryMinusNode node, Object data) {
+    protected Object visit(ASTUnaryMinusNode node, Object data) {
         return prefixChild(node, "-", data);
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTVar node, Object data) {
+    protected Object visit(ASTVar node, Object data) {
         builder.append("var ");
         check(node, node.image, data);
         return data;
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTWhileStatement node, Object data) {
+    protected Object visit(ASTWhileStatement node, Object data) {
         builder.append("while (");
         accept(node.jjtGetChild(0), data);
         builder.append(") ");
@@ -688,12 +689,12 @@ final class Debugger implements ParserVi
     }
 
     /** {@inheritDoc} */
-    public Object visit(SimpleNode node, Object data) {
+    protected Object visit(SimpleNode node, Object data) {
         throw new UnsupportedOperationException("unexpected type of node");
     }
 
     /** {@inheritDoc} */
-    public Object visit(ASTAmbiguous node, Object data) {
+    protected Object visit(ASTAmbiguous node, Object data) {
         throw new UnsupportedOperationException("unexpected type of node");
     }
 }
\ No newline at end of file

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

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Expression.java (from r1206774, 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/jexl3/Expression.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/Expression.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Expression.java&r1=1206774&r2=1207941&rev=1207941&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/jexl3/Expression.java Tue Nov 29 16:18:59 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jexl2;
+package org.apache.commons.jexl3;
 
 
 /**

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

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

Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/ExpressionImpl.java (from r1206774, 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/jexl3/ExpressionImpl.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/ExpressionImpl.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java&r1=1206774&r2=1207941&rev=1207941&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/jexl3/ExpressionImpl.java Tue Nov 29 16:18:59 2011
@@ -14,32 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jexl2;
+package org.apache.commons.jexl3;
 
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
 
-import org.apache.commons.jexl2.parser.ASTJexlScript;
+import org.apache.commons.jexl3.parser.ASTJexlScript;
 
 /**
- * Instances of ExpressionImpl are created by the {@link JexlEngine},
- * and this is the default implementation of the {@link Expression} and
- * {@link Script} interface.
+ * Intended for backwards compatibility with jexl2 in case of derivation.
  * @since 1.0
+ * @deprecated
  */
-public class ExpressionImpl implements Expression, Script {
-    /** The engine for this expression. */
-    protected final JexlEngine jexl;
-    /**
-     * Original expression stripped from leading & trailing spaces.
-     */
-    protected final String expression;
-    /**
-     * The resulting AST we can interpret.
-     */
-    protected final ASTJexlScript script;
-
+public class ExpressionImpl extends JexlScript {
     /**
      * Do not let this be generally instantiated with a 'new'.
      *
@@ -48,121 +33,8 @@ public class ExpressionImpl implements E
      * @param ref the parsed expression.
      */
     protected ExpressionImpl(JexlEngine engine, String expr, ASTJexlScript ref) {
-        jexl = engine;
-        expression = expr;
-        script = ref;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Object evaluate(JexlContext context) {
-        if (script.jjtGetNumChildren() < 1) {
-            return null;
-        }
-        Interpreter interpreter = jexl.createInterpreter(context);
-        interpreter.setFrame(script.createFrame((Object[]) null));
-        return interpreter.interpret(script.jjtGetChild(0));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String dump() {
-        Debugger debug = new Debugger();
-        boolean d = debug.debug(script);
-        return debug.data() + (d ? " /*" + debug.start() + ":" + debug.end() + "*/" : "/*?:?*/ ");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getExpression() {
-        return expression;
-    }
-
-    /**
-     * Provide a string representation of this expression.
-     * @return the expression or blank if it's null.
-     */
-    @Override
-    public String toString() {
-        String expr = getExpression();
-        return expr == null ? "" : expr;
+        super(engine, expr, ref);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public String getText() {
-        return toString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Object execute(JexlContext context) {
-        Interpreter interpreter = jexl.createInterpreter(context);
-        interpreter.setFrame(script.createFrame((Object[]) null));
-        return interpreter.interpret(script);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Object execute(JexlContext context, Object... args) {
-        Interpreter interpreter = jexl.createInterpreter(context);
-        interpreter.setFrame(script.createFrame(args));
-        return interpreter.interpret(script);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getParameters() {
-        return script.getParameters();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getLocalVariables() {
-        return script.getLocalVariables();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Set<List<String>> getVariables() {
-        return jexl.getVariables(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Callable<Object> callable(JexlContext context) {
-        return callable(context, (Object[]) null);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Callable<Object> callable(JexlContext context, Object... args) {
-        final Interpreter interpreter = jexl.createInterpreter(context);
-        interpreter.setFrame(script.createFrame(args));
-
-        return new Callable<Object>() {
-            /** Use interpreter as marker for not having run. */
-            private Object result = interpreter;
-
-            public Object call() throws Exception {
-                if (result == interpreter) {
-                    result = interpreter.interpret(script);
-                }
-                return result;
-            }
-
-        };
-    }
 
 }
\ No newline at end of file

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

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



Mime
View raw message