Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 59528 invoked from network); 7 Aug 2009 16:21:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Aug 2009 16:21:49 -0000 Received: (qmail 75606 invoked by uid 500); 7 Aug 2009 16:21:56 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 75520 invoked by uid 500); 7 Aug 2009 16:21:56 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 75511 invoked by uid 99); 7 Aug 2009 16:21:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Aug 2009 16:21:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Aug 2009 16:21:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 37957238888F; Fri, 7 Aug 2009 16:21:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r802069 - in /commons/proper/jexl/branches/2.0: ./ src/main/java/org/apache/commons/jexl/ src/main/java/org/apache/commons/jexl/util/ src/main/java/org/apache/commons/jexl/util/introspection/ Date: Fri, 07 Aug 2009 16:21:32 -0000 To: commits@commons.apache.org From: rahul@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090807162133.37957238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rahul Date: Fri Aug 7 16:21:32 2009 New Revision: 802069 URL: http://svn.apache.org/viewvc?rev=802069&view=rev Log: Rename last Velocity originated classes (the prefixes are probably more confusing at this point). JEXL-77 Added: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java (contents, props changed) - copied, changed from r802064, commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelMethod.java commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java (contents, props changed) - copied, changed from r802064, commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java (contents, props changed) - copied, changed from r802064, commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertySet.java Removed: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelMethod.java commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertySet.java Modified: commons/proper/jexl/branches/2.0/RELEASE-NOTES.txt commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/Interpreter.java commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/AbstractExecutor.java commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/Uberspect.java commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java Modified: commons/proper/jexl/branches/2.0/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/RELEASE-NOTES.txt?rev=802069&r1=802068&r2=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/RELEASE-NOTES.txt (original) +++ commons/proper/jexl/branches/2.0/RELEASE-NOTES.txt Fri Aug 7 16:21:32 2009 @@ -44,6 +44,12 @@ Please create a JexlEngine and use createExpression() or createScript() instead. + * VelMethod + * VelPropertyGet + * VelPropertySet + + Please use JexlMethod, JexlPropertyGet and JexlPropertySet instead. + The following methods have been removed: * Info.getTemplateName() - use Info.getName() instead Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/Interpreter.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/Interpreter.java?rev=802069&r1=802068&r2=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/Interpreter.java (original) +++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/Interpreter.java Fri Aug 7 16:21:32 2009 @@ -83,9 +83,9 @@ import org.apache.commons.jexl.util.AbstractExecutor; import org.apache.commons.jexl.util.introspection.Uberspect; -import org.apache.commons.jexl.util.introspection.VelMethod; -import org.apache.commons.jexl.util.introspection.VelPropertyGet; -import org.apache.commons.jexl.util.introspection.VelPropertySet; +import org.apache.commons.jexl.util.introspection.JexlMethod; +import org.apache.commons.jexl.util.introspection.JexlPropertyGet; +import org.apache.commons.jexl.util.introspection.JexlPropertySet; /** * An interpreter of JEXL syntax. @@ -751,7 +751,7 @@ } } } - VelMethod vm = uberspect.getMethod(data, methodName, argv, node); + JexlMethod vm = uberspect.getMethod(data, methodName, argv, node); // DG: If we can't find an exact match, narrow the parameters and try again! if (vm == null) { narrowArguments(argv); @@ -860,7 +860,7 @@ } } } - VelMethod vm = uberspect.getMethod(namespace, function, argv, node); + JexlMethod vm = uberspect.getMethod(namespace, function, argv, node); // DG: If we can't find an exact match, narrow the parameters and // try again! if (vm == null) { @@ -1144,7 +1144,7 @@ // check if there is a size method on the object that returns an // integer and if so, just use it Object[] params = new Object[0]; - VelMethod vm = uberspect.getMethod(val, "size", EMPTY_PARAMS, node); + JexlMethod vm = uberspect.getMethod(val, "size", EMPTY_PARAMS, node); if (vm != null && vm.getReturnType() == Integer.TYPE) { Integer result; try { @@ -1194,7 +1194,7 @@ } } } - VelPropertyGet vg = uberspect.getPropertyGet(object, attribute, node); + JexlPropertyGet vg = uberspect.getPropertyGet(object, attribute, node); if (vg != null) { try { Object value = vg.invoke(object); @@ -1248,7 +1248,7 @@ } } } - VelPropertySet vs = uberspect.getPropertySet(object, attribute, value, node); + JexlPropertySet vs = uberspect.getPropertySet(object, attribute, value, node); if (vs != null) { try { // cache executor in volatile JexlNode.value Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/AbstractExecutor.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/AbstractExecutor.java?rev=802069&r1=802068&r2=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/AbstractExecutor.java (original) +++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/AbstractExecutor.java Fri Aug 7 16:21:32 2009 @@ -16,9 +16,9 @@ */ package org.apache.commons.jexl.util; import org.apache.commons.jexl.util.introspection.MethodKey; -import org.apache.commons.jexl.util.introspection.VelMethod; -import org.apache.commons.jexl.util.introspection.VelPropertySet; -import org.apache.commons.jexl.util.introspection.VelPropertyGet; +import org.apache.commons.jexl.util.introspection.JexlMethod; +import org.apache.commons.jexl.util.introspection.JexlPropertySet; +import org.apache.commons.jexl.util.introspection.JexlPropertyGet; import java.lang.reflect.InvocationTargetException; /** @@ -118,7 +118,7 @@ /** * Abstract class that is used to execute an arbitrary 'get' method. */ - public abstract static class Get extends AbstractExecutor implements VelPropertyGet { + public abstract static class Get extends AbstractExecutor implements JexlPropertyGet { /** * Default and sole constructor. * @param theClass the class this executor applies to @@ -159,7 +159,7 @@ /** * Abstract class that is used to execute an arbitrary 'set' method. */ - public abstract static class Set extends AbstractExecutor implements VelPropertySet { + public abstract static class Set extends AbstractExecutor implements JexlPropertySet { /** * Default and sole constructor. * @param theClass the class this executor applies to @@ -205,7 +205,7 @@ /** * Abstract class that is used to execute an arbitrary method. */ - public abstract static class Method extends AbstractExecutor implements VelMethod { + public abstract static class Method extends AbstractExecutor implements JexlMethod { /** * A helper class to pass the method & parameters. */ Copied: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java (from r802064, commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelMethod.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java?p2=commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java&p1=commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelMethod.java&r1=802064&r2=802069&rev=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelMethod.java (original) +++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java Fri Aug 7 16:21:32 2009 @@ -27,7 +27,7 @@ * @author Geir Magnusson Jr. * @version $Id$ */ -public interface VelMethod { +public interface JexlMethod { /** * invocation method - called when the method invocation should be performed * and a value returned. Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlMethod.java ------------------------------------------------------------------------------ svn:mergeinfo = Copied: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java (from r802064, commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java?p2=commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java&p1=commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java&r1=802064&r2=802069&rev=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java (original) +++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java Fri Aug 7 16:21:32 2009 @@ -27,7 +27,7 @@ * @author Geir Magnusson Jr. * @version $Id$ */ -public interface VelPropertyGet { +public interface JexlPropertyGet { /** * invocation method - called when the 'get action' should be performed and * a value returned. Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertyGet.java ------------------------------------------------------------------------------ svn:mergeinfo = Copied: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java (from r802064, commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertySet.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java?p2=commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java&p1=commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertySet.java&r1=802064&r2=802069&rev=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/VelPropertySet.java (original) +++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java Fri Aug 7 16:21:32 2009 @@ -27,7 +27,7 @@ * @author Geir Magnusson Jr. * @version $Id$ */ -public interface VelPropertySet { +public interface JexlPropertySet { /** * method used to set the value in the object. * Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/JexlPropertySet.java ------------------------------------------------------------------------------ svn:mergeinfo = Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/Uberspect.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/Uberspect.java?rev=802069&r1=802068&r2=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/Uberspect.java (original) +++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/Uberspect.java Fri Aug 7 16:21:32 2009 @@ -56,9 +56,9 @@ * @param method the method name * @param args method arguments * @param info template info - * @return a {@link VelMethod}. + * @return a {@link JexlMethod}. */ - VelMethod getMethod(Object obj, String method, Object[] args, DebugInfo info); + JexlMethod getMethod(Object obj, String method, Object[] args, DebugInfo info); /** * Property getter - returns VelPropertyGet appropos for #set($foo = @@ -66,9 +66,9 @@ * @param obj the object to get the property from. * @param identifier property name * @param info template info - * @return a {@link VelPropertyGet}. + * @return a {@link JexlPropertyGet}. */ - VelPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo info); + JexlPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo info); /** * Property setter - returns VelPropertySet appropos for #set($foo.bar = @@ -77,7 +77,7 @@ * @param identifier property name * @param arg value to set. * @param info template info - * @return a {@link VelPropertySet}. + * @return a {@link JexlPropertySet}. */ - VelPropertySet getPropertySet(Object obj, Object identifier, Object arg, DebugInfo info); + JexlPropertySet getPropertySet(Object obj, Object identifier, Object arg, DebugInfo info); } \ No newline at end of file Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java?rev=802069&r1=802068&r2=802069&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java (original) +++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java Fri Aug 7 16:21:32 2009 @@ -126,21 +126,21 @@ /** * {@inheritDoc} */ - public VelMethod getMethod(Object obj, String methodName, Object[] args, DebugInfo i) { + public JexlMethod getMethod(Object obj, String methodName, Object[] args, DebugInfo i) { return getMethodExecutor(obj, methodName, args); } /** * {@inheritDoc} */ - public VelPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo i) { + public JexlPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo i) { return getGetExecutor(obj, identifier); } /** * {@inheritDoc} */ - public VelPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, DebugInfo i) { + public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, DebugInfo i) { return getSetExecutor(obj, identifier, arg); } } \ No newline at end of file