jvanzyl 01/03/14 13:51:58
Modified: src/java/org/apache/velocity/runtime/defaults
velocity.properties
Log:
- changes to the default properties to match the cleanup
of the RuntimeConstants.
Revision Changes Path
1.17 +20 -34
jakarta-velocity/src/java/org/apache/velocity/runtime/defaults/velocity.properties
Index: velocity.properties
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/defaults/velocity.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- velocity.properties 2001/01/13 16:49:17 1.16
+++ velocity.properties 2001/03/14 21:51:55 1.17
@@ -15,12 +15,14 @@
#----------------------------------------------------------------------------
# This controls if Runtime.error(), info() and warn() messages include the
-# whole stack trace.
+# whole stack trace. The last property controls whether invalid references
+# are logged.
#----------------------------------------------------------------------------
runtime.log.error.stacktrace = false
runtime.log.warn.stacktrace = false
runtime.log.info.stacktrace = false
+runtime.log.invalid.reference = true
#----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
@@ -29,14 +31,6 @@
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
@@ -45,8 +39,8 @@
# for this reference is 1.
#----------------------------------------------------------------------------
-counter.name = velocityCount
-counter.initial.value = 1
+directive.foreach.counter.name = velocityCount
+directive.foreach.counter.initial.value = 1
#----------------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
@@ -55,14 +49,14 @@
# is governed.
#----------------------------------------------------------------------------
-include.output.errormsg.start = <!-- include error :
-include.output.errormsg.end = see error log -->
+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
#----------------------------------------------------------------------------
-parse_directive.maxdepth = 10
+directive.parse.max.depth = 10
#----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
@@ -71,13 +65,14 @@
#
#----------------------------------------------------------------------------
-resource.loader.1.public.name = File
-resource.loader.1.description = Velocity File Resource Loader
-resource.loader.1.class =
org.apache.velocity.runtime.resource.loader.FileResourceLoader
-resource.loader.1.resource.path = .
-resource.loader.1.cache = false
-resource.loader.1.modificationCheckInterval = 2
+resource.loader = file
+file.resource.loader.description = Velocity File Resource Loader
+file.resource.loader.class =
org.apache.velocity.runtime.resource.loader.FileResourceLoader
+file.resource.loader.path = .
+file.resource.loader.cache = false
+file.resource.loader.modificationCheckInterval = 2
+
#----------------------------------------------------------------------------
# VELOCIMACRO PROPERTIES
#----------------------------------------------------------------------------
@@ -85,30 +80,21 @@
# 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.global.library = VM_global_library.vm
-velocimacro.permissions.allowInline = true
-velocimacro.permissions.allowInlineToReplaceGlobal = false
-velocimacro.permissions.allowInlineLocalScope = false
+velocimacro.permissions.allow.inline = true
+velocimacro.permissions.allow.inline.to.replace.global = false
+velocimacro.permissions.allow.inline.local.scope = false
velocimacro.context.localscope = false
#----------------------------------------------------------------------------
-# REFERENCE DEBUG OUTPUT
-#----------------------------------------------------------------------------
-# property to turn off the log output when a reference isn't valid. Currently
-# will leave this as true (on) to duplicate existing behavior, but this allows
-# you to turn the chatter off in production.
-#----------------------------------------------------------------------------
-runtime.log.reference.log_invalid = true
-
-#----------------------------------------------------------------------------
# INTERPOLATION
#----------------------------------------------------------------------------
# turn off and on interpolation of references and directives in string
# literals. ON by default :)
#----------------------------------------------------------------------------
-stringliterals.interpolate = true
+runtime.interpolate.string.literals = true
