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/05/17 09:08:57 UTC
svn commit: r1831763 - in /tomcat/trunk: java/org/apache/jasper/resources/
webapps/docs/
Author: markt
Date: Thu May 17 09:08:57 2018
New Revision: 1831763
URL: http://svn.apache.org/viewvc?rev=1831763&view=rev
Log:
Since JspC output is Tomcat version specific, no reason not to use the latest schema version when generating web[-fragment].xml content.
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=1831763&r1=1831762&r2=1831763&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu May 17 09:08:57 2018
@@ -194,25 +194,26 @@ where options include:\n\
\ -target <version> Set the -target argument to the compiler (default 1.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\
-\ "http://java.sun.com/dtd/web-app_2_3.dtd">\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\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-->\n\
-<web-app>\n\
\n
jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment 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-fragment_3_0.xsd"\n\
-\ version="3.0"\n\
-\ metadata-complete="true">\n\
+\<web-fragment 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-fragment_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
<!--\n\
@@ -225,14 +226,10 @@ jspc.webfrg.footer=\n\
jspc.webinc.header=\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-Place this fragment in the web.xml before all icon, display-name,\n\
-description, distributable, and context-param elements.\n\
-->\n
jspc.webinc.footer=\n\
<!--\n\
-All session-config, mime-mapping, welcome-file-list, error-page, taglib,\n\
-resource-ref, security-constraint, login-config, security-role,\n\
-env-entry, and ejb-ref elements should follow this fragment.\n\
+End of content automatically created by Apache Tomcat JspC.\n\
-->\n
jspc.webinc.insertEnd=<!-- JSPC servlet mappings end -->
jspc.webinc.insertStart=<!-- JSPC servlet mappings start -->
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=1831763&r1=1831762&r2=1831763&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Thu May 17 09:08:57 2018
@@ -187,32 +187,44 @@ y donde <opciones> incluyen:\n\
\ -source <version> Set the -source argument to the compiler (default 1.8)\n\
\ -target <version> Set the -target argument to the compiler (default 1.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\
- \ "http://java.sun.com/dtd/web-app_2_3.dtd">\n\
- <!--\n\
- Creado automaticamente mediante Apache Tomcat JspC.\n\
- -->\n\
- <web-app>\n\
- \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\
+<!--\n\
+Creado automaticamente mediante Apache Tomcat JspC.\n\
+-->\n\
+\n
jspc.webxml.footer = \n\
</web-app>\n\
\n
-jspc.webinc.header = \n\
- <!--\n\
- Creado automaticamente mediante Apache Tomcat JspC.\n\
- Coloque este fragmento en el fichero web.xml antes de \n\
- todos los elementos: icon, display-name, description, \n\
- distributable y context-param .\n\
- -->\n
-jspc.webinc.footer = \n\
- <!--\n\
- All session-config, mime-mapping, welcome-file-list, error-page, taglib,\n\
- resource-ref, security-constraint, login-config, security-role,\n\
- env-entry, and ejb-ref elements should follow this fragment.\n\
- -->\n
+jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
+\<web-fragment 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-fragment_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="true">\n\
+\ <name>org_apache_jasper.jspc</name>\n\
+\ <distributable/>\n\
+<!--\n\
+Creado automaticamente mediante Apache Tomcat JspC.\n\
+-->\n\
+\n
+jspc.webfrg.footer=\n\
+</web-fragment>\n\
+\n
+jspc.webinc.header=\n\
+<!--\n\
+Creado automaticamente mediante Apache Tomcat JspC.\n\
+-->\n
+jspc.webinc.footer=\n\
+<!--\n\
+End of content automatically created by Apache Tomcat JspC.\n\
+-->\n
jspc.webinc.insertEnd = <!-- Fin de mapeos de servlet JSPC -->
jspc.webinc.insertStart = <!-- Inicio de mapeos de servlet JSPC -->
jspc.error.generalException = ERROR-el archivo [{0}] ha generado la excepci\u00F3n general siguiente:
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=1831763&r1=1831762&r2=1831763&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties Thu May 17 09:08:57 2018
@@ -124,29 +124,42 @@ o\u00f9 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\
-\n\
-<!DOCTYPE web-app\n\
-\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
-\ "http://java.sun.com/dtd/web-app_2_3.dtd">\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\
<!--\n\
Cr\u00e9er automatiquement par le JspC Apache Tomcat.\n\
-->\n\
-<web-app>\n\
\n
jspc.webxml.footer=\n\
</web-app>\n\
\n
+jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
+\<web-fragment 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-fragment_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="true">\n\
+\ <name>org_apache_jasper.jspc</name>\n\
+\ <distributable/>\n\
+<!--\n\
+Cr\u00e9er automatiquement par le JspC Apache Tomcat.\n\
+-->\n\
+\n
+jspc.webfrg.footer=\n\
+</web-fragment>\n\
+\n
jspc.webinc.header=\n\
<!--\n\
Cr\u00e9er automatiquement par le JspC Apache Tomcat.\n\
-Placez ce fragment dans le fichier web.xml avant all icon, display-name,\n\
-description, distributable, and context-param elements.\n\
-->\n
jspc.webinc.footer=\n\
<!--\n\
-All session-config, mime-mapping, welcome-file-list, error-page, taglib,\n\
-resource-ref, security-constraint, login-config, security-role,\n\
-env-entry, and ejb-ref elements should follow this fragment.\n\
+End of content automatically created by Apache Tomcat JspC.\n\
-->\n
jspc.error.generalException=ERREUR-le fichier [{0}] a g\u00e9n\u00e9r\u00e9 l''exception g\u00e9n\u00e9rale suivante:
jspc.error.fileDoesNotExist=L''argument fichier [{0}] n''existe pas
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=1831763&r1=1831762&r2=1831763&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Thu May 17 09:08:57 2018
@@ -164,29 +164,42 @@ JSP\u30d5\u30a1\u30a4\u30eb\u306e\u5834\
\ -target <version> Set the -target argument to the compiler (default 1.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\
-\ "http://java.sun.com/dtd/web-app_2_3.dtd">\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\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-->\n\
-<web-app>\n\
\n
jspc.webxml.footer=\n\
</web-app>\n\
\n
+jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
+\<web-fragment 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-fragment_4_0.xsd"\n\
+\ version="4.0"\n\
+\ metadata-complete="true">\n\
+\ <name>org_apache_jasper.jspc</name>\n\
+\ <distributable/>\n\
+<!--\n\
+Automatically created by Apache Tomcat JspC.\n\
+-->\n\
+\n
+jspc.webfrg.footer=\n\
+</web-fragment>\n\
+\n
jspc.webinc.header=\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
-Place this fragment in the web.xml before all icon, display-name,\n\
-description, distributable, and context-param elements.\n\
-->\n
jspc.webinc.footer=\n\
<!--\n\
-All session-config, mime-mapping, welcome-file-list, error-page, taglib,\n\
-resource-ref, security-constraint, login-config, security-role,\n\
-env-entry, and ejb-ref elements should follow this fragment.\n\
+End of content automatically created by Apache Tomcat JspC.\n\
-->\n
jspc.webinc.insertEnd=<!-- JSPC servlet mappings end -->
jspc.webinc.insertStart=<!-- JSPC servlet mappings start -->
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1831763&r1=1831762&r2=1831763&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 17 09:08:57 2018
@@ -143,6 +143,10 @@
Enable JspC from Tomcat 9 to work with Maven JspC compiler plug-ins
written for Tomcat 8.5.x. Patch provided by Pavel Cibulka. (markt)
</fix>
+ <fix>
+ Update web.xml, web-fragment.xml and web.xml extracts generated by JspC
+ to use the Servlet 4.0 version of the relevant schemas. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org