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:14:37 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/configuration Configuration.java
geirm 2003/05/04 10:14:37
Modified: src/java/org/apache/velocity/context Context.java
InternalContextAdapter.java
src/java/org/apache/velocity/io VelocityWriter.java
src/java/org/apache/velocity/runtime Runtime.java
RuntimeInstance.java RuntimeServices.java
RuntimeSingleton.java VelocimacroFactory.java
VelocimacroManager.java
src/java/org/apache/velocity/runtime/configuration
Configuration.java
Log:
import fix, and static fix
Revision Changes Path
1.5 +1 -4 jakarta-velocity/src/java/org/apache/velocity/context/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/Context.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Context.java 23 Oct 2001 20:48:04 -0000 1.4
+++ Context.java 4 May 2003 17:14:36 -0000 1.5
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Hashtable;
-import java.io.Serializable;
-
/**
* Interface describing the application data context. This set of
* routines is used by the application to set and remove 'named' data
1.5 +1 -3 jakarta-velocity/src/java/org/apache/velocity/context/InternalContextAdapter.java
Index: InternalContextAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/InternalContextAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InternalContextAdapter.java 20 May 2001 19:44:34 -0000 1.4
+++ InternalContextAdapter.java 4 May 2003 17:14:36 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
-
/**
* interface to bring all necessary internal and user contexts together.
* this is what the AST expects to deal with. If anything new comes
1.7 +1 -2 jakarta-velocity/src/java/org/apache/velocity/io/VelocityWriter.java
Index: VelocityWriter.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/io/VelocityWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityWriter.java 22 Oct 2001 03:53:23 -0000 1.6
+++ VelocityWriter.java 4 May 2003 17:14:36 -0000 1.7
@@ -55,7 +55,6 @@
*/
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.Writer;
/**
1.116 +1 -24 jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
Index: Runtime.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- Runtime.java 9 Aug 2002 19:49:00 -0000 1.115
+++ Runtime.java 4 May 2003 17:14:36 -0000 1.116
@@ -54,42 +54,19 @@
* <http://www.apache.org/>.
*/
-import java.io.InputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.io.Reader;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.Stack;
-import java.util.Enumeration;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.apache.log.Logger;
import org.apache.velocity.Template;
-import org.apache.velocity.runtime.log.LogManager;
-import org.apache.velocity.runtime.log.LogSystem;
-import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.runtime.parser.ParseException;
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.VelocimacroFactory;
-import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.ContentResource;
-import org.apache.velocity.runtime.resource.ResourceManager;
-
-import org.apache.velocity.util.SimplePool;
-import org.apache.velocity.util.StringUtils;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.ParseErrorException;
1.18 +1 -9 jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeInstance.java
Index: RuntimeInstance.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeInstance.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RuntimeInstance.java 9 Aug 2002 00:54:53 -0000 1.17
+++ RuntimeInstance.java 4 May 2003 17:14:36 -0000 1.18
@@ -56,19 +56,13 @@
import java.io.InputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.Reader;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.Hashtable;
import java.util.Properties;
-import java.util.Stack;
import java.util.Enumeration;
-import java.util.TreeMap;
-import java.util.Vector;
import java.util.HashMap;
import org.apache.velocity.Template;
@@ -85,7 +79,6 @@
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.VelocimacroFactory;
-import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.ContentResource;
import org.apache.velocity.runtime.resource.ResourceManager;
@@ -94,7 +87,6 @@
import org.apache.velocity.util.introspection.Introspector;
import org.apache.velocity.util.introspection.Uberspect;
-import org.apache.velocity.util.introspection.UberspectImpl;
import org.apache.velocity.util.introspection.UberspectLoggable;
import org.apache.velocity.exception.ResourceNotFoundException;
1.7 +1 -26 jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeServices.java
Index: RuntimeServices.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeServices.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RuntimeServices.java 9 Aug 2002 01:05:30 -0000 1.6
+++ RuntimeServices.java 4 May 2003 17:14:36 -0000 1.7
@@ -54,42 +54,17 @@
* <http://www.apache.org/>.
*/
-import java.io.InputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.io.Reader;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.Stack;
-import java.util.Enumeration;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.apache.log.Logger;
import org.apache.velocity.Template;
-import org.apache.velocity.runtime.log.LogManager;
-import org.apache.velocity.runtime.log.LogSystem;
-
-import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.runtime.parser.ParseException;
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.VelocimacroFactory;
-
-import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.ContentResource;
-import org.apache.velocity.runtime.resource.ResourceManager;
-
-import org.apache.velocity.util.SimplePool;
-import org.apache.velocity.util.StringUtils;
import org.apache.velocity.util.introspection.Introspector;
import org.apache.velocity.util.introspection.Uberspect;
1.6 +1 -23 jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeSingleton.java
Index: RuntimeSingleton.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeSingleton.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RuntimeSingleton.java 9 Aug 2002 00:47:28 -0000 1.5
+++ RuntimeSingleton.java 4 May 2003 17:14:36 -0000 1.6
@@ -54,42 +54,20 @@
* <http://www.apache.org/>.
*/
-import java.io.InputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.io.Reader;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.Stack;
-import java.util.Enumeration;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.apache.log.Logger;
import org.apache.velocity.Template;
-import org.apache.velocity.runtime.log.LogManager;
-import org.apache.velocity.runtime.log.LogSystem;
import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.runtime.parser.ParseException;
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.VelocimacroFactory;
-import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.ContentResource;
-import org.apache.velocity.runtime.resource.ResourceManager;
-
-import org.apache.velocity.util.SimplePool;
-import org.apache.velocity.util.StringUtils;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.ParseErrorException;
1.17 +1 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
Index: VelocimacroFactory.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VelocimacroFactory.java 21 Oct 2001 10:58:35 -0000 1.16
+++ VelocimacroFactory.java 4 May 2003 17:14:36 -0000 1.17
@@ -57,7 +57,6 @@
import org.apache.velocity.Template;
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.directive.VelocimacroProxy;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
import java.util.Vector;
import java.util.Map;
1.17 +1 -4 jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroManager.java
Index: VelocimacroManager.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VelocimacroManager.java 28 Feb 2002 05:24:00 -0000 1.16
+++ VelocimacroManager.java 4 May 2003 17:14:36 -0000 1.17
@@ -55,13 +55,10 @@
*/
import java.util.Hashtable;
-import java.util.TreeMap;
import java.io.StringReader;
import java.io.BufferedReader;
-import org.apache.velocity.Template;
-import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.directive.VelocimacroProxy;
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.util.StringUtils;
1.34 +3 -3 jakarta-velocity/src/java/org/apache/velocity/runtime/configuration/Configuration.java
Index: Configuration.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/configuration/Configuration.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Configuration.java 22 Oct 2001 03:53:23 -0000 1.33
+++ Configuration.java 4 May 2003 17:14:37 -0000 1.34
@@ -413,7 +413,7 @@
*/
public String getInclude()
{
- return this.include;
+ return Configuration.include;
}
/**
@@ -424,7 +424,7 @@
*/
public void setInclude(String inc)
{
- this.include = inc;
+ Configuration.include = inc;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: cvs commit:
jakarta-velocity/src/java/org/apache/velocity/runtime/configuration
Configuration.java
Posted by Jon Scott Stevens <jo...@latchkey.com>.
on 2003/5/4 10:14 AM, "geirm@apache.org" <ge...@apache.org> wrote:
> ===================================================================
> RCS file:
> /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/configuration/
> Configuration.java,v
> retrieving revision 1.33
> retrieving revision 1.34
> diff -u -r1.33 -r1.34
> --- Configuration.java 22 Oct 2001 03:53:23 -0000 1.33
> +++ Configuration.java 4 May 2003 17:14:37 -0000 1.34
> @@ -424,7 +424,7 @@
> */
> public void setInclude(String inc)
> {
> - this.include = inc;
> + Configuration.include = inc;
> }
You just added (or there is one already existing) a tab in front of the
Configuration.include = inc; line.
-jon
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org