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 2020/05/04 15:52:29 UTC
[tomcat] branch 8.5.x updated (cae8992 -> c82d864)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from cae8992 Add missing ALv2 headers
new 74c96b4 Backport updates to German translations
new c82d864 Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jasper/resources/LocalStrings.properties | 8 +++----
.../jasper/resources/LocalStrings_de.properties | 26 +++++++++++++++++++++-
2 files changed, 29 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Backport updates to German translations
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 74c96b49dfe4159e3304ba96bd8502f3914fb6f8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 16:42:30 2020 +0100
Backport updates to German translations
---
.../jasper/resources/LocalStrings_de.properties | 26 +++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 561324d..4ea6cbf 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -24,7 +24,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von jsp:plugin sein
-jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
+jsp.error.file.not.found=Datei [{0}] nicht gefunden
jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
jsp.error.invalid.tagdir=Tag Verzeichnis [{0}] beginnt nicht mit "/WEB-INF/tags"
@@ -64,6 +64,19 @@ jsp.warning.unknown.targetVM=Unbekannte Ziel-VM [{0}] ignoriert
jspc.webfrg.footer=\n\
</web-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\
+Automatisch erstellt von Apache Tomcat JspC.\n\
+-->\n\
+\n
jspc.webinc.header=\n\
<!--\n\
Automatisch erstellt von Apache Tomcat JspC.\n\
@@ -72,5 +85,16 @@ Automatisch erstellt von Apache Tomcat JspC.\n\
jspc.webxml.footer=\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"\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\
+Automatisch erstellt durch Apache Tomcat JspC.\n\
+-->\n\
+\n
org.apache.jasper.compiler.TldCache.servletContextNull=Der angegebene ServletContext war null
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Correct backport. web.xml versions are 3.1 for
Tomcat 8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c82d8641786caccf4d968a2be17665c221e18861
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 16:52:12 2020 +0100
Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x
---
java/org/apache/jasper/resources/LocalStrings.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_de.properties | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index edd2477..44ed90d 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -362,8 +362,8 @@ 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\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -390,8 +390,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\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\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 4ea6cbf..e3e52ec 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -68,8 +68,8 @@ 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\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -89,8 +89,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\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\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatisch erstellt durch Apache Tomcat JspC.\n\
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org