Author: henrib Date: Tue Nov 29 16:22:56 2011 New Revision: 1207943 URL: http://svn.apache.org/viewvc?rev=1207943&view=rev Log: JEXL-122: moved code to o.a.c.jexl3 / move jexl2-compat to jexl-compat
Added: commons/proper/jexl/trunk/jexl-compat/ - copied from r1206774, commons/proper/jexl/trunk/jexl2-compat/ commons/proper/jexl/trunk/jexl-compat/pom.xml - copied, changed from r1207231, commons/proper/jexl/trunk/jexl2-compat/pom.xml Modified: commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Script.java commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/package.html Copied: commons/proper/jexl/trunk/jexl-compat/pom.xml (from r1207231, commons/proper/jexl/trunk/jexl2-compat/pom.xml) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl-compat/pom.xml?p2=commons/proper/jexl/trunk/jexl-compat/pom.xml&p1=commons/proper/jexl/trunk/jexl2-compat/pom.xml&r1=1207231&r2=1207943&rev=1207943&view=diff ============================================================================== --- commons/proper/jexl/trunk/jexl2-compat/pom.xml (original) +++ commons/proper/jexl/trunk/jexl-compat/pom.xml Tue Nov 29 16:22:56 2011 @@ -26,7 +26,7 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-jexl-compat</artifactId> <name>Commons JEXL (1.x compatibility)</name> - <version>2.1-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <inceptionYear>2003</inceptionYear> <description>Jexl is an implementation of the JSTL Expression Language with extensions.</description> <url>http://commons.apache.org/jexl/</url> @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jexl</artifactId> - <version>2.1-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </dependency> </dependencies> @@ -88,7 +88,7 @@ <maven.compile.source>1.5</maven.compile.source> <maven.compile.target>1.5</maven.compile.target> <commons.componentid>jexl-compat</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.binary.suffix /> Modified: commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java?rev=1207943&r1=1206774&r2=1207943&view=diff ============================================================================== --- commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java (original) +++ commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java Tue Nov 29 16:22:56 2011 @@ -22,7 +22,7 @@ package org.apache.commons.jexl; * @since 2.0 * @version $Id$ */ -public interface Expression extends org.apache.commons.jexl2.Expression { +public interface Expression extends org.apache.commons.jexl3.Expression { /** * Evaluates the expression with the variables contained in the * supplied {@link JexlContext}. Modified: commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java?rev=1207943&r1=1206774&r2=1207943&view=diff ============================================================================== --- commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java (original) +++ commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java Tue Nov 29 16:22:56 2011 @@ -16,7 +16,7 @@ */ package org.apache.commons.jexl; -import org.apache.commons.jexl2.JexlEngine; +import org.apache.commons.jexl3.JexlEngine; /** * Creates Expression objects. Modified: commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java?rev=1207943&r1=1206774&r2=1207943&view=diff ============================================================================== --- commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java (original) +++ commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java Tue Nov 29 16:22:56 2011 @@ -18,11 +18,12 @@ package org.apache.commons.jexl; import java.io.File; import java.net.URL; -import org.apache.commons.jexl2.JexlEngine; -import org.apache.commons.jexl2.Interpreter; -import org.apache.commons.jexl2.JexlException; -import org.apache.commons.jexl2.parser.JexlNode; -import org.apache.commons.jexl2.parser.ASTJexlScript; +import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.Interpreter; +import org.apache.commons.jexl3.JexlException; +import org.apache.commons.jexl3.JexlScript; +import org.apache.commons.jexl3.parser.JexlNode; +import org.apache.commons.jexl3.parser.ASTJexlScript; /** * This implements Jexl-1.x (Jelly) compatible behaviors on top of Jexl-2.0. @@ -55,14 +56,14 @@ public class JexlOne { /** - * A Jexl1.x context wrapped into a Jexl2 context. + * A Jexl1.x context wrapped into a jexl3 context. */ - private static final class ContextAdapter implements org.apache.commons.jexl2.JexlContext { + private static final class ContextAdapter implements org.apache.commons.jexl3.JexlContext { /** The Jexl1.x context. */ private final JexlContext legacy; /** - * Creates a jexl2.JexlContext from a jexl.JexlContext. + * Creates a jexl3.JexlContext from a jexl.JexlContext. * @param ctxt10 */ ContextAdapter(JexlContext ctxt10) { @@ -93,9 +94,9 @@ public class JexlOne { /** * Adapts a Jexl-1.x context to a Jexl-2.0 context. * @param aContext a oac.jexl context - * @return an oac.jexl2 context + * @return an oac.jexl3 context */ - static final org.apache.commons.jexl2.JexlContext adapt(JexlContext aContext) { + static final org.apache.commons.jexl3.JexlContext adapt(JexlContext aContext) { return aContext == null ? JexlOneEngine.EMPTY_CONTEXT : new ContextAdapter(aContext); } } @@ -165,7 +166,7 @@ public class JexlOne { /** {@inheritDoc} */ @Override - protected Script createScript(ASTJexlScript tree, String text) { + protected JexlScript createScript(ASTJexlScript tree, String text) { return new JexlOneExpression(this, text, tree); } @@ -179,8 +180,7 @@ public class JexlOne { /** * The specific Jexl-1.x expressions implementation. */ - private static final class JexlOneExpression - extends org.apache.commons.jexl2.ExpressionImpl + private static final class JexlOneExpression extends org.apache.commons.jexl3.JexlScript implements Expression, Script { /** * Default local ctor. Modified: commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Script.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Script.java?rev=1207943&r1=1206774&r2=1207943&view=diff ============================================================================== --- commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Script.java (original) +++ commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/Script.java Tue Nov 29 16:22:56 2011 @@ -21,7 +21,7 @@ package org.apache.commons.jexl; * @since 2.0 * @version $Id$ */ -public interface Script extends org.apache.commons.jexl2.Script { +public interface Script extends org.apache.commons.jexl3.Script { /** * Executes the script with the variables contained in the * supplied {@link JexlContext}. Modified: commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java?rev=1207943&r1=1206774&r2=1207943&view=diff ============================================================================== --- commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java (original) +++ commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java Tue Nov 29 16:22:56 2011 @@ -16,7 +16,7 @@ */ package org.apache.commons.jexl; -import org.apache.commons.jexl2.JexlEngine; +import org.apache.commons.jexl3.JexlEngine; /** * <p> @@ -35,7 +35,7 @@ import org.apache.commons.jexl2.JexlEngi * </p> * * <p> - * This is a convenience class; using an instance of a {@link JexlEngine} + * This is a convenience class; using an instance of a {@link org.apache.commons.jexl3.JexlEngine} * that serves the same purpose with more control is recommended. * </p> * @since 1.1 Modified: commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/package.html URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/package.html?rev=1207943&r1=1206774&r2=1207943&view=diff ============================================================================== --- commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/package.html (original) +++ commons/proper/jexl/trunk/jexl-compat/src/main/java/org/apache/commons/jexl/package.html Tue Nov 29 16:22:56 2011 @@ -22,12 +22,12 @@ <h2>Jexl-1.x compatible implementation.</h2> <p> This package only contains classes that re-implement Jexl-1.x interfaces - and behaviors. This is intended to allow easier conversion to Jexl-2.0. + and behaviors. This is intended to allow easier conversion to Jexl-2.0 and later. </p> <p> - Jexl-2.0 changed a lot of APIs and behaviors, enough to warrant putting it - in its own org.apache.commons.jexl2 package and avoid possible "jar-hell" cases. - Those could have occured if someone was trying to use both Jexl-2.0 and Jexl-1.x. + Jexl-2.0 and Jexl-3.0 changed a lot of APIs and behaviors, enough to warrant putting them + in its their org.apache.commons.jexl{2,3} packages and avoid possible "jar-hell" cases. + Those could have occured if someone was trying to use Jexl-3.0, Jexl-2.0 and Jexl-1.x at the same time. </p> <p> This package contains the original Jexl-1.x main API namely ScriptFactory, ExpressionFactory,