[spring-extensions] branch master updated: Update deprecated Velocity configuration properties.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=d8ae93f2e6811db72ac5f98b676c49cd30a2fcd7

The following commit(s) were added to refs/heads/master by this push:
       new  d8ae93f   Update deprecated Velocity configuration properties.
d8ae93f is described below

commit d8ae93f2e6811db72ac5f98b676c49cd30a2fcd7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 10 12:30:24 2019 -0400

    Update deprecated Velocity configuration properties.
---
 .../java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java   | 4 ++--
 .../net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
index 2f3ff8e..c848f63 100644
--- a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
+++ b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
@@ -76,7 +76,7 @@ public class VelocityConfigurer extends VelocityEngineFactory
     private static final String SPRING_MACRO_RESOURCE_LOADER_NAME = "springMacro";
 
     /** Key for the class of Spring's bind macro resource loader. */
-    private static final String SPRING_MACRO_RESOURCE_LOADER_CLASS = "springMacro.resource.loader.class";
+    private static final String SPRING_MACRO_RESOURCE_LOADER_CLASS = "resource.loader.springMacro.class";
 
     /** Name of Spring's default bind macro library. */
     private static final String SPRING_MACRO_LIBRARY = "net/shibboleth/ext/spring/velocity/spring.vm";
@@ -119,7 +119,7 @@ public class VelocityConfigurer extends VelocityEngineFactory
         velocityEngine.setProperty(
                 SPRING_MACRO_RESOURCE_LOADER_CLASS, ClasspathResourceLoader.class.getName());
         velocityEngine.addProperty(
-                VelocityEngine.RESOURCE_LOADER, SPRING_MACRO_RESOURCE_LOADER_NAME);
+                VelocityEngine.RESOURCE_LOADERS, SPRING_MACRO_RESOURCE_LOADER_NAME);
         velocityEngine.addProperty(
                 VelocityEngine.VM_LIBRARY, SPRING_MACRO_LIBRARY);
     }
diff --git a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java
index aa5657a..204b3e0 100644
--- a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java
+++ b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java
@@ -325,7 +325,7 @@ public class VelocityEngineFactory {
                         resolvedPath.append(',');
                     }
                 }
-                velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
+                velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file");
                 velocityEngine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE, "true");
                 velocityEngine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, resolvedPath.toString());
             } catch (final IOException ex) {
@@ -353,7 +353,7 @@ public class VelocityEngineFactory {
      */
     protected void initSpringResourceLoader(@Nonnull final VelocityEngine velocityEngine,
             @Nullable final String path) {
-        velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, SpringResourceLoader.NAME);
+        velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADERS, SpringResourceLoader.NAME);
         velocityEngine.setProperty(SpringResourceLoader.SPRING_RESOURCE_LOADER_CLASS,
                 SpringResourceLoader.class.getName());
         velocityEngine.setProperty(SpringResourceLoader.SPRING_RESOURCE_LOADER_CACHE, "true");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.