diff --git a/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties b/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties index e790f7906..e51cb6273 100644 --- a/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties +++ b/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties @@ -44,7 +44,7 @@ directive.foreach.max_loops = -1 # as long as zero numbers, do evaluate to false. # ---------------------------------------------------------------------------- -directive.if.empty_check = true +directive.if.empty_check = false # ---------------------------------------------------------------------------- # P A R S E P R O P E R T I E S @@ -127,8 +127,7 @@ velocimacro.body_reference = bodyContent # without an explicit default value is missing from the macro call, its value # will be looked up in the global context # ---------------------------------------------------------------------------- -velocimacro.enable_bc_mode = false - +velocimacro.enable_bc_mode = true # ---------------------------------------------------------------------------- # STRICT REFERENCE MODE # ---------------------------------------------------------------------------- @@ -206,7 +205,7 @@ introspector.uberspect.class = org.apache.velocity.util.introspection.UberspectI # Sets the data types Conversion Handler used by the default uberspector # ---------------------------------------------------------------------------- -introspector.conversion_handler.class = org.apache.velocity.util.introspection.TypeConversionHandlerImpl +introspector.conversion_handler.class = none 1 # ---------------------------------------------------------------------------- @@ -248,7 +247,7 @@ introspector.restrict.classes = javax.script.ScriptEngine # Possible values: none, bc (aka Backward Compatible), lines, structured # ---------------------------------------------------------------------------- -parser.space_gobbling = lines +parser.space_gobbling = bc # ---------------------------------------------------------------------------- # HYPHEN IN IDENTIFIERS @@ -256,4 +255,7 @@ parser.space_gobbling = lines # Set to true to allow '-' in reference identifiers (backward compatibility option) # ---------------------------------------------------------------------------- -parser.allow_hyphen_in_identifiers = false +parser.allow_hyphen_in_identifiers = true + +# When displaying null arguments literals, use provided arguments literals +velocimacro.arguments.preserve_literals = true