You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2009/11/25 17:23:45 UTC
svn commit: r884175 [2/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...
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.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;
/**
* Tests for blocks
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.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/test/java/org/apache/commons/jexl2/ClassCreator.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreator.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreator.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreator.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
* limitations under the License.
* under the License.
*/
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
import java.io.File;
import java.io.FileWriter;
@@ -68,17 +68,17 @@
seed = s;
className = "foo" + s;
sourceName = className + ".java";
- packageDir = new File(base, seed + "/org/apache/commons/jexl/generated");
+ packageDir = new File(base, seed + "/org/apache/commons/jexl2/generated");
packageDir.mkdirs();
loader = null;
}
public String getClassName() {
- return "org.apache.commons.jexl.generated." + className;
+ return "org.apache.commons.jexl2.generated." + className;
}
public Class<?> getClassInstance() throws Exception {
- return getClassLoader().loadClass("org.apache.commons.jexl.generated." + className);
+ return getClassLoader().loadClass("org.apache.commons.jexl2.generated." + className);
}
public ClassLoader getClassLoader() throws Exception {
@@ -105,7 +105,7 @@
void generate() throws Exception {
FileWriter aWriter = new FileWriter(new File(packageDir, sourceName), false);
- aWriter.write("package org.apache.commons.jexl.generated;");
+ aWriter.write("package org.apache.commons.jexl2.generated;");
aWriter.write("public class " + className + "{\n");
aWriter.write("private int value =");
aWriter.write(Integer.toString(seed));
@@ -129,7 +129,7 @@
}
Integer r = (Integer) jexl.invokeMethod(javac, "compile", source);
if (r >= 0) {
- return getClassLoader().loadClass("org.apache.commons.jexl.generated." + className);
+ return getClassLoader().loadClass("org.apache.commons.jexl2.generated." + className);
}
return null;
}
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java Wed Nov 25 16:23:41 2009
@@ -14,7 +14,7 @@
* limitations under the License.
* under the License.
*/
-package org.apache.commons.jexl;
+package org.apache.commons.jexl2;
import java.io.File;
import java.lang.ref.Reference;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Foo.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Foo.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Foo.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Foo.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.ArrayList;
import java.util.Iterator;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.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;
import java.util.ArrayList;
import java.util.Arrays;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.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/test/java/org/apache/commons/jexl2/IssuesTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java 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/test/java/org/apache/commons/jexl2/Jexl.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.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;
import java.util.Map;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.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.StringReader;
import java.math.BigDecimal;
@@ -30,8 +30,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.jexl.parser.ParseException;
-import org.apache.commons.jexl.parser.Parser;
+import org.apache.commons.jexl2.parser.ParseException;
+import org.apache.commons.jexl2.parser.Parser;
/**
* Simple testcases
@@ -258,7 +258,7 @@
public void testNew() throws Exception {
JexlContext jc = JexlHelper.createContext();
jc.getVars().put("double", Double.class);
- jc.getVars().put("foo", "org.apache.commons.jexl.Foo");
+ jc.getVars().put("foo", "org.apache.commons.jexl2.Foo");
Expression expr;
Object value;
expr = JEXL.createExpression("new(double, 1)");
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTestCase.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTestCase.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTestCase.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;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.commons.jexl.parser.JexlNode;
-import org.apache.commons.jexl.parser.ASTJexlScript;
+import org.apache.commons.jexl2.parser.JexlNode;
+import org.apache.commons.jexl2.parser.ASTJexlScript;
import junit.framework.TestCase;
@@ -190,7 +190,7 @@
* @throws Exception
*/
public static void runTest(String tname, String mname) throws Exception {
- String testClassName = "org.apache.commons.jexl."+tname;
+ String testClassName = "org.apache.commons.jexl2."+tname;
Class<JexlTestCase> clazz = null;
JexlTestCase test = null;
// find the class
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.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.Collections;
import java.util.HashMap;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java Wed Nov 25 16:23:41 2009
@@ -14,9 +14,9 @@
* 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.junit.Asserter;
+import org.apache.commons.jexl2.junit.Asserter;
/**
* Tests for calling methods on objects
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.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;
/**
* Tests for malformed expressions and scripts.
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.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.File;
import java.net.URL;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.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;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.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;
/**
* Tests for while statement.
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java Wed Nov 25 16:23:41 2009
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.jexl.examples;
+package org.apache.commons.jexl2.examples;
-import org.apache.commons.jexl.*;
+import org.apache.commons.jexl2.*;
import junit.framework.TestCase;
import java.util.List;
import java.util.ArrayList;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java Wed Nov 25 16:23:41 2009
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.jexl.examples;
+package org.apache.commons.jexl2.examples;
-import org.apache.commons.jexl.*;
+import org.apache.commons.jexl2.*;
import junit.framework.TestCase;
/**
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java Wed Nov 25 16:23:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.jexl.examples;
+package org.apache.commons.jexl2.examples;
import junit.framework.TestCase;
/**
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java Wed Nov 25 16:23:41 2009
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.commons.jexl.junit;
+package org.apache.commons.jexl2.junit;
import java.util.HashMap;
import java.util.Map;
import junit.framework.Assert;
-import org.apache.commons.jexl.Expression;
-import org.apache.commons.jexl.JexlContext;
-import org.apache.commons.jexl.JexlEngine;
-import org.apache.commons.jexl.JexlHelper;
+import org.apache.commons.jexl2.Expression;
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.JexlHelper;
/**
* A utility class for performing JUnit based assertions using Jexl
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.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.junit;
+package org.apache.commons.jexl2.junit;
import junit.framework.AssertionFailedError;
-import org.apache.commons.jexl.JexlEngine;
-import org.apache.commons.jexl.JexlTestCase;
-import org.apache.commons.jexl.Foo;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.JexlTestCase;
+import org.apache.commons.jexl2.Foo;
/**
* Simple testcases
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/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.junit Package</title>
+ <title>Package Documentation for org.apache.commons.jexl2.junit Package</title>
</head>
<body bgcolor="white">
Using JEXL expressions in JUnit assertions.
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.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;
import java.io.StringReader;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java Wed Nov 25 16:23:41 2009
@@ -16,7 +16,7 @@
*
*/
-package org.apache.commons.jexl.scripting;
+package org.apache.commons.jexl2.scripting;
import java.io.Reader;
import java.util.Arrays;
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java 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.ArrayList;
import java.util.HashMap;
@@ -22,17 +22,17 @@
import java.util.Map;
-import org.apache.commons.jexl.JexlTestCase;
-import org.apache.commons.jexl.util.Introspector;
-import org.apache.commons.jexl.util.AbstractExecutor;
-import org.apache.commons.jexl.util.PropertyGetExecutor;
-import org.apache.commons.jexl.util.PropertySetExecutor;
-import org.apache.commons.jexl.util.DuckGetExecutor;
-import org.apache.commons.jexl.util.DuckSetExecutor;
-import org.apache.commons.jexl.util.ListGetExecutor;
-import org.apache.commons.jexl.util.ListSetExecutor;
-import org.apache.commons.jexl.util.MapGetExecutor;
-import org.apache.commons.jexl.util.MapSetExecutor;
+import org.apache.commons.jexl2.JexlTestCase;
+import org.apache.commons.jexl2.util.Introspector;
+import org.apache.commons.jexl2.util.AbstractExecutor;
+import org.apache.commons.jexl2.util.PropertyGetExecutor;
+import org.apache.commons.jexl2.util.PropertySetExecutor;
+import org.apache.commons.jexl2.util.DuckGetExecutor;
+import org.apache.commons.jexl2.util.DuckSetExecutor;
+import org.apache.commons.jexl2.util.ListGetExecutor;
+import org.apache.commons.jexl2.util.ListSetExecutor;
+import org.apache.commons.jexl2.util.MapGetExecutor;
+import org.apache.commons.jexl2.util.MapSetExecutor;
/**
* Tests for checking introspection discovery.
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java?rev=884175&r1=884008&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java 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 junit.framework.TestCase;
/**
* Checks the CacheMap.MethodKey implementation
Modified: commons/proper/jexl/trunk/xdocs/reference/examples.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/reference/examples.xml?rev=884175&r1=884174&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/xdocs/reference/examples.xml (original)
+++ commons/proper/jexl/trunk/xdocs/reference/examples.xml Wed Nov 25 16:23:41 2009
@@ -66,7 +66,7 @@
</p>
<p>
Once you have your expression, you can then use use the
- <a href="http://commons.apache.org/jexl/apidocs/org/apache/commons/jexl/Expression.html#evaluate(org.apache.commons.jexl.JexlContext)">evaluate</a>
+ <a href="http://commons.apache.org/jexl/apidocs/org/apache/commons/jexl/Expression.html#evaluate(org.apache.commons.jexl2.JexlContext)">evaluate</a>
to execute it and obtain a result.
</p>
<p>
Modified: commons/proper/jexl/trunk/xdocs/reference/jsr223.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/reference/jsr223.xml?rev=884175&r1=884174&r2=884175&view=diff
==============================================================================
--- commons/proper/jexl/trunk/xdocs/reference/jsr223.xml (original)
+++ commons/proper/jexl/trunk/xdocs/reference/jsr223.xml Wed Nov 25 16:23:41 2009
@@ -48,7 +48,7 @@
<p>
The binary release includes a command-line application which can be used to exercise the JSR-223 script engine.
For example:
- <source>java -cp commons-jexl-2.0.jar;commons-logging-1.1.1.jar[;bsf-api-3.0.jar] org.apache.commons.jexl.scripting.Main script.jexl</source>
+ <source>java -cp commons-jexl-2.0.jar;commons-logging-1.1.1.jar[;bsf-api-3.0.jar] org.apache.commons.jexl2.scripting.Main script.jexl</source>
If a single argument is provided, then that is assumed to be the name of a script file;
otherwise, the application prompts for script input to be evaluated.
In both cases, the variable "args" contains the command-line arguments.
@@ -71,9 +71,9 @@
<p>
The classes used to support JSR-223 scripting access are:
<ul>
- <li>org.apache.commons.jexl.scripting.JexlScriptEngineFactory - the factory</li>
- <li>org.apache.commons.jexl.scripting.JexlScriptEngine - the engine</li>
- <li>org.apache.commons.jexl.scripting.JexlScriptObject - class used to give scripts access to JEXL objects</li>
+ <li>org.apache.commons.jexl2.scripting.JexlScriptEngineFactory - the factory</li>
+ <li>org.apache.commons.jexl2.scripting.JexlScriptEngine - the engine</li>
+ <li>org.apache.commons.jexl2.scripting.JexlScriptObject - class used to give scripts access to JEXL objects</li>
</ul>
</p>
</section>