You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2003/05/04 19:24:32 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader ClasspathResourceLoader.java
geirm 2003/05/04 10:24:32
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTDirective.java ASTElseStatement.java
ASTEscape.java ASTIdentifier.java ASTMethod.java
ASTReference.java ASTSetDirective.java
ASTStringLiteral.java ASTprocess.java
AbstractExecutor.java BooleanPropertyExecutor.java
GetExecutor.java Node.java NodeUtils.java
PropertyExecutor.java SimpleNode.java
src/java/org/apache/velocity/runtime/resource Resource.java
ResourceManager.java ResourceManagerImpl.java
src/java/org/apache/velocity/runtime/resource/loader
ClasspathResourceLoader.java
Log:
import cleanup
Revision Changes Path
1.21 +1 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
Index: ASTDirective.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ASTDirective.java 22 Oct 2001 03:53:24 -0000 1.20
+++ ASTDirective.java 4 May 2003 17:24:30 -0000 1.21
@@ -59,7 +59,6 @@
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.directive.Parse;
import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.exception.MethodInvocationException;
1.8 +1 -4 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
Index: ASTElseStatement.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ASTElseStatement.java 22 Oct 2001 03:53:24 -0000 1.7
+++ ASTElseStatement.java 4 May 2003 17:24:30 -0000 1.8
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.io.Writer;
-import java.io.IOException;
-
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.Parser;
1.6 +1 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
Index: ASTEscape.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ASTEscape.java 23 Mar 2002 13:38:32 -0000 1.5
+++ ASTEscape.java 4 May 2003 17:24:30 -0000 1.6
@@ -59,7 +59,6 @@
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.Token;
/**
* This class is responsible for handling Escapes
1.19 +1 -7 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
Index: ASTIdentifier.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ASTIdentifier.java 21 Apr 2002 21:04:44 -0000 1.18
+++ ASTIdentifier.java 4 May 2003 17:24:30 -0000 1.19
@@ -53,18 +53,12 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-import java.util.Map;
-
-import java.lang.reflect.Method;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.util.introspection.IntrospectionCacheData;
-import org.apache.velocity.util.introspection.Introspector;
-import org.apache.velocity.util.introspection.VelMethod;
import org.apache.velocity.util.introspection.Info;
import org.apache.velocity.util.introspection.VelPropertyGet;
-import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.app.event.EventCartridge;
1.24 +1 -8 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
Index: ASTMethod.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ASTMethod.java 7 May 2002 13:24:43 -0000 1.23
+++ ASTMethod.java 4 May 2003 17:24:30 -0000 1.24
@@ -54,14 +54,8 @@
* <http://www.apache.org/>.
*/
-import java.lang.reflect.Method;
-
-import java.io.*;
-
import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.parser.*;
-import org.apache.velocity.util.introspection.Introspector;
import org.apache.velocity.util.introspection.IntrospectionCacheData;
import org.apache.velocity.util.introspection.VelMethod;
import org.apache.velocity.util.introspection.Info;
@@ -70,7 +64,6 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.MethodExceptionEventHandler;
/**
* ASTMethod.java
1.49 +1 -6 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
Index: ASTReference.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ASTReference.java 27 Apr 2002 18:23:47 -0000 1.48
+++ ASTReference.java 4 May 2003 17:24:30 -0000 1.49
@@ -56,25 +56,20 @@
import java.io.Writer;
import java.io.IOException;
-import java.util.Map;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.exception.ReferenceException;
import org.apache.velocity.runtime.parser.*;
-import org.apache.velocity.util.introspection.Introspector;
import org.apache.velocity.util.introspection.VelPropertySet;
import org.apache.velocity.util.introspection.Info;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
/**
* This class is responsible for handling the references in
1.22 +1 -4 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
Index: ASTSetDirective.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ASTSetDirective.java 25 Mar 2002 00:42:49 -0000 1.21
+++ ASTSetDirective.java 4 May 2003 17:24:30 -0000 1.22
@@ -59,13 +59,10 @@
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.exception.ReferenceException;
import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.Token;
import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.app.event.NullSetEventHandler;
import org.apache.velocity.app.event.EventCartridge;
/**
1.17 +1 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
Index: ASTStringLiteral.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ASTStringLiteral.java 28 Feb 2002 05:06:08 -0000 1.16
+++ ASTStringLiteral.java 4 May 2003 17:24:30 -0000 1.17
@@ -58,7 +58,6 @@
import org.apache.velocity.runtime.parser.Parser;
import java.io.StringWriter;
-import java.io.ByteArrayInputStream;
import java.io.BufferedReader;
import java.io.StringReader;
1.5 +0 -3 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
Index: ASTprocess.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASTprocess.java 19 Mar 2001 18:53:53 -0000 1.4
+++ ASTprocess.java 4 May 2003 17:24:30 -0000 1.5
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.io.Writer;
-import java.io.IOException;
-
import org.apache.velocity.runtime.parser.Parser;
public class ASTprocess extends SimpleNode
1.12 +1 -5 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java
Index: AbstractExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractExecutor.java 21 Apr 2002 20:57:25 -0000 1.11
+++ AbstractExecutor.java 4 May 2003 17:24:30 -0000 1.12
@@ -58,10 +58,6 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.exception.MethodInvocationException;
-
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeLogger;
/**
1.3 +1 -11 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
Index: BooleanPropertyExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BooleanPropertyExecutor.java 21 Apr 2002 20:57:25 -0000 1.2
+++ BooleanPropertyExecutor.java 4 May 2003 17:24:30 -0000 1.3
@@ -53,19 +53,9 @@
* <http://www.apache.org/>.
*/
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.velocity.util.introspection.Introspector;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.context.InternalContextAdapter;
-
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeLogger;
-
-import org.apache.velocity.util.introspection.Introspector;
/**
* Handles discovery and valuation of a
1.8 +1 -4 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
Index: GetExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GetExecutor.java 21 Apr 2002 20:57:25 -0000 1.7
+++ GetExecutor.java 4 May 2003 17:24:30 -0000 1.8
@@ -53,15 +53,12 @@
* <http://www.apache.org/>.
*/
-import java.lang.reflect.Method;
-
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.util.introspection.Introspector;
import java.lang.reflect.InvocationTargetException;
import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeLogger;
1.8 +0 -1 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/Node.java
Index: Node.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/Node.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Node.java 7 Sep 2001 05:02:15 -0000 1.7
+++ Node.java 4 May 2003 17:24:30 -0000 1.8
@@ -59,7 +59,6 @@
import java.io.IOException;
import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.runtime.parser.Token;
import org.apache.velocity.exception.MethodInvocationException;
1.16 +1 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
Index: NodeUtils.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NodeUtils.java 19 Nov 2001 13:02:33 -0000 1.15
+++ NodeUtils.java 4 May 2003 17:24:30 -0000 1.16
@@ -54,7 +54,6 @@
*/
import org.apache.velocity.context.Context;
-import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.*;
/**
1.15 +0 -8 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
Index: PropertyExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PropertyExecutor.java 21 Apr 2002 20:57:25 -0000 1.14
+++ PropertyExecutor.java 4 May 2003 17:24:30 -0000 1.15
@@ -53,19 +53,11 @@
* <http://www.apache.org/>.
*/
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
import org.apache.velocity.util.introspection.Introspector;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.context.InternalContextAdapter;
-
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeLogger;
-
-import org.apache.velocity.util.introspection.Introspector;
/**
* Returned the value of object property when executed.
1.13 +0 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
Index: SimpleNode.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SimpleNode.java 18 Oct 2001 10:25:08 -0000 1.12
+++ SimpleNode.java 4 May 2003 17:24:31 -0000 1.13
@@ -63,9 +63,7 @@
import org.apache.velocity.runtime.exception.ReferenceException;
import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.runtime.parser.Token;
-import org.apache.velocity.runtime.parser.ParserTreeConstants;
-import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
1.11 +1 -7 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/Resource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Resource.java 10 Oct 2002 17:49:53 -0000 1.10
+++ Resource.java 4 May 2003 17:24:31 -0000 1.11
@@ -54,15 +54,9 @@
* <http://www.apache.org/>.
*/
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.Writer;
-
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.apache.velocity.exception.ResourceNotFoundException;
1.34 +1 -3 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManager.java
Index: ResourceManager.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ResourceManager.java 25 Mar 2002 00:44:00 -0000 1.33
+++ ResourceManager.java 4 May 2003 17:24:31 -0000 1.34
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.io.IOException;
-
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.exception.ResourceNotFoundException;
1.7 +1 -4 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
Index: ResourceManagerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceManagerImpl.java 25 Mar 2002 00:44:00 -0000 1.6
+++ ResourceManagerImpl.java 4 May 2003 17:24:31 -0000 1.7
@@ -56,14 +56,11 @@
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
import java.util.Vector;
import java.io.InputStream;
import java.io.IOException;
-import org.apache.velocity.Template;
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeConstants;
1.8 +1 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
Index: ClasspathResourceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClasspathResourceLoader.java 28 Mar 2002 15:16:08 -0000 1.7
+++ ClasspathResourceLoader.java 4 May 2003 17:24:31 -0000 1.8
@@ -56,7 +56,6 @@
import java.io.InputStream;
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.exception.ResourceNotFoundException;
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org