cvs commit: jakarta-velocity/src/java/org/apache/velocity/servlet VelocityServlet.java

[geirm]

geirm       01/04/13 19:52:53

  Modified:    src/java/org/apache/velocity/servlet VelocityServlet.java
  Log:
  Changed to new INPUT_ENCODING constant
  
  Revision  Changes    Path
  1.31      +9 -3      
jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java
  
  Index: VelocityServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- VelocityServlet.java      2001/04/12 11:37:59     1.30
  +++ VelocityServlet.java      2001/04/14 02:52:53     1.31
  @@ -129,7 +129,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
    * @author <a href="[EMAIL PROTECTED]">Kent Johnson</a>
  - * $Id: VelocityServlet.java,v 1.30 2001/04/12 11:37:59 geirm Exp $
  + * $Id: VelocityServlet.java,v 1.31 2001/04/14 02:52:53 geirm Exp $
    */
   public abstract class VelocityServlet extends HttpServlet
   {
  @@ -152,7 +152,13 @@
        *  The default content type for the response
        */
       public static final String DEFAULT_CONTENT_TYPE = "text/html";
  -     
  +    
  +  
  +    /**
  +     *  Encoding for the output stream
  +     */
  +    public static final String DEFAULT_OUTPUT_ENCODING = "ISO-8859-1";
  + 
       /**
        * The encoding to use when generating outputing.
        */
  @@ -202,7 +208,7 @@
               
               defaultContentType = Runtime.getString( CONTENT_TYPE, 
DEFAULT_CONTENT_TYPE);
               
  -            encoding = Runtime.getString(Runtime.TEMPLATE_ENCODING, "8859_1");
  +            encoding = Runtime.getString( Runtime.OUTPUT_ENCODING, 
DEFAULT_OUTPUT_ENCODING);
           }
           catch( Exception e )
           {