jvanzyl 01/03/05 03:48:58
Modified: src/java/org/apache/velocity Template.java
VelocityContext.java
src/java/org/apache/velocity/anakia AnakiaTask.java
Escape.java TreeWalker.java XPathTool.java
src/java/org/apache/velocity/app FieldMethodizer.java
src/java/org/apache/velocity/app/tools
VelocityFormatter.java
src/java/org/apache/velocity/convert WebMacro.java
src/java/org/apache/velocity/io VelocityWriter.java
src/java/org/apache/velocity/runtime Runtime.java
RuntimeConstants.java VelocimacroFactory.java
VelocimacroManager.java
src/java/org/apache/velocity/runtime/compiler Compiler.java
src/java/org/apache/velocity/runtime/configuration
Configuration.java
src/java/org/apache/velocity/runtime/directive
Directive.java DirectiveConstants.java Foreach.java
Include.java Literal.java Macro.java Parse.java
ParseDirectiveException.java VMProxyArg.java
VelocimacroProxy.java
src/java/org/apache/velocity/runtime/exception
NodeException.java ReferenceException.java
src/java/org/apache/velocity/runtime/log LogManager.java
VelocityFormatter.java
src/java/org/apache/velocity/runtime/parser Parser.jjt
src/java/org/apache/velocity/runtime/resource
ContentResource.java Resource.java
ResourceFactory.java ResourceManager.java
src/java/org/apache/velocity/runtime/resource/loader
FileResourceLoader.java JarHolder.java
JarResourceLoader.java ResourceLoader.java
ResourceLoaderFactory.java
src/java/org/apache/velocity/runtime/visitor
BaseVisitor.java NodeViewMode.java
src/java/org/apache/velocity/servlet VelocityServlet.java
src/java/org/apache/velocity/test BaseTestCase.java
ContextSafetyTestCase.java
InlineScopeVMTestCase.java
IntrospectorTestCase.java
MultipleFileResourcePathTest.java
RuntimeTestCase.java TemplateTestCase.java
VelocityTestSuite.java
src/java/org/apache/velocity/test/misc Test.java
src/java/org/apache/velocity/test/provider Child.java
Person.java TestProvider.java
src/java/org/apache/velocity/test/view TemplateNodeView.java
src/java/org/apache/velocity/texen Generator.java
src/java/org/apache/velocity/texen/ant TexenTask.java
src/java/org/apache/velocity/texen/util FileUtil.java
PropertiesUtil.java
src/java/org/apache/velocity/util StringUtils.java
src/java/org/apache/velocity/util/introspection
ClassMap.java IntrospectionCacheData.java
Introspector.java MethodMap.java
Log:
- no functional changes, just formatting and date of license. something
to do before going to bed :-)
Revision Changes Path
1.29 +2 -2 jakarta-velocity/src/java/org/apache/velocity/Template.java
Index: Template.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/Template.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Template.java 2001/02/26 02:55:31 1.28
+++ Template.java 2001/03/05 11:44:21 1.29
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -89,7 +89,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Template.java,v 1.28 2001/02/26 02:55:31 geirm Exp $
+ * @version $Id: Template.java,v 1.29 2001/03/05 11:44:21 jvanzyl Exp $
*/
public class Template extends Resource
{
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/VelocityContext.java
Index: VelocityContext.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/VelocityContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityContext.java 2001/01/03 05:13:58 1.1
+++ VelocityContext.java 2001/03/05 11:44:24 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Fedor Karpelevitch</a>
- * @version $Id: VelocityContext.java,v 1.1 2001/01/03 05:13:58 geirm Exp $
+ * @version $Id: VelocityContext.java,v 1.2 2001/03/05 11:44:24 jvanzyl Exp $
*/
public class VelocityContext extends AbstractContext implements Cloneable
1.16 +2 -2
jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java
Index: AnakiaTask.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AnakiaTask.java 2001/03/04 23:44:35 1.15
+++ AnakiaTask.java 2001/03/05 11:44:32 1.16
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -90,7 +90,7 @@
* <a href="http://jakarta.apache.org/velocity/anakia.html">Website</a>.
*
* @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
- * @version $Id: AnakiaTask.java,v 1.15 2001/03/04 23:44:35 jon Exp $
+ * @version $Id: AnakiaTask.java,v 1.16 2001/03/05 11:44:32 jvanzyl Exp $
*/
public class AnakiaTask extends MatchingTask
{
1.3 +2 -2 jakarta-velocity/src/java/org/apache/velocity/anakia/Escape.java
Index: Escape.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/Escape.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Escape.java 2000/12/20 07:20:17 1.2
+++ Escape.java 2001/03/05 11:44:34 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
* of the " -> &quot; character.
*
* @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
- * @version $Id: Escape.java,v 1.2 2000/12/20 07:20:17 jvanzyl Exp $
+ * @version $Id: Escape.java,v 1.3 2001/03/05 11:44:34 jvanzyl Exp $
*/
public class Escape
{
1.3 +2 -2
jakarta-velocity/src/java/org/apache/velocity/anakia/TreeWalker.java
Index: TreeWalker.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/TreeWalker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TreeWalker.java 2000/12/20 07:19:00 1.2
+++ TreeWalker.java 2001/03/05 11:44:35 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,7 @@
* over the Vector and visit each Element node.
*
* @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
- * @version $Id: TreeWalker.java,v 1.2 2000/12/20 07:19:00 jvanzyl Exp $
+ * @version $Id: TreeWalker.java,v 1.3 2001/03/05 11:44:35 jvanzyl Exp $
*/
public class TreeWalker
{
1.8 +2 -2
jakarta-velocity/src/java/org/apache/velocity/anakia/XPathTool.java
Index: XPathTool.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/XPathTool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XPathTool.java 2000/12/20 07:16:18 1.7
+++ XPathTool.java 2001/03/05 11:44:37 1.8
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@
*
* @author <a href="[EMAIL PROTECTED]">bob mcwhirter</a>
* @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
- * @version $Id: XPathTool.java,v 1.7 2000/12/20 07:16:18 jvanzyl Exp $
+ * @version $Id: XPathTool.java,v 1.8 2001/03/05 11:44:37 jvanzyl Exp $
*/
public class XPathTool
{
1.3 +2 -1
jakarta-velocity/src/java/org/apache/velocity/app/FieldMethodizer.java
Index: FieldMethodizer.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/app/FieldMethodizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FieldMethodizer.java 2001/02/12 01:25:40 1.2
+++ FieldMethodizer.java 2001/03/05 11:44:48 1.3
@@ -1,4 +1,5 @@
package org.apache.velocity.app;
+
/*
* The Apache Software License, Version 1.1
*
@@ -91,7 +92,7 @@
* to handle them by explicitly placing them into the context.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: FieldMethodizer.java,v 1.2 2001/02/12 01:25:40 geirm Exp $
+ * @version $Id: FieldMethodizer.java,v 1.3 2001/03/05 11:44:48 jvanzyl Exp $
*/
public class FieldMethodizer
{
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/app/tools/VelocityFormatter.java
Index: VelocityFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/app/tools/VelocityFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityFormatter.java 2001/02/11 21:25:54 1.1
+++ VelocityFormatter.java 2001/03/05 11:44:54 1.2
@@ -1,7 +1,7 @@
package org.apache.velocity.app.tools;
/*
- * Copyright (c) 1997-2000 The Java Apache Project. All rights reserved.
+ * Copyright (c) 2001 The Java Apache Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -79,7 +79,7 @@
* </pre></code>
*
* @author <a href="[EMAIL PROTECTED]">Sean Legassick</a>
- * @version $Id: VelocityFormatter.java,v 1.1 2001/02/11 21:25:54 geirm Exp $
+ * @version $Id: VelocityFormatter.java,v 1.2 2001/03/05 11:44:54 jvanzyl Exp $
*/
public class VelocityFormatter
{
1.6 +1 -1
jakarta-velocity/src/java/org/apache/velocity/convert/WebMacro.java
Index: WebMacro.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/convert/WebMacro.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebMacro.java 2001/01/15 15:19:26 1.5
+++ WebMacro.java 2001/03/05 11:44:59 1.6
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +8 -14
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VelocityWriter.java 2000/12/20 07:07:25 1.2
+++ VelocityWriter.java 2001/03/05 11:45:04 1.3
@@ -1,15 +1,9 @@
package org.apache.velocity.io;
/*
- * $Header:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/io/VelocityWriter.java,v 1.2
2000/12/20 07:07:25 jvanzyl Exp $
- * $Revision: 1.2 $
- * $Date: 2000/12/20 07:07:25 $
- *
- * ====================================================================
- *
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -17,7 +11,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -25,15 +19,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
@@ -58,8 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
- *
- */
+ */
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -137,6 +130,7 @@
* are fixed -akv
*
* @author Anil K. Vijendran
+ * @version $Id: VelocityWriter.java,v 1.3 2001/03/05 11:45:04 jvanzyl Exp $
*/
public final class VelocityWriter extends Writer
{
1.91 +2 -2
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.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Runtime.java 2001/03/04 21:10:26 1.90
+++ Runtime.java 2001/03/05 11:45:08 1.91
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -172,7 +172,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magusson Jr.</a>
- * @version $Id: Runtime.java,v 1.90 2001/03/04 21:10:26 jvanzyl Exp $
+ * @version $Id: Runtime.java,v 1.91 2001/03/05 11:45:08 jvanzyl Exp $
*/
public class Runtime implements RuntimeConstants
{
1.16 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java
Index: RuntimeConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RuntimeConstants.java 2001/03/03 20:52:17 1.15
+++ RuntimeConstants.java 2001/03/05 11:45:11 1.16
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.10 +2 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VelocimacroFactory.java 2001/02/23 21:29:44 1.9
+++ VelocimacroFactory.java 2001/03/05 11:45:12 1.10
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
* manages the set of VMs in a running Velocity engine.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: VelocimacroFactory.java,v 1.9 2001/02/23 21:29:44 jon Exp $
+ * @version $Id: VelocimacroFactory.java,v 1.10 2001/03/05 11:45:12 jvanzyl Exp $
*
*/
public class VelocimacroFactory
1.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VelocimacroManager.java 2001/01/13 16:49:59 1.7
+++ VelocimacroManager.java 2001/03/05 11:45:13 1.8
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jose Alberto Fernandez</a>
- * @version $Id: VelocimacroManager.java,v 1.7 2001/01/13 16:49:59 geirm Exp $
+ * @version $Id: VelocimacroManager.java,v 1.8 2001/03/05 11:45:13 jvanzyl Exp $
*/
public class VelocimacroManager
{
1.3 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/compiler/Compiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Compiler.java 2000/12/20 07:30:04 1.2
+++ Compiler.java 2001/03/05 11:45:25 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.10 +4 -4
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Configuration.java 2001/03/05 10:37:55 1.9
+++ Configuration.java 2001/03/05 11:45:31 1.10
@@ -1,7 +1,7 @@
package org.apache.velocity.runtime.configuration;
/*
- * Copyright (c) 1997-2000 The Java Apache Project. All rights reserved.
+ * Copyright (c) 2001 The Java Apache Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -136,8 +136,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
+ * @author <a href="mailto:daveb@miceda-data">Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Configuration.java,v 1.9 2001/03/05 10:37:55 jvanzyl Exp $
+ * @version $Id: Configuration.java,v 1.10 2001/03/05 11:45:31 jvanzyl Exp $
*/
public class Configuration extends Hashtable
{
@@ -351,8 +352,7 @@
*
* @exception IOException, if there was an I/O problem.
*/
- private void init( Configuration exp )
- throws IOException
+ private void init( Configuration exp ) throws IOException
{
isInitialized = true;
}
1.12 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Directive.java
Index: Directive.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Directive.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Directive.java 2001/02/14 22:23:27 1.11
+++ Directive.java 2001/03/05 11:45:37 1.12
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/DirectiveConstants.java
Index: DirectiveConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/DirectiveConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DirectiveConstants.java 2000/11/28 04:16:21 1.2
+++ DirectiveConstants.java 2001/03/05 11:45:39 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.32 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java
Index: Foreach.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Foreach.java 2001/02/14 22:31:50 1.31
+++ Foreach.java 2001/03/05 11:45:41 1.32
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,7 +85,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Foreach.java,v 1.31 2001/02/14 22:31:50 geirm Exp $
+ * @version $Id: Foreach.java,v 1.32 2001/03/05 11:45:41 jvanzyl Exp $
*/
public class Foreach extends Directive
{
1.15 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Include.java
Index: Include.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Include.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Include.java 2001/01/03 05:28:33 1.14
+++ Include.java 2001/03/05 11:45:43 1.15
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Include.java,v 1.14 2001/01/03 05:28:33 geirm Exp $
+ * @version $Id: Include.java,v 1.15 2001/03/05 11:45:43 jvanzyl Exp $
*/
public class Include extends Directive
{
1.3 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Literal.java
Index: Literal.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Literal.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Literal.java 2001/01/03 05:28:33 1.2
+++ Literal.java 2001/03/05 11:45:44 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
* that during render().
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Literal.java,v 1.2 2001/01/03 05:28:33 geirm Exp $
+ * @version $Id: Literal.java,v 1.3 2001/03/05 11:45:44 jvanzyl Exp $
*/
public class Literal extends Directive
{
1.11 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Macro.java
Index: Macro.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Macro.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Macro.java 2001/01/13 16:40:32 1.10
+++ Macro.java 2001/03/05 11:45:46 1.11
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,7 @@
* macro. It is used inline in the parser when processing a directive.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Macro.java,v 1.10 2001/01/13 16:40:32 geirm Exp $
+ * @version $Id: Macro.java,v 1.11 2001/03/05 11:45:46 jvanzyl Exp $
*/
public class Macro extends Directive
{
1.15 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Parse.java
Index: Parse.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Parse.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Parse.java 2001/02/05 04:33:59 1.14
+++ Parse.java 2001/03/05 11:45:48 1.15
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christoph Reck</a>
- * @version $Id: Parse.java,v 1.14 2001/02/05 04:33:59 geirm Exp $
+ * @version $Id: Parse.java,v 1.15 2001/03/05 11:45:48 jvanzyl Exp $
*/
public class Parse extends Directive
{
1.3 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/ParseDirectiveException.java
Index: ParseDirectiveException.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/ParseDirectiveException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParseDirectiveException.java 2000/12/11 03:50:38 1.2
+++ ParseDirectiveException.java 2001/03/05 11:45:49 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
* Exception for #parse() problems
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ParseDirectiveException.java,v 1.2 2000/12/11 03:50:38 geirm Exp $
+ * @version $Id: ParseDirectiveException.java,v 1.3 2001/03/05 11:45:49 jvanzyl Exp
$
*/
public class ParseDirectiveException extends Exception
1.4 +4 -4
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
Index: VMProxyArg.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VMProxyArg.java 2001/01/24 17:04:42 1.3
+++ VMProxyArg.java 2001/03/05 11:45:50 1.4
@@ -1,7 +1,9 @@
+package org.apache.velocity.runtime.directive;
+
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,8 +54,6 @@
* <http://www.apache.org/>.
*/
-package org.apache.velocity.runtime.directive;
-
import java.io.ByteArrayInputStream;
import java.io.StringWriter;
@@ -109,7 +109,7 @@
* into a local context.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: VMProxyArg.java,v 1.3 2001/01/24 17:04:42 geirm Exp $
+ * @version $Id: VMProxyArg.java,v 1.4 2001/03/05 11:45:50 jvanzyl Exp $
*/
public class VMProxyArg
{
1.19 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
Index: VelocimacroProxy.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- VelocimacroProxy.java 2001/01/13 16:40:32 1.18
+++ VelocimacroProxy.java 2001/03/05 11:45:52 1.19
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@
* a proxy Directive-derived object to fit with the current directive system
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: VelocimacroProxy.java,v 1.18 2001/01/13 16:40:32 geirm Exp $
+ * @version $Id: VelocimacroProxy.java,v 1.19 2001/03/05 11:45:52 jvanzyl Exp $
*/
public class VelocimacroProxy extends Directive
{
1.2 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/exception/NodeException.java
Index: NodeException.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/exception/NodeException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NodeException.java 2000/11/24 23:59:18 1.1
+++ NodeException.java 2001/03/05 11:46:17 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/exception/ReferenceException.java
Index: ReferenceException.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/exception/ReferenceException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReferenceException.java 2000/12/05 05:08:10 1.3
+++ ReferenceException.java 2001/03/05 11:46:20 1.4
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/log/LogManager.java
Index: LogManager.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/LogManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogManager.java 2001/01/02 02:40:30 1.1
+++ LogManager.java 2001/03/05 11:46:28 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@
* this class for logging.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: LogManager.java,v 1.1 2001/01/02 02:40:30 jvanzyl Exp $
+ * @version $Id: LogManager.java,v 1.2 2001/03/05 11:46:28 jvanzyl Exp $
*/
public class LogManager
{
1.2 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
Index: VelocityFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/VelocityFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityFormatter.java 2001/01/02 02:40:30 1.1
+++ VelocityFormatter.java 2001/03/05 11:46:30 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.57 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jjt
Index: Parser.jjt
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jjt,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Parser.jjt 2001/03/01 03:31:13 1.56
+++ Parser.jjt 2001/03/05 11:46:36 1.57
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -120,7 +120,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.jjt,v 1.56 2001/03/01 03:31:13 geirm Exp $
+ * @version $Id: Parser.jjt,v 1.57 2001/03/05 11:46:36 jvanzyl Exp $
*/
public class Parser
{
1.3 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ContentResource.java
Index: ContentResource.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ContentResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentResource.java 2000/12/19 15:33:16 1.2
+++ ContentResource.java 2001/03/05 11:46:42 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
* sources.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ContentResource.java,v 1.2 2000/12/19 15:33:16 jvanzyl Exp $
+ * @version $Id: ContentResource.java,v 1.3 2001/03/05 11:46:42 jvanzyl Exp $
*/
public class ContentResource extends Resource
{
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Resource.java 2001/02/26 03:33:19 1.3
+++ Resource.java 2001/03/05 11:46:44 1.4
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,7 +72,7 @@
* sources.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Resource.java,v 1.3 2001/02/26 03:33:19 geirm Exp $
+ * @version $Id: Resource.java,v 1.4 2001/03/05 11:46:44 jvanzyl Exp $
*/
public abstract class Resource
{
1.2 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceFactory.java
Index: ResourceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceFactory.java 2000/12/19 05:30:05 1.1
+++ ResourceFactory.java 2001/03/05 11:46:46 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.14 +2 -2
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ResourceManager.java 2001/03/05 10:38:31 1.13
+++ ResourceManager.java 2001/03/05 11:46:48 1.14
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@
* Runtime.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ResourceManager.java,v 1.13 2001/03/05 10:38:31 jvanzyl Exp $
+ * @version $Id: ResourceManager.java,v 1.14 2001/03/05 11:46:48 jvanzyl Exp $
*/
public class ResourceManager
{
1.7 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Index: FileResourceLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileResourceLoader.java 2001/03/04 00:51:29 1.6
+++ FileResourceLoader.java 2001/03/05 11:46:59 1.7
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@
* That'll change once we decide how we want to do configuration
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*/
public class FileResourceLoader extends ResourceLoader
{
1.3 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
Index: JarHolder.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JarHolder.java 2001/03/05 02:48:55 1.2
+++ JarHolder.java 2001/03/05 11:47:01 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*/
public class JarHolder
{
1.6 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
Index: JarResourceLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JarResourceLoader.java 2001/03/05 02:50:01 1.5
+++ JarResourceLoader.java 2001/03/05 11:47:02 1.6
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*/
public class JarResourceLoader extends ResourceLoader
{
1.6 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
Index: ResourceLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceLoader.java 2001/03/03 20:33:22 1.5
+++ ResourceLoader.java 2001/03/05 11:47:04 1.6
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,7 +68,7 @@
* extend.
*
* @autor <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * $Id: ResourceLoader.java,v 1.5 2001/03/03 20:33:22 jvanzyl Exp $
+ * $Id: ResourceLoader.java,v 1.6 2001/03/05 11:47:04 jvanzyl Exp $
*/
public abstract class ResourceLoader
{
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
Index: ResourceLoaderFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceLoaderFactory.java 2000/12/19 05:30:06 1.1
+++ ResourceLoaderFactory.java 2001/03/05 11:47:06 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@
* Factory to grab a template loader.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * $Id: ResourceLoaderFactory.java,v 1.1 2000/12/19 05:30:06 jvanzyl Exp $
+ * $Id: ResourceLoaderFactory.java,v 1.2 2001/03/05 11:47:06 jvanzyl Exp $
*/
public class ResourceLoaderFactory
{
1.8 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
Index: BaseVisitor.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseVisitor.java 2001/01/03 05:28:34 1.7
+++ BaseVisitor.java 2001/03/05 11:47:17 1.8
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
Index: NodeViewMode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NodeViewMode.java 2000/10/21 02:00:18 1.3
+++ NodeViewMode.java 2001/03/05 11:47:19 1.4
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
* as well.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: NodeViewMode.java,v 1.3 2000/10/21 02:00:18 jvanzyl Exp $
+ * @version $Id: NodeViewMode.java,v 1.4 2001/03/05 11:47:19 jvanzyl Exp $
*/
public class NodeViewMode extends BaseVisitor
{
1.23 +2 -2
jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java
Index: VelocityServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- VelocityServlet.java 2001/02/26 04:51:23 1.22
+++ VelocityServlet.java 2001/03/05 11:47:25 1.23
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -104,7 +104,7 @@
* @author Dave Bryson
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * $Id: VelocityServlet.java,v 1.22 2001/02/26 04:51:23 geirm Exp $
+ * $Id: VelocityServlet.java,v 1.23 2001/03/05 11:47:25 jvanzyl Exp $
*/
public abstract class VelocityServlet extends HttpServlet
{
1.6 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/BaseTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseTestCase.java 2000/12/20 06:51:47 1.5
+++ BaseTestCase.java 2001/03/05 11:47:32 1.6
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@
* case implementations are used to automatate testing via JUnit.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
- * @version $Id: BaseTestCase.java,v 1.5 2000/12/20 06:51:47 jvanzyl Exp $
+ * @version $Id: BaseTestCase.java,v 1.6 2001/03/05 11:47:32 jvanzyl Exp $
*/
public abstract class BaseTestCase extends TestCase
{
1.5 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/ContextSafetyTestCase.java
Index: ContextSafetyTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/ContextSafetyTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextSafetyTestCase.java 2001/03/05 10:33:31 1.4
+++ ContextSafetyTestCase.java 2001/03/05 11:47:34 1.5
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,7 +80,7 @@
* RuntimeTestCase causes the Runtime to be initialized twice.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ContextSafetyTestCase.java,v 1.4 2001/03/05 10:33:31 jvanzyl Exp $
+ * @version $Id: ContextSafetyTestCase.java,v 1.5 2001/03/05 11:47:34 jvanzyl Exp $
*/
public class ContextSafetyTestCase extends BaseTestCase
{
1.6 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/InlineScopeVMTestCase.java
Index: InlineScopeVMTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/InlineScopeVMTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InlineScopeVMTestCase.java 2001/01/03 05:28:51 1.5
+++ InlineScopeVMTestCase.java 2001/03/05 11:47:35 1.6
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,7 +76,7 @@
* Tests if the VM template-locality is working.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: InlineScopeVMTestCase.java,v 1.5 2001/01/03 05:28:51 geirm Exp $
+ * @version $Id: InlineScopeVMTestCase.java,v 1.6 2001/03/05 11:47:35 jvanzyl Exp $
*/
public class InlineScopeVMTestCase extends TestCase
{
1.5 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/IntrospectorTestCase.java
Index: IntrospectorTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/IntrospectorTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IntrospectorTestCase.java 2000/12/20 06:42:03 1.4
+++ IntrospectorTestCase.java 2001/03/05 11:47:37 1.5
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,7 +72,7 @@
* for now.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: IntrospectorTestCase.java,v 1.4 2000/12/20 06:42:03 jvanzyl Exp $
+ * @version $Id: IntrospectorTestCase.java,v 1.5 2001/03/05 11:47:37 jvanzyl Exp $
*/
public class IntrospectorTestCase extends BaseTestCase
{
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/MultipleFileResourcePathTest.java
Index: MultipleFileResourcePathTest.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/MultipleFileResourcePathTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultipleFileResourcePathTest.java 2001/03/04 00:42:05 1.1
+++ MultipleFileResourcePathTest.java 2001/03/05 11:47:38 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,7 +76,7 @@
* Multiple paths in the file resource loader.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: MultipleFileResourcePathTest.java,v 1.1 2001/03/04 00:42:05
jvanzyl Exp $
+ * @version $Id: MultipleFileResourcePathTest.java,v 1.2 2001/03/05 11:47:38
jvanzyl Exp $
*/
public class MultipleFileResourcePathTest extends TestCase
{
1.4 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/RuntimeTestCase.java
Index: RuntimeTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/RuntimeTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RuntimeTestCase.java 2000/12/20 06:39:12 1.3
+++ RuntimeTestCase.java 2001/03/05 11:47:40 1.4
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
* Base functionality to be extended by all runtime test cases.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
- * @version $Id: RuntimeTestCase.java,v 1.3 2000/12/20 06:39:12 jvanzyl Exp $
+ * @version $Id: RuntimeTestCase.java,v 1.4 2001/03/05 11:47:40 jvanzyl Exp $
*/
public abstract class RuntimeTestCase extends BaseTestCase
{
1.23 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/TemplateTestCase.java
Index: TemplateTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/TemplateTestCase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TemplateTestCase.java 2001/03/05 10:33:32 1.22
+++ TemplateTestCase.java 2001/03/05 11:47:41 1.23
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -94,7 +94,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: TemplateTestCase.java,v 1.22 2001/03/05 10:33:32 jvanzyl Exp $
+ * @version $Id: TemplateTestCase.java,v 1.23 2001/03/05 11:47:41 jvanzyl Exp $
*/
public class TemplateTestCase extends BaseTestCase
{
1.17 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/VelocityTestSuite.java
Index: VelocityTestSuite.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/VelocityTestSuite.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VelocityTestSuite.java 2001/03/05 02:28:11 1.16
+++ VelocityTestSuite.java 2001/03/05 11:47:42 1.17
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: VelocityTestSuite.java,v 1.16 2001/03/05 02:28:11 dlr Exp $
+ * @version $Id: VelocityTestSuite.java,v 1.17 2001/03/05 11:47:42 jvanzyl Exp $
*/
public class VelocityTestSuite extends TestSuite
{
1.17 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/misc/Test.java
Index: Test.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/misc/Test.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Test.java 2001/02/26 04:02:32 1.16
+++ Test.java 2001/03/05 11:47:57 1.17
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -86,7 +86,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Test.java,v 1.16 2001/02/26 04:02:32 geirm Exp $
+ * @version $Id: Test.java,v 1.17 2001/03/05 11:47:57 jvanzyl Exp $
*/
public class Test
{
1.3 +1 -1
jakarta-velocity/src/java/org/apache/velocity/test/provider/Child.java
Index: Child.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/provider/Child.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Child.java 2000/12/20 06:55:47 1.2
+++ Child.java 2001/03/05 11:48:04 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +1 -1
jakarta-velocity/src/java/org/apache/velocity/test/provider/Person.java
Index: Person.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/provider/Person.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Person.java 2000/12/20 06:55:47 1.2
+++ Person.java 2001/03/05 11:48:05 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.15 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/provider/TestProvider.java
Index: TestProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/provider/TestProvider.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TestProvider.java 2001/01/24 15:30:09 1.14
+++ TestProvider.java 2001/03/05 11:48:06 1.15
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
* is traversed and dynamic content generated.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: TestProvider.java,v 1.14 2001/01/24 15:30:09 geirm Exp $
+ * @version $Id: TestProvider.java,v 1.15 2001/03/05 11:48:06 jvanzyl Exp $
*/
public class TestProvider
{
1.3 +1 -1
jakarta-velocity/src/java/org/apache/velocity/test/view/TemplateNodeView.java
Index: TemplateNodeView.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/view/TemplateNodeView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateNodeView.java 2000/12/05 05:15:07 1.2
+++ TemplateNodeView.java 2001/03/05 11:48:12 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.13 +36 -39
jakarta-velocity/src/java/org/apache/velocity/texen/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/texen/Generator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Generator.java 2001/03/02 20:35:02 1.12
+++ Generator.java 2001/03/05 11:48:17 1.13
@@ -1,8 +1,11 @@
package org.apache.velocity.texen;
/*
- * Copyright (c) 1997-2000 The Java Apache Project. All rights reserved.
+ * The Apache Software License, Version 1.1
*
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -15,45 +18,40 @@
* the documentation and/or other materials provided with the
* distribution.
*
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- * "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- * "Java Apache Project" must not be used to endorse or promote products
- * derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- * nor may "Apache" nor "Apache JServ" appear in their names without
- * prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
*
* This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
*/
import java.io.*;
@@ -63,13 +61,12 @@
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
-
/**
* A text/code generator class
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leon Messerschmidt</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Generator.java,v 1.12 2001/03/02 20:35:02 jvanzyl Exp $
+ * @version $Id: Generator.java,v 1.13 2001/03/05 11:48:17 jvanzyl Exp $
*/
public class Generator
{
1.16 +36 -38
jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java
Index: TexenTask.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TexenTask.java 2001/03/02 20:35:17 1.15
+++ TexenTask.java 2001/03/05 11:48:22 1.16
@@ -1,8 +1,11 @@
package org.apache.velocity.texen.ant;
/*
- * Copyright (c) 1997-2000 The Java Apache Project. All rights reserved.
+ * The Apache Software License, Version 1.1
*
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -15,45 +18,40 @@
* the documentation and/or other materials provided with the
* distribution.
*
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- * "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- * "Java Apache Project" must not be used to endorse or promote products
- * derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- * nor may "Apache" nor "Apache JServ" appear in their names without
- * prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
*
* This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
*/
import java.util.Enumeration;
@@ -79,7 +77,7 @@
* An ant task for generating output by using Velocity
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: TexenTask.java,v 1.15 2001/03/02 20:35:17 jvanzyl Exp $
+ * @version $Id: TexenTask.java,v 1.16 2001/03/05 11:48:22 jvanzyl Exp $
*/
public class TexenTask extends Task
1.7 +35 -37
jakarta-velocity/src/java/org/apache/velocity/texen/util/FileUtil.java
Index: FileUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/texen/util/FileUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileUtil.java 2001/02/27 15:24:02 1.6
+++ FileUtil.java 2001/03/05 11:48:28 1.7
@@ -1,8 +1,11 @@
package org.apache.velocity.texen.util;
/*
- * Copyright (c) 1997-2000 The Java Apache Project. All rights reserved.
+ * The Apache Software License, Version 1.1
*
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -15,45 +18,40 @@
* the documentation and/or other materials provided with the
* distribution.
*
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- * "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- * "Java Apache Project" must not be used to endorse or promote products
- * derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- * nor may "Apache" nor "Apache JServ" appear in their names without
- * prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
*
* This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
*/
import java.io.File;
1.5 +35 -37
jakarta-velocity/src/java/org/apache/velocity/texen/util/PropertiesUtil.java
Index: PropertiesUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/texen/util/PropertiesUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PropertiesUtil.java 2001/02/27 08:03:03 1.4
+++ PropertiesUtil.java 2001/03/05 11:48:31 1.5
@@ -1,8 +1,11 @@
package org.apache.velocity.texen.util;
/*
- * Copyright (c) 1997-2000 The Java Apache Project. All rights reserved.
+ * The Apache Software License, Version 1.1
*
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -15,45 +18,40 @@
* the documentation and/or other materials provided with the
* distribution.
*
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- * "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- * "Java Apache Project" must not be used to endorse or promote products
- * derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- * nor may "Apache" nor "Apache JServ" appear in their names without
- * prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
*
* This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
*/
import java.io.FileInputStream;
1.9 +2 -2
jakarta-velocity/src/java/org/apache/velocity/util/StringUtils.java
Index: StringUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/StringUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StringUtils.java 2001/03/05 01:26:38 1.8
+++ StringUtils.java 2001/03/05 11:48:39 1.9
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@
* string utilities class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: StringUtils.java,v 1.8 2001/03/05 01:26:38 dlr Exp $
+ * @version $Id: StringUtils.java,v 1.9 2001/03/05 11:48:39 jvanzyl Exp $
*/
public class StringUtils
{
1.8 +2 -2
jakarta-velocity/src/java/org/apache/velocity/util/introspection/ClassMap.java
Index: ClassMap.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/ClassMap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClassMap.java 2000/11/10 02:29:48 1.7
+++ ClassMap.java 2001/03/05 11:48:44 1.8
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bob McWhirter</a>
- * @version $Id: ClassMap.java,v 1.7 2000/11/10 02:29:48 jvanzyl Exp $
+ * @version $Id: ClassMap.java,v 1.8 2001/03/05 11:48:44 jvanzyl Exp $
*/
// TODO: public boolean (String[] list)
1.2 +4 -4
jakarta-velocity/src/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java
Index: IntrospectionCacheData.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntrospectionCacheData.java 2000/12/12 23:44:18 1.1
+++ IntrospectionCacheData.java 2001/03/05 11:48:46 1.2
@@ -1,7 +1,9 @@
+package org.apache.velocity.util.introspection;
+
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,14 +54,12 @@
* <http://www.apache.org/>.
*/
-package org.apache.velocity.util.introspection;
-
/**
* Holds information for node-local context data introspection
* information @see InternalContext
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: IntrospectionCacheData.java,v 1.1 2000/12/12 23:44:18 geirm Exp $
+ * @version $Id: IntrospectionCacheData.java,v 1.2 2001/03/05 11:48:46 jvanzyl Exp $
*/
public class IntrospectionCacheData
1.9 +40 -24
jakarta-velocity/src/java/org/apache/velocity/util/introspection/Introspector.java
Index: Introspector.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/Introspector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Introspector.java 2000/11/25 18:27:27 1.8
+++ Introspector.java 2001/03/05 11:48:49 1.9
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,13 +85,8 @@
* and stored for
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bob McWhirter</a>
- * @version $Id: Introspector.java,v 1.8 2000/11/25 18:27:27 jon Exp $
+ * @version $Id: Introspector.java,v 1.9 2001/03/05 11:48:49 jvanzyl Exp $
*/
-
-// isAssignable checks for arguments that are subclasses
-// DirectHit map
-// DirectMiss map
-
public class Introspector
{
private static Hashtable classMethodMaps = new Hashtable();
@@ -100,25 +95,33 @@
throws Exception
{
if (c == null)
- throw new Exception ( "Introspector.getMethod(): Class method key was
null: " + name );
-
- // If this is the first time seeing this class
- // then create a method map for this class and
- // store it in Hashtable of class method maps.
+ {
+ throw new Exception (
+ "Introspector.getMethod(): Class method key was null: " + name );
+ }
+
+ /*
+ * If this is the first time seeing this class
+ * then create a method map for this class and
+ * store it in Hashtable of class method maps.
+ */
if (!classMethodMaps.containsKey(c))
{
- // Lots of threads might be whizzing through here,
- // so we do a double-checked lock, which only involves
- // synchronization when there's a key-miss. Avoids
- // doing duplicate work, and constructing objects twice
- // in particular race conditions
-
- // Though, some folks say that double-checked-locking
- // doesn't necessarily work-as-expected in Java on
- // multi-proc machines. Doesn't make things worse,
- // but just doesn't help as much as you'd imagine it
- // would. Darn re-ordering of instructions.
-
+ /*
+ * Lots of threads might be whizzing through here,
+ * so we do a double-checked lock, which only involves
+ * synchronization when there's a key-miss. Avoids
+ * doing duplicate work, and constructing objects twice
+ * in particular race conditions
+ */
+
+ /*
+ * Though, some folks say that double-checked-locking
+ * doesn't necessarily work-as-expected in Java on
+ * multi-proc machines. Doesn't make things worse,
+ * but just doesn't help as much as you'd imagine it
+ * would. Darn re-ordering of instructions.
+ */
synchronized (classMethodMaps)
{
if (!classMethodMaps.containsKey(c))
@@ -130,6 +133,13 @@
return findMethod(c, name, params);
}
+ /**
+ * Find a method in a class.
+ *
+ * @param Class class to search
+ * @param String name of method
+ * @param Object[] parameters
+ */
private static Method findMethod(Class c, String name, Object[] params)
{
ClassMap classMethodMap = (ClassMap) classMethodMaps.get(c);
@@ -139,6 +149,7 @@
/**
* Checks whether the provided object implements a given method.
*
+ *
* @param object The object to check.
* @param methodName The method to check for.
* @return Whether the method is implemented.
@@ -148,9 +159,14 @@
int m;
Method[] methods = object.getClass().getMethods();
+
for (m = 0 ; m < methods.length ; ++m)
+ {
if (methodName.equals(methods[m].getName()))
+ {
break;
+ }
+ }
return (m < methods.length);
}
1.9 +29 -7
jakarta-velocity/src/java/org/apache/velocity/util/introspection/MethodMap.java
Index: MethodMap.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/MethodMap.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MethodMap.java 2000/12/07 17:44:33 1.8
+++ MethodMap.java 2001/03/05 11:48:51 1.9
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,11 +66,14 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bob McWhirter</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christoph Reck</a>
- * @version $Id: MethodMap.java,v 1.8 2000/12/07 17:44:33 jvanzyl Exp $
+ * @version $Id: MethodMap.java,v 1.9 2001/03/05 11:48:51 jvanzyl Exp $
*/
public class MethodMap
{
+ /**
+ * Keep track of all methods with the same name.
+ */
Map methodByNameMap = new Hashtable();
/**
@@ -83,16 +86,31 @@
String methodName = method.getName();
if (!methodByNameMap.containsKey(methodName))
+ {
methodByNameMap.put(methodName, new ArrayList());
+ }
((List) methodByNameMap.get(methodName)).add(method);
}
-
+
+ /**
+ * Return a list of methods with the same name.
+ *
+ * @param String key
+ * @return List list of methods
+ */
public List get(String key)
{
return (List) methodByNameMap.get(key);
}
+ /**
+ * Find a method.
+ *
+ * @param String name of method
+ * @param Object[] params
+ * @return Method
+ */
public Method find(String methodName, Object[] params)
{
List methodList = (List) methodByNameMap.get(methodName);
@@ -112,13 +130,17 @@
method = (Method) methodList.get(i);
parameterTypes = method.getParameterTypes();
- // The methods we are trying to compare must
- // the same number of arguments.
+ /*
+ * The methods we are trying to compare must
+ * the same number of arguments.
+ */
if (parameterTypes.length == params.length)
{
- // Make sure the given parameter is a valid
- // subclass of the method parameter in question.
+ /*
+ * Make sure the given parameter is a valid
+ * subclass of the method parameter in question.
+ */
for (int j = 0; ; j++)
{
