velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r898045 - in /velocity/engine/branches/2.0_Exp/src: java/org/apache/velocity/ java/org/apache/velocity/exception/ java/org/apache/velocity/runtime/directive/ java/org/apache/velocity/runtime/parser/node/ java/org/apache/velocity/runtime/res...
Date Mon, 11 Jan 2010 20:11:04 GMT
Author: nbubna
Date: Mon Jan 11 20:11:02 2010
New Revision: 898045

URL: http://svn.apache.org/viewvc?rev=898045&view=rev
Log:
VELOCITY-674 merge Jarkko's patch for the trunk to fix Eclipse warnings

Modified:
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/VelocityContext.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MathException.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MethodInvocationException.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Block.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/BlockMacro.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Evaluate.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/StopCommand.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTIndex.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/ClassUtils.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/LinkingUberspector.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/MethodMap.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/BaseTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/DefineTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ForeachTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ScopeTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictCompareTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictEscapeTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictForeachTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictMathTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringConcatenationTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/TextblockTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/VarargMethodsTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity689TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity701TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity702TestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/BaseSQLTest.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/VelocityContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/VelocityContext.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/VelocityContext.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/VelocityContext.java Mon Jan 11 20:11:02 2010
@@ -20,12 +20,10 @@
  */
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.velocity.context.AbstractContext;
 import org.apache.velocity.context.Context;
-import org.apache.velocity.runtime.RuntimeServices;
 
 /**
  *  General purpose implemention of the application Context

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MathException.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MathException.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MathException.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MathException.java Mon Jan 11 20:11:02 2010
@@ -28,6 +28,8 @@
  */
 public class MathException extends VelocityException
 {
+    private static final long serialVersionUID = -7966507088645215583L;
+
     public MathException(final String exceptionMessage)
     {
         super(exceptionMessage);

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MethodInvocationException.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MethodInvocationException.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MethodInvocationException.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/exception/MethodInvocationException.java Mon Jan 11 20:11:02 2010
@@ -1,6 +1,5 @@
 package org.apache.velocity.exception;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.velocity.runtime.log.Log;
 
 /*

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Block.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Block.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Block.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Block.java Mon Jan 11 20:11:02 2010
@@ -1,178 +1,177 @@
-package org.apache.velocity.runtime.directive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "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.    
- */
-
-import java.io.Writer;
-import java.io.IOException;
-import java.io.StringWriter;
-
-import org.apache.commons.lang.text.StrBuilder;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.exception.TemplateInitException;
-import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.Renderable;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.parser.node.Node;
-
-/**
- * Directive that puts an unrendered AST block in the context
- * under the specified key, postponing rendering until the
- * reference is used and rendered.
- *
- * @author Andrew Tetlaw
- * @author Nathan Bubna
- * @author <a href="mailto:wyla@removethis.sci.fi">Jarkko Viinamaki</a>
- * @since 1.7
- * @version $Id: Block.java 686842 2008-08-18 18:29:31Z nbubna $
- */
-public abstract class Block extends Directive
-{
-    protected Node block;
-    protected Log log;
-    protected int maxDepth;
-    protected String key;
-
-    /**
-     * Return type of this directive.
-     */
-    public int getType()
-    {
-        return BLOCK;
-    }
-
-    /**
-     *  simple init - get the key
-     */
-    public void init(RuntimeServices rs, InternalContextAdapter context, Node node)
-        throws TemplateInitException
-    {
-        super.init(rs, context, node);
-
-        log = rs.getLog();
-
-        /**
-         * No checking is done. We just grab the last child node and assume
-         * that it's the block!
-         */
-        block = node.jjtGetChild(node.jjtGetNumChildren() - 1);
-    }
-
-    public boolean render(InternalContextAdapter context, Writer writer)
-    {
-        preRender(context);
-        try
-        {
-            return block.render(context, writer);
-        }
-        catch (IOException e)
-        {
-            String msg = "Failed to render " + id(context) + " to writer "
-              + " at " + Log.formatFileString(this);
-
-            log.error(msg, e);
-            throw new RuntimeException(msg, e);
-        }
-        catch (StopCommand stop)
-        {
-            if (!stop.isFor(this))
-            {
-                throw stop;
-            }
-            return true;
-        }
-        finally
-        {
-            postRender(context);
-        }
-    }
-
-    /**
-     * Creates a string identifying the source and location of the block
-     * definition, and the current template being rendered if that is
-     * different.
-     */
-    protected String id(InternalContextAdapter context)
-    {
-        StrBuilder str = new StrBuilder(100)
-            .append("block $").append(key);
-        if (!context.getCurrentTemplateName().equals(getTemplateName()))
-        {
-            str.append(" used in ").append(context.getCurrentTemplateName());
-        }
-        return str.toString();
-    }
-    
-    /**
-     * actual class placed in the context, holds the context
-     * being used for the render, as well as the parent (which already holds
-     * everything else we need).
-     */
-    public static class Reference implements Renderable
-    {
-        private InternalContextAdapter context;
-        private Block parent;
-        private int depth;
-        
-        public Reference(InternalContextAdapter context, Block parent)
-        {
-            this.context = context;
-            this.parent = parent;
-        }
-        
-        /**
-         * Render the AST of this block into the writer using the context.
-         */
-        public boolean render(InternalContextAdapter context, Writer writer)
-        {
-            depth++;
-            if (depth > parent.maxDepth)
-            {
-                /* this is only a debug message, as recursion can
-                 * happen in quasi-innocent situations and is relatively
-                 * harmless due to how we handle it here.
-                 * this is more to help anyone nuts enough to intentionally
-                 * use recursive block definitions and having problems
-                 * pulling it off properly.
-                 */
-                parent.log.debug("Max recursion depth reached for " + parent.id(context)
-                    + " at " + Log.formatFileString(parent));
-                depth--;
-                return false;
-            }
-            else
-            {
-                parent.render(context, writer);
-                depth--;
-                return true;
-            }
-        }
-
-        public String toString()
-        {
-            Writer writer = new StringWriter();
-            if (render(context, writer))
-            {
-                return writer.toString();
-            }
-            return null;
-        }
-    }
-}
+package org.apache.velocity.runtime.directive;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "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.    
+ */
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import org.apache.commons.lang.text.StrBuilder;
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.exception.TemplateInitException;
+import org.apache.velocity.runtime.Renderable;
+import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.runtime.log.Log;
+import org.apache.velocity.runtime.parser.node.Node;
+
+/**
+ * Directive that puts an unrendered AST block in the context
+ * under the specified key, postponing rendering until the
+ * reference is used and rendered.
+ *
+ * @author Andrew Tetlaw
+ * @author Nathan Bubna
+ * @author <a href="mailto:wyla@removethis.sci.fi">Jarkko Viinamaki</a>
+ * @since 1.7
+ * @version $Id: Block.java 686842 2008-08-18 18:29:31Z nbubna $
+ */
+public abstract class Block extends Directive
+{
+    protected Node block;
+    protected Log log;
+    protected int maxDepth;
+    protected String key;
+
+    /**
+     * Return type of this directive.
+     */
+    public int getType()
+    {
+        return BLOCK;
+    }
+
+    /**
+     *  simple init - get the key
+     */
+    public void init(RuntimeServices rs, InternalContextAdapter context, Node node)
+        throws TemplateInitException
+    {
+        super.init(rs, context, node);
+
+        log = rs.getLog();
+
+        /**
+         * No checking is done. We just grab the last child node and assume
+         * that it's the block!
+         */
+        block = node.jjtGetChild(node.jjtGetNumChildren() - 1);
+    }
+
+    public boolean render(InternalContextAdapter context, Writer writer)
+    {
+        preRender(context);
+        try
+        {
+            return block.render(context, writer);
+        }
+        catch (IOException e)
+        {
+            String msg = "Failed to render " + id(context) + " to writer "
+              + " at " + Log.formatFileString(this);
+
+            log.error(msg, e);
+            throw new RuntimeException(msg, e);
+        }
+        catch (StopCommand stop)
+        {
+            if (!stop.isFor(this))
+            {
+                throw stop;
+            }
+            return true;
+        }
+        finally
+        {
+            postRender(context);
+        }
+    }
+
+    /**
+     * Creates a string identifying the source and location of the block
+     * definition, and the current template being rendered if that is
+     * different.
+     */
+    protected String id(InternalContextAdapter context)
+    {
+        StrBuilder str = new StrBuilder(100)
+            .append("block $").append(key);
+        if (!context.getCurrentTemplateName().equals(getTemplateName()))
+        {
+            str.append(" used in ").append(context.getCurrentTemplateName());
+        }
+        return str.toString();
+    }
+    
+    /**
+     * actual class placed in the context, holds the context
+     * being used for the render, as well as the parent (which already holds
+     * everything else we need).
+     */
+    public static class Reference implements Renderable
+    {
+        private InternalContextAdapter context;
+        private Block parent;
+        private int depth;
+        
+        public Reference(InternalContextAdapter context, Block parent)
+        {
+            this.context = context;
+            this.parent = parent;
+        }
+        
+        /**
+         * Render the AST of this block into the writer using the context.
+         */
+        public boolean render(InternalContextAdapter context, Writer writer)
+        {
+            depth++;
+            if (depth > parent.maxDepth)
+            {
+                /* this is only a debug message, as recursion can
+                 * happen in quasi-innocent situations and is relatively
+                 * harmless due to how we handle it here.
+                 * this is more to help anyone nuts enough to intentionally
+                 * use recursive block definitions and having problems
+                 * pulling it off properly.
+                 */
+                parent.log.debug("Max recursion depth reached for " + parent.id(context)
+                    + " at " + Log.formatFileString(parent));
+                depth--;
+                return false;
+            }
+            else
+            {
+                parent.render(context, writer);
+                depth--;
+                return true;
+            }
+        }
+
+        public String toString()
+        {
+            Writer writer = new StringWriter();
+            if (render(context, writer))
+            {
+                return writer.toString();
+            }
+            return null;
+        }
+    }
+}

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/BlockMacro.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/BlockMacro.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/BlockMacro.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/BlockMacro.java Mon Jan 11 20:11:02 2010
@@ -21,9 +21,9 @@
 
 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.Renderable;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.node.Node;

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Evaluate.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Evaluate.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Evaluate.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Evaluate.java Mon Jan 11 20:11:02 2010
@@ -23,7 +23,6 @@
 import java.io.StringReader;
 import java.io.Writer;
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.context.InternalContextAdapterImpl;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/StopCommand.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/StopCommand.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/StopCommand.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/StopCommand.java Mon Jan 11 20:11:02 2010
@@ -35,6 +35,7 @@
  */
 public class StopCommand extends Error
 {
+    private static final long serialVersionUID = 2577683435802825964L;
     private Object stopMe;
     private boolean nearest = false;
 

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTIndex.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTIndex.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTIndex.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTIndex.java Mon Jan 11 20:11:02 2010
@@ -7,10 +7,7 @@
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.log.Log;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.node.ASTMethod.MethodCacheKey;
 import org.apache.velocity.util.ClassUtils;
-import org.apache.velocity.util.introspection.Info;
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
 import org.apache.velocity.util.introspection.VelMethod;
 
 /*

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java Mon Jan 11 20:11:02 2010
@@ -33,7 +33,6 @@
 import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.util.ClassUtils;
 import org.apache.velocity.util.introspection.Info;
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
 import org.apache.velocity.util.introspection.VelMethod;
 
 /**

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java Mon Jan 11 20:11:02 2010
@@ -23,9 +23,6 @@
 
 import org.apache.commons.lang.text.StrBuilder;
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.RuntimeConstants;
@@ -33,7 +30,6 @@
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.runtime.parser.Token;
-import org.apache.velocity.runtime.visitor.BaseVisitor;
 
 /**
  * ASTStringLiteral support. Will interpolate!

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java Mon Jan 11 20:11:02 2010
@@ -20,10 +20,8 @@
  */
 
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.velocity.runtime.RuntimeConstants;

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java Mon Jan 11 20:11:02 2010
@@ -22,7 +22,6 @@
 import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.util.ClassUtils;
-import org.apache.velocity.util.StringUtils;
 
 /**
  * Factory to grab a template loader.

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/ClassUtils.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/ClassUtils.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/ClassUtils.java Mon Jan 11 20:11:02 2010
@@ -24,7 +24,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.node.SimpleNode;
 import org.apache.velocity.runtime.parser.node.ASTMethod.MethodCacheKey;
 import org.apache.velocity.util.introspection.Info;

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java Mon Jan 11 20:11:02 2010
@@ -21,7 +21,6 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/LinkingUberspector.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/LinkingUberspector.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/LinkingUberspector.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/LinkingUberspector.java Mon Jan 11 20:11:02 2010
@@ -21,9 +21,6 @@
 
 import java.util.Iterator;
 
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.util.RuntimeServicesAware;
-
 /**
  * <p>
  * When the runtime.introspection.uberspect configuration property contains several

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/MethodMap.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/MethodMap.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/MethodMap.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/MethodMap.java Mon Jan 11 20:11:02 2010
@@ -22,7 +22,6 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java Mon Jan 11 20:11:02 2010
@@ -20,7 +20,6 @@
  */
 
 import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Enumeration;

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/BaseTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/BaseTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/BaseTestCase.java Mon Jan 11 20:11:02 2010
@@ -22,18 +22,16 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+
 import junit.framework.TestCase;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.util.StringUtils;
 import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
 import org.apache.velocity.runtime.resource.util.StringResourceRepository;
+import org.apache.velocity.test.misc.TestLogChute;
+import org.apache.velocity.util.StringUtils;
 
 /**
  * Base test case that provides utility methods for

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/DefineTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/DefineTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/DefineTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/DefineTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,7 +19,6 @@
  * under the License.    
  */
 
-import org.apache.velocity.VelocityContext;
 
 /**
  * This class tests the #define directive

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ForeachTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ForeachTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ForeachTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ForeachTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,17 +19,11 @@
  * under the License.    
  */
 
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.TestCase;
-
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.test.provider.ForeachMethodCallHelper;
 
 /**

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ScopeTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ScopeTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ScopeTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/ScopeTestCase.java Mon Jan 11 20:11:02 2010
@@ -20,10 +20,9 @@
  */
 
 import java.util.HashMap;
-import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.directive.Scope;
+
 
 /**
  * This class tests the directive scope controls

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,7 +19,6 @@
  * under the License.    
  */
 
-import org.apache.velocity.VelocityContext;
 
 /**
  * This class tests support for putting static utility classes

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictCompareTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictCompareTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictCompareTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictCompareTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,9 +19,7 @@
  * under the License.    
  */
 
-import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.runtime.RuntimeConstants;
 
 /**

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictEscapeTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictEscapeTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictEscapeTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictEscapeTestCase.java Mon Jan 11 20:11:02 2010
@@ -17,8 +17,6 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.runtime.RuntimeConstants;
 
 

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictForeachTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictForeachTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictForeachTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictForeachTestCase.java Mon Jan 11 20:11:02 2010
@@ -21,7 +21,7 @@
 
 import java.util.ArrayList;
 import java.util.Iterator;
-import org.apache.velocity.VelocityContext;
+
 import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.RuntimeConstants;
 

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictMathTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictMathTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictMathTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictMathTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,7 +19,6 @@
  * under the License.    
  */
 
-import org.apache.velocity.VelocityContext;
 import org.apache.velocity.exception.MathException;
 import org.apache.velocity.runtime.RuntimeConstants;
 

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictReferenceTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictReferenceTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StrictReferenceTestCase.java Mon Jan 11 20:11:02 2010
@@ -228,7 +228,7 @@
 
         public void setProp(String val)
         {
-            this.prop = prop;
+            this.prop = val;
         }
 
         public String getNullVal()

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringConcatenationTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringConcatenationTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringConcatenationTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringConcatenationTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,9 +19,6 @@
  * under the License.    
  */
 
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.exception.MathException;
-import org.apache.velocity.runtime.RuntimeConstants;
 
 /**
  * This class tests support for string concatenation.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java Mon Jan 11 20:11:02 2010
@@ -20,9 +20,9 @@
  */
 
 import java.io.StringWriter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+
 import junit.framework.TestCase;
+
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/TextblockTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/TextblockTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/TextblockTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/TextblockTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,8 +19,7 @@
  * under the License.    
  */
  
-import org.apache.velocity.runtime.RuntimeConstants; 
-import org.apache.velocity.runtime.parser.node.ASTTextblock; 
+import org.apache.velocity.runtime.parser.node.ASTTextblock;
 
 /**
  * This class tests the Textblock directive.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/VarargMethodsTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/VarargMethodsTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/VarargMethodsTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/VarargMethodsTestCase.java Mon Jan 11 20:11:02 2010
@@ -19,7 +19,6 @@
  * under the License.    
  */
 
-import java.util.Arrays;
 import org.apache.velocity.VelocityContext;
 
 /**

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java Mon Jan 11 20:11:02 2010
@@ -23,9 +23,8 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.test.BaseTestCase;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Test Case for <a href="https://issues.apache.org/jira/browse/VELOCITY-537">Velocity Issue 537</a>.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java Mon Jan 11 20:11:02 2010
@@ -20,8 +20,6 @@
  */
 
 import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.runtime.RuntimeConstants;
 
 /**
  * This class tests VELOCITY-615.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java Mon Jan 11 20:11:02 2010
@@ -20,8 +20,6 @@
  */
 
 import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.runtime.RuntimeConstants;
 
 /**
  * This class tests VELOCITY-625.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java Mon Jan 11 20:11:02 2010
@@ -20,7 +20,6 @@
  */
 
 import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.runtime.RuntimeConstants;
 
 /**
  * This class tests VELOCITY-629.  Make sure string literals

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java Mon Jan 11 20:11:02 2010
@@ -19,9 +19,8 @@
  * under the License.    
  */
 
-import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.VelocityContext;
 import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.test.BaseTestCase;
 
 /**
  * This class tests VELOCITY-62.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java Mon Jan 11 20:11:02 2010
@@ -20,7 +20,6 @@
  */
 
 import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.runtime.RuntimeConstants;
 
 /**
  * This class tests VELOCITY-631.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java Mon Jan 11 20:11:02 2010
@@ -20,7 +20,6 @@
  */
 
 import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.runtime.RuntimeConstants;
 
 /**
  * This class tests VELOCITY-667.  Make "#macro" throws a parse exception

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity689TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity689TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity689TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity689TestCase.java Mon Jan 11 20:11:02 2010
@@ -1,76 +1,75 @@
-package org.apache.velocity.test.issues;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "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.    
- */
-
-import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.runtime.RuntimeConstants;
-
-/**
- * This class tests VELOCITY-689.
- */
-public class Velocity689TestCase extends BaseTestCase
-{
-    public Velocity689TestCase(String name)
-    {
-        super(name);
-        //DEBUG = true;
-    }
-
-    public void setUpContext(VelocityContext ctx)
-    {
-        ctx.put("foo", new Foo());
-    }
-
-    public void testIt()
-    {
-        String template = "$foo.baz, $foo.bar";
-        assertEvalEquals("baz, bar", template);
-    }
-
-    public static interface HasMethod
-    {
-        String getBar();
-    }
-
-    public static interface HasOtherMethod extends HasMethod
-    {
-        String getBaz();
-    }
-
-    public static interface NoMethod extends HasOtherMethod
-    {
-        // nada!
-    }
-
-    private static class Foo implements NoMethod
-    {
-        public String getBar()
-        {
-            return "bar";
-        }
-
-        public String getBaz()
-        {
-            return "baz";
-        }
-    }
-
-}
+package org.apache.velocity.test.issues;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "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.    
+ */
+
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-689.
+ */
+public class Velocity689TestCase extends BaseTestCase
+{
+    public Velocity689TestCase(String name)
+    {
+        super(name);
+        //DEBUG = true;
+    }
+
+    public void setUpContext(VelocityContext ctx)
+    {
+        ctx.put("foo", new Foo());
+    }
+
+    public void testIt()
+    {
+        String template = "$foo.baz, $foo.bar";
+        assertEvalEquals("baz, bar", template);
+    }
+
+    public static interface HasMethod
+    {
+        String getBar();
+    }
+
+    public static interface HasOtherMethod extends HasMethod
+    {
+        String getBaz();
+    }
+
+    public static interface NoMethod extends HasOtherMethod
+    {
+        // nada!
+    }
+
+    private static class Foo implements NoMethod
+    {
+        public String getBar()
+        {
+            return "bar";
+        }
+
+        public String getBaz()
+        {
+            return "baz";
+        }
+    }
+
+}

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity701TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity701TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity701TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity701TestCase.java Mon Jan 11 20:11:02 2010
@@ -19,10 +19,7 @@
  * under the License.    
  */
 
-import java.lang.reflect.Modifier;
 import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * This class tests VELOCITY-701.

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity702TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity702TestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity702TestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity702TestCase.java Mon Jan 11 20:11:02 2010
@@ -1,99 +1,98 @@
-package org.apache.velocity.test.issues;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "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.    
- */
-
-import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.test.misc.TestLogChute;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
-import org.apache.velocity.runtime.resource.util.StringResourceRepository;
-
-/**
- * This class tests VELOCITY-702.
- */
-public class Velocity702TestCase extends BaseTestCase
-{
-    public Velocity702TestCase(String name)
-    {
-        super(name);
-    }
-
-    public void setUpEngine(VelocityEngine engine)
-    {
-        engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "high,low");
-        engine.addProperty("high.resource.loader.class", StringResourceLoader.class.getName());
-        engine.addProperty("high.resource.loader.cache", "false");
-        engine.addProperty("high.resource.loader.repository.name", "high");
-        engine.addProperty("high.resource.loader.repository.static", "false");
-        engine.addProperty("high.resource.loader.modificationCheckInterval", "1");
-        engine.addProperty("low.resource.loader.class", StringResourceLoader.class.getName());
-        engine.addProperty("low.resource.loader.cache", "true");
-        engine.addProperty("low.resource.loader.repository.name", "low");
-        engine.addProperty("low.resource.loader.repository.static", "false");
-        engine.addProperty("low.resource.loader.modificationCheckInterval", "1");
-        engine.init();
-    }
-
-    public void testIt() throws Exception
-    {
-        addToHigh("foo", "foo");
-        addToLow("foo", "bar");
-        assertTmplEquals("foo", "foo");
-
-        removeFromHigh("foo");
-        assertTmplEquals("bar", "foo");
-
-        Thread.sleep(1500);
-        addToHigh("foo", "woogie");
-        assertTmplEquals("woogie", "foo");
-    }
-
-    private void addToHigh(String name, String content)
-    {
-        getHighRepo().putStringResource(name, content);
-    }
-
-    private void removeFromHigh(String name)
-    {
-        getHighRepo().removeStringResource(name);
-    }
-
-    private StringResourceRepository getHighRepo()
-    {
-        return (StringResourceRepository)engine.getApplicationAttribute("high");
-    }
-
-    private void addToLow(String name, String content)
-    {
-        getLowRepo().putStringResource(name, content);
-    }
-
-    private void removeFromLow(String name)
-    {
-        getLowRepo().removeStringResource(name);
-    }
-
-    private StringResourceRepository getLowRepo()
-    {
-        return (StringResourceRepository)engine.getApplicationAttribute("low");
-    }
-
-}
+package org.apache.velocity.test.issues;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "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.    
+ */
+
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
+import org.apache.velocity.runtime.resource.util.StringResourceRepository;
+import org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-702.
+ */
+public class Velocity702TestCase extends BaseTestCase
+{
+    public Velocity702TestCase(String name)
+    {
+        super(name);
+    }
+
+    public void setUpEngine(VelocityEngine engine)
+    {
+        engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "high,low");
+        engine.addProperty("high.resource.loader.class", StringResourceLoader.class.getName());
+        engine.addProperty("high.resource.loader.cache", "false");
+        engine.addProperty("high.resource.loader.repository.name", "high");
+        engine.addProperty("high.resource.loader.repository.static", "false");
+        engine.addProperty("high.resource.loader.modificationCheckInterval", "1");
+        engine.addProperty("low.resource.loader.class", StringResourceLoader.class.getName());
+        engine.addProperty("low.resource.loader.cache", "true");
+        engine.addProperty("low.resource.loader.repository.name", "low");
+        engine.addProperty("low.resource.loader.repository.static", "false");
+        engine.addProperty("low.resource.loader.modificationCheckInterval", "1");
+        engine.init();
+    }
+
+    public void testIt() throws Exception
+    {
+        addToHigh("foo", "foo");
+        addToLow("foo", "bar");
+        assertTmplEquals("foo", "foo");
+
+        removeFromHigh("foo");
+        assertTmplEquals("bar", "foo");
+
+        Thread.sleep(1500);
+        addToHigh("foo", "woogie");
+        assertTmplEquals("woogie", "foo");
+    }
+
+    private void addToHigh(String name, String content)
+    {
+        getHighRepo().putStringResource(name, content);
+    }
+
+    private void removeFromHigh(String name)
+    {
+        getHighRepo().removeStringResource(name);
+    }
+
+    private StringResourceRepository getHighRepo()
+    {
+        return (StringResourceRepository)engine.getApplicationAttribute("high");
+    }
+
+    private void addToLow(String name, String content)
+    {
+        getLowRepo().putStringResource(name, content);
+    }
+
+    private void removeFromLow(String name)
+    {
+        getLowRepo().removeStringResource(name);
+    }
+
+    private StringResourceRepository getLowRepo()
+    {
+        return (StringResourceRepository)engine.getApplicationAttribute("low");
+    }
+
+}

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/BaseSQLTest.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/BaseSQLTest.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/BaseSQLTest.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/BaseSQLTest.java Mon Jan 11 20:11:02 2010
@@ -23,8 +23,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import javax.sql.DataSource;
-
 import org.apache.velocity.test.BaseTestCase;
 
 /**

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java?rev=898045&r1=898044&r2=898045&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java (original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java Mon Jan 11 20:11:02 2010
@@ -33,8 +33,8 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeSingleton;
 import org.apache.velocity.test.misc.TestLogChute;
+import org.apache.velocity.runtime.RuntimeSingleton;
 import org.apache.velocity.runtime.resource.loader.DataSourceResourceLoader;
 
 



Mime
View raw message