SAK-14142 Velocity Loading Template from Webapps

Rather than requiring that WARs be unpacked into the filesystem, this allows the templates to be loaded directly from the webapp. We use the webapp loaded from the velocity tools project.
axxter99 · Jul 25, 2015 · 65d15f3 · 65d15f3
1 parent 8e3b150
commit 65d15f3
Show file tree

Hide file tree

Showing 24 changed files with 116 additions and 141 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/mailarchive/mailarchive-tool/tool/src/webapp/velocity.properties b/mailarchive/mailarchive-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/memory/memory-tool/tool/src/webapp/velocity.properties b/memory/memory-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/message/message-tool/tool/src/webapp/velocity.properties b/message/message-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/presence/presence-tool/tool/src/webapp/velocity.properties b/presence/presence-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/rights/rights-tool/tool/src/webapp/velocity.properties b/rights/rights-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/site-manage/site-manage-link-helper/src/webapp/velocity.properties b/site-manage/site-manage-link-helper/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/site-manage/site-manage-tool/tool/src/webapp/velocity.properties b/site-manage/site-manage-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/site/site-tool/tool/src/webapp/velocity.properties b/site/site-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/user/user-tool/tool/src/webapp/velocity.properties b/user/user-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