Merge pull request sakaiproject#918 from buckett/SAK-14142

SAK-14142 Allow Velocity tools to work when webapps aren't expanded.
DaweiXia · Jul 30, 2015 · da7e4ef · da7e4ef
2 parents d0f663c + 3f69337
commit da7e4ef
Show file tree

Hide file tree

Showing 38 changed files with 222 additions and 1,369 deletions.
diff --git a/access/access-tool/tool/src/webapp/velocity.properties b/access/access-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/access/web-tool/src/webapp/velocity.properties b/access/web-tool/src/webapp/velocity.properties
@@ -63,13 +63,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/alias/alias-tool/tool/src/webapp/velocity.properties b/alias/alias-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/announcement/announcement-tool/tool/src/webapp/velocity.properties b/announcement/announcement-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/archive/archive-tool/tool/src/webapp/velocity.properties b/archive/archive-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/assignment/assignment-tool/tool/src/webapp/velocity.properties b/assignment/assignment-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/authz/authz-tool/tool/src/webapp/velocity.properties b/authz/authz-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/basiclti/basiclti-tool/src/webapp/velocity.properties b/basiclti/basiclti-tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/calendar/calendar-tool/tool/src/webapp/velocity.properties b/calendar/calendar-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/citations/citations-servlet/servlet/src/webapp/velocity.properties b/citations/citations-servlet/servlet/src/webapp/velocity.properties
@@ -104,13 +104,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/citations/citations-tool/tool/src/webapp/velocity.properties b/citations/citations-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/content/content-tool/tool/src/webapp/velocity.properties b/content/content-tool/tool/src/webapp/velocity.properties
@@ -62,13 +62,12 @@ directive.parse.max.depth = 10
 # 
 #----------------------------------------------------------------------------
 
-resource.loader = file, classpath
+resource.loader = webapp, classpath
 
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .,WebRoot
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 classpath.resource.loader.description = Velocity Classpath Resource Loader
 classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

diff --git a/login/login-render-engine-impl/impl/pom.xml b/login/login-render-engine-impl/impl/pom.xml
@@ -48,6 +48,11 @@
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
+    <dependency>
+      <groupId>velocity-tools</groupId>
+      <artifactId>velocity-tools</artifactId>
+      <version>1.4</version>
+    </dependency>
   </dependencies>
   <build>
 <resources>

diff --git a/...der-engine-impl/impl/src/bundle/org/sakaiproject/login/impl/velocity/loginvelocity.config b/...der-engine-impl/impl/src/bundle/org/sakaiproject/login/impl/velocity/loginvelocity.config
@@ -2,16 +2,12 @@
 #
 # Tell Velocity which resource loader we are using
 #
-resource.loader=file, class
-#
+resource.loader = webapp, classpath
 
-#
-# File resource loader information
-#
-file.resource.loader.description=Velocity File Resource Loader
-file.resource.loader.class=org.sakaiproject.login.impl.velocity.WebappLoader
-file.resource.loader.cache=true
-file.resource.loader.modificationCheckInterval=60
+webapp.resource.loader.description = Velocity Webapp Resource Loader
+webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader
+webapp.resource.loader.modificationCheckInterval = 0
+webapp.resource.loader.cachingOn = true
 
 #
 # Class resource loader information