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 009d5eeced25dc8d69b1da13adea5b2b73608fd5
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Mon Jul 12 09:19:53 2021 +0200
updated velocity properties + set log level to info.
---
app/src/main/resources/log4j2.xml | 2 +-
app/src/main/webapp/WEB-INF/velocity.properties | 4 +++-
app/src/test/resources/WEB-INF/velocity.properties | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/src/main/resources/log4j2.xml
b/app/src/main/resources/log4j2.xml
index f7aba64..4e21134 100644
--- a/app/src/main/resources/log4j2.xml
+++ b/app/src/main/resources/log4j2.xml
@@ -70,7 +70,7 @@ limitations under the License.
<!-- roller.log; everything not defined here will end up in server.log
-->
<Logger name="org.apache.roller" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
- <Logger name="org.apache.velocity" level="error"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
+ <Logger name="org.apache.velocity" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
<Logger name="org.springframework" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
<Logger name="org.apache.struts2" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
<Logger name="org.openid4java" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
diff --git a/app/src/main/webapp/WEB-INF/velocity.properties
b/app/src/main/webapp/WEB-INF/velocity.properties
index a63cc49..6d043a8 100644
--- a/app/src/main/webapp/WEB-INF/velocity.properties
+++ b/app/src/main/webapp/WEB-INF/velocity.properties
@@ -52,6 +52,9 @@ runtime.log.invalid.reference=false
runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
runtime.log.logsystem.log4j.category=org.apache.velocity
+# modern JVMs have fast deduplication
+runtime.string_interning=false
+
# Override the default global library, set to blank to load no default
velocimacro.library.path = weblog.vm,feeds.vm,roller-custom.vm
@@ -66,7 +69,6 @@ velocimacro.inline.local_scope=false
# set encoding/charset to UTF-8
resource.default_encoding=UTF-8
-output.encoding=UTF-8
default.contentType=text/html; charset=utf-8
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 2111013..3af60e6 100644
--- a/app/src/test/resources/WEB-INF/velocity.properties
+++ b/app/src/test/resources/WEB-INF/velocity.properties
@@ -51,6 +51,9 @@ runtime.log.invalid.reference=false
runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
runtime.log.logsystem.log4j.category=org.apache.velocity
+# modern JVMs have fast deduplication
+runtime.string_interning=false
+
# Override the default global library, set to blank to load no default
velocimacro.library.path = weblog.vm,feeds.vm,roller-custom.vm
@@ -66,5 +69,4 @@ velocimacro.inline.local_scope=false
# set encoding/charset to UTF-8
resource.default_encoding=UTF-8
-output.encoding=UTF-8
default.contentType=text/html; charset=utf-8
