This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 68ce97f WICKET-6653 Fix deprecation warnings in Velocity properties
68ce97f is described below
commit 68ce97f0d3714a0e1cc77dfb93fe259ea9df0157
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Fri Jun 14 00:02:40 2019 +0300
WICKET-6653 Fix deprecation warnings in Velocity properties
---
.../src/main/webapp/META-INF/velocity.properties | 32 +++++++++---------
.../wicket/examples/forminput/FormInputTest.java | 4 +--
.../org/apache/wicket/velocity/velocity.properties | 38 +++++++++++-----------
3 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/wicket-examples/src/main/webapp/META-INF/velocity.properties
b/wicket-examples/src/main/webapp/META-INF/velocity.properties
index 4deb3c8..88485a6 100644
--- a/wicket-examples/src/main/webapp/META-INF/velocity.properties
+++ b/wicket-examples/src/main/webapp/META-INF/velocity.properties
@@ -77,7 +77,7 @@ runtime.log.logsystem.log4j.file.backups=1
# T E M P L A T E E N C O D I N G
#----------------------------------------------------------------------------
-input.encoding=ISO-8859-1
+resource.default_encoding=ISO-8859-1
output.encoding=ISO-8859-1
#----------------------------------------------------------------------------
@@ -99,14 +99,14 @@ directive.foreach.counter.initial.value = 1
# is governed.
#----------------------------------------------------------------------------
-directive.include.output.errormsg.start = <!-- include error :
-directive.include.output.errormsg.end = see error log -->
+directive.include.output_error_start = <!-- include error :
+directive.include.output_error_end = see error log -->
#----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
#----------------------------------------------------------------------------
-directive.parse.max.depth = 10
+directive.parse.max_depth = 10
#----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
@@ -115,19 +115,19 @@ directive.parse.max.depth = 10
#
#----------------------------------------------------------------------------
-resource.manager.logwhenfound=true
-resource.loader=file,class
+resource.manager.log_when_found=true
+resource.loaders=file,class
file.resource.loader.description=Velocity File Resource Loader
-file.resource.loader.class=org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path=.
-file.resource.loader.cache=false
-file.resource.loader.modificationCheckInterval=1
+resource.loader.file.class=org.apache.velocity.runtime.resource.loader.FileResourceLoader
+resource.loader.file.path=.
+resource.loader.file.cache=false
+resource.loader.file.modification_check_interval=1
-class.resource.loader.description=Velocity Classpath Resource Loader
+resource.loader.class.description=Velocity Classpath Resource Loader
class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
class.resource.loader.cache=false
-class.resource.loader.modificationCheckInterval=1
+resource.loader.class.modification_check_interval=1
#----------------------------------------------------------------------------
@@ -139,9 +139,9 @@ class.resource.loader.modificationCheckInterval=1
#----------------------------------------------------------------------------
#velocimacro.library = /WEB-INF/VM_global_library.vm
-velocimacro.permissions.allow.inline = true
-velocimacro.permissions.allow.inline.to.replace.global = false
-velocimacro.permissions.allow.inline.local.scope = false
+velocimacro.inline.allow = true
+velocimacro.inline.replace_global = false
+velocimacro.inline.local_scope = false
velocimacro.context.localscope = false
@@ -151,7 +151,7 @@ velocimacro.context.localscope = false
# turn off and on interpolation of references and directives in string
# literals. ON by default :)
#----------------------------------------------------------------------------
-runtime.interpolate.string.literals = true
+runtime.interpolate_string_literals = true
#----------------------------------------------------------------------------
# RESOURCE MANAGEMENT
diff --git
a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
index e41a70d..4941a69 100644
---
a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
+++
b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
@@ -23,13 +23,13 @@ import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
*/
-public class FormInputTest extends WicketTestCase
+class FormInputTest extends WicketTestCase
{
/**
* Test page.
*/
@Test
- public void test_1()
+ void test_1()
{
tester.startPage(FormInput.class);
diff --git
a/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
b/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
index 94044e3..9f5a2ea 100644
---
a/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
+++
b/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
@@ -76,7 +76,7 @@ runtime.log.logsystem.log4j.file.backups=1
# T E M P L A T E E N C O D I N G
#----------------------------------------------------------------------------
-input.encoding=ISO-8859-1
+resource.default_encoding=ISO-8859-1
output.encoding=ISO-8859-1
#----------------------------------------------------------------------------
@@ -98,14 +98,14 @@ directive.foreach.counter.initial.value = 1
# is governed.
#----------------------------------------------------------------------------
-directive.include.output.errormsg.start = <!-- include error :
-directive.include.output.errormsg.end = see error log -->
+directive.include.output_error_start = <!-- include error :
+directive.include.output_error_end = see error log -->
#----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
#----------------------------------------------------------------------------
-directive.parse.max.depth = 10
+directive.parse.max_depth = 10
#----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
@@ -114,19 +114,19 @@ directive.parse.max.depth = 10
#
#----------------------------------------------------------------------------
-resource.manager.logwhenfound=true
-resource.loader=file,class
+resource.manager.log_when_found=true
+resource.loaders=file,class
-file.resource.loader.description=Velocity File Resource Loader
-file.resource.loader.class=org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path=.
-file.resource.loader.cache=false
-file.resource.loader.modificationCheckInterval=1
+resource.loader.file.description=Velocity File Resource Loader
+resource.loader.file.class=org.apache.velocity.runtime.resource.loader.FileResourceLoader
+resource.loader.file.path=.
+resource.loader.file.cache=false
+resource.loader.file.modification_check_interval=1
-class.resource.loader.description=Velocity Classpath Resource Loader
-class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-class.resource.loader.cache=false
-class.resource.loader.modificationCheckInterval=1
+resource.loader.class.description=Velocity Classpath Resource Loader
+resource.loader.class.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+resource.loader.class.cache=false
+resource.loader.class.modification_check_interval=1
#----------------------------------------------------------------------------
@@ -138,9 +138,9 @@ class.resource.loader.modificationCheckInterval=1
#----------------------------------------------------------------------------
#velocimacro.library = /WEB-INF/VM_global_library.vm
-velocimacro.permissions.allow.inline = true
-velocimacro.permissions.allow.inline.to.replace.global = false
-velocimacro.permissions.allow.inline.local.scope = false
+velocimacro.inline.allow = true
+velocimacro.inline.replace_global = false
+velocimacro.inline.local_scope = false
velocimacro.context.localscope = false
@@ -150,7 +150,7 @@ velocimacro.context.localscope = false
# turn off and on interpolation of references and directives in string
# literals. ON by default :)
#----------------------------------------------------------------------------
-runtime.interpolate.string.literals = true
+runtime.interpolate_string_literals = true
#----------------------------------------------------------------------------
