From 91c9fcba06fff146d35210a8aabb2520149d8fbe Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 30 Apr 2004 01:50:16 +0000
Subject: [PATCH] git-svn-id: https://samskivert.googlecode.com/svn/trunk@1421
 6335cc39-0255-0410-8fd6-9bcaacd3b74c

---
 .../velocity/DispatcherServlet.java           | 53 +++++++++++++------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java b/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java
index 3059a754..77ade1e7 100644
--- a/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java
+++ b/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java
@@ -1,5 +1,5 @@
 //
-// $Id: DispatcherServlet.java,v 1.24 2004/04/26 08:47:59 mdb Exp $
+// $Id: DispatcherServlet.java,v 1.25 2004/04/30 01:50:16 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -152,6 +152,31 @@ import com.samskivert.util.StringUtil;
 public class DispatcherServlet extends VelocityServlet
     implements MethodExceptionEventHandler
 {
+    /**
+     * Performs various initialization.
+     */
+    public void init (ServletConfig config)
+        throws ServletException
+    {
+        super.init(config);
+
+        // determine the character set we'll use
+        _charset = config.getInitParameter(CHARSET_KEY);
+        if (_charset == null) {
+            _charset = "UTF-8";
+        }
+    }
+
+    /**
+     * Clean up after ourselves and our application.
+     */
+    public void destroy ()
+    {
+        super.destroy();
+	// shutdown our application
+        _app.shutdown();
+    }
+
     /**
      * Initialize ourselves and our application.
      */
@@ -222,16 +247,6 @@ public class DispatcherServlet extends VelocityServlet
         return props;
     }
 
-    /**
-     * Clean up after ourselves and our application.
-     */
-    public void destroy ()
-    {
-        super.destroy();
-	// shutdown our application
-        _app.shutdown();
-    }
-
     /**
      * Loads up the template appropriate for this request, locates and
      * invokes any associated logic class and finally returns the prepared
@@ -262,15 +277,15 @@ public class DispatcherServlet extends VelocityServlet
 	// then select the template
 	Template tmpl = selectTemplate(siteId, ictx);
 
-        // assume the request is in UTF-8 format unless it has actually
-        // been sensibly parsed by the browser
+        // assume the request is in the default character set unless it
+        // has actually been sensibly supplied by the browser
         if (req.getCharacterEncoding() == null) {
-            req.setCharacterEncoding("UTF-8");
+            req.setCharacterEncoding(_charset);
         }
 
-        // assume an HTML response in the UTF-8 character set unless
+        // assume an HTML response in the default character set unless
         // otherwise massaged by the logic
-        rsp.setContentType("text/html; charset=UTF-8");
+        rsp.setContentType("text/html; charset=" + _charset);
 
 	try {
             // insert the application into the context in case the
@@ -439,6 +454,9 @@ public class DispatcherServlet extends VelocityServlet
     /** A table of resolved logic instances. */
     protected HashMap _logic = new HashMap();
 
+    /** The character set in which serve our responses. */
+    protected String _charset;
+
     /** This is the key used in the context for error messages. */
     protected static final String ERROR_KEY = "error";
 
@@ -468,4 +486,7 @@ public class DispatcherServlet extends VelocityServlet
 
     /** The servlet parameter key specifying the base logic package. */
     protected static final String LOGIC_PKG_KEY = "logic_package";
+
+    /** The servlet parameter key specifying the default character set. */
+    protected static final String CHARSET_KEY = "charset";
 }