You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2016/07/17 10:50:33 UTC
svn commit: r1753056 - in /velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view: WebappResourceLoader.java servlet/WebappLoader.java

Author: cbrisson
Date: Sun Jul 17 10:50:33 2016
New Revision: 1753056

URL: http://svn.apache.org/viewvc?rev=1753056&view=rev
Log:
[tools] reflect ExtendedProperties -> ExtProperties change from engine

Modified:
    velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
    velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java?rev=1753056&r1=1753055&r2=1753056&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java (original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java Sun Jul 17 10:50:33 2016
@@ -27,7 +27,7 @@ import javax.servlet.ServletContext;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader2;
-import org.apache.velocity.shaded.commons.collections.ExtendedProperties;
+import org.apache.velocity.util.ExtProperties;
 
 /**
  * Resource loader that uses the ServletContext of a webapp to
@@ -67,10 +67,10 @@ public class WebappResourceLoader extend
      *        been placed in the runtime's application attributes
      *        under its full class name (i.e. "javax.servlet.ServletContext").
      *
-     * @param configuration the {@link ExtendedProperties} associated with
+     * @param configuration the {@link ExtProperties} associated with
      *        this resource loader.
      */
-    public void init(ExtendedProperties configuration)
+    public void init(ExtProperties configuration)
     {
         log.trace("WebappResourceLoader: initialization starting.");
 

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java?rev=1753056&r1=1753055&r2=1753056&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java (original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java Sun Jul 17 10:50:33 2016
@@ -20,6 +20,7 @@ package org.apache.velocity.tools.view.s
  */
 
 import org.apache.velocity.shaded.commons.collections.ExtendedProperties;
+import org.apache.velocity.util.ExtProperties;
 import org.apache.velocity.tools.view.WebappResourceLoader;
 
 /**
@@ -37,6 +38,6 @@ public class WebappLoader extends Webapp
     public void init(ExtendedProperties configuration)
     {
         log.warn("WebappLoader is deprecated. Use {} instead.", WebappResourceLoader.class.getName());
-        super.init(configuration);
+        super.init(ExtProperties.convertProperties(configuration));
     }
 }