Author: henrib
Date: Mon Dec 7 20:38:09 2009
New Revision: 888125
URL: http://svn.apache.org/viewvc?rev=888125&view=rev
Log:
moving 1.x compat to jexl2-compat
Added:
commons/proper/jexl/trunk/jexl2-compat/ (props changed)
- copied from r887559, commons/proper/jexl/trunk/compat/
commons/proper/jexl/trunk/jexl2-compat/pom.xml
- copied unchanged from r887559,
commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml
commons/proper/jexl/trunk/jexl2-compat/src/
- copied from r887559,
commons/proper/jexl/trunk/compat/commons-jexl-compat/src/
Removed:
commons/proper/jexl/trunk/jexl2-compat/commons-jexl-compat/pom.xml
commons/proper/jexl/trunk/jexl2-compat/commons-jexl-compat/src/
Modified:
commons/proper/jexl/trunk/jexl2-compat/src/main/java/org/apache/commons/jexl/JexlOne.java
commons/proper/jexl/trunk/jexl2-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java
Propchange: commons/proper/jexl/trunk/jexl2-compat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 7 20:38:09 2009
@@ -0,0 +1 @@
+target
Modified:
commons/proper/jexl/trunk/jexl2-compat/src/main/java/org/apache/commons/jexl/JexlOne.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl2-compat/src/main/java/org/apache/commons/jexl/JexlOne.java?rev=888125&r1=887559&r2=888125&view=diff
==============================================================================
---
commons/proper/jexl/trunk/jexl2-compat/src/main/java/org/apache/commons/jexl/JexlOne.java
(original)
+++
commons/proper/jexl/trunk/jexl2-compat/src/main/java/org/apache/commons/jexl/JexlOne.java
Mon Dec 7 20:38:09 2009
@@ -160,7 +160,7 @@
/*...@inheritdoc}*/
protected Interpreter createInterpreter(JexlContext context) {
- return new JexlOne.JexlOneInterpreter(this, context);
+ return new JexlOneInterpreter(this, context);
}
/** {...@inheritdoc} */
Modified:
commons/proper/jexl/trunk/jexl2-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl2-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java?rev=888125&r1=887559&r2=888125&view=diff
==============================================================================
---
commons/proper/jexl/trunk/jexl2-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java
(original)
+++
commons/proper/jexl/trunk/jexl2-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java
Mon Dec 7 20:38:09 2009
@@ -24,7 +24,7 @@
* @since 1.1
*/
public class ScriptTest extends TestCase {
- static final String TEST1 = "../../src/test/scripts/test1.jexl";
+ static final String TEST1 = "../src/test/scripts/test1.jexl";
// test class for testScriptUpdatesContext
// making this class private static will cause the test to fail.
