This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 6988b826f02eb146aed402de5594984c85cceb9d
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Mon Jul 12 08:41:06 2021 +0200
replaced deprecated velocity properties with new ones.
---
.../roller/planet/tasks/GeneratePlanetTask.java | 4 +-
.../ui/rendering/velocity/RollerVelocity.java | 8 ++--
.../rendering/velocity/WebappResourceLoader.java | 8 ++--
app/src/main/webapp/WEB-INF/velocity.properties | 52 +++++++++++-----------
app/src/test/resources/WEB-INF/velocity.properties | 46 +++++++++----------
5 files changed, 59 insertions(+), 59 deletions(-)
diff --git
a/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
b/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
index dd6797f..e1ac7c9 100644
--- a/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
+++ b/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
@@ -40,7 +40,7 @@ import org.apache.velocity.app.VelocityEngine;
*/
public class GeneratePlanetTask extends PlanetTask {
- private static Log log = LogFactory.getLog(GeneratePlanetTask.class);
+ private static final Log log = LogFactory.getLog(GeneratePlanetTask.class);
@Override
@@ -68,7 +68,7 @@ public class GeneratePlanetTask extends PlanetTask {
// Fire up Velocity engine, point it at templates and init
VelocityEngine engine = new VelocityEngine();
- engine.setProperty("resource.loader","file");
+ engine.setProperty("resource.loaders", "file");
engine.setProperty("file.resource.loader.class",
"org.apache.velocity.runtime.resource.loader.FileResourceLoader");
engine.setProperty("file.resource.loader.path", templateDir);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
index ca09a05..c3f1aa8 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
@@ -63,10 +63,10 @@ public class RollerVelocity {
// Override for theme reloading
if (themeReload) {
- velocityProps.setProperty("class.resource.loader.cache",
"false");
-
velocityProps.setProperty("class.resource.loader.modificationCheckInterval",
"2");
- velocityProps.setProperty("webapp.resource.loader.cache",
"false");
-
velocityProps.setProperty("webapp.resource.loader.modificationCheckInterval",
"2");
+ velocityProps.setProperty("resource.loader.class.cache",
"false");
+
velocityProps.setProperty("resource.loader.class.modification_check_interval",
"2");
+ velocityProps.setProperty("resource.loader.webapp.cache",
"false");
+
velocityProps.setProperty("resource.loader.webapp.modification_check_interval",
"2");
velocityProps.setProperty("velocimacro.library.autoreload",
"true");
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
index f21555b..0a53e17 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
@@ -48,15 +48,15 @@ import org.apache.velocity.util.ExtProperties;
*
* The default search path is '/' (relative to the webapp root), but you can
* change this behaviour by specifying one or more paths by mean of as many
- * webapp.resource.loader.path properties as needed in the velocity.properties
+ * resource.loader.webapp.path properties as needed in the velocity.properties
* file.
*
* All paths must be relative to the root of the webapp.
*
- * To enable caching and cache refreshing the webapp.resource.loader.cache and
- * webapp.resource.loader.modificationCheckInterval properties need to be set
in
+ * To enable caching and cache refreshing the resource.loader.webapp.cache and
+ * resource.loader.webapp.modification_check_interval properties need to be
set in
* the velocity.properties file ... auto-reloading of global macros requires
the
- * webapp.resource.loader.cache property to be set to 'false'.
+ * resource.loader.webapp.cache property to be set to 'false'.
*
*/
public class WebappResourceLoader extends ResourceLoader {
diff --git a/app/src/main/webapp/WEB-INF/velocity.properties
b/app/src/main/webapp/WEB-INF/velocity.properties
index b764d13..a63cc49 100644
--- a/app/src/main/webapp/WEB-INF/velocity.properties
+++ b/app/src/main/webapp/WEB-INF/velocity.properties
@@ -15,34 +15,34 @@
# directory of this distribution.
# specify resource loaders to use
-resource.loader = webapp, theme, roller, class
+resource.loaders = webapp, theme, roller, class
# theme resource loader
-theme.resource.loader.public.name=theme
-theme.resource.loader.description=Roller Theme Resource Loader
-theme.resource.loader.class=org.apache.roller.weblogger.ui.rendering.velocity.ThemeResourceLoader
-theme.resource.loader.cache=false
-theme.resource.loader.modificationCheckInterval=60
+resource.loader.theme.public.name=theme
+resource.loader.theme.description=Roller Theme Resource Loader
+resource.loader.theme.class=org.apache.roller.weblogger.ui.rendering.velocity.ThemeResourceLoader
+resource.loader.theme.cache=false
+resource.loader.theme.modification_check_interval=60
# for the loader we call 'roller', use the RollerResourceLoader
-roller.resource.loader.public.name=roller
-roller.resource.loader.description=Roller Main Resource Loader
-roller.resource.loader.class=org.apache.roller.weblogger.ui.rendering.velocity.RollerResourceLoader
-roller.resource.loader.cache=false
-roller.resource.loader.modificationCheckInterval=60
+resource.loader.roller.public.name=roller
+resource.loader.roller.description=Roller Main Resource Loader
+resource.loader.roller.class=org.apache.roller.weblogger.ui.rendering.velocity.RollerResourceLoader
+resource.loader.roller.cache=false
+resource.loader.roller.modification_check_interval=60
# for the loader we call 'class', use the ClasspathResourceLoader
-class.resource.loader.description = Velocity Classpath Resource Loader
-class.resource.loader.class =
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-class.resource.loader.cache=true
-class.resource.loader.modificationCheckInterval=60
+resource.loader.class.description = Velocity Classpath Resource Loader
+resource.loader.class.class =
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+resource.loader.class.cache=true
+resource.loader.class.modification_check_interval=60
# for the loader we call 'webapp', use the WebappResourceLoader
-webapp.resource.loader.description=Webapp Resource Loader
-webapp.resource.loader.class=org.apache.roller.weblogger.ui.rendering.velocity.WebappResourceLoader
-webapp.resource.loader.cache=true
-webapp.resource.loader.path=/WEB-INF/velocity,/WEB-INF/velocity/templates,/WEB-INF/velocity/templates/feeds,templates/weblog,templates/planet
-webapp.resource.loader.modificationCheckInterval=60
+resource.loader.webapp.description=Webapp Resource Loader
+resource.loader.webapp.class=org.apache.roller.weblogger.ui.rendering.velocity.WebappResourceLoader
+resource.loader.webapp.cache=true
+resource.loader.webapp.path=/WEB-INF/velocity,/WEB-INF/velocity/templates,/WEB-INF/velocity/templates/feeds,templates/weblog,templates/planet
+resource.loader.webapp.modification_check_interval=60
# log invalid template references?
# set this to false to have a quieter velocity.log
@@ -53,21 +53,21 @@
runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
runtime.log.logsystem.log4j.category=org.apache.velocity
# Override the default global library, set to blank to load no default
-velocimacro.library = weblog.vm,feeds.vm,roller-custom.vm
+velocimacro.library.path = weblog.vm,feeds.vm,roller-custom.vm
-# See RollerVelocity for reloading "webapp.resource.loader.path" files via
WebappResourceLoader settings
+# See RollerVelocity for reloading "resource.loader.webapp.path" files via
WebappResourceLoader settings
velocimacro.library.autoreload=false
# Allow Velocimacros to be defined in regular templates
-velocimacro.permissions.allow.inline=true
+velocimacro.inline.allow=true
# Allow template authors to define macros in any template
-velocimacro.permissions.allow.inline.local.scope=false
+velocimacro.inline.local_scope=false
# set encoding/charset to UTF-8
-input.encoding=UTF-8
+resource.default_encoding=UTF-8
output.encoding=UTF-8
default.contentType=text/html; charset=utf-8
-runtime.introspector.uberspect=org.apache.velocity.util.introspection.SecureUberspector
+introspector.uberspect.class=org.apache.velocity.util.introspection.SecureUberspector
diff --git a/app/src/test/resources/WEB-INF/velocity.properties
b/app/src/test/resources/WEB-INF/velocity.properties
index b4433fc..2111013 100644
--- a/app/src/test/resources/WEB-INF/velocity.properties
+++ b/app/src/test/resources/WEB-INF/velocity.properties
@@ -15,33 +15,33 @@
# directory of this distribution.
# specify resource loaders to use
-resource.loader = webapp, theme, roller, class
+resource.loaders = webapp, theme, roller, class
# theme resource loader
-theme.resource.loader.public.name=theme
-theme.resource.loader.description=Roller Theme Resource Loader
-theme.resource.loader.class=org.apache.roller.weblogger.ui.rendering.velocity.ThemeResourceLoader
-theme.resource.loader.cache=false
-theme.resource.loader.modificationCheckInterval=2
+resource.loader.theme.public.name=theme
+resource.loader.theme.description=Roller Theme Resource Loader
+resource.loader.theme.class=org.apache.roller.weblogger.ui.rendering.velocity.ThemeResourceLoader
+resource.loader.theme.cache=false
+resource.loader.theme.modification_check_interval=2
# for the loader we call 'roller', use the RollerResourceLoader
-roller.resource.loader.public.name=roller
-roller.resource.loader.description=Roller Main Resource Loader
-roller.resource.loader.class=org.apache.roller.weblogger.ui.rendering.velocity.RollerResourceLoader
-roller.resource.loader.cache=false
-roller.resource.loader.modificationCheckInterval=2
+resource.loader.roller.public.name=roller
+resource.loader.roller.description=Roller Main Resource Loader
+resource.loader.roller.class=org.apache.roller.weblogger.ui.rendering.velocity.RollerResourceLoader
+resource.loader.roller.cache=false
+resource.loader.roller.modification_check_interval=2
# for the loader we call 'class', use the ClasspathResourceLoader
-class.resource.loader.description = Velocity Classpath Resource Loader
-class.resource.loader.class =
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-class.resource.loader.cache=true
-class.resource.loader.modificationCheckInterval=60
+resource.loader.class.description = Velocity Classpath Resource Loader
+resource.loader.class.class =
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+resource.loader.class.cache=true
+resource.loader.class.modification_check_interval=60
# for the loader we call 'webapp', use the WebappResourceLoader
-webapp.resource.loader.description = Roller Webapp Resource Loader
-webapp.resource.loader.class =
org.apache.roller.weblogger.ui.rendering.velocity.WebappResourceLoader
-webapp.resource.loader.cache=true
-webapp.resource.loader.modificationCheckInterval=60
+resource.loader.webapp.description = Roller Webapp Resource Loader
+resource.loader.webapp.class =
org.apache.roller.weblogger.ui.rendering.velocity.WebappResourceLoader
+resource.loader.webapp.cache=true
+resource.loader.webapp.modification_check_interval=60
# log invalid template references?
# set this to false to have a quieter velocity.log
@@ -52,19 +52,19 @@
runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
runtime.log.logsystem.log4j.category=org.apache.velocity
# Override the default global library, set to blank to load no default
-velocimacro.library = weblog.vm,feeds.vm,roller-custom.vm
+velocimacro.library.path = weblog.vm,feeds.vm,roller-custom.vm
# Change to false for deployment environments.
# Caching for the 'class' & 'webapp' ResourceLoaders must be false for this to
work
velocimacro.library.autoreload=true
# Allow Velocimacros to be defined in regular templates
-velocimacro.permissions.allow.inline=true
+velocimacro.inline.allow=true
# Allow template authors to define macros in any template
-velocimacro.permissions.allow.inline.local.scope=false
+velocimacro.inline.local_scope=false
# set encoding/charset to UTF-8
-input.encoding=UTF-8
+resource.default_encoding=UTF-8
output.encoding=UTF-8
default.contentType=text/html; charset=utf-8
