Author: markt
Date: Wed Jul 6 15:45:33 2016
New Revision: 1751704
URL: http://svn.apache.org/viewvc?rev=1751704&view=rev
Log:
When writing out a full web.xml file with JspC ensure that the encoding used in
the XML prolog matches the encoding used to write the contents of the file.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.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/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 6 15:45:33 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438,1751447,1751463
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438,1751447,1751463,1751702
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java?rev=1751704&r1=1751703&r2=1751704&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java Wed Jul 6 15:45:33
2016
@@ -230,7 +230,7 @@ public class JspC extends Task implement
// Generation of web.xml fragments
protected String webxmlFile;
protected int webxmlLevel;
- protected String webxmlEncoding;
+ protected String webxmlEncoding = "UTF-8";
protected boolean addWebXmlMappings = false;
protected Writer mapout;
@@ -983,7 +983,7 @@ public class JspC extends Task implement
* Sets the encoding to be used to read and write web.xml files.
*
* <p>
- * If not specified, defaults to the platform default encoding.
+ * If not specified, defaults to UTF-8.
* </p>
*
* @param encoding
@@ -1473,7 +1473,7 @@ public class JspC extends Task implement
mappingout = null;
}
if (webxmlLevel >= ALL_WEBXML) {
- mapout.write(Localizer.getMessage("jspc.webxml.header"));
+ mapout.write(Localizer.getMessage("jspc.webxml.header",
webxmlEncoding));
mapout.flush();
} else if ((webxmlLevel>= INC_WEBXML) && !addWebXmlMappings) {
mapout.write(Localizer.getMessage("jspc.webinc.header"));
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=1751704&r1=1751703&r2=1751704&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
Wed Jul 6 15:45:33 2016
@@ -176,7 +176,7 @@ where options include:\n\
\ -webinc <file> Creates a partial servlet mappings in the file\n\
\ -webxml <file> Creates a complete web.xml in the file\n\
\ -webxmlencoding <enc> Set the encoding charset used to read and write the
web.xml\n\
-\ file (default is platform default encoding)\n\
+\ file (default is UTF-8)\n\
\ -addwebxmlmappings Merge generated web.xml fragment into the web.xml file
of the\n\
\ web-app, whose JSP pages we are processing\n\
\ -ieplugin <clsid> Java Plugin classid for Internet Explorer\n\
@@ -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="UTF-8"?>\n\
+jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
\n\
<!DOCTYPE web-app\n\
\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1751704&r1=1751703&r2=1751704&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Wed Jul 6 15:45:33 2016
@@ -180,7 +180,7 @@ jspc.usage = Uso\: jspc <opciones> [--]
\ -javaEncoding <enc> Set the encoding charset for Java classes
(default UTF-8)\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\="UTF-8"?>\n\
+jspc.webxml.header = <?xml version\="1.0" encoding\="{0}"?>\n\
\n\
<\!DOCTYPE web-app\n\
\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1751704&r1=1751703&r2=1751704&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Wed Jul 6 15:45:33 2016
@@ -116,7 +116,7 @@ o\u00f9 les options comprennet:\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="UTF-8"?>\n\
+jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
\n\
<!DOCTYPE web-app\n\
\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1751704&r1=1751703&r2=1751704&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Wed Jul 6 15:45:33 2016
@@ -158,7 +158,7 @@ JSP\u30d5\u30a1\u30a4\u30eb\u306e\u5834\
\ -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="UTF-8"?>\n\
+jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
\n\
<!DOCTYPE web-app\n\
\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1751704&r1=1751703&r2=1751704&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Jul 6 15:45:33 2016
@@ -45,6 +45,17 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 8.5.4" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ When writing out a full web.xml file with JspC ensure that the encoding
+ used in the XML prolog matches the encoding used to write the contents
+ of the file. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+<section name="Tomcat 8.5.3" rtext="release in progress">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
