From: Takashi Okamoto <[EMAIL PROTECTED]>
Subject: [PATCH] improve internationalization for admin tool
Date: Mon, 12 Aug 2002 22:14:20 +0900 (JST)
> This is the second patch to internationalize the admin tools. First
> patch was commited by amy. New patch will improve at following point:
.. snip ...
> Could you apply this patch?
Oops, I posted wrong patch. Please ignore previous mail. The patch
which is attached this mail is right.
regards,
Takashi Okamoto
? webapps/admin/WEB-INF/classes/filters
Index: catalina/src/share/org/apache/catalina/core/StandardServer.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.30
diff -u -r1.30 StandardServer.java
--- catalina/src/share/org/apache/catalina/core/StandardServer.java 10 Jul 2002
09:49:01 -0000 1.30
+++ catalina/src/share/org/apache/catalina/core/StandardServer.java 12 Aug 2002
+12:32:15 -0000
@@ -71,6 +71,8 @@
import java.beans.PropertyDescriptor;
import java.io.File;
import java.io.FileWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
import java.io.InputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -742,7 +744,7 @@
// Open an output writer for the new configuration file
PrintWriter writer = null;
try {
- writer = new PrintWriter(new FileWriter(configNew));
+ writer = new PrintWriter(new OutputStreamWriter(new
+FileOutputStream(configNew), "UTF8"));
} catch (IOException e) {
if (writer != null) {
try {
@@ -1916,6 +1918,7 @@
Server server) throws Exception {
// Store the beginning of this element
+ writer.println("<?xml version='1.0' encoding='utf-8'?>");
for (int i = 0; i < indent; i++) {
writer.print(' ');
}
Index: catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java,v
retrieving revision 1.6
diff -u -r1.6 MemoryUserDatabase.java
--- catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java 10 Feb
2002 03:20:17 -0000 1.6
+++ catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java 12 Aug
+2002 12:32:15 -0000
@@ -506,11 +506,11 @@
// Configure our PrintWriter
FileOutputStream fos = new FileOutputStream(fileNew);
- OutputStreamWriter osw = new OutputStreamWriter(fos);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF8");
writer = new PrintWriter(osw);
// Print the file prolog
- writer.println("<?xml version='1.0'?>");
+ writer.println("<?xml version='1.0' encoding='utf-8'?>");
writer.println("<tomcat-users>");
// Print entries for each defined role, group, and user
Index: webapps/admin/WEB-INF/web.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/web.xml,v
retrieving revision 1.13
diff -u -r1.13 web.xml
--- webapps/admin/WEB-INF/web.xml 13 Jun 2002 23:43:03 -0000 1.13
+++ webapps/admin/WEB-INF/web.xml 12 Aug 2002 12:32:16 -0000
@@ -11,6 +11,25 @@
Tomcat HTML based administration web application.
</description>
+ <!-- Example filter to set character encoding on each request -->
+ <filter>
+ <filter-name>Set Character Encoding</filter-name>
+ <filter-class>filters.SetCharacterEncodingFilter</filter-class>
+ <init-param>
+ <param-name>encoding</param-name>
+ <param-value>UTF8</param-value>
+ </init-param>
+ </filter>
+
+
+ <!-- Example filter mapping to apply the "Set Character Encoding" filter
+ to *all* requests processed by this web application -->
+ <filter-mapping>
+ <filter-name>Set Character Encoding</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+
<!-- Action Servlet Configuration -->
<servlet>
<servlet-name>action</servlet-name>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
