2016-07-05 16:59 GMT+03:00  <ma...@apache.org>:
> Author: markt
> Date: Tue Jul  5 13:59:14 2016
> New Revision: 1751479
>
> URL: http://svn.apache.org/viewvc?rev=1751479&view=rev
> Log:
> Use UTF-8 with a standard prolog for all XML files.
>
> Modified:
>     tomcat/tc8.5.x/trunk/   (props changed)
>     tomcat/tc8.5.x/trunk/bin/catalina-tasks.xml
>     tomcat/tc8.5.x/trunk/build.xml
>     tomcat/tc8.5.x/trunk/conf/context.xml
>     tomcat/tc8.5.x/trunk/conf/jaspic-providers.xml
>     tomcat/tc8.5.x/trunk/conf/jaspic-providers.xsd
>     tomcat/tc8.5.x/trunk/conf/server.xml
>     tomcat/tc8.5.x/trunk/conf/tomcat-users.xml
>     tomcat/tc8.5.x/trunk/conf/tomcat-users.xsd
>     tomcat/tc8.5.x/trunk/conf/web.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
>     tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/deploy/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/mbeans-descriptors.xml
>     tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/mbeans-descriptors.xml
>     tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
>     tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
>     
> tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
>     
> tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
>     tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml
>     tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/tagPlugins.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
>     tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml
>     tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/changelog.xml
>     tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
>     tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/package.xsl
>     tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/project.xml
>     tomcat/tc8.5.x/trunk/modules/jdbc-pool/pom.xml
>     
> tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
>     
> tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
>     tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml
>     tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
>     tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml
>     tomcat/tc8.5.x/trunk/res/checkstyle/javax-checkstyle.xml
>     tomcat/tc8.5.x/trunk/res/checkstyle/javax-import-control.xml
>     tomcat/tc8.5.x/trunk/res/checkstyle/org-checkstyle.xml
>     tomcat/tc8.5.x/trunk/res/checkstyle/org-import-control.xml
>     tomcat/tc8.5.x/trunk/res/cobertura/logback.xml
>     tomcat/tc8.5.x/trunk/res/deployer/build.xml
>     tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml
>     tomcat/tc8.5.x/trunk/test/conf/jaspic-test-01.xml
>     tomcat/tc8.5.x/trunk/test/conf/jaspic-test-02.xml
>     
> tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
>     tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml
>     
> tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
>     tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml
>     
> tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
>     
> tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
>     
> tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
>     
> tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
>     tomcat/tc8.5.x/trunk/test/webapp-2.2/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-2.3/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-2.4/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-2.5/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-3.0/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-3.1/WEB-INF/web.xml
>     
> tomcat/tc8.5.x/trunk/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-fragments/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-servletsecurity/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp-servletsecurity2/WEB-INF/web.xml
>     
> tomcat/tc8.5.x/trunk/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/bug53545.tld
>     
> tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/classes/META-INF/org.apache.jasper/tagPlugins.xml
>     tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug48668.tagx
>     tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug55198.tagx
>     tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug56265.tagx
>     tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug54801a.jspx
>     tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug54801b.jspx
>     tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug54821a.jspx
>     tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug54821b.jspx
>     tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug56029.jspx
>     tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug56334and56561.jspx
>     tomcat/tc8.5.x/trunk/webapps/ROOT/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/webapps/docs/appdev/web.xml.txt
>     tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
>     tomcat/tc8.5.x/trunk/webapps/docs/jndi-resources-howto.xml
>     tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
>     tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/webapps/examples/jsp/xml/xml.jsp
>     tomcat/tc8.5.x/trunk/webapps/host-manager/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
>     tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
>     tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
>     tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/web.xml
>     tomcat/tc8.5.x/trunk/webapps/manager/xform.xsl
>


Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1751479&r1=1751478&r2=1751479&view=diff
==============================================================================
--- 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Tue Jul  5 13:59:14 2016
@@ -187,7 +187,7 @@ where options include:\n\
 \    -source <version>   Set the -source argument to the compiler
(default 1.7)\n\
 \    -target <version>   Set the -target argument to the compiler
(default 1.7)\n\

-jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
+jspc.webxml.header=<?xml version="1.0" encoding="UTF-8"?>\n\
 \n\
 <!DOCTYPE web-app\n\
 \    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\


+ same change in localized files.

The above change means that JspC has to use UTF-8 to write the file.

Looking into JspC.java, it looks that the default is system encoding,
not UTF-8 and not ISO-8859-1 either. So the old header was wrong as
well.


Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to