Author: cbrisson Date: Thu Jan 26 02:28:46 2017 New Revision: 1780314 URL: http://svn.apache.org/viewvc?rev=1780314&view=rev Log: [engine] remove unused imports
Modified: 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/MethodExceptionEventHandler.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.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/runtime/VelocimacroFactory.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/Directive.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/Include.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/Parse.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.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/node/ASTComment.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/ASTEscapedDirective.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/SimpleNode.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/util/StringResourceRepositoryImpl.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/introspection/IntrospectorCache.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/UberspectImpl.java velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.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/StrictReferenceTestCase.java velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.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/util/introspection/ConversionHandlerTestCase.java velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java 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/Example2.java velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.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/java/org/apache/velocity/script/test/tools/EventToolTest.java 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=1780314&r1=1780313&r2=1780314&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 02:28:46 2017 @@ -24,8 +24,6 @@ import org.apache.velocity.exception.Vel import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.introspection.Info; -import java.util.Iterator; - /** * Calls on request all registered event handlers for a particular event. Each 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=1780314&r1=1780313&r2=1780314&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 02:28:46 2017 @@ -1,7 +1,6 @@ package org.apache.velocity.app.event; import org.apache.velocity.context.Context; -import org.apache.velocity.util.ContextAware; /* * Licensed to the Apache Software Foundation (ASF) under one 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=1780314&r1=1780313&r2=1780314&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 02:28:46 2017 @@ -1,7 +1,6 @@ package org.apache.velocity.app.event; import org.apache.velocity.context.Context; -import org.apache.velocity.util.ContextAware; import org.apache.velocity.util.introspection.Info; /* Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java Thu Jan 26 02:28:46 2017 @@ -21,13 +21,11 @@ package org.apache.velocity.app.event.im import org.apache.velocity.app.event.ReferenceInsertionEventHandler; import org.apache.velocity.context.Context; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.RuntimeServicesAware; import org.apache.velocity.util.StringUtils; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.regex.PatternSyntaxException; 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=1780314&r1=1780313&r2=1780314&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 02:28:46 2017 @@ -21,14 +21,12 @@ package org.apache.velocity.app.event.im import org.apache.velocity.app.event.IncludeEventHandler; import org.apache.velocity.context.Context; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.ContextAware; import org.apache.velocity.util.RuntimeServicesAware; import org.apache.velocity.util.StringUtils; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Simple event handler that checks to see if an included page is available. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java Thu Jan 26 02:28:46 2017 @@ -28,7 +28,6 @@ import org.apache.velocity.runtime.direc import org.apache.velocity.runtime.parser.node.Node; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.HashMap; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java Thu Jan 26 02:28:46 2017 @@ -25,9 +25,9 @@ import org.apache.velocity.exception.Vel import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.util.StringUtils; import java.io.Writer; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java Thu Jan 26 02:28:46 2017 @@ -32,7 +32,6 @@ import org.apache.velocity.runtime.parse import org.apache.velocity.runtime.parser.node.Node; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.Writer; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java Thu Jan 26 02:28:46 2017 @@ -27,8 +27,8 @@ import org.apache.velocity.exception.Res import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.node.SimpleNode; import org.apache.velocity.util.introspection.Info; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java Thu Jan 26 02:28:46 2017 @@ -25,10 +25,10 @@ import org.apache.velocity.exception.Vel import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.ASTReference; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.node.SimpleNode; import org.apache.velocity.util.StringUtils; import org.apache.velocity.util.introspection.Info; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java Thu Jan 26 02:28:46 2017 @@ -27,8 +27,8 @@ import org.apache.velocity.exception.Tem import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.util.StringUtils; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java Thu Jan 26 02:28:46 2017 @@ -23,9 +23,9 @@ import org.apache.velocity.context.Inter import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import java.io.IOException; import java.io.Writer; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java Thu Jan 26 02:28:46 2017 @@ -30,9 +30,9 @@ import org.apache.velocity.exception.Vel import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.node.SimpleNode; import org.apache.velocity.util.StringUtils; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java Thu Jan 26 02:28:46 2017 @@ -30,10 +30,10 @@ import org.apache.velocity.runtime.Rende import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeConstants.SpaceGobbling; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.ASTDirective; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.util.StringUtils; import java.io.IOException; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java Thu Jan 26 02:28:46 2017 @@ -24,10 +24,10 @@ import org.apache.velocity.runtime.Runti import org.apache.velocity.runtime.directive.Foreach; import org.apache.velocity.runtime.directive.MacroParseException; import org.apache.velocity.runtime.parser.ParseException; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.ASTReference; import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import java.io.IOException; import java.io.Writer; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java Thu Jan 26 02:28:46 2017 @@ -23,7 +23,6 @@ import org.apache.velocity.context.Inter 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.parser.Parser; import org.apache.velocity.runtime.parser.Token; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java Thu Jan 26 02:28:46 2017 @@ -24,7 +24,6 @@ import org.apache.velocity.exception.Met import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.TemplateInitException; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.parser.Parser; import java.io.IOException; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java Thu Jan 26 02:28:46 2017 @@ -20,15 +20,12 @@ package org.apache.velocity.runtime.pars */ import org.apache.velocity.context.InternalContextAdapter; +import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.runtime.parser.Parser; import java.io.IOException; import java.io.Writer; -import org.apache.velocity.context.InternalContextAdapter; -import org.apache.velocity.exception.TemplateInitException; -import org.apache.velocity.runtime.parser.Parser; - /** * This class is responsible for handling EscapedDirectives * in VTL. 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -19,7 +19,6 @@ package org.apache.velocity.runtime.pars * under the License. */ -import org.apache.velocity.exception.VelocityException; import org.slf4j.Logger; import java.lang.reflect.Method; 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -25,14 +25,12 @@ import org.apache.velocity.exception.Met import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.TemplateInitException; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.util.StringUtils; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.Writer; 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -22,8 +22,8 @@ package org.apache.velocity.runtime.reso import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeServices; + import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -29,7 +29,6 @@ import org.apache.velocity.runtime.resou import org.apache.velocity.util.ExtProperties; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java Thu Jan 26 02:28:46 2017 @@ -20,7 +20,6 @@ package org.apache.velocity.runtime.reso */ import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.StringResourceLoader; import java.util.Collections; import java.util.HashMap; 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -23,15 +23,7 @@ import org.apache.velocity.runtime.direc import org.apache.velocity.runtime.parser.node.Node; import org.apache.velocity.util.introspection.Info; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileReader; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Hashtable; import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; /** * This class provides some methods for dynamically Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java Thu Jan 26 02:28:46 2017 @@ -19,7 +19,6 @@ package org.apache.velocity.util.introsp * under the License. */ -import org.apache.commons.lang3.Conversion; import org.slf4j.Logger; import java.util.HashMap; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java Thu Jan 26 02:28:46 2017 @@ -20,8 +20,6 @@ package org.apache.velocity.util.introsp */ import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.util.RuntimeServicesAware; import java.util.Iterator; 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -31,14 +31,13 @@ import org.apache.velocity.runtime.parse import org.apache.velocity.runtime.parser.node.PutExecutor; import org.apache.velocity.runtime.parser.node.SetExecutor; import org.apache.velocity.runtime.parser.node.SetPropertyExecutor; -import org.apache.velocity.runtime.resource.ResourceManager; import org.apache.velocity.util.ArrayIterator; import org.apache.velocity.util.ArrayListWrapper; import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.EnumerationIterator; import org.apache.velocity.util.RuntimeServicesAware; + import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -27,7 +27,6 @@ import org.apache.velocity.runtime.Runti import org.apache.velocity.runtime.resource.loader.StringResourceLoader; import org.apache.velocity.runtime.resource.util.StringResourceRepository; import org.apache.velocity.test.misc.TestLogger; -import org.apache.velocity.util.StringUtils; import java.io.File; import java.io.FileReader; 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=1780314&r1=1780313&r2=1780314&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 Thu Jan 26 02:28:46 2017 @@ -22,7 +22,6 @@ package org.apache.velocity.test; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.introspection.Introspector; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java Thu Jan 26 02:28:46 2017 @@ -21,7 +21,6 @@ package org.apache.velocity.test; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.util.introspection.Introspector; import java.lang.reflect.Method; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java Thu Jan 26 02:28:46 2017 @@ -21,7 +21,6 @@ package org.apache.velocity.test; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.introspection.Introspector; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java Thu Jan 26 02:28:46 2017 @@ -24,8 +24,6 @@ import org.apache.velocity.exception.Met import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.StringResourceLoader; -import org.apache.velocity.test.misc.TestLogger; /** * Test strict reference mode turned on by the velocity property Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java Thu Jan 26 02:28:46 2017 @@ -19,13 +19,14 @@ package org.apache.velocity.test.eventha * under the License. */ -import java.util.Locale; import org.apache.velocity.app.event.IncludeEventHandler; import org.apache.velocity.app.event.MethodExceptionEventHandler; import org.apache.velocity.app.event.ReferenceInsertionEventHandler; import org.apache.velocity.context.Context; import org.apache.velocity.util.introspection.Info; +import java.util.Locale; + /** * This is a test set of event handlers, used to test event handler sequences. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java Thu Jan 26 02:28:46 2017 @@ -25,7 +25,6 @@ import org.apache.velocity.runtime.Runti import org.apache.velocity.runtime.resource.loader.StringResourceLoader; import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.test.misc.TestLogger; -import org.apache.velocity.util.ExtProperties; import java.io.FileReader; import java.io.StringWriter; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java Thu Jan 26 02:28:46 2017 @@ -28,7 +28,6 @@ import org.apache.velocity.context.Conte import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeInstance; import org.apache.velocity.test.BaseTestCase; -import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.introspection.ConversionHandler; import org.apache.velocity.util.introspection.ConversionHandlerImpl; import org.apache.velocity.util.introspection.Converter; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java Thu Jan 26 02:28:46 2017 @@ -26,14 +26,9 @@ import org.apache.velocity.app.Velocity; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.test.misc.TestLogger; -import org.apache.velocity.util.introspection.AbstractChainableUberspector; -import org.apache.velocity.util.introspection.Info; -import org.apache.velocity.util.introspection.UberspectImpl; -import org.apache.velocity.util.introspection.VelPropertyGet; -import org.apache.velocity.util.introspection.VelPropertySet; + import java.io.StringWriter; -import java.util.ArrayList; /** * Tests DeprecatedCheckUberspector Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java Thu Jan 26 02:28:46 2017 @@ -22,13 +22,8 @@ package org.apache.velocity.test.util.in import junit.framework.Test; import junit.framework.TestSuite; import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.test.BaseTestCase; -import org.apache.velocity.test.misc.TestLogger; - -import java.io.StringWriter; /** * Tests DeprecatedCheckUberspector Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java Thu Jan 26 02:28:46 2017 @@ -18,6 +18,9 @@ package org.apache.velocity.example; * under the License. */ +import org.apache.velocity.context.AbstractContext; +import org.apache.velocity.context.Context; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -27,9 +30,6 @@ import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.Statement; -import org.apache.velocity.context.AbstractContext; -import org.apache.velocity.context.Context; - /** * Example context impl that uses a database to store stuff :) * Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java Thu Jan 26 02:28:46 2017 @@ -18,15 +18,15 @@ package org.apache.velocity.example; * under the License. */ +import org.apache.velocity.Template; +import org.apache.velocity.runtime.RuntimeSingleton; + import java.io.BufferedWriter; import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Hashtable; import java.util.Properties; -import org.apache.velocity.Template; -import org.apache.velocity.runtime.RuntimeSingleton; - /** * the ultimate in silliness... * Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java Thu Jan 26 02:28:46 2017 @@ -18,21 +18,21 @@ package org.apache.velocity.example; * under the License. */ -import java.io.StringWriter; - -import org.apache.velocity.context.Context; -import org.apache.velocity.util.introspection.Info; -import org.slf4j.helpers.FormattingTuple; -import org.slf4j.helpers.MarkerIgnoringBase; -import org.slf4j.helpers.MessageFormatter; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.app.event.EventCartridge; import org.apache.velocity.app.event.MethodExceptionEventHandler; import org.apache.velocity.app.event.ReferenceInsertionEventHandler; +import org.apache.velocity.context.Context; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; -import org.apache.velocity.runtime.RuntimeServices; +import org.apache.velocity.util.introspection.Info; + +import org.slf4j.helpers.FormattingTuple; +import org.slf4j.helpers.MarkerIgnoringBase; +import org.slf4j.helpers.MessageFormatter; + +import java.io.StringWriter; /** * This class is a simple demonstration of how the event handling Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java Thu Jan 26 02:28:46 2017 @@ -18,14 +18,14 @@ package org.apache.velocity.example; * under the License. */ -import org.apache.velocity.app.Velocity; -import org.apache.velocity.VelocityContext; import org.apache.velocity.Template; - +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; -import java.io.*; +import java.io.BufferedWriter; +import java.io.OutputStreamWriter; import java.util.ArrayList; /** Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java Thu Jan 26 02:28:46 2017 @@ -18,13 +18,13 @@ package org.apache.velocity.example; * under the License. */ -import java.io.StringWriter; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; +import java.io.StringWriter; + /** * This class is a simple demonstration of how the Velocity Template Engine * can be used in a standalone application using the Velocity utility class. Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java Thu Jan 26 02:28:46 2017 @@ -18,12 +18,12 @@ package org.apache.velocity.example; * under the License. */ -import java.util.Set; -import java.util.TreeMap; - import org.apache.velocity.context.AbstractContext; import org.apache.velocity.context.Context; +import java.util.Set; +import java.util.TreeMap; + /** * Example context impl that uses a TreeMap * Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java Thu Jan 26 02:28:46 2017 @@ -18,17 +18,17 @@ package org.apache.velocity.example; * under the License. */ -import java.io.BufferedWriter; -import java.io.OutputStreamWriter; -import java.io.Writer; - -import org.apache.velocity.VelocityContext; import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.jdom.Document; import org.jdom.input.SAXBuilder; +import java.io.BufferedWriter; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Example to show basic XML handling in a template. Modified: velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java Thu Jan 26 02:28:46 2017 @@ -49,18 +49,10 @@ package org.apache.velocity.script; * @version $Id: VelocityScriptEngine.java$ */ -import java.io.File; -import java.io.FileInputStream; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; -import java.util.Properties; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; -import org.apache.velocity.runtime.RuntimeInstance; import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.runtime.RuntimeInstance; import org.apache.velocity.runtime.resource.loader.ResourceLoader; import org.apache.velocity.runtime.resource.loader.StringResourceLoader; @@ -73,6 +65,13 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; import javax.script.ScriptException; import javax.script.SimpleBindings; +import java.io.File; +import java.io.FileInputStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Properties; public class VelocityScriptEngine extends AbstractScriptEngine implements Compilable { Modified: velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java Thu Jan 26 02:28:46 2017 @@ -26,7 +26,6 @@ import javax.script.CompiledScript; import javax.script.ScriptContext; import javax.script.ScriptException; import java.io.StringWriter; -import java.io.Writer; public class ScriptEngineTest extends AbstractScriptTest { Modified: velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/tools/EventToolTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/tools/EventToolTest.java?rev=1780314&r1=1780313&r2=1780314&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/tools/EventToolTest.java (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/tools/EventToolTest.java Thu Jan 26 02:28:46 2017 @@ -20,6 +20,7 @@ package org.apache.velocity.script.test. import org.apache.velocity.script.VelocityScriptEngine; import org.apache.velocity.script.test.AbstractScriptTest; + import javax.script.ScriptContext; import javax.script.ScriptException; import java.io.StringWriter;