geirm 01/04/13 19:52:28
Modified: src/java/org/apache/velocity/runtime RuntimeConstants.java
src/java/org/apache/velocity/runtime/defaults
velocity.properties
Log:
Changed to :
INPUT_ENCODING for (guess what) input character encoding for the templates and
OUTPUT_ENCODING for output encoding, used right now only by Anakia and
VelocityServlet
Revision Changes Path
1.24 +9 -3
jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java
Index: RuntimeConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- RuntimeConstants.java 2001/03/31 05:28:01 1.23
+++ RuntimeConstants.java 2001/04/14 02:52:26 1.24
@@ -62,7 +62,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: RuntimeConstants.java,v 1.23 2001/03/31 05:28:01 geirm Exp $
+ * @version $Id: RuntimeConstants.java,v 1.24 2001/04/14 02:52:26 geirm Exp $
*/
public interface RuntimeConstants
{
@@ -332,9 +332,15 @@
"runtime.interpolate.string.literals";
/**
- * The encoding to use for the template.
+ * The character encoding for the templates. Used by the parser in
+ * processing the input streams.
*/
- public static final String TEMPLATE_ENCODING = "template.encoding";
+ public static final String INPUT_ENCODING = "input.encoding";
+
+ /**
+ * Encoding for the output stream. Currently used by Anakia and
VelocityServlet
+ */
+ public static final String OUTPUT_ENCODING = "output.encoding";
/*
* ----------------------------------------------------------------------
1.21 +2 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/defaults/velocity.properties
Index: velocity.properties
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/defaults/velocity.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- velocity.properties 2001/03/19 08:05:08 1.20
+++ velocity.properties 2001/04/14 02:52:28 1.21
@@ -61,7 +61,8 @@
# T E M P L A T E E N C O D I N G
#----------------------------------------------------------------------------
-template.encoding=8859_1
+input.encoding=ISO-8859-1
+output.encoding=ISO-8859-1
#----------------------------------------------------------------------------
# F O R E A C H P R O P E R T I E S
