amyroh 2002/09/11 23:44:25
Modified: catalina/src/conf tomcat-users.xml web.xml
catalina/src/share/org/apache/catalina/servlets
HTMLManagerServlet.java ManagerServlet.java
catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
Log:
Fix the output character encoding of servlet to Tomcat 5.
Revision Changes Path
1.4 +1 -1 jakarta-tomcat-catalina/catalina/src/conf/tomcat-users.xml
Index: tomcat-users.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/tomcat-users.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat-users.xml 11 Aug 2002 13:54:53 -0000 1.3
+++ tomcat-users.xml 12 Sep 2002 06:44:25 -0000 1.4
@@ -4,7 +4,7 @@
you must define such a user - the username and password are arbitrary.
-->
<tomcat-users>
- <user name="tomcat" password="tomcat" roles="tomcat" />
+ <user name="tomcat" password="tomcat" roles="tomcat,admin" />
<user name="role1" password="tomcat" roles="role1" />
<user name="both" password="tomcat" roles="tomcat,role1" />
</tomcat-users>
1.3 +4 -4 jakarta-tomcat-catalina/catalina/src/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 23 Aug 2002 23:04:05 -0000 1.2
+++ web.xml 12 Sep 2002 06:44:25 -0000 1.3
@@ -226,7 +226,7 @@
<!-- $CATALINA_HOME/server/lib/servlets-cgi.renametojar file -->
<!-- to $CATALINA_HOME/server/lib/servlets-cgi.jar -->
-<!--
+
<servlet>
<servlet-name>cgi</servlet-name>
<servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
@@ -244,7 +244,7 @@
</init-param>
<load-on-startup>5</load-on-startup>
</servlet>
--->
+
<!-- ================ Built In Servlet Mappings ========================= -->
@@ -287,12 +287,12 @@
-->
<!-- The mapping for the CGI Gateway servlet -->
-<!--
+
<servlet-mapping>
<servlet-name>cgi</servlet-name>
<url-pattern>/cgi-bin/*</url-pattern>
</servlet-mapping>
--->
+
<!-- ==================== Default Session Configuration ================= -->
1.2 +7 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTMLManagerServlet.java 18 Jul 2002 16:47:40 -0000 1.1
+++ HTMLManagerServlet.java 12 Sep 2002 06:44:25 -0000 1.2
@@ -70,6 +70,7 @@
import java.text.MessageFormat;
import java.util.Date;
import java.util.Iterator;
+import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
import javax.servlet.ServletException;
@@ -127,6 +128,8 @@
// Prepare our output writer to generate the response message
response.setContentType("text/html");
+ Locale locale = Locale.getDefault();
+ response.setLocale(locale);
PrintWriter writer = response.getWriter();
// Process the requested command
1.2 +9 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
Index: ManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ManagerServlet.java 18 Jul 2002 16:47:41 -0000 1.1
+++ ManagerServlet.java 12 Sep 2002 06:44:25 -0000 1.2
@@ -74,6 +74,7 @@
import java.net.URL;
import java.util.Enumeration;
import java.util.Iterator;
+import java.util.Locale;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import javax.naming.Binding;
@@ -330,6 +331,8 @@
// Prepare our output writer to generate the response message
response.setContentType("text/plain");
+ Locale locale = Locale.getDefault();
+ response.setLocale(locale);
PrintWriter writer = response.getWriter();
// Process the requested command (note - "/deploy" is not listed here)
@@ -393,6 +396,8 @@
// Prepare our output writer to generate the response message
response.setContentType("text/plain");
+ Locale locale = Locale.getDefault();
+ response.setLocale(locale);
PrintWriter writer = response.getWriter();
// Process the requested command
1.2 +8 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorReportValve.java 18 Jul 2002 16:47:42 -0000 1.1
+++ ErrorReportValve.java 12 Sep 2002 06:44:25 -0000 1.2
@@ -72,6 +72,7 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
+import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -348,9 +349,12 @@
Writer writer = response.getReporter();
if (writer != null) {
+
+ Locale locale = Locale.getDefault();
try {
hres.setContentType("text/html");
+ hres.setLocale(locale);
} catch (Throwable t) {
if (debug >= 1)
log("status.setContentType", t);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
