You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2006/09/19 22:47:16 UTC
svn commit: r447961 [1/2] - in /jakarta/velocity/engine/trunk: ./ build/
convert/ examples/anakia/xdocs/ examples/anakia/xdocs/stylesheets/
examples/app_example1/ examples/app_example2/ examples/event_example/
examples/logger_example/ examples/xmlapp_e...
Author: henning
Date: Tue Sep 19 13:47:13 2006
New Revision: 447961
URL: http://svn.apache.org/viewvc?view=rev&rev=447961
Log:
Do some gentle reformatting of comments, making the code a bit better
stomachable for tools like Checkstyle.
Modified:
jakarta/velocity/engine/trunk/build/build.properties
jakarta/velocity/engine/trunk/build/build.xml
jakarta/velocity/engine/trunk/build/test.sh
jakarta/velocity/engine/trunk/convert/convert-wm.bat
jakarta/velocity/engine/trunk/convert/convert-wm.sh
jakarta/velocity/engine/trunk/examples/anakia/xdocs/index.xml
jakarta/velocity/engine/trunk/examples/anakia/xdocs/stylesheets/site.vsl
jakarta/velocity/engine/trunk/examples/app_example1/appendVELCP.bat
jakarta/velocity/engine/trunk/examples/app_example2/Example2.java
jakarta/velocity/engine/trunk/examples/app_example2/appendVELCP.bat
jakarta/velocity/engine/trunk/examples/app_example2/example2.sh
jakarta/velocity/engine/trunk/examples/event_example/EventExample.java
jakarta/velocity/engine/trunk/examples/logger_example/appendVELCP.bat
jakarta/velocity/engine/trunk/examples/xmlapp_example/appendVELCP.bat
jakarta/velocity/engine/trunk/examples/xmlapp_example/xmlapp_example.sh
jakarta/velocity/engine/trunk/experimental/veltag/examples/veltag.tld
jakarta/velocity/engine/trunk/experimental/veltag/repository.xml
jakarta/velocity/engine/trunk/project.properties
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPool.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPoolImpl.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/build.sh
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/TemplateNumber.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java
jakarta/velocity/engine/trunk/src/parser/Parser.jjt
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ArithmeticTestCase.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/InfoTestCase.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ParserTestCase.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceCachingTestCase.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/UberspectorTestCase.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/GetPutObject.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java
jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml
jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml
jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl
jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl
jakarta/velocity/engine/trunk/test/configuration/test-config.properties
jakarta/velocity/engine/trunk/test/misc/compile.sh
jakarta/velocity/engine/trunk/test/misc/dump.sh
jakarta/velocity/engine/trunk/test/misc/test.sh
jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props
jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh
jakarta/velocity/engine/trunk/test/texen/service.props
jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/build.sh
jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/velocity.properties
jakarta/velocity/engine/trunk/whiteboard/daveb/myprops.properties
jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/build.sh
jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/velocity.properties
jakarta/velocity/engine/trunk/whiteboard/geir/test.sh
jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.properties
jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.xml
jakarta/velocity/engine/trunk/xdocs/site.css
jakarta/velocity/engine/trunk/xdocs/stylesheets/site.vsl
jakarta/velocity/engine/trunk/xdocs/stylesheets/wiki.vsl
Modified: jakarta/velocity/engine/trunk/build/build.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/build.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/build/build.properties (original)
+++ jakarta/velocity/engine/trunk/build/build.properties Tue Sep 19 13:47:13 2006
@@ -76,11 +76,11 @@
# Set to Sun Javadocs
javadocs.ref.jsdk= http://java.sun.com/j2se/1.4.2/docs/api/
-########################################################################
+# #######################################################################
#
# Downloading jars from ibiblio repository
#
-########################################################################
+# #######################################################################
#
# Settings for the proxy to use for download. Change this if you must
Modified: jakarta/velocity/engine/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/build.xml?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/build/build.xml (original)
+++ jakarta/velocity/engine/trunk/build/build.xml Tue Sep 19 13:47:13 2006
@@ -548,7 +548,7 @@
<!-- =================================================================== -->
<target name="build-package-tree" depends="clean">
- <!--
+ <!--
Don't move these ant calls into depends! If you do so, either jar
or jar-dep or docs (via its depends on jar) will set the jarname
property and as it is immutable, you will no longer be able to
Modified: jakarta/velocity/engine/trunk/build/test.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/test.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/build/test.sh (original)
+++ jakarta/velocity/engine/trunk/build/test.sh Tue Sep 19 13:47:13 2006
@@ -1,11 +1,11 @@
-#!/bin/sh
-#----------------------------------------------
+# !/bin/sh
+# ----------------------------------------------
# Script for running individual velocity tests.
-#----------------------------------------------
+# ----------------------------------------------
-#-------------------------------------------------------------------
+# -------------------------------------------------------------------
-#--------------------------------------------
+# --------------------------------------------
# No need to edit anything past here
-#--------------------------------------------
+# --------------------------------------------
ant -buildfile testcases.xml "$@"
Modified: jakarta/velocity/engine/trunk/convert/convert-wm.bat
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/convert/convert-wm.bat?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/convert/convert-wm.bat (original)
+++ jakarta/velocity/engine/trunk/convert/convert-wm.bat Tue Sep 19 13:47:13 2006
@@ -26,4 +26,4 @@
set CLASSPATH=%_CLASSPATH%
set _CLASSPATH=
-pause
\ No newline at end of file
+pause
Modified: jakarta/velocity/engine/trunk/convert/convert-wm.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/convert/convert-wm.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/convert/convert-wm.sh (original)
+++ jakarta/velocity/engine/trunk/convert/convert-wm.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
[ -z $1 ] && echo \
&& echo 'Need a template or a directory of templates to convert!' \
Modified: jakarta/velocity/engine/trunk/examples/anakia/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/anakia/xdocs/index.xml?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/anakia/xdocs/index.xml (original)
+++ jakarta/velocity/engine/trunk/examples/anakia/xdocs/index.xml Tue Sep 19 13:47:13 2006
@@ -43,4 +43,4 @@
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: jakarta/velocity/engine/trunk/examples/anakia/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/anakia/xdocs/stylesheets/site.vsl?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/anakia/xdocs/stylesheets/site.vsl (original)
+++ jakarta/velocity/engine/trunk/examples/anakia/xdocs/stylesheets/site.vsl Tue Sep 19 13:47:13 2006
@@ -16,7 +16,7 @@
## This is where the macro's live
#macro ( makeProject )
- ##set ($menus = $project.getChild("body").getChildren("menu"))
+ ## set ($menus = $project.getChild("body").getChildren("menu"))
#set ($menus = $xpath.applyTo("body/menu", $project))
#foreach ( $menu in $menus )
@@ -59,8 +59,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
- ##set ($au = $root.getChild("properties").getChild("author").getText())
- ##set ($em = $root.getChild("properties").getChild("author").getAttributeValue("email"))
+ ## set ($au = $root.getChild("properties").getChild("author").getText())
+ ## set ($em = $root.getChild("properties").getChild("author").getAttributeValue("email"))
<!--
## For some reason, we can't .getText() and .getValue() directly in the
@@ -72,8 +72,8 @@
## This should work, but doesn't
- ##set ($au = $xpath.applyTo("properties/author", $root).get(0).getText())
- ##set ($em = $xpath.applyTo("properties/author/@email", $root).get(0).getValue())
+ ## set ($au = $xpath.applyTo("properties/author", $root).get(0).getText())
+ ## set ($em = $xpath.applyTo("properties/author/@email", $root).get(0).getValue())
-->
@@ -90,7 +90,7 @@
#makeProject()
</td>
<td>
- ##set ($allSections = $root.getChild("body").getChildren("section"))
+ ## set ($allSections = $root.getChild("body").getChildren("section"))
#set ($allSections = $xpath.applyTo("body/section", $root))
#foreach ( $section in $allSections )
Modified: jakarta/velocity/engine/trunk/examples/app_example1/appendVELCP.bat
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/app_example1/appendVELCP.bat?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/app_example1/appendVELCP.bat (original)
+++ jakarta/velocity/engine/trunk/examples/app_example1/appendVELCP.bat Tue Sep 19 13:47:13 2006
@@ -1,2 +1,2 @@
-set VELCP=%VELCP%;%1
\ No newline at end of file
+set VELCP=%VELCP%;%1
Modified: jakarta/velocity/engine/trunk/examples/app_example2/Example2.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/app_example2/Example2.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/app_example2/Example2.java (original)
+++ jakarta/velocity/engine/trunk/examples/app_example2/Example2.java Tue Sep 19 13:47:13 2006
@@ -72,7 +72,7 @@
System.out.println(" template : " + w );
- /*
+ /*
* lets dynamically 'create' our template
* and use the evaluate() method to render it
*/
Modified: jakarta/velocity/engine/trunk/examples/app_example2/appendVELCP.bat
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/app_example2/appendVELCP.bat?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/app_example2/appendVELCP.bat (original)
+++ jakarta/velocity/engine/trunk/examples/app_example2/appendVELCP.bat Tue Sep 19 13:47:13 2006
@@ -1,2 +1,2 @@
-set VELCP=%VELCP%;%1
\ No newline at end of file
+set VELCP=%VELCP%;%1
Modified: jakarta/velocity/engine/trunk/examples/app_example2/example2.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/app_example2/example2.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/app_example2/example2.sh (original)
+++ jakarta/velocity/engine/trunk/examples/app_example2/example2.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
_VELCP=.
Modified: jakarta/velocity/engine/trunk/examples/event_example/EventExample.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/event_example/EventExample.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/event_example/EventExample.java (original)
+++ jakarta/velocity/engine/trunk/examples/event_example/EventExample.java Tue Sep 19 13:47:13 2006
@@ -73,7 +73,7 @@
return;
}
- /*
+ /*
* lets make a Context and add some data
*/
@@ -93,7 +93,7 @@
try
{
- /*
+ /*
* lets test each type of event handler individually
* using 'dynamic' templates
*
Modified: jakarta/velocity/engine/trunk/examples/logger_example/appendVELCP.bat
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/logger_example/appendVELCP.bat?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/logger_example/appendVELCP.bat (original)
+++ jakarta/velocity/engine/trunk/examples/logger_example/appendVELCP.bat Tue Sep 19 13:47:13 2006
@@ -1,2 +1,2 @@
-set VELCP=%VELCP%;%1
\ No newline at end of file
+set VELCP=%VELCP%;%1
Modified: jakarta/velocity/engine/trunk/examples/xmlapp_example/appendVELCP.bat
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/xmlapp_example/appendVELCP.bat?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/xmlapp_example/appendVELCP.bat (original)
+++ jakarta/velocity/engine/trunk/examples/xmlapp_example/appendVELCP.bat Tue Sep 19 13:47:13 2006
@@ -1,2 +1,2 @@
-set VELCP=%VELCP%;%1
\ No newline at end of file
+set VELCP=%VELCP%;%1
Modified: jakarta/velocity/engine/trunk/examples/xmlapp_example/xmlapp_example.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/examples/xmlapp_example/xmlapp_example.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/examples/xmlapp_example/xmlapp_example.sh (original)
+++ jakarta/velocity/engine/trunk/examples/xmlapp_example/xmlapp_example.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
_VELCP=.
Modified: jakarta/velocity/engine/trunk/experimental/veltag/examples/veltag.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/experimental/veltag/examples/veltag.tld?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/experimental/veltag/examples/veltag.tld (original)
+++ jakarta/velocity/engine/trunk/experimental/veltag/examples/veltag.tld Tue Sep 19 13:47:13 2006
@@ -20,4 +20,4 @@
</attribute>
</tag>
-</taglib>
\ No newline at end of file
+</taglib>
Modified: jakarta/velocity/engine/trunk/experimental/veltag/repository.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/experimental/veltag/repository.xml?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/experimental/veltag/repository.xml (original)
+++ jakarta/velocity/engine/trunk/experimental/veltag/repository.xml Tue Sep 19 13:47:13 2006
@@ -34,4 +34,4 @@
</package>
</packagegroup>
-</repository>
\ No newline at end of file
+</repository>
Modified: jakarta/velocity/engine/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/project.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/project.properties (original)
+++ jakarta/velocity/engine/trunk/project.properties Tue Sep 19 13:47:13 2006
@@ -43,4 +43,4 @@
maven.xdoc.theme= velocity
# Uncomment when http://jira.codehaus.org/browse/MPTEST-57 has been resolved
-#maven.test.classpath= ${basedir}/test/cpload/test1.jar:${basedir}/test/cpload/test2.jar:${basedir}/test/multiloader/test1.jar
+# maven.test.classpath= ${basedir}/test/cpload/test1.jar:${basedir}/test/cpload/test2.jar:${basedir}/test/multiloader/test1.jar
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java Tue Sep 19 13:47:13 2006
@@ -280,4 +280,4 @@
return returnValue;
}
-}
\ No newline at end of file
+}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPool.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPool.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPool.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPool.java Tue Sep 19 13:47:13 2006
@@ -2,7 +2,7 @@
import org.apache.velocity.runtime.parser.Parser;
-/*
+/*
* Copyright 2000-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
@@ -16,7 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
/**
* Provides instances of parsers as needed. get() will return a new parser if
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPoolImpl.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPoolImpl.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPoolImpl.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/ParserPoolImpl.java Tue Sep 19 13:47:13 2006
@@ -3,7 +3,7 @@
import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.util.SimplePool;
-/*
+/*
* Copyright 2000-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
@@ -17,7 +17,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
/**
* This wraps the original parser SimplePool class. It also handles
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java Tue Sep 19 13:47:13 2006
@@ -418,7 +418,7 @@
*/
if (!templateLocal)
{
- /*
+ /*
* otherwise, if we have it already in global namespace, and they can't replace
* since local templates are not allowed, the global namespace is implied.
* remember, we don't know anything about namespace managment here, so lets
@@ -585,7 +585,7 @@
* note that we don't need to put this twonk back
* into the map, as we can just use the same reference
* and this block is synchronized
- */
+ */
}
}
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java Tue Sep 19 13:47:13 2006
@@ -52,7 +52,7 @@
/** map of names of library tempates/namespaces */
private final Hashtable libraryMap = new Hashtable();
- /*
+ /*
* big switch for namespaces. If true, then properties control
* usage. If false, no.
*/
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties Tue Sep 19 13:47:13 2006
@@ -1,84 +1,84 @@
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the default properties for the
# Velocity Runtime. These values are used when
# Runtime.init() is called, and when Runtime.init(properties)
# fails to find the specificed properties file.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# R U N T I M E L O G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# default LogChute to use: default: AvalonLogChute, Log4JLogChute, JdkLogChute
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.JdkLogChute
-#---------------------------------------------------------------------------
+# ---------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.log = velocity.log
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# This controls whether invalid references are logged.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.log.invalid.references = true
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
input.encoding=ISO-8859-1
output.encoding=ISO-8859-1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# F O R E A C H P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These properties control how the counter is accessed in the #foreach
# directive. By default the reference $velocityCount will be available
# in the body of the #foreach directive. The default starting value
# for this reference is 1.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
directive.foreach.counter.name = velocityCount
directive.foreach.counter.initial.value = 1
directive.foreach.maxloops = -1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# S E T P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These properties control the behavior of #set.
# For compatibility, the default behavior is to disallow setting a reference
# to null. This default may be changed in a future version.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
directive.set.null.allowed = false
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the properties that governed the way #include'd content
# is governed.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
directive.include.output.errormsg.start = <!-- include error :
directive.include.output.errormsg.end = see error log -->
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
directive.parse.max.depth = 10
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
#
#
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
resource.loader = file
@@ -88,14 +88,14 @@
file.resource.loader.cache = false
file.resource.loader.modificationCheckInterval = 2
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# VELOCIMACRO PROPERTIES
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# global : name of default global library. It is expected to be in the regular
# template path. You may remove it (either the file or this property) if
# you wish with no harm.
-#----------------------------------------------------------------------------
-#velocimacro.library = VM_global_library.vm
+# ----------------------------------------------------------------------------
+# velocimacro.library = VM_global_library.vm
velocimacro.permissions.allow.inline = true
velocimacro.permissions.allow.inline.to.replace.global = false
@@ -103,52 +103,52 @@
velocimacro.context.localscope = false
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# INTERPOLATION
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# turn off and on interpolation of references and directives in string
# literals. ON by default :)
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.interpolate.string.literals = true
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# RESOURCE MANAGEMENT
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# Allows alternative ResourceManager and ResourceCache implementations
# to be plugged in.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl
resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# PARSER POOL
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# Selects a custom factory class for the parser pool. Must implement
# ParserPool. parser.pool.size is used by the default implementation
# ParserPoolImpl
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
parser.pool.class = org.apache.velocity.runtime.ParserPoolImpl
parser.pool.size = 20
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# EVENT HANDLER
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# Allows alternative event handlers to be plugged in. Note that each
# class property is actually a comma-separated list of classes (which will
# be called in order).
-#----------------------------------------------------------------------------
-#eventhandler.referenceinsertion.class =
-#eventhandler.nullset.class =
-#eventhandler.methodexception.class =
-#eventhandler.include.class =
+# ----------------------------------------------------------------------------
+# eventhandler.referenceinsertion.class =
+# eventhandler.nullset.class =
+# eventhandler.methodexception.class =
+# eventhandler.include.class =
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# PLUGGABLE INTROSPECTOR
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# Allows alternative introspection and all that can of worms brings
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.introspector.uberspect = org.apache.velocity.util.introspection.UberspectImpl
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java Tue Sep 19 13:47:13 2006
@@ -238,7 +238,7 @@
/*
* right number of args?
- */
+ */
if ( getNumArgs() != i )
{
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj Tue Sep 19 13:47:13 2006
@@ -1351,9 +1351,9 @@
{
return ParserTreeConstants.JJTINTEGERLITERAL;
}
- /*
+ /*
* Need to put this before the floating point expansion
- */
+ */
| LOOKAHEAD( <LBRACKET> [<WHITESPACE>] ( Reference() | IntegerLiteral()) [<WHITESPACE>] <DOUBLEDOT> ) IntegerRange()
{
return ParserTreeConstants.JJTINTEGERRANGE;
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/build.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/build.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/build.sh (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/build.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
echo "Running JJTree ..."
jjtree Parser.jjt
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java Tue Sep 19 13:47:13 2006
@@ -67,4 +67,4 @@
* @return An Iterator of Keys in the cache.
*/
public Iterator enumerateKeys();
-}
\ No newline at end of file
+}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java Tue Sep 19 13:47:13 2006
@@ -284,7 +284,7 @@
public Resource getResource(String resourceName, int resourceType, String encoding )
throws ResourceNotFoundException, ParseErrorException, Exception
{
- /*
+ /*
* Check to see if the resource was placed in the cache.
* If it was placed in the cache then we will use
* the cached version of the resource. If not we
@@ -390,7 +390,7 @@
resource.setName( resourceName );
resource.setEncoding( encoding );
- /*
+ /*
* Now we have to try to find the appropriate
* loader for this resource. We have to cycle through
* the list of available resource loaders and see
@@ -486,7 +486,7 @@
protected void refreshResource( Resource resource, String encoding )
throws ResourceNotFoundException, ParseErrorException, Exception
{
- /*
+ /*
* The resource knows whether it needs to be checked
* or not, and the resource's loader can check to
* see if the source has been modified. If both
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java Tue Sep 19 13:47:13 2006
@@ -280,8 +280,8 @@
long timeStamp = 0;
/*
- * get the template name from the resource
- */
+ * get the template name from the resource
+ */
String name = resource.getName();
if (name == null || name.length() == 0)
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java Tue Sep 19 13:47:13 2006
@@ -155,7 +155,7 @@
/*
* do whatever we have to do to init Velocity
- */
+ */
initVelocity( config );
/*
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/TemplateNumber.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/TemplateNumber.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/TemplateNumber.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/TemplateNumber.java Tue Sep 19 13:47:13 2006
@@ -32,4 +32,4 @@
*/
public Number getAsNumber();
-}
\ No newline at end of file
+}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java Tue Sep 19 13:47:13 2006
@@ -143,7 +143,7 @@
* since we are synchronizing on this
* object, we have to clear it rather than
* just dump it.
- */
+ */
classMethodMaps.clear();
/*
Modified: jakarta/velocity/engine/trunk/src/parser/Parser.jjt
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/parser/Parser.jjt?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/parser/Parser.jjt (original)
+++ jakarta/velocity/engine/trunk/src/parser/Parser.jjt Tue Sep 19 13:47:13 2006
@@ -1235,9 +1235,9 @@
{
return ParserTreeConstants.JJTINTEGERLITERAL;
}
- /*
+ /*
* Need to put this before the floating point expansion
- */
+ */
| LOOKAHEAD( <LBRACKET> [<WHITESPACE>] ( Reference() | IntegerLiteral()) [<WHITESPACE>] <DOUBLEDOT> ) IntegerRange()
{
return ParserTreeConstants.JJTINTEGERRANGE;
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java Tue Sep 19 13:47:13 2006
@@ -119,7 +119,7 @@
/*
* put the Vector into the context, and merge both
- */
+ */
VelocityContext context = new VelocityContext();
template1.merge(context, writer1);
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ArithmeticTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ArithmeticTestCase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ArithmeticTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ArithmeticTestCase.java Tue Sep 19 13:47:13 2006
@@ -171,40 +171,40 @@
}
/*
-
- COMMENT OUT FOR PERFORMANCE-MEASSUREMENTS
-
- public void testProfile()
- {
-
- long start = System.currentTimeMillis();
-
- Number v1 = new Long (1000);
- Number v2 = new Double (10.23);
- Number result = null;
- for (int a = 0; a < 10000; a++)
- {
-
- result = MathUtils.typeConvert (
- new BigDecimal (v1.doubleValue()).add (
- new BigDecimal (v2.doubleValue())), v1, v2, false);
-
- }
-
- System.out.println ("took: "+(System.currentTimeMillis()-start));
-
- start = System.currentTimeMillis();
- for (int a = 0; a < 10000; a++)
- {
-
- result = MathUtils.divide( v1, v2);
- }
-
- Number result2 = result;
- System.out.println ("took: "+(System.currentTimeMillis()-start));
- }
-
-*/
+ *
+ * COMMENT OUT FOR PERFORMANCE-MEASSUREMENTS
+ *
+ * public void testProfile()
+ * {
+ *
+ * long start = System.currentTimeMillis();
+ *
+ * Number v1 = new Long (1000);
+ * Number v2 = new Double (10.23);
+ * Number result = null;
+ * for (int a = 0; a < 10000; a++)
+ * {
+ *
+ * result = MathUtils.typeConvert (
+ * new BigDecimal (v1.doubleValue()).add (
+ * new BigDecimal (v2.doubleValue())), v1, v2, false);
+ *
+ * }
+ *
+ * System.out.println ("took: "+(System.currentTimeMillis()-start));
+ *
+ * start = System.currentTimeMillis();
+ * for (int a = 0; a < 10000; a++)
+ * {
+ *
+ * result = MathUtils.divide( v1, v2);
+ * }
+ *
+ * Number result2 = result;
+ * System.out.println ("took: "+(System.currentTimeMillis()-start));
+ * }
+ *
+ */
/**
* Test additional functions
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/InfoTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/InfoTestCase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/InfoTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/InfoTestCase.java Tue Sep 19 13:47:13 2006
@@ -14,7 +14,7 @@
import org.apache.velocity.util.introspection.Info;
-/*
+/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
@@ -28,7 +28,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
/**
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ParserTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ParserTestCase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ParserTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ParserTestCase.java Tue Sep 19 13:47:13 2006
@@ -100,8 +100,8 @@
ve.evaluate(new VelocityContext(), new StringWriter(), "foo", template);
/*
- * this should throw an exception
- */
+ * this should throw an exception
+ */
template = "#macro($x) foo #end";
@@ -136,16 +136,16 @@
ve.evaluate(new VelocityContext(), new StringWriter(), "foo", template);
/*
- * this should work - spaces intentional
- */
+ * this should work - spaces intentional
+ */
template = "#foreach( $i in $woogie ) end #end";
ve.evaluate(new VelocityContext(), new StringWriter(), "foo", template);
/*
- * this should bomb
- */
+ * this should bomb
+ */
template = "#macro( foo $a) $a #end #foo(woogie)";
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceCachingTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceCachingTestCase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceCachingTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceCachingTestCase.java Tue Sep 19 13:47:13 2006
@@ -1,6 +1,6 @@
package org.apache.velocity.test;
-/*
+/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
import java.io.StringWriter;
import java.io.Writer;
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/UberspectorTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/UberspectorTestCase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/UberspectorTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/UberspectorTestCase.java Tue Sep 19 13:47:13 2006
@@ -258,23 +258,23 @@
/*
-
- public void testMapGetSet()
- throws Exception
- {
- Uberspect u = ri.getUberspect();
- Map map = new HashMap();
-
- VelPropertyGet getter = u.getPropertyGet(map, "", null);
- VelPropertySet setter = u.getPropertySet(map, "", Object.class, null);
-
- assertNotNull("Got a null getter", getter);
- assertNotNull("Got a null setter", setter);
-
- assertEquals("Got wrong getter", "foo", getter.getMethodName());
- assertEquals("Got wrong setter", "bar", setter.getMethodName());
- }
- */
+ *
+ * public void testMapGetSet()
+ * throws Exception
+ * {
+ * Uberspect u = ri.getUberspect();
+ * Map map = new HashMap();
+ *
+ * VelPropertyGet getter = u.getPropertyGet(map, "", null);
+ * VelPropertySet setter = u.getPropertySet(map, "", Object.class, null);
+ *
+ * assertNotNull("Got a null getter", getter);
+ * assertNotNull("Got a null setter", setter);
+ *
+ * assertEquals("Got wrong getter", "foo", getter.getMethodName());
+ * assertEquals("Got wrong setter", "bar", setter.getMethodName());
+ * }
+ */
}
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java Tue Sep 19 13:47:13 2006
@@ -69,15 +69,15 @@
Velocity.evaluate(context, compare1, "evaltest", input1);
/*
- @todo FIXME: Not tested right now.
-
- StringWriter result2 = new StringWriter();
- Velocity.mergeTemplate("mergethis.vm", context, result2);
-
- StringWriter result3 = new StringWriter();
- Velocity.invokeVelocimacro("floog", "test", new String[2],
- context, result3);
-*/
+ * @todo FIXME: Not tested right now.
+ *
+ * StringWriter result2 = new StringWriter();
+ * Velocity.mergeTemplate("mergethis.vm", context, result2);
+ *
+ * StringWriter result3 = new StringWriter();
+ * Velocity.invokeVelocimacro("floog", "test", new String[2],
+ * context, result3);
+ */
if (!result1.equals(compare1.toString()))
{
fail("Output incorrect.");
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/GetPutObject.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/GetPutObject.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/GetPutObject.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/GetPutObject.java Tue Sep 19 13:47:13 2006
@@ -29,4 +29,4 @@
{
this.value = value;
}
-}
\ No newline at end of file
+}
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java Tue Sep 19 13:47:13 2006
@@ -2,7 +2,7 @@
import org.apache.velocity.util.introspection.Info;
-/*
+/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
@@ -16,7 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
/**
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java Tue Sep 19 13:47:13 2006
@@ -5,7 +5,7 @@
import org.apache.velocity.util.introspection.VelMethod;
import org.apache.velocity.util.introspection.VelPropertyGet;
-/*
+/*
* Copyright 2000-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
@@ -19,7 +19,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
/**
* A introspector that allows testing when methods are not found.
@@ -57,4 +57,4 @@
return propertyGet;
}
-}
\ No newline at end of file
+}
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java Tue Sep 19 13:47:13 2006
@@ -1,6 +1,6 @@
package org.apache.velocity.test.provider;
-/*
+/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
/**
* Used to confirm that a null to string is processed properly
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java Tue Sep 19 13:47:13 2006
@@ -294,19 +294,19 @@
/*
* This can't have the signature
-
- public void setState(boolean state)
-
- or dynamically invoking the method
- doesn't work ... you would have to
- put a wrapper around a method for a
- real boolean property that takes a
- Boolean object if you wanted this to
- work. Not really sure how useful it
- is anyway. Who cares about boolean
- values you can just set a variable.
-
- */
+ *
+ * public void setState(boolean state)
+ *
+ * or dynamically invoking the method
+ * doesn't work ... you would have to
+ * put a wrapper around a method for a
+ * real boolean property that takes a
+ * Boolean object if you wanted this to
+ * work. Not really sure how useful it
+ * is anyway. Who cares about boolean
+ * values you can just set a variable.
+ *
+ */
public void setState(Boolean state)
{
Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml Tue Sep 19 13:47:13 2006
@@ -24,4 +24,4 @@
</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml Tue Sep 19 13:47:13 2006
@@ -8,4 +8,4 @@
<item name="About OC" href="/about/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl Tue Sep 19 13:47:13 2006
@@ -58,8 +58,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
- ##set ($au = $root.getChild("properties").getChild("author").getText())
- ##set ($em = $root.getChild("properties").getChild("author").getAttributeValue("email"))
+ ## set ($au = $root.getChild("properties").getChild("author").getText())
+ ## set ($em = $root.getChild("properties").getChild("author").getAttributeValue("email"))
#metaauthor ( $au.getText() $em.getValue() )
<title>$root.getChild("properties").getChild("title").getText()</title>
@@ -72,7 +72,7 @@
#makeProject()
</td>
<td>
- ##set ($allSections = $root.getChild("body").getChildren("section"))
+ ## set ($allSections = $root.getChild("body").getChildren("section"))
#set ($allSections = $xpath.applyTo("body/section", $root))
#foreach ( $section in $allSections )
Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl Tue Sep 19 13:47:13 2006
@@ -93,4 +93,4 @@
</table>
</body>
</html>
-#end
\ No newline at end of file
+#end
Modified: jakarta/velocity/engine/trunk/test/configuration/test-config.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/configuration/test-config.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/configuration/test-config.properties (original)
+++ jakarta/velocity/engine/trunk/test/configuration/test-config.properties Tue Sep 19 13:47:13 2006
@@ -77,9 +77,9 @@
# ---------------------------------------------------------
config.double.value = 3.14159265358793
-#---------------------------------------------------------
+# ---------------------------------------------------------
# Testing escaped commas
-#---------------------------------------------------------
+# ---------------------------------------------------------
escape.comma1 = foo\,
escape.comma2 = bar\,lala,woogie\,,bjork!
Modified: jakarta/velocity/engine/trunk/test/misc/compile.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/misc/compile.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/misc/compile.sh (original)
+++ jakarta/velocity/engine/trunk/test/misc/compile.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
CLASSPATH=.:../../bin/classes
Modified: jakarta/velocity/engine/trunk/test/misc/dump.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/misc/dump.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/misc/dump.sh (original)
+++ jakarta/velocity/engine/trunk/test/misc/dump.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
CLASSPATH=.:../../bin/classes
Modified: jakarta/velocity/engine/trunk/test/misc/test.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/misc/test.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/misc/test.sh (original)
+++ jakarta/velocity/engine/trunk/test/misc/test.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
CLASSPATH=.:../../bin/classes
Modified: jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props Tue Sep 19 13:47:13 2006
@@ -3,9 +3,9 @@
name=Jason van Zyl
email=jvanzyl@apache.org
-## The contents of the file license.txt
-## will be available in the context
-## as $license.
+# # The contents of the file license.txt
+# # will be available in the context
+# # as $license.
license.file.contents = test/texen/license.txt
Modified: jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
(
cd jar-contents
Modified: jakarta/velocity/engine/trunk/test/texen/service.props
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen/service.props?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen/service.props (original)
+++ jakarta/velocity/engine/trunk/test/texen/service.props Tue Sep 19 13:47:13 2006
@@ -3,9 +3,9 @@
name=Jason van Zyl
email=jvanzyl@apache.org
-## The contents of the file license.txt
-## will be available in the context
-## as $license.
+# # The contents of the file license.txt
+# # will be available in the context
+# # as $license.
license.file.contents = test/texen/license.txt
Modified: jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/build.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/build.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/build.sh (original)
+++ jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/build.sh Tue Sep 19 13:47:13 2006
@@ -1,10 +1,10 @@
-#!/bin/sh
+# !/bin/sh
-#-------------------------------------------------------------------
+# -------------------------------------------------------------------
-#--------------------------------------------
+# --------------------------------------------
# No need to edit anything past here
-#--------------------------------------------
+# --------------------------------------------
if test -z "${JAVA_HOME}" ; then
echo "ERROR: JAVA_HOME not found in your environment."
echo "Please, set the JAVA_HOME variable in your environment to match the"
Modified: jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/velocity.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/velocity.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/velocity.properties (original)
+++ jakarta/velocity/engine/trunk/whiteboard/daveb/dajarred/velocity.properties Tue Sep 19 13:47:13 2006
@@ -1,66 +1,66 @@
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the default properties for the
# Velocity Runtime. These values are used when
# Runtime.init() is called, and when Runtime.init(properties)
# fails to find the specificed properties file.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# R U N T I M E L O G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.log=velocity.log
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
template.encoding=8859_1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# C O N T E N T T Y P E
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# This is the default content type for the VelocityServlet.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
default.contentType=text/html
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# F O R E A C H P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These properties control how the counter is accessed in the #foreach
# directive. By default the reference $velocityCount will be available
# in the body of the #foreach directive. The default starting value
# for this reference is 1.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
counter.name = velocityCount
counter.initial.value = 1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the properties that governed the way #include'd content
# is governed.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
include.output.errormsg.start = <!-- include error :
include.output.errormsg.end = see error log -->
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
parse_directive.maxdepth = 10
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
#
#
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
resource.loader.1.public.name = Jar
resource.loader.1.description = Velocity Jar Resource Loader
@@ -70,25 +70,25 @@
resource.loader.1.cache = false
resource.loader.1.modificationCheckInterval = 2
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# E X T E R N A L S E R V I C E I N I T I A L I Z A T I O N
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# If this property is set to true then an external service will
# set certain system properties and initialize the Velocity
# Runtime. This method is used by Turbine to initialize the
# Velocity Runtime for the TurbineVelocityService.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
external.init = false
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# VELOCIMACRO GLOBAL LIBRARY
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# name of default global library. It is expected to be in the regular
# template path. You may remove it (either the file or this property) if
# you wish with no harm.
-#----------------------------------------------------------------------------
-#velocimacro.library.global=VM_global_library.vm
+# ----------------------------------------------------------------------------
+# velocimacro.library.global=VM_global_library.vm
Modified: jakarta/velocity/engine/trunk/whiteboard/daveb/myprops.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/daveb/myprops.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/daveb/myprops.properties (original)
+++ jakarta/velocity/engine/trunk/whiteboard/daveb/myprops.properties Tue Sep 19 13:47:13 2006
@@ -11,7 +11,7 @@
# #
# Path to templates.
# Default=current directory
-##
+# #
template.path=.
# #
Modified: jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/build.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/build.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/build.sh (original)
+++ jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/build.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#! /bin/sh
+# ! /bin/sh
if [ "$JAVA_HOME" = "" ] ; then
echo You must set JAVA_HOME to point at your Java Development Kit directory
Modified: jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/velocity.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/velocity.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/velocity.properties (original)
+++ jakarta/velocity/engine/trunk/whiteboard/daveb/pdfvsl/velocity.properties Tue Sep 19 13:47:13 2006
@@ -1,66 +1,66 @@
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the default properties for the
# Velocity Runtime. These values are used when
# Runtime.init() is called, and when Runtime.init(properties)
# fails to find the specificed properties file.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# R U N T I M E L O G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.log = velocity.log
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
template.encoding=8859_1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# C O N T E N T T Y P E
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# This is the default content type for the VelocityServlet.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
default.contentType=text/html
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# F O R E A C H P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These properties control how the counter is accessed in the #foreach
# directive. By default the reference $velocityCount will be available
# in the body of the #foreach directive. The default starting value
# for this reference is 1.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
counter.name = velocityCount
counter.initial.value = 1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the properties that governed the way #include'd content
# is governed.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
include.output.errormsg.start = <!-- include error :
include.output.errormsg.end = see error log -->
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
parse_directive.maxdepth = 10
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
#
#
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
resource.loader.1.public.name = File
resource.loader.1.description = Velocity File Resource Loader
@@ -69,23 +69,23 @@
resource.loader.1.cache = false
resource.loader.1.modificationCheckInterval = 2
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# E X T E R N A L S E R V I C E I N I T I A L I Z A T I O N
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# If this property is set to true then an external service will
# set certain system properties and initialize the Velocity
# Runtime. This method is used by Turbine to initialize the
# Velocity Runtime for the TurbineVelocityService.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
external.init = false
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# VELOCIMACRO GLOBAL LIBRARY
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# name of default global library. It is expected to be in the regular
# template path. You may remove it (either the file or this property) if
# you wish with no harm.
-#----------------------------------------------------------------------------
-#velocimacro.library.global=VM_global_library.vm
+# ----------------------------------------------------------------------------
+# velocimacro.library.global=VM_global_library.vm
Modified: jakarta/velocity/engine/trunk/whiteboard/geir/test.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/geir/test.sh?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/geir/test.sh (original)
+++ jakarta/velocity/engine/trunk/whiteboard/geir/test.sh Tue Sep 19 13:47:13 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
CLASSPATH=.
Modified: jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.properties?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.properties (original)
+++ jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.properties Tue Sep 19 13:47:13 2006
@@ -75,11 +75,11 @@
# Set to Sun Javadocs
javadocs.ref.jsdk= http://java.sun.com/j2se/1.4.2/docs/api/
-########################################################################
+# #######################################################################
#
# Downloading jars from ibiblio repository using the ivy resolver
#
-########################################################################
+# #######################################################################
#
# Settings for the proxy to use for download. Change this if you must
Modified: jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.xml?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.xml (original)
+++ jakarta/velocity/engine/trunk/whiteboard/henning/using_ivy/build.xml Tue Sep 19 13:47:13 2006
@@ -552,7 +552,7 @@
<!-- =================================================================== -->
<target name="build-package-tree" depends="clean">
- <!--
+ <!--
Don't move these ant calls into depends! If you do so, either jar
or jar-dep or docs (via its depends on jar) will set the jarname
property and as it is immutable, you will no longer be able to
Modified: jakarta/velocity/engine/trunk/xdocs/site.css
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/xdocs/site.css?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/xdocs/site.css (original)
+++ jakarta/velocity/engine/trunk/xdocs/site.css Tue Sep 19 13:47:13 2006
@@ -1,19 +1,19 @@
-/*
-
-## Copyright 1999-2004 The Apache Software Foundation
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-
-*/
+/*
+ *
+ * ## Copyright 1999-2004 The Apache Software Foundation
+ * ## Licensed under the Apache License, Version 2.0 (the "License");
+ * ## you may not use this file except in compliance with the License.
+ * ## You may obtain a copy of the License at
+ * ##
+ * ## http://www.apache.org/licenses/LICENSE-2.0
+ * ##
+ * ## Unless required by applicable law or agreed to in writing, software
+ * ## distributed under the License is distributed on an "AS IS" BASIS,
+ * ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * ## See the License for the specific language governing permissions and
+ * ## limitations under the License.
+ *
+ */
/** defined standard tags **/
@@ -300,4 +300,4 @@
font-style:bold;
}
-}
\ No newline at end of file
+}
Modified: jakarta/velocity/engine/trunk/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/xdocs/stylesheets/site.vsl?view=diff&rev=447961&r1=447960&r2=447961
==============================================================================
--- jakarta/velocity/engine/trunk/xdocs/stylesheets/site.vsl (original)
+++ jakarta/velocity/engine/trunk/xdocs/stylesheets/site.vsl Tue Sep 19 13:47:13 2006
@@ -128,7 +128,7 @@
#end
-### displays a basic node, calling macros if appropriate
+## # displays a basic node, calling macros if appropriate
#macro ( display $node )
#if ($node.getName().equals("img"))
#image ($node)
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org