You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/09/14 13:21:04 UTC
svn commit: r1840922 - in /tomcat/trunk: java/org/apache/jasper/resources/
webapps/docs/
Author: markt
Date: Fri Sep 14 13:21:03 2018
New Revision: 1840922
URL: http://svn.apache.org/viewvc?rev=1840922&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62721
Correct generation of web.xml header when using JspC.
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1840922&r1=1840921&r2=1840922&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties [UTF-8] Fri Sep 14 13:21:03 2018
@@ -196,12 +196,12 @@ where options include:\n\
\ (\"2.0C\" means two threads per core)\n\
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
-\ metadata-complete="false">\n\
+\<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
+\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-->\n\
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1840922&r1=1840921&r2=1840922&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties [UTF-8] Fri Sep 14 13:21:03 2018
@@ -187,12 +187,12 @@ y donde <opciones> incluyen:\n\
\ -target <version> Set the -target argument to the compiler (default 1.8)\n\
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
-\ metadata-complete="false">\n\
+\<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
+\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Creado automaticamente mediante Apache Tomcat JspC.\n\
-->\n\
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1840922&r1=1840921&r2=1840922&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties [UTF-8] Fri Sep 14 13:21:03 2018
@@ -123,12 +123,12 @@ où les options comprennet:\n\
\ -target <version> Set the -target argument to the compiler (default 1.8)\n\
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
-\ metadata-complete="false">\n\
+\<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
+\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Créer automatiquement par le JspC Apache Tomcat.\n\
-->\n\
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1840922&r1=1840921&r2=1840922&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties [UTF-8] Fri Sep 14 13:21:03 2018
@@ -163,12 +163,12 @@ JSPファイルの場所は次のオプ�
\ -target <version> Set the -target argument to the compiler (default 1.8)\n\
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
-\ metadata-complete="false">\n\
+\<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
+\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-->\n\
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840922&r1=1840921&r2=1840922&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Sep 14 13:21:03 2018
@@ -80,6 +80,10 @@
Correct parsing of XML whitespace in TLD function signatures that
incorrectly only looked for the space character. (markt)
</fix>
+ <fix>
+ <bug>62721</bug>: Correct generation of web.xml header when using JspC.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org