velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1855147 - in /velocity/engine/branches/VELOCITY-909/velocity-engine-core/src: main/java/org/apache/velocity/app/event/ main/resources/org/apache/velocity/runtime/defaults/ test/java/org/apache/velocity/test/issues/ test/resources/issues/ve...
Date Sun, 10 Mar 2019 12:40:17 GMT
Author: cbrisson
Date: Sun Mar 10 12:40:17 2019
New Revision: 1855147

URL: http://svn.apache.org/viewvc?rev=1855147&view=rev
Log:
[engine][VELOCITY-909] Remove all references to old property directive.set.null.allowed (removed
in 2.0)

Modified:
    velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java
    velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties
    velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java
    velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props

Modified: velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java?rev=1855147&r1=1855146&r2=1855147&view=diff
==============================================================================
--- velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java
(original)
+++ velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/java/org/apache/velocity/app/event/IncludeEventHandler.java
Sun Mar 10 12:40:17 2019
@@ -29,7 +29,7 @@ import org.apache.velocity.context.Conte
  * @version $Id$
  * @since 1.5
  */
-public interface  IncludeEventHandler extends EventHandler
+public interface IncludeEventHandler extends EventHandler
 {
     /**
      * Called when an include-type directive is encountered (

Modified: velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties
URL: http://svn.apache.org/viewvc/velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties?rev=1855147&r1=1855146&r2=1855147&view=diff
==============================================================================
--- velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties
(original)
+++ velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/velocity.properties
Sun Mar 10 12:40:17 2019
@@ -148,8 +148,7 @@ velocimacro.arguments.preserve_literals
 # that are not defined in the context, or have not been defined
 # with a #set directive. This setting will also throw an exception
 # if an attempt is made to call a non-existing property on an object
-# or if the object is null.  When this property is true then property
-# 'directive.set.null.allowed' is also set to true.
+# or if the object is null.
 # ----------------------------------------------------------------------------
 runtime.references.strict.enable = false
 

Modified: velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java?rev=1855147&r1=1855146&r2=1855147&view=diff
==============================================================================
--- velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java
(original)
+++ velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java
Sun Mar 10 12:40:17 2019
@@ -64,7 +64,6 @@ public class Velocity747TestCase extends
         engine2.addProperty("file.resource.loader.cache", "true");
         engine2.addProperty("file.resource.loader.modificationCheckInterval", "-1");
         engine2.addProperty("velocimacro.permissions.allow.inline.local.scope", "true");
-        engine2.addProperty("directive.set.null.allowed", "true");
         engine2.addProperty("velocimacro.max.depth", "-1");
         engine2.addProperty("string.resource.loader.class", StringResourceLoader.class.getName());
         engine2.addProperty("string.resource.loader.repository.name", "stringRepo");

Modified: velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
URL: http://svn.apache.org/viewvc/velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props?rev=1855147&r1=1855146&r2=1855147&view=diff
==============================================================================
--- velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
(original)
+++ velocity/engine/branches/VELOCITY-909/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
Sun Mar 10 12:40:17 2019
@@ -2,5 +2,4 @@ file.resource.loader.cache = true
 file.resource.loader.modificationCheckInterval = -1
 
 velocimacro.permissions.allow.inline.local.scope = true  
-directive.set.null.allowed = true
 velocimacro.max.depth = -1



Mime
View raw message