Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java Mon Aug 31 21:06:34 2015 @@ -23,9 +23,9 @@ import org.apache.velocity.exception.Met import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.util.ClassUtils; +import org.apache.velocity.util.StringUtils; import org.apache.velocity.util.introspection.VelMethod; /* @@ -106,7 +106,7 @@ public class ASTIndex extends SimpleNode throw new VelocityException( "A 'size()' method required for negative value " + ((Integer)argument).intValue() + " does not exist for class '" - + o.getClass().getName() + "' at " + Log.formatFileString(node)); + + o.getClass().getName() + "' at " + StringUtils.formatFileString(node)); } Object size = null; @@ -117,7 +117,7 @@ public class ASTIndex extends SimpleNode catch (Exception e) { throw new VelocityException("Error trying to calls the 'size()' method on '" - + o.getClass().getName() + "' at " + Log.formatFileString(node), e); + + o.getClass().getName() + "' at " + StringUtils.formatFileString(node), e); } int sizeint = 0; @@ -130,7 +130,7 @@ public class ASTIndex extends SimpleNode // If size() doesn't return an Integer we want to report a pretty error throw new VelocityException("Method 'size()' on class '" + o.getClass().getName() + "' returned '" + size.getClass().getName() - + "' when Integer was expected at " + Log.formatFileString(node)); + + "' when Integer was expected at " + StringUtils.formatFileString(node)); } argument = new Integer(sizeint + ((Integer)argument).intValue()); @@ -188,7 +188,7 @@ public class ASTIndex extends SimpleNode String msg = "Error invoking method 'get(" + (argument == null ? "null" : argument.getClass().getName()) + ")' in " + o.getClass().getName() - + " at " + Log.formatFileString(this); + + " at " + StringUtils.formatFileString(this); log.error(msg, e); throw new VelocityException(msg, e); }
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java Mon Aug 31 21:06:34 2015 @@ -24,8 +24,8 @@ import java.util.List; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.Parser; +import org.apache.velocity.util.StringUtils; /** * handles the range 'operator' [ n .. m ] @@ -89,7 +89,7 @@ public class ASTIntegerRange extends Sim log.error((left == null ? "Left" : "Right") + " side of range operator [n..m] has null value." + " Operation not possible. " - + Log.formatFileString(this)); + + StringUtils.formatFileString(this)); return null; } @@ -102,7 +102,7 @@ public class ASTIntegerRange extends Sim log.error((!(left instanceof Number) ? "Left" : "Right") + " side of range operator is not a valid type. " + "Currently only integers (1,2,3...) and the Number type are supported. " - + Log.formatFileString(this)); + + StringUtils.formatFileString(this)); return null; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java Mon Aug 31 21:06:34 2015 @@ -33,11 +33,11 @@ import org.apache.velocity.io.Filter; import org.apache.velocity.runtime.Renderable; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.directive.Block.Reference; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.DuckType; +import org.apache.velocity.util.StringUtils; import org.apache.velocity.util.introspection.Info; import org.apache.velocity.util.introspection.VelMethod; import org.apache.velocity.util.introspection.VelPropertySet; @@ -265,7 +265,7 @@ public class ASTReference extends Simple String name = jjtGetChild(i).getFirstToken().image; throw new VelocityException("Attempted to access '" + name + "' on a null value at " - + Log.formatFileString(uberInfo.getTemplateName(), + + StringUtils.formatFileString(uberInfo.getTemplateName(), + jjtGetChild(i).getLine(), jjtGetChild(i).getColumn())); } previousResult = result; @@ -414,7 +414,7 @@ public class ASTReference extends Simple // as another element of the error stack we report to log. log.error("Exception rendering " + ((renderable instanceof Reference)? "block ":"Renderable ") - + rootString + " at " + Log.formatFileString(this)); + + rootString + " at " + StringUtils.formatFileString(this)); throw e; } } @@ -434,7 +434,7 @@ public class ASTReference extends Simple { throw new VelocityException("Reference " + literal() + " evaluated to null when attempting to render at " - + Log.formatFileString(this)); + + StringUtils.formatFileString(this)); } else // toString == null { @@ -444,7 +444,7 @@ public class ASTReference extends Simple throw new VelocityException("Reference " + literal() + " evaluated to object " + value.getClass().getName() + " whose toString() method returned null at " - + Log.formatFileString(this)); + + StringUtils.formatFileString(this)); } } return true; @@ -538,7 +538,7 @@ public class ASTReference extends Simple catch(Exception e) { throw new VelocityException("Reference evaluation threw an exception at " - + Log.formatFileString(this), e); + + StringUtils.formatFileString(this), e); } } @@ -592,7 +592,7 @@ public class ASTReference extends Simple if (result == null) { String msg = "reference set is not a valid reference at " - + Log.formatFileString(uberInfo); + + StringUtils.formatFileString(uberInfo); log.error(msg); return false; } @@ -616,7 +616,7 @@ public class ASTReference extends Simple } String msg = "reference set is not a valid reference at " - + Log.formatFileString(uberInfo); + + StringUtils.formatFileString(uberInfo); log.error(msg); return false; @@ -663,7 +663,7 @@ public class ASTReference extends Simple "Found neither a 'set' or 'put' method with param types '(" + printClass(paramClasses[0]) + "," + printClass(paramClasses[1]) + ")' on class '" + result.getClass().getName() - + "' at " + Log.formatFileString(astIndex)); + + "' at " + StringUtils.formatFileString(astIndex)); } return false; } @@ -746,7 +746,7 @@ public class ASTReference extends Simple * maybe a security exception? */ String msg = "ASTReference setValue() : exception : " + e - + " template at " + Log.formatFileString(uberInfo); + + " template at " + StringUtils.formatFileString(uberInfo); log.error(msg, e); throw new VelocityException(msg, e); } @@ -977,7 +977,7 @@ public class ASTReference extends Simple catch(RuntimeException e) { log.error("Exception calling reference $" + variable + " at " - + Log.formatFileString(uberInfo)); + + StringUtils.formatFileString(uberInfo)); throw e; } @@ -986,7 +986,7 @@ public class ASTReference extends Simple if (!context.containsKey(variable)) { log.error("Variable $" + variable + " has not been set at " - + Log.formatFileString(uberInfo)); + + StringUtils.formatFileString(uberInfo)); throw new MethodInvocationException("Variable $" + variable + " has not been set", null, identifier, uberInfo.getTemplateName(), uberInfo.getLine(), uberInfo.getColumn()); Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java Mon Aug 31 21:06:34 2015 @@ -27,7 +27,6 @@ import org.apache.velocity.context.Inter import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.util.introspection.Info; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java Mon Aug 31 21:06:34 2015 @@ -25,10 +25,10 @@ import org.apache.velocity.context.Inter import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.ParseException; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; +import org.apache.velocity.util.StringUtils; /** * ASTStringLiteral support. Will interpolate! @@ -172,7 +172,7 @@ public class ASTStringLiteral extends Si catch (ParseException e) { String msg = "Failed to parse String literal at "+ - Log.formatFileString(templateName, getLine(), getColumn()); + StringUtils.formatFileString(templateName, getLine(), getColumn()); throw new TemplateInitException(msg, e, templateName, getColumn(), getLine()); } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java Mon Aug 31 21:06:34 2015 @@ -22,7 +22,7 @@ package org.apache.velocity.runtime.pars import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.velocity.runtime.log.Log; +import org.slf4j.Logger; /** * Abstract class that is used to execute an arbitrary @@ -36,7 +36,7 @@ import org.apache.velocity.runtime.log.L public abstract class AbstractExecutor { /** */ - protected Log log = null; + protected Logger log = null; /** * Method to be executed. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java Mon Aug 31 21:06:34 2015 @@ -19,8 +19,9 @@ package org.apache.velocity.runtime.pars * under the License. */ +import org.slf4j.Logger; + import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.util.introspection.Introspector; /** @@ -45,7 +46,7 @@ public class BooleanPropertyExecutor ext * @param property * @since 1.5 */ - public BooleanPropertyExecutor(final Log log, final Introspector introspector, + public BooleanPropertyExecutor(final Logger log, final Introspector introspector, final Class clazz, final String property) { super(log, introspector, clazz, property); Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java Mon Aug 31 21:06:34 2015 @@ -20,8 +20,10 @@ package org.apache.velocity.runtime.pars */ import java.lang.reflect.InvocationTargetException; + +import org.slf4j.Logger; + import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.util.introspection.Introspector; @@ -49,7 +51,7 @@ public class GetExecutor extends Abstrac * @param property * @since 1.5 */ - public GetExecutor(final Log log, final Introspector introspector, + public GetExecutor(final Logger log, final Introspector introspector, final Class clazz, final String property) { this.log = log; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java Mon Aug 31 21:06:34 2015 @@ -20,8 +20,10 @@ package org.apache.velocity.runtime.pars */ import java.util.Map; + +import org.slf4j.Logger; + import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; /** * GetExecutor that is smart about Maps. If it detects one, it does not @@ -36,7 +38,7 @@ public class MapGetExecutor { private final String property; - public MapGetExecutor(final Log log, final Class clazz, final String property) + public MapGetExecutor(final Logger log, final Class clazz, final String property) { this.log = log; this.property = property; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java Mon Aug 31 21:06:34 2015 @@ -20,8 +20,10 @@ package org.apache.velocity.runtime.pars */ import java.util.Map; + +import org.slf4j.Logger; + import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; /** * SetExecutor that is smart about Maps. If it detects one, it does not @@ -36,7 +38,7 @@ public class MapSetExecutor { private final String property; - public MapSetExecutor(final Log log, final Class clazz, final String property) + public MapSetExecutor(final Logger log, final Class clazz, final String property) { this.log = log; this.property = property; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java Mon Aug 31 21:06:34 2015 @@ -21,9 +21,10 @@ package org.apache.velocity.runtime.pars import java.lang.reflect.InvocationTargetException; +import org.slf4j.Logger; + import org.apache.commons.lang3.StringUtils; import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.util.introspection.Introspector; /** @@ -40,7 +41,7 @@ public class PropertyExecutor extends Ab * @param property * @since 1.5 */ - public PropertyExecutor(final Log log, final Introspector introspector, + public PropertyExecutor(final Logger log, final Introspector introspector, final Class clazz, final String property) { this.log = log; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java Mon Aug 31 21:06:34 2015 @@ -22,9 +22,10 @@ package org.apache.velocity.runtime.pars import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; +import org.slf4j.Logger; + import org.apache.commons.lang3.StringUtils; import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.util.introspection.Introspector; /** @@ -46,7 +47,7 @@ public class PublicFieldExecutor extends * @param property * @since 1.5 */ - public PublicFieldExecutor(final Log log, final Introspector introspector, + public PublicFieldExecutor(final Logger log, final Introspector introspector, final Class clazz, final String property) { this.log = log; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java Mon Aug 31 21:06:34 2015 @@ -20,8 +20,10 @@ package org.apache.velocity.runtime.pars */ import java.lang.reflect.InvocationTargetException; + +import org.slf4j.Logger; + import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.util.introspection.Introspector; @@ -49,7 +51,7 @@ public class PutExecutor extends SetExec * @param arg * @param property */ - public PutExecutor(final Log log, final Introspector introspector, + public PutExecutor(final Logger log, final Introspector introspector, final Class clazz, final Object arg, final String property) { this.log = log; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java Mon Aug 31 21:06:34 2015 @@ -22,7 +22,7 @@ package org.apache.velocity.runtime.pars import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.velocity.runtime.log.Log; +import org.slf4j.Logger; /** * Abstract class that is used to execute an arbitrary @@ -41,7 +41,7 @@ import org.apache.velocity.runtime.log.L public abstract class SetExecutor { /** Class logger */ - protected Log log = null; + protected Logger log = null; /** * Method to be executed. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java Mon Aug 31 21:06:34 2015 @@ -21,9 +21,10 @@ package org.apache.velocity.runtime.pars import java.lang.reflect.InvocationTargetException; +import org.slf4j.Logger; + import org.apache.commons.lang3.StringUtils; import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.util.introspection.Introspector; /** @@ -46,7 +47,7 @@ public class SetPropertyExecutor * @param property * @param arg */ - public SetPropertyExecutor(final Log log, final Introspector introspector, + public SetPropertyExecutor(final Logger log, final Introspector introspector, final Class clazz, final String property, final Object arg) { this.log = log; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java Mon Aug 31 21:06:34 2015 @@ -23,9 +23,10 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; +import org.slf4j.Logger; + import org.apache.commons.lang3.StringUtils; import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.util.introspection.Introspector; /** @@ -51,7 +52,7 @@ public class SetPublicFieldExecutor * @param property * @param arg */ - public SetPublicFieldExecutor(final Log log, final Introspector introspector, + public SetPublicFieldExecutor(final Logger log, final Introspector introspector, final Class clazz, final String property, final Object arg) { this.log = log; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java Mon Aug 31 21:06:34 2015 @@ -23,15 +23,17 @@ import java.io.IOException; import java.io.Writer; import java.util.Arrays; +import org.slf4j.Logger; + import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; +import org.apache.velocity.util.StringUtils; /** * @@ -42,7 +44,7 @@ public class SimpleNode implements Node protected RuntimeServices rsvc = null; /** */ - protected Log log = null; + protected Logger log = null; /** */ protected Node parent; @@ -261,7 +263,7 @@ public class SimpleNode implements Node */ protected String getLocation(InternalContextAdapter context) { - return Log.formatFileString(this); + return StringUtils.formatFileString(this); } // All additional methods Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java Mon Aug 31 21:06:34 2015 @@ -24,13 +24,14 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; +import org.slf4j.Logger; + import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.resource.loader.ResourceLoader; import org.apache.velocity.runtime.resource.loader.ResourceLoaderFactory; import org.apache.velocity.util.ClassUtils; @@ -86,7 +87,7 @@ public class ResourceManagerImpl protected RuntimeServices rsvc = null; /** Logging. */ - protected Log log = null; + protected Logger log = null; /** * Initialize the ResourceManager. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java Mon Aug 31 21:06:34 2015 @@ -28,8 +28,9 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.Hashtable; +import org.slf4j.Logger; + import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; @@ -45,7 +46,7 @@ public class JarHolder private JarFile theJar = null; private JarURLConnection conn = null; - private Log log = null; + private Logger log = null; /** * @param rs Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java Mon Aug 31 21:06:34 2015 @@ -21,8 +21,9 @@ package org.apache.velocity.runtime.reso import java.io.InputStream; +import org.slf4j.Logger; + import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.ResourceCacheImpl; import org.apache.velocity.exception.ResourceNotFoundException; @@ -58,7 +59,7 @@ public abstract class ResourceLoader protected String className = null; protected RuntimeServices rsvc = null; - protected Log log = null; + protected Logger log = null; /** * This initialization is used by all resource Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java Mon Aug 31 21:06:34 2015 @@ -29,13 +29,14 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; +import org.apache.velocity.runtime.directive.Directive; +import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.util.introspection.Info; /** * This class provides some methods for dynamically * invoking methods in objects, and some string - * manipulation methods used by torque. The string - * methods will soon be moved into the turbine - * string utilities class. + * manipulation and formatting methods. * * @author <a href="mailto:[email protected]";>Jason van Zyl</a> * @author <a href="mailto:[email protected]";>Daniel Rall</a> @@ -609,4 +610,53 @@ public class StringUtils return s.trim(); } } + + /** + * Creates a string that formats the template filename with line number + * and column of the given Directive. We use this routine to provide a cosistent format for displaying + * file errors. + */ + public static final String formatFileString(Directive directive) + { + return formatFileString(directive.getTemplateName(), directive.getLine(), directive.getColumn()); + } + + /** + * Creates a string that formats the template filename with line number + * and column of the given Node. We use this routine to provide a cosistent format for displaying + * file errors. + */ + public static final String formatFileString(Node node) + { + return formatFileString(node.getTemplateName(), node.getLine(), node.getColumn()); + } + + /** + * Simply creates a string that formats the template filename with line number + * and column. We use this routine to provide a cosistent format for displaying + * file errors. + */ + public static final String formatFileString(Info info) + { + return formatFileString(info.getTemplateName(), info.getLine(), info.getColumn()); + } + + /** + * Simply creates a string that formats the template filename with line number + * and column. We use this routine to provide a cosistent format for displaying + * file errors. + * @param template File name of template, can be null + * @param linenum Line number within the file + * @param colnum Column number withing the file at linenum + */ + public static final String formatFileString(String template, int linenum, int colnum) + { + StringBuilder buffer = new StringBuilder(); + if (template == null || template.equals("")) + { + template = "<unknown template>"; + } + buffer.append(template).append("[line ").append(linenum).append(", column ").append(colnum).append(']'); + return buffer.toString(); + } } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java Mon Aug 31 21:06:34 2015 @@ -24,7 +24,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.velocity.runtime.log.Log; + +import org.slf4j.Logger; /** * A cache of introspection information for a specific class instance. @@ -44,7 +45,7 @@ public class ClassFieldMap private static final boolean debugReflection = false; /** Class logger */ - private final Log log; + private final Logger log; /** * Class passed into the constructor used to as @@ -61,7 +62,7 @@ public class ClassFieldMap * Standard constructor * @param clazz The class for which this ClassMap gets constructed. */ - public ClassFieldMap(final Class clazz, final Log log) + public ClassFieldMap(final Class clazz, final Logger log) { this.clazz = clazz; this.log = log; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java Mon Aug 31 21:06:34 2015 @@ -24,7 +24,8 @@ import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.velocity.runtime.log.Log; + +import org.slf4j.Logger; /** * A cache of introspection information for a specific class instance. @@ -45,7 +46,7 @@ public class ClassMap private static final boolean debugReflection = true; /** Class logger */ - private final Log log; + private final Logger log; /** * Class passed into the constructor used to as @@ -59,7 +60,7 @@ public class ClassMap * Standard constructor * @param clazz The class for which this ClassMap gets constructed. */ - public ClassMap(final Class clazz, final Log log) + public ClassMap(final Class clazz, final Logger log) { this.clazz = clazz; this.log = log; @@ -209,7 +210,7 @@ public class ClassMap } /** Class logger */ - private final Log log; + private final Logger log; /** * Cache of Methods, or CACHE_MISS, keyed by method @@ -220,7 +221,7 @@ public class ClassMap /** Map of methods that are searchable according to method parameters to find a match */ private final MethodMap methodMap = new MethodMap(); - private MethodCache(Log log) + private MethodCache(Logger log) { this.log = log; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java Mon Aug 31 21:06:34 2015 @@ -19,8 +19,8 @@ package org.apache.velocity.util.introsp * under the License. */ -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.util.StringUtils; /** * Little class to carry in info such as template name, line and column @@ -92,6 +92,6 @@ public class Info */ public String toString() { - return Log.formatFileString(getTemplateName(), getLine(), getColumn()); + return StringUtils.formatFileString(getTemplateName(), getLine(), getColumn()); } } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java Mon Aug 31 21:06:34 2015 @@ -21,7 +21,7 @@ package org.apache.velocity.util.introsp import java.lang.reflect.Method; -import org.apache.velocity.runtime.log.Log; +import org.slf4j.Logger; /** * This basic function of this class is to return a Method @@ -55,10 +55,10 @@ import org.apache.velocity.runtime.log.L public class Introspector extends IntrospectorBase { /** - * @param log A Log object to use for the introspector. + * @param log A Logger object to use for the introspector. * @since 1.5 */ - public Introspector(final Log log) + public Introspector(final Logger log) { super(log); } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java Mon Aug 31 21:06:34 2015 @@ -22,7 +22,7 @@ package org.apache.velocity.util.introsp import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.apache.velocity.runtime.log.Log; +import org.slf4j.Logger; /** * Lookup a a Method object for a particular class given the name of a method @@ -56,7 +56,7 @@ import org.apache.velocity.runtime.log.L public abstract class IntrospectorBase { /** Class logger */ - protected final Log log; + protected final Logger log; /** The Introspector Cache */ private final IntrospectorCache introspectorCache; @@ -64,7 +64,7 @@ public abstract class IntrospectorBase /** * C'tor. */ - protected IntrospectorBase(final Log log) + protected IntrospectorBase(final Logger log) { this.log = log; introspectorCache = new IntrospectorCacheImpl(log); // TODO: Load that from properties. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java Mon Aug 31 21:06:34 2015 @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.velocity.runtime.log.Log; +import org.slf4j.Logger; /** * This is the internal introspector cache implementation. @@ -43,7 +43,7 @@ public final class IntrospectorCacheImpl "IntrospectorCache detected classloader change. Dumping cache."; /** Class logger */ - private final Log log; + private final Logger log; /** * Holds the method maps for the classes we know about. Map: Class --> ClassMap object. @@ -66,7 +66,7 @@ public final class IntrospectorCacheImpl /** * C'tor */ - public IntrospectorCacheImpl(final Log log) + public IntrospectorCacheImpl(final Logger log) { this.log = log; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java Mon Aug 31 21:06:34 2015 @@ -20,7 +20,8 @@ package org.apache.velocity.util.introsp */ import java.lang.reflect.Method; -import org.apache.velocity.runtime.log.Log; + +import org.slf4j.Logger; /** * <p>Prevent "dangerous" classloader/reflection related calls. Use this @@ -40,7 +41,7 @@ public class SecureIntrospectorImpl exte private String[] badClasses; private String[] badPackages; - public SecureIntrospectorImpl(String[] badClasses, String[] badPackages, Log log) + public SecureIntrospectorImpl(String[] badClasses, String[] badPackages, Logger log) { super(log); this.badClasses = badClasses; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java Mon Aug 31 21:06:34 2015 @@ -27,8 +27,9 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.Map; +import org.slf4j.Logger; + import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.parser.node.AbstractExecutor; import org.apache.velocity.runtime.parser.node.BooleanPropertyExecutor; import org.apache.velocity.runtime.parser.node.GetExecutor; @@ -55,7 +56,7 @@ public class UberspectImpl implements Ub /** * Our runtime logger. */ - protected Log log; + protected Logger log; /** * the default Velocity introspector @@ -79,7 +80,7 @@ public class UberspectImpl implements Ub * @param log The logger instance to use. * @since 1.5 */ - public void setLog(Log log) + public void setLog(Logger log) { this.log = log; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectLoggable.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectLoggable.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectLoggable.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectLoggable.java Mon Aug 31 21:06:34 2015 @@ -19,7 +19,7 @@ package org.apache.velocity.util.introsp * under the License. */ -import org.apache.velocity.runtime.log.Log; +import org.slf4j.Logger; /** * Marker interface to let an uberspector indicate it can and wants to @@ -40,6 +40,6 @@ public interface UberspectLoggable * uberspector * @param log */ - public void setLog(Log log); + public void setLog(Logger log); } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java Mon Aug 31 21:06:34 2015 @@ -20,7 +20,9 @@ package org.apache.velocity.util.introspection; import java.util.Iterator; -import org.apache.velocity.runtime.log.Log; + +import org.slf4j.Logger; + import org.apache.velocity.runtime.parser.node.PublicFieldExecutor; import org.apache.velocity.runtime.parser.node.SetPublicFieldExecutor; import org.apache.velocity.util.introspection.UberspectImpl.VelGetterImpl; @@ -38,7 +40,7 @@ public class UberspectPublicFields imple /** * Our runtime logger. */ - protected Log log; + protected Logger log; /** * the default Velocity introspector @@ -62,7 +64,7 @@ public class UberspectPublicFields imple * @param log The logger instance to use. * @since 1.5 */ - public void setLog(Log log) + public void setLog(Logger log) { this.log = log; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties Mon Aug 31 21:06:34 2015 @@ -16,22 +16,6 @@ # under the License. # ---------------------------------------------------------------------------- -# R U N T I M E L O G -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# default LogChute to use: default: Log4JLogChute, Slf4jLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute -# ---------------------------------------------------------------------------- - -runtime.log.logsystem.class = org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.slf4j.Slf4jLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute - -# --------------------------------------------------------------------------- -# This is the location of the Velocity Runtime log. -# ---------------------------------------------------------------------------- - -runtime.log = velocity.log - -# ---------------------------------------------------------------------------- # This controls whether invalid references are logged. # ---------------------------------------------------------------------------- Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java Mon Aug 31 21:06:34 2015 @@ -30,7 +30,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Test use of an absolute path with the FileResourceLoader @@ -101,7 +101,7 @@ public class AbsoluteFileResourceLoaderT Velocity.FILE_RESOURCE_LOADER_PATH, ""); Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java Mon Aug 31 21:06:34 2015 @@ -30,7 +30,7 @@ import org.apache.velocity.app.VelocityE import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.resource.loader.StringResourceLoader; import org.apache.velocity.runtime.resource.util.StringResourceRepository; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.StringUtils; /** @@ -46,7 +46,7 @@ public abstract class BaseTestCase exten protected VelocityEngine engine; protected VelocityContext context; protected boolean DEBUG = false; - protected TestLogChute log; + protected TestLogger log; protected String stringRepoName = "string.repo"; public BaseTestCase(String name) @@ -67,10 +67,8 @@ public abstract class BaseTestCase exten engine = new VelocityEngine(); //by default, make the engine's log output go to the test-report - log = new TestLogChute(false, false); - log.setEnabledLevel(TestLogChute.INFO_ID); - log.setSystemErrLevel(TestLogChute.WARN_ID); - engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, log); + log = new TestLogger(false, false); + engine.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, log); // use string resource loader by default, instead of file engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,string"); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java Mon Aug 31 21:06:34 2015 @@ -31,7 +31,7 @@ import org.apache.commons.io.IOUtils; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.log.LogChute; +import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.introspection.IntrospectorCacheImpl; /** @@ -40,14 +40,13 @@ import org.apache.velocity.util.introspe * @author <a href="mailto:[email protected]";>Geir Magnusson Jr.</a> * @version $Id$ */ -public class ClassloaderChangeTestCase extends TestCase implements LogChute +public class ClassloaderChangeTestCase extends TestCase { private VelocityEngine ve = null; - private boolean sawCacheDump = false; + private TestLogger logger = null; private static String OUTPUT = "Hello From Foo"; - /** * Default constructor. */ @@ -60,15 +59,12 @@ public class ClassloaderChangeTestCase e throws Exception { ve = new VelocityEngine(); - ve.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, this ); + logger = new TestLogger(false, true); + logger.setEnabledLevel(TestLogger.LOG_LEVEL_DEBUG); + ve.setProperty(VelocityEngine.RUNTIME_LOG_INSTANCE, logger); ve.init(); } - public void init( RuntimeServices rs ) - { - // do nothing with it - } - public static Test suite () { return new TestSuite(ClassloaderChangeTestCase.class); @@ -80,7 +76,7 @@ public class ClassloaderChangeTestCase e public void testClassloaderChange() throws Exception { - sawCacheDump = false; + logger.on(); VelocityContext vc = new VelocityContext(); Object foo = null; @@ -132,40 +128,13 @@ public class ClassloaderChangeTestCase e fail("Output from doIt() incorrect"); } - if (!sawCacheDump) + if (!logger.getLog().contains(IntrospectorCacheImpl.CACHEDUMP_MSG)) { fail("Didn't see introspector cache dump."); } } /** - * method to catch Velocity log messages. When we - * see the introspector dump message, then set the flag - */ - public void log(int level, String message) - { - if (message.equals( IntrospectorCacheImpl.CACHEDUMP_MSG) ) - { - sawCacheDump = true; - } - } - - /** - * method to catch Velocity log messages. When we - * see the introspector dump message, then set the flag - */ - public void log(int level, String message, Throwable t) - { - // ignore the Throwable for this test - log(level, message); - } - - public boolean isLevelEnabled(int level) - { - return true; - } - - /** * Simple (real simple...) classloader that depends * on a Foo.class being located in the classloader * directory under test Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java Mon Aug 31 21:06:34 2015 @@ -31,7 +31,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Load templates from the Classpath. @@ -100,7 +100,7 @@ public class ClasspathResourceTestCase e "2"); Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java Mon Aug 31 21:06:34 2015 @@ -32,7 +32,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Tests if we are context safe : can we switch objects in the context @@ -62,7 +62,7 @@ public class ContextSafetyTestCase exten Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java Mon Aug 31 21:06:34 2015 @@ -30,7 +30,7 @@ import junit.framework.TestSuite; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Tests input encoding handling. The input target is UTF-8, having @@ -60,7 +60,7 @@ public class EncodingTestCase extends Ba Velocity.setProperty( Velocity.INPUT_ENCODING, "UTF-8" ); Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java Mon Aug 31 21:06:34 2015 @@ -32,7 +32,7 @@ import org.apache.velocity.runtime.Runti import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.ContextAware; import org.apache.velocity.util.RuntimeServicesAware; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Tests event handling for all event handlers except IncludeEventHandler. This is tested Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java Mon Aug 31 21:06:34 2015 @@ -29,13 +29,15 @@ import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestSuite; +import org.slf4j.Logger; + import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.log.LogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Tests event handling for all event handlers when multiple event handlers are @@ -44,7 +46,7 @@ import org.apache.velocity.runtime.log.L * @author <a href="mailto:[email protected]";>Will Glass-Husain</a> * @version $Id$ */ -public class FilteredEventHandlingTestCase extends BaseTestCase implements LogChute +public class FilteredEventHandlingTestCase extends BaseTestCase { /** @@ -79,7 +81,7 @@ public class FilteredEventHandlingTestCa private static final String COMPARE_DIR = TEST_COMPARE_DIR + "/includeevent/compare"; - private String logString = null; + private TestLogger logger = new TestLogger(false, false); /** * Default constructor. @@ -89,15 +91,6 @@ public class FilteredEventHandlingTestCa super(name); } - - /** - * Required by LogChute - */ - public void init( RuntimeServices rs ) - { - /* don't need it...*/ - } - public static Test suite () { return new TestSuite(FilteredEventHandlingTestCase.class); @@ -116,7 +109,7 @@ public class FilteredEventHandlingTestCa * Set up two VelocityEngines that will apply the handlers in both orders */ VelocityEngine ve = new VelocityEngine(); - ve.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, this); + ve.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, logger); ve.setProperty(RuntimeConstants.EVENTHANDLER_METHODEXCEPTION, sequence1); ve.setProperty(RuntimeConstants.EVENTHANDLER_REFERENCEINSERTION, sequence1); ve.setProperty(RuntimeConstants.EVENTHANDLER_INCLUDE, sequence1); @@ -124,7 +117,7 @@ public class FilteredEventHandlingTestCa ve.init(); VelocityEngine ve2 = new VelocityEngine(); - ve2.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, this); + ve2.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, logger); ve2.setProperty(RuntimeConstants.EVENTHANDLER_METHODEXCEPTION, sequence2); ve2.setProperty(RuntimeConstants.EVENTHANDLER_REFERENCEINSERTION, sequence2); ve2.setProperty(RuntimeConstants.EVENTHANDLER_INCLUDE, sequence2); @@ -182,9 +175,10 @@ public class FilteredEventHandlingTestCa // sequence 1 context = new VelocityContext(); w = new StringWriter(); - logString = null; + logger.startCapture(); ve.evaluate( context, w, "test", "#set($test1 = $test2)" ); - if ( logString != null) + String log = logger.getLog(); + if ( log != null && log.length() > 0) { fail( "log null set test 1"); } @@ -192,13 +186,15 @@ public class FilteredEventHandlingTestCa // sequence 2 context = new VelocityContext(); w = new StringWriter(); - logString = null; + logger.startCapture(); ve2.evaluate( context, w, "test", "#set($test1 = $test2)" ); - if ( logString != null) + log = logger.getLog(); + if ( log != null && log.length() > 0) { fail( "log null set test 2"); } + logger.stopCapture(); // check include event handler with both sequences @@ -243,26 +239,4 @@ public class FilteredEventHandlingTestCa } } - - - - - /** - * handler for LogChute interface - */ - public void log(int level, String message) - { - logString = message; - } - - public void log(int level, String message, Throwable t) - { - logString = message; - } - - public boolean isLevelEnabled(int level) - { - return true; - } - } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java Mon Aug 31 21:06:34 2015 @@ -35,7 +35,7 @@ import org.apache.velocity.app.event.Inc import org.apache.velocity.context.Context; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.RuntimeServicesAware; /** @@ -103,7 +103,7 @@ public class IncludeEventHandlingTestCas Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java Mon Aug 31 21:06:34 2015 @@ -31,7 +31,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Tests if the VM template-locality is working. @@ -67,7 +67,7 @@ public class InlineScopeVMTestCase exten Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java Mon Aug 31 21:06:34 2015 @@ -26,7 +26,7 @@ import junit.framework.TestSuite; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Test case for the Velocity Introspector which @@ -61,7 +61,7 @@ public class Introspector2TestCase exten throws Exception { Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java Mon Aug 31 21:06:34 2015 @@ -24,7 +24,7 @@ import junit.framework.TestSuite; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -60,7 +60,7 @@ public class MacroForwardDefineTestCase /** * Collects the log messages. */ - private TestLogChute logger = new TestLogChute(); + private TestLogger logger = new TestLogger(false, true); /** * Default constructor. @@ -82,9 +82,8 @@ public class MacroForwardDefineTestCase Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_REFERENCE_LOG_INVALID,"true"); // actual instance of logger - logger = new TestLogChute(true, false); - Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,logger); - Velocity.setProperty(TestLogChute.TEST_LOGGER_LEVEL, "debug"); + logger.setEnabledLevel(TestLogger.LOG_LEVEL_DEBUG); + Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, logger); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java Mon Aug 31 21:06:34 2015 @@ -28,7 +28,7 @@ import junit.framework.TestSuite; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.exception.MethodInvocationException; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Tests if we can hand Velocity an arbitrary class for logging. @@ -57,7 +57,7 @@ public class MethodInvocationExceptionTe */ Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java Mon Aug 31 21:06:34 2015 @@ -33,7 +33,7 @@ import org.apache.velocity.app.VelocityE import org.apache.velocity.context.Context; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.log.LogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Test a reported bug in which method overloading throws IllegalArgumentException @@ -43,7 +43,7 @@ import org.apache.velocity.runtime.log.L * @author <a href="mailto:[email protected]";>Will Glass-Husain</a> * @version $Id$ */ -public class MethodOverloadingTestCase extends BaseTestCase implements LogChute +public class MethodOverloadingTestCase extends BaseTestCase { String logData; @@ -122,10 +122,10 @@ public class MethodOverloadingTestCase e public void testFile(String basefilename) throws Exception { - + TestLogger logger = new TestLogger(); VelocityEngine ve = new VelocityEngine(); ve.addProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); - ve.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, this ); + ve.setProperty(VelocityEngine.RUNTIME_LOG_INSTANCE, logger ); ve.init(); Template template; @@ -142,7 +142,9 @@ public class MethodOverloadingTestCase e context = new VelocityContext(); setupContext(context); + logger.on(); template.merge(context, fwriter); + logger.off(); fwriter.flush(); fwriter.close(); @@ -150,6 +152,7 @@ public class MethodOverloadingTestCase e { fail("Output incorrect."); } + logData = logger.getLog(); } public void setupContext(Context context) @@ -179,53 +182,4 @@ public class MethodOverloadingTestCase e { return "String"; } - - - public void log(int level, String message) - { - String out = ""; - - /* - * Start with the appropriate prefix - */ - switch( level ) - { - case DEBUG_ID : - out = DEBUG_PREFIX; - break; - case INFO_ID : - out = INFO_PREFIX; - break; - case TRACE_ID : - out = TRACE_PREFIX; - break; - case WARN_ID : - out = WARN_PREFIX; - break; - case ERROR_ID : - out = ERROR_PREFIX; - break; - default : - out = INFO_PREFIX; - break; - } - - logData += "\n" + out + message; - } - - public void init( RuntimeServices rs ) - { - // do nothing with it - } - - public void log(int level, String message, Throwable t) - { - // ignore the Throwable, we're not testing this method here - log(level, message); - } - - public boolean isLevelEnabled(int level) - { - return true; - } } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java Mon Aug 31 21:06:34 2015 @@ -30,7 +30,7 @@ import junit.framework.TestSuite; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Load templates from the Classpath. @@ -128,7 +128,7 @@ public class MultiLoaderTestCase extends Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java Mon Aug 31 21:06:34 2015 @@ -31,7 +31,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; /** * Multiple paths in the file resource loader. @@ -91,7 +91,7 @@ public class MultipleFileResourcePathTes Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH2); Velocity.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java?rev=1700350&r1=1700349&r2=1700350&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java Mon Aug 31 21:06:34 2015 @@ -20,7 +20,7 @@ package org.apache.velocity.test; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogChute; +import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.VelocityContext; import org.apache.velocity.Template; @@ -191,7 +191,7 @@ public class ParseWithMacroLibsTestCase new Boolean(local)); ve.setProperty("file.resource.loader.cache", new Boolean(cache)); ve.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/parsemacros"); @@ -220,7 +220,7 @@ public class ParseWithMacroLibsTestCase Boolean.FALSE); ve1.setProperty("file.resource.loader.cache", Boolean.TRUE); ve1.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/parsemacros"); @@ -270,7 +270,7 @@ public class ParseWithMacroLibsTestCase Boolean.FALSE); ve1.setProperty("file.resource.loader.cache", Boolean.TRUE); ve1.setProperty( - Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName()); + Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/parsemacros");
