Author: markt
Date: Fri Sep 14 13:30:12 2018
New Revision: 1840925
URL: http://svn.apache.org/viewvc?rev=1840925&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/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1840925&r1=1840924&r2=1840925&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Fri Sep 14 13:30:12 2018
@@ -276,12 +276,12 @@ where options include:\n\
\ (\"2.0C\" means two threads per core)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"\n\
+\<web-app xmlns="http://java.sun.com/xml/ns/javaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee\n\
\
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"\n\
-\ version="3.0"\n\
-\ metadata-complete="false">\n\
+\ version="3.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-->\n\
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1840925&r1=1840924&r2=1840925&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Fri Sep 14 13:30:12 2018
@@ -265,12 +265,12 @@ jspc.usage = Uso\: jspc <opciones> [--]
\ -source <version> Set the -source argument to the compiler (default
1.6)\n\
\ -target <version> Set the -target argument to the compiler (default
1.6)\n
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+\<web-app xmlns="http://java.sun.com/xml/ns/javaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee\n\
\
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"\n\
-\ version="3.0"\n\
-\ metadata-complete="false">\n\
+\ version="3.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Creado automaticamente mediante Apache Tomcat JspC.\n\
-->\n\
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1840925&r1=1840924&r2=1840925&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Fri Sep 14 13:30:12 2018
@@ -197,12 +197,12 @@ o\u00f9 les options comprennet:\n\
\ -target <version> Set the -target argument to the compiler (default
1.6)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"\n\
+\<web-app xmlns="http://java.sun.com/xml/ns/javaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee\n\
\
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"\n\
-\ version="3.0"\n\
-\ metadata-complete="false">\n\
+\ version="3.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Cr\u00e9er automatiquement par le JspC Apache Tomcat.\n\
-->\n\
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1840925&r1=1840924&r2=1840925&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Fri Sep 14 13:30:12 2018
@@ -238,12 +238,12 @@ JSP\u30d5\u30a1\u30a4\u30eb\u306e\u5834\
\ -target <version> Set the -target argument to the compiler (default
1.6)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"\n\
+\<web-app xmlns="http://java.sun.com/xml/ns/javaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee\n\
\
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"\n\
-\ version="3.0"\n\
-\ metadata-complete="false">\n\
+\ version="3.0"\n\
+\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-->\n\
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1840925&r1=1840924&r2=1840925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep 14 13:30:12 2018
@@ -58,6 +58,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.92 (violetagg)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>62721</bug>: Correct generation of web.xml header when using JspC.
+ (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.91 (violetagg)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
