velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1780307 [1/6] - in /velocity/engine/trunk: ./ src/changes/ velocity-engine-core/ velocity-engine-core/src/main/java/org/apache/velocity/ velocity-engine-core/src/main/java/org/apache/velocity/app/ velocity-engine-core/src/main/java/org/apa...
Date Thu, 26 Jan 2017 01:57:03 GMT
Author: cbrisson
Date: Thu Jan 26 01:57:00 2017
New Revision: 1780307

URL: http://svn.apache.org/viewvc?rev=1780307&view=rev
Log:
[engine] fix trailing whitespaces

Modified:
    velocity/engine/trunk/README.md
    velocity/engine/trunk/pom.xml
    velocity/engine/trunk/src/changes/changes.xml
    velocity/engine/trunk/velocity-engine-core/pom.xml
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/FieldMethodizer.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandler.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/InvalidReferenceEventHandler.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/MethodExceptionEventHandler.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/InvalidReferenceInfo.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/Context.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapter.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalEventContext.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalHousekeepingContext.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalWrapperContext.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MathException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ResourceNotFoundException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/VelocityException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/Filter.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPool.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroManager.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/BlockMacro.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Break.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/DirectiveConstants.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/ForeachScope.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/InputBase.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/MacroParseException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/CharStream.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/TemplateParseException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirectiveAssign.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGENode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNENode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCache.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceFactory.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManager.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResource.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepository.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ContextAware.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/Pair.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/RuntimeServicesAware.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/SimplePool.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringBuilderWriter.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateBoolean.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateNumber.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateString.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ChainableUberspector.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/DeprecatedCheckUberspector.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Uberspect.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertyGet.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertySet.java
    velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
    velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/directive.properties
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArithmeticTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BlockMacroTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommentsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommonsExtPropTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/DefineTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExceptionTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ForeachTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/GetAsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MiscTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParserTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TestBaseTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TextblockTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocityAppTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity532TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity587TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity614TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity625TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity629TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity667TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity682TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity709TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity727TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity728TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity729TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity755TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity762TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity830TestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/GetPutObject.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectorTestObject.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/BoolObj.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/ForeachMethodCallHelper.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NullToStringObject.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NumberMethods.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Person.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java
    velocity/engine/trunk/velocity-engine-examples/src/etc/README.txt
    velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/README.txt
    velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/appendVELCP.bat
    velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/README.txt
    velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/appendVELCP.bat
    velocity/engine/trunk/velocity-engine-examples/src/etc/context_example/README.txt
    velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/README.txt
    velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/appendVELCP.bat
    velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java
    velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java
    velocity/engine/trunk/velocity-engine-examples/src/main/resources/dbtest.vm
    velocity/engine/trunk/velocity-engine-examples/src/main/resources/example.vm
    velocity/engine/trunk/velocity-engine-examples/src/main/resources/example2.vm
    velocity/engine/trunk/velocity-engine-examples/src/main/resources/velocity.properties
    velocity/engine/trunk/velocity-engine-examples/src/main/resources/xml.vm
    velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
    velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
    velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java
    velocity/engine/trunk/velocity-engine-scripting/src/test/resources/velocity.properties

Modified: velocity/engine/trunk/README.md
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/README.md?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/README.md (original)
+++ velocity/engine/trunk/README.md Thu Jan 26 01:57:00 2017
@@ -14,7 +14,7 @@ Here's a description of the top level di
     velocity-engine-examples/   Several simple examples
     velocity-engine-scripting/  JSR-223 implementation for Velocity scripting
     src/                        Source for parent modules, mainly changelog
-            
+
 ## REQUIREMENTS
 
 Apache Velocity will run with any Java runtime engine v1.7 or greater.

Modified: velocity/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Thu Jan 26 01:57:00 2017
@@ -59,7 +59,7 @@
       </properties>
     </profile>
   </profiles>
-  
+
   <build>
     <defaultGoal>install</defaultGoal>
     <pluginManagement>

Modified: velocity/engine/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/src/changes/changes.xml (original)
+++ velocity/engine/trunk/src/changes/changes.xml Thu Jan 26 01:57:00 2017
@@ -42,7 +42,7 @@
       <action type="add" dev="cbrisson">
          Default encoding is now UTF-8.
       </action>
-        
+
       <action type="add" dev="cbrisson">
           Make Velocity use the base logger namespace 'org.apache.velocity' unless specified with runtime.log.name in the configuration, and have the runtime instance log with this base namespace, and other modules log with children namespaces:
           <ul>
@@ -55,11 +55,11 @@
           </ul>
           Get rid of UberspectLoggable interface.
       </action>
-        
+
       <action type="add" dev="cbrisson">
 	      Added unary negate math operator
       </action>
-      
+
       <action type="add" dev="cbrisson">
         Add a configurable space gobbling feature, to control indentation in the generated code.
         <br/>
@@ -87,115 +87,115 @@
       <action type="fix" dev="cbrisson" issue="VELOCITY-843">
         support $array.empty, as for $list.empty
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-833" due-to="Jarkko Viinamäki">
         avoid useless string calculation in ASTStringLiteral
       </action>
-      
+
       <action type="add" dev="cbrisson">
         nicified AST tree debug output
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-830">
         fix parsing of $obj._method()
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-827" due-to="Dawid Weiss">
         loading default properties should not prepend '/' and should use classloader to get resource stream
       </action>
-      
+
       <action type="add" dev="cbrisson" issue="VELOCITY-825">
          Allow conversion of method args from String to Enum constant
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-815" due-to="Oswaldo Hernandez">
         Applied performance patch for MapGetExecutor: it's faster to directly use object
         instance rather than to inspect all public interfaces
       </action>
-      
+
       <action type="add" dev="cbrisson" issue="VELOCITY-799">
         The new configuration property context.autoreference.key, if present, allows to specify the name
         of the reference under which the context is accessible in itself
       </action>
-      
+
       <action type="add" dev="cbrisson" issue="VELOCITY-746">
         MethodExceptionEventHandler now provide template location infos
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-797" due-to="Jarkko Viinamäki">
         Attach macros to their defining template. Also fixes VELOCITY-776. Thanks to Simon Kitching for the multithreading testcase.
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-820" due-to="Robert Fuller">
         have #foreach honnor the Closeable interface on the iterator
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-804" due-to="Felipe Maschio">
         Don't leave 'initializing' to true if a problem occurs during initialization.
       </action>
-      
+
       <action type="add" dev="cbrisson" issue="VELOCITY-790">
         Remove dependency upon commons-collections-3 (except at compile-time for deprecated methods and classes
         which are needed for backward compatibility), use our own ExtProperties object.
       </action>
-      
+
       <action type="add" dev="cbrisson" issue="VELOCITY-735" due-to="Dishara Wijewardana">
         Add a first implementation for the JSR 223 standard scripting interface.
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-809">
         Fix Template default encoding initialization problem.
       </action>
-      
+
       <action type="add" dev="cbrisson" issue="VELOCITY-793">
         The ResourceLoader API now provides a Reader rather than an InputStream.
         Also fixes VELOCITY-599.
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-553">
         InvalidReferenceHandler events should not be triggered by quiet references, null values,
         or by references testing inside #if / #elseif. Thanks to Renato Steiner
         for his testcase.
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-266">
         Take advantage of the major version jump to enforce String keys
         in internal Context API
       </action>
-      
+
       <action type="fix" dev="sdimitriu" issue="VELOCITY-863" due-to="Mike Kienenberger">
         Fix regression: #set&lt;tab&gt;left-paren no longer valid grammar
         Patch from Mike Kienenberger applied + added test
       </action>
-      
+
       <action type="add" dev="cbrisson">
         switch to slf4j logging facade
       </action>
-      
+
       <action type="fix" dev="cbrisson">
         fix parser for '$map{key}' text rendering (StackOverflow 32805217)
       </action>
-      
+
       <action type="fix" dev="sdimitriu" issue="VELOCITY-869">
         Vulnerability in dependency: commons-collections: 3.2.1
       </action>
-      
+
       <action type="fix" dev="sdimitriu" issue="VELOCITY-870">
         Exception displayed when trying to loop over an Iterable private class
       </action>
-      
+
       <action type="fix" dev="sdimitriu" issue="VELOCITY-871">
         #foreach should work over any Iterable class
       </action>
-      
+
       <action type="fix" dev="sdimitriu">
         Catch exceptions raised during chainable uberspector initialization
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-542">
         Hypen is no more allowed in variable names
       </action>
-      
+
       <action type="add" dev="cbrisson" issue="VELOCITY-706">
         Method arguments can now be expressions
       </action>
@@ -259,16 +259,16 @@
 	  Add ability to specify default values for macro parameters, e.g.;
 	  #macro(foo bar=1)
 	</action>
-      
+
         <action type="add" dev="byron" issue="VELOCITY-695">
 	  Add ability to place line comments next to macro parameter definitions.
 	</action>
-      
+
         <action type="add" dev="byron" issue="VELOCITY-690">
 	  Block directives no longer require parenthesis so #@foo #end is now allowed.
 	  Also, brackets now work with Block Macros so #{@foo}bar#end works.
 	</action>
-      
+
         <action type="fix" dev="nbubna">
           Removed all deprecations (Anakia, Texen, VelocityServlet, etc.)
         </action>
@@ -413,7 +413,7 @@
 	the exception and render nothing then the reference can be
 	preceeded with '$!' as in $!foo.
       </action>
-      
+
       <action type="add" dev="byron"  issue="VELOCITY-673">
 	The non default VelocityEngine construtors now do not initialize the runtime
 	system so that properties may be set after construction.  Also fixes an
@@ -429,7 +429,7 @@
 	slash before a reference or macro always escapes the reference or macro and
 	absorbs the forward slash regardless if the reference or macro is defined.
       </action>
-      
+
       <action type="fix" dev="nbubna" issue="VELOCITY-676" due-to="Jarkko Viinamäki">
         Fix StringIndexOutOfBoundsException caused by #[[##x]]# (line comment on
         same line as end of textblock).
@@ -442,7 +442,7 @@
       <action type="add" dev="byron" issue="VELOCITY-668" due-to="Jarkko Viinamäki">
 	Minor performance tweaks based on Findbugs findings
       </action>
-      
+
       <action type="fix" dev="byron" issue="VELOCITY-667">
 	Pre 1.6 behavior of specifying #macro without parenthesis
 	would throw a VelocityException has been restored.
@@ -467,20 +467,20 @@
 	Also addresses a performance bottleneck detected in the old implementation.
 	#stop is a general use directive now, and not just for debugging.
       </action>
-      
+
       <action type="add" dev="byron" issue="VELOCITY-662">
 	Reduce performance bottleneck with the referenceInsert event handler call
       </action>
-      
+
       <action type="add" dev="byron" issue="VELOCITY-656">
 	Better error reporting when toString() throw an exception when testing
 	an #if conditional. For example #if($foo)
       </action>
-      
+
       <action type="add" dev="byron" issue="VELOCITY-406">
  	  Added bracketed index syntax, $foo[0], or #set($foo[0] = 1)
       </action>
-      
+
       <action type="add" dev="byron" issue="VELOCITY-659">
           Removed java.lang.Exception from throws clause of Velocity
           and VelocityEngine API. Also removed IOException so that all
@@ -557,7 +557,7 @@
          Pre 1.6 behavior of specifying #macro without parenthesis
          would throw a VelocityException has been restored.
       </action>
-      
+
       <action type="add" dev="byron" issue="VELOCITY-656">
      Better error reporting when toString() throw an exception
      when testing an #if conditional. For example #if($foo)
@@ -571,7 +571,7 @@
           Throw an exception in strict mode when >=, &lt;=, &lt; or >
           comparisons can't be made.
       </action>
-      
+
       <action type="fix" dev="cbrisson" issue="VELOCITY-657">
           Fix $velocityHasNext so it is not always true.
       </action>
@@ -758,7 +758,7 @@
       </action>
 
       <action type="fix" dev="wglass" issue="VELOCITY-566" due-to="Etienne Massip">
-          Prevent exception due to simultaneous rendering of macros.  
+          Prevent exception due to simultaneous rendering of macros.
       </action>
 
       <action type="add" dev="nbubna" issue="VELOCITY-533" due-to="Christopher Schultz">
@@ -770,7 +770,7 @@
       </action>
 
       <action type="fix" dev="wglass" issue="VELOCITY-536" due-to="Lei Gu, Dima Tkach">
-          Prevent NPE when template is parsed simultaneously by multiple users.  (may apply only to macros).  
+          Prevent NPE when template is parsed simultaneously by multiple users.  (may apply only to macros).
       </action>
 
       <action type="fix" dev="wglass" issue="VELOCITY-362" due-to="Supun Kamburugamuva">
@@ -825,7 +825,7 @@
       <action type="update" dev="wglass">
         Deprecate integrated texen and anakia, factor it out into separate jars.
       </action>
- 
+
       <action type="add" dev="wglass" issue="VELOCITY-509">
         Added new directive #evaluate() to dynamically evaluate VTL.
       </action>
@@ -844,7 +844,7 @@
       </action>
 
     </release>
-    
+
     <release version="1.5-beta2" date="2006-11-24">
 
       <action type="add" dev="henning" issue="VELOCITY-183" due-to="Eelco Hillenius">
@@ -889,7 +889,7 @@
       </action>
 
       <action type="fix" dev="henning" issue="VELOCITY-449" due-to="Alexey Panchenko">
-    Add an additional pair of Executors that are smart about Map. 
+    Add an additional pair of Executors that are smart about Map.
       </action>
 
       <action type="fix" dev="wglass" issue="VELOCITY-453" due-to="Alexey Panchenko">
@@ -897,7 +897,7 @@
       </action>
 
       <action type="fix" dev="wglass" issue="VELOCITY-459" due-to="Stephen Haberman">
-    Change the meaning of localscope for macros to allow access to references from 
+    Change the meaning of localscope for macros to allow access to references from
     calling context.
       </action>
 

Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Thu Jan 26 01:57:00 2017
@@ -116,10 +116,10 @@
           <nodeUsesParser>true</nodeUsesParser>
           <nodePackage>org.apache.velocity.runtime.parser.node</nodePackage>
           <sourceDirectory>${basedir}/src/main/parser</sourceDirectory>
-<!--          
+<!--
           <interimDirectory>${basedir}/src/main/java</interimDirectory>
           <outputDirectory>${basedir}/src/main/java</outputDirectory>
--->          
+-->
         </configuration>
       </plugin>
     </plugins>

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java Thu Jan 26 01:57:00 2017
@@ -82,7 +82,7 @@ public class Template extends Resource
     public Template()
     {
         super();
-        
+
         setType(ResourceManager.RESOURCE_TEMPLATE);
     }
 
@@ -185,7 +185,7 @@ public class Template extends Resource
                     if (errorCondition == null)
                     {
                          throw new VelocityException(e);
-                    }                    
+                    }
                 }
             }
         }
@@ -264,7 +264,7 @@ public class Template extends Resource
         merge(context, writer, null);
     }
 
-    
+
     /**
      * The AST node structure is merged with the
      * context to produce the final output.
@@ -339,7 +339,7 @@ public class Template extends Resource
                                                     (String)macroLibraries.get(i), pe.getMessage(), pe);
                         throw pe;
                     }
-                    
+
                     catch (Exception e)
                     {
                         throw new RuntimeException("Template.merge(): parse failed in template  " +

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.context.AbstractContext;
@@ -183,5 +183,5 @@ public class VelocityContext extends Abs
         {
         }
         return clone;
-    }    
+    }
 }

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/FieldMethodizer.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/FieldMethodizer.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/FieldMethodizer.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/FieldMethodizer.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.util.ClassUtils;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.context.Context;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandler.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandler.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandler.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandler.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
@@ -39,12 +39,12 @@ import java.util.Iterator;
  * @since 1.5
  */
 public class EventHandlerUtil {
-    
-    
+
+
     /**
      * Called before a reference is inserted. All event handlers are called in
      * sequence. The default implementation inserts the reference as is.
-     * 
+     *
      * This is a major hotspot method called by ASTReference render.
      *
      * @param reference reference from template about to be inserted
@@ -124,7 +124,7 @@ public class EventHandlerUtil {
         /* default behaviour is to re-throw exception */
         throw e;
     }
-    
+
     /**
      * Called when an include-type directive is encountered (#include or
      * #parse). All the registered event handlers are called unless null is
@@ -169,11 +169,11 @@ public class EventHandlerUtil {
             throw new VelocityException("Exception in event handler.",e);
         }
     }
-   
+
 
     /**
      * Called when an invalid get method is encountered.
-     * 
+     *
      * @param rsvc current instance of RuntimeServices
      * @param context the context when the reference was found invalid
      * @param reference complete invalid reference
@@ -183,7 +183,7 @@ public class EventHandlerUtil {
      * @return substitute return value for missing reference, or null if no substitute
      */
     public static Object invalidGetMethod(RuntimeServices rsvc,
-            InternalContextAdapter context, String reference, 
+            InternalContextAdapter context, String reference,
             Object object, String property, Info info)
     {
         try
@@ -209,7 +209,7 @@ public class EventHandlerUtil {
 
    /**
      * Called when an invalid set method is encountered.
-     * 
+     *
      * @param rsvc current instance of RuntimeServices
      * @param context the context when the reference was found invalid
      * @param leftreference left reference being assigned to
@@ -217,7 +217,7 @@ public class EventHandlerUtil {
      * @param info contains info on template, line, col
      */
     public static void invalidSetMethod(RuntimeServices rsvc,
-            InternalContextAdapter context, String leftreference, 
+            InternalContextAdapter context, String leftreference,
             String rightreference, Info info)
     {
         try
@@ -241,10 +241,10 @@ public class EventHandlerUtil {
             throw new VelocityException("Exception in event handler.",e);
         }
     }
-    
+
     /**
      * Called when an invalid method is encountered.
-     * 
+     *
      * @param rsvc current instance of RuntimeServices
      * @param context the context when the reference was found invalid
      * @param reference complete invalid reference

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java Thu Jan 26 01:57:00 2017
@@ -19,7 +19,7 @@ import org.apache.velocity.util.ContextA
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/InvalidReferenceEventHandler.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/InvalidReferenceEventHandler.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/InvalidReferenceEventHandler.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/InvalidReferenceEventHandler.java Thu Jan 26 01:57:00 2017
@@ -16,17 +16,17 @@ package org.apache.velocity.app.event;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.context.Context;
 import org.apache.velocity.util.introspection.Info;
 
 /**
- * Event handler called when an invalid reference is encountered.  Allows 
+ * Event handler called when an invalid reference is encountered.  Allows
  * the application to report errors or substitute return values. May be chained
  * in sequence; the behavior will differ per method.
- * 
+ *
  * <p>This feature should be regarded as experimental.
  *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
@@ -35,14 +35,14 @@ import org.apache.velocity.util.introspe
  */
 public interface InvalidReferenceEventHandler extends EventHandler
 {
-    
+
     /**
-     * Called when object is null or there is no getter for the given 
-     * property.  Also called for invalid references without properties.  
+     * Called when object is null or there is no getter for the given
+     * property.  Also called for invalid references without properties.
      * invalidGetMethod() will be called in sequence for
      * each link in the chain until the first non-null value is
      * returned.
-     * 
+     *
      * @param context the context when the reference was found invalid
      * @param reference string with complete invalid reference
      * @param object the object referred to, or null if not found
@@ -50,32 +50,32 @@ public interface InvalidReferenceEventHa
      * @param info contains template, line, column details
      * @return substitute return value for missing reference, or null if no substitute
      */
-    public Object invalidGetMethod(Context context, String reference, 
+    public Object invalidGetMethod(Context context, String reference,
             Object object, String property, Info info);
 
     /**
-     * Called when object is null or there is no setter for the given 
+     * Called when object is null or there is no setter for the given
      * property.  invalidSetMethod() will be called in sequence for
      * each link in the chain until a true value is returned.  It's
      * recommended that false be returned as a default to allow
      * for easy chaining.
-     * 
+     *
      * @param context the context when the reference was found invalid
      * @param leftreference left reference being assigned to
      * @param rightreference invalid reference on the right
      * @param info contains info on template, line, col
-     * 
-     * @return if true then stop calling invalidSetMethod along the 
+     *
+     * @return if true then stop calling invalidSetMethod along the
      * chain.
      */
-    public boolean invalidSetMethod(Context context, String leftreference, 
+    public boolean invalidSetMethod(Context context, String leftreference,
             String rightreference, Info info);
 
     /**
      * Called when object is null or the given method does not exist.
-     * invalidMethod() will be called in sequence for each link in 
-     * the chain until the first non-null value is returned. 
-     * 
+     * invalidMethod() will be called in sequence for each link in
+     * the chain until the first non-null value is returned.
+     *
      * @param context the context when the reference was found invalid
      * @param reference string with complete invalid reference
      * @param object the object referred to, or null if not found
@@ -83,6 +83,6 @@ public interface InvalidReferenceEventHa
      * @param info contains template, line, column details
      * @return substitute return value for missing reference, or null if no substitute
      */
-    public Object invalidMethod(Context context, String reference,  
+    public Object invalidMethod(Context context, String reference,
             Object object, String method, Info info);
 }

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/MethodExceptionEventHandler.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/MethodExceptionEventHandler.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/MethodExceptionEventHandler.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/MethodExceptionEventHandler.java Thu Jan 26 01:57:00 2017
@@ -20,7 +20,7 @@ import org.apache.velocity.util.introspe
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.context.Context;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java Thu Jan 26 01:57:00 2017
@@ -21,7 +21,7 @@ package org.apache.velocity.app.event.im
 
 /**
  * Escapes the characters in a String to be suitable to pass to an SQL query.
- * 
+ *
  * @author wglass
  * @since 1.5
  */

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event.im
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.IncludeEventHandler;
@@ -43,9 +43,9 @@ import org.slf4j.LoggerFactory;
  * </PRE>
  * </code>
  * </p><p>
- * The name of the missing resource is put into the Velocity context, under the 
- * key "missingResource", so that the "notfound" template can report the missing 
- * resource with a Velocity reference, like: 
+ * The name of the missing resource is put into the Velocity context, under the
+ * key "missingResource", so that the "notfound" template can report the missing
+ * resource with a Velocity reference, like:
  * <code>$missingResource</code>
  * </p>
  *
@@ -67,7 +67,7 @@ public class IncludeNotFound implements
      * Check to see if included file exists, and display "not found" page if it
      * doesn't. If "not found" page does not exist, log an error and return
      * null.
-     * 
+     *
      * @param includeResourcePath
      * @param currentResourcePath
      * @param directiveName
@@ -115,9 +115,9 @@ public class IncludeNotFound implements
          notfound = StringUtils.nullTrim(rs.getString(PROPERTY_NOT_FOUND, DEFAULT_NOT_FOUND));
     }
 
-    /** 
+    /**
      * @see org.apache.velocity.util.ContextAware#setContext(org.apache.velocity.context.Context)
-     */ 
+     */
     public void setContext(Context context)
     {
         this.context = context;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event.im
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.IncludeEventHandler;
@@ -35,7 +35,7 @@ public class IncludeRelativePath impleme
 
     /**
      * Return path relative to the current template's path.
-     * 
+     *
      * @param includeResourcePath  the path as given in the include directive.
      * @param currentResourcePath the path of the currently rendering template that includes the
      *            include directive.

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/InvalidReferenceInfo.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/InvalidReferenceInfo.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/InvalidReferenceInfo.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/InvalidReferenceInfo.java Thu Jan 26 01:57:00 2017
@@ -16,15 +16,15 @@ package org.apache.velocity.app.event.im
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.util.introspection.Info;
 
 /**
- * Convenience class to use when reporting out invalid syntax 
+ * Convenience class to use when reporting out invalid syntax
  * with line, column, and template name.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain </a>
  * @version $Id$
  * @since 1.5
@@ -32,11 +32,11 @@ import org.apache.velocity.util.introspe
 public class InvalidReferenceInfo extends Info
 {
     private String invalidReference;
-    
+
     public InvalidReferenceInfo(String invalidReference, Info info)
     {
         super(info.getTemplateName(),info.getLine(),info.getColumn());
-        this.invalidReference = invalidReference; 
+        this.invalidReference = invalidReference;
     }
 
     /**
@@ -47,8 +47,8 @@ public class InvalidReferenceInfo extend
     {
         return invalidReference;
     }
-    
-    
+
+
 
     /**
      * Formats a textual representation of this object as <code>SOURCE

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event.im
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.MethodExceptionEventHandler;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.app.event.im
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.InvalidReferenceEventHandler;
@@ -30,41 +30,41 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Use this event handler to flag invalid references.  Since this 
+ * Use this event handler to flag invalid references.  Since this
  * is intended to be used for a specific request, this should be
  * used as a local event handler attached to a specific context
  * instead of being globally defined in the Velocity properties file.
- * 
+ *
  * <p>
  * Note that InvalidReferenceHandler can be used
  * in two modes.  If the Velocity properties file contains the following:
  * <pre>
  * eventhandler.invalidreference.exception = true
  * </pre>
- * then the event handler will throw a ParseErrorRuntimeException upon 
- * hitting the first invalid reference.  This stops processing and is 
+ * then the event handler will throw a ParseErrorRuntimeException upon
+ * hitting the first invalid reference.  This stops processing and is
  * passed through to the application code.  The ParseErrorRuntimeException
  * contain information about the template name, line number, column number,
  * and invalid reference.
- * 
+ *
  * <p>
- * If this configuration setting is false or omitted then the page 
+ * If this configuration setting is false or omitted then the page
  * will be processed as normal, but all invalid references will be collected
  * in a List of InvalidReferenceInfo objects.
- * 
+ *
  * <p>This feature should be regarded as experimental.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
  * @version $Id$
  * @since 1.5
  */
-public class ReportInvalidReferences implements 
+public class ReportInvalidReferences implements
     InvalidReferenceEventHandler, RuntimeServicesAware
 {
 
     public static final String EVENTHANDLER_INVALIDREFERENCE_EXCEPTION = "eventhandler.invalidreference.exception";
-    
-    /** 
+
+    /**
      * List of InvalidReferenceInfo objects
      */
     List invalidReferences = new ArrayList();
@@ -73,8 +73,8 @@ public class ReportInvalidReferences imp
      * If true, stop at the first invalid reference and throw an exception.
      */
     private boolean stopOnFirstInvalidReference = false;
-    
-       
+
+
     /**
      * Collect the error and/or throw an exception, depending on configuration.
      *
@@ -86,7 +86,7 @@ public class ReportInvalidReferences imp
      * @return always returns null
      * @throws ParseErrorException
      */
-    public Object invalidGetMethod(Context context, String reference, Object object, 
+    public Object invalidGetMethod(Context context, String reference, Object object,
             String property, Info info)
     {
         reportInvalidReference(reference, info);
@@ -104,7 +104,7 @@ public class ReportInvalidReferences imp
      * @return always returns null
      * @throws ParseErrorException
      */
-    public Object invalidMethod(Context context, String reference, Object object, 
+    public Object invalidMethod(Context context, String reference, Object object,
             String method, Info info)
     {
         if (reference == null)
@@ -135,9 +135,9 @@ public class ReportInvalidReferences imp
 
 
     /**
-     * Check for an invalid reference and collect the error or throw an exception 
+     * Check for an invalid reference and collect the error or throw an exception
      * (depending on configuration).
-     * 
+     *
      * @param reference the invalid reference
      * @param info line, column, template name
      */
@@ -145,7 +145,7 @@ public class ReportInvalidReferences imp
     {
         InvalidReferenceInfo invalidReferenceInfo = new InvalidReferenceInfo(reference, info);
         invalidReferences.add(invalidReferenceInfo);
-        
+
         if (stopOnFirstInvalidReference)
         {
             throw new ParseErrorException(
@@ -164,7 +164,7 @@ public class ReportInvalidReferences imp
     {
         return invalidReferences;
     }
-    
+
 
     /**
      * Called automatically when event cartridge is initialized.
@@ -174,7 +174,7 @@ public class ReportInvalidReferences imp
     {
         stopOnFirstInvalidReference = rs.getConfiguration().getBoolean(
                 EVENTHANDLER_INVALIDREFERENCE_EXCEPTION,
-                false);        
+                false);
     }
-    
+
 }

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -225,7 +225,7 @@ public abstract class AbstractContext ex
         {
             exists = innerContext.containsKey(key);
         }
-        
+
         return exists;
     }
 
@@ -267,6 +267,3 @@ public abstract class AbstractContext ex
     }
 
 }
-
-
-

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.EventCartridge;
@@ -43,7 +43,7 @@ public abstract class ChainedInternalCon
 {
     /** the parent context */
     protected InternalContextAdapter wrappedContext = null;
-    
+
     /**
      * CTOR, wraps an ICA
      * @param inner context
@@ -52,7 +52,7 @@ public abstract class ChainedInternalCon
     {
         wrappedContext = inner;
     }
-    
+
     /**
      * Return the inner / user context.
      * @return The inner / user context.
@@ -215,7 +215,7 @@ public abstract class ChainedInternalCon
     {
         wrappedContext.setMacroLibraries(macroLibraries);
     }
-    
+
     /**
      * @see org.apache.velocity.context.InternalHousekeepingContext#getMacroLibraries()
      */

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/Context.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/Context.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/Context.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/Context.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapter.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapter.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapter.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapter.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.EventCartridge;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.EventCartridge;
@@ -254,5 +254,3 @@ class InternalContextBase implements Int
         return eventCartridge;
     }
 }
-
-

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalEventContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalEventContext.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalEventContext.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalEventContext.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.app.event.EventCartridge;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalHousekeepingContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalHousekeepingContext.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalHousekeepingContext.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalHousekeepingContext.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import org.apache.velocity.runtime.resource.Resource;

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalWrapperContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalWrapperContext.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalWrapperContext.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalWrapperContext.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.context;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -27,7 +27,7 @@ package org.apache.velocity.context;
  */
 public interface InternalWrapperContext
 {
-    
+
     /**
      * Returns the wrapped user context.
      * @return The wrapped user context.
@@ -45,15 +45,15 @@ public interface InternalWrapperContext
      * Retrieve the specified key value pair from the given scope.
      */
     Object put(String key, Object value);
-    
+
     /**
      * Place key value pair into the context of the specified scope.
      */
     Object get(String key);
-    
+
     /**
      * Tests if the key exists in the specified scope
      */
     boolean containsKey(String key);
-        
+
 }

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java Thu Jan 26 01:57:00 2017
@@ -16,7 +16,7 @@ package org.apache.velocity.exception;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MathException.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MathException.java?rev=1780307&r1=1780306&r2=1780307&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MathException.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MathException.java Thu Jan 26 01:57:00 2017
@@ -16,11 +16,11 @@ package org.apache.velocity.exception;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
- * Separate exception class to distinguish math problems.   
+ * Separate exception class to distinguish math problems.
  *
  * @author Nathan Bubna
  * @since 1.6



Mime
View raw message