You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2016/07/16 20:22:11 UTC
svn commit: r1752994 - in
/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view:
ImportSupport.java VelocityView.java
Author: cbrisson
Date: Sat Jul 16 20:22:11 2016
New Revision: 1752994
URL: http://svn.apache.org/viewvc?rev=1752994&view=rev
Log:
[tools] output.encoding property key definition belongs to the view ; make UTF-8 the default encoding
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportSupport.java?rev=1752994&r1=1752993&r2=1752994&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportSupport.java (original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportSupport.java Sat Jul 16 20:22:11 2016
@@ -56,7 +56,7 @@ public abstract class ImportSupport
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+.-";
/** Default character encoding for response. */
- protected static final String DEFAULT_ENCODING = "ISO-8859-1";
+ protected static final String DEFAULT_ENCODING = "UTF-8";
protected Logger LOG;
protected ServletContext application;
Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1752994&r1=1752993&r2=1752994&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java (original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java Sat Jul 16 20:22:11 2016
@@ -94,6 +94,9 @@ public class VelocityView extends ViewTo
/** The HTTP content type context key. */
public static final String CONTENT_TYPE_KEY = "default.contentType";
+ /** The HTTP output encoding. */
+ public static final String OUTPUT_ENCODING_KEY = "output.encoding";
+
/**
* Key used to access the ServletContext in
* the Velocity application attributes.
@@ -105,7 +108,7 @@ public class VelocityView extends ViewTo
public static final String DEFAULT_CONTENT_TYPE = "text/html";
/** Default encoding for the output stream */
- public static final String DEFAULT_OUTPUT_ENCODING = "ISO-8859-1";
+ public static final String DEFAULT_OUTPUT_ENCODING = "UTF-8";
/**
* Key used to access the toolbox configuration file path from the
@@ -702,7 +705,7 @@ public class VelocityView extends ViewTo
this.defaultContentType =
getProperty(CONTENT_TYPE_KEY, DEFAULT_CONTENT_TYPE);
- String encoding = getProperty(RuntimeConstants.OUTPUT_ENCODING,
+ String encoding = getProperty(OUTPUT_ENCODING_KEY,
DEFAULT_OUTPUT_ENCODING);
// For non Latin-1 encodings, ensure that the charset is