This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 676507728587e7f64f25c78781b56bec1f10c08a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 10 10:35:59 2019 +0100
Align web.xml fragment formats. Derive missings values where possible.
---
.../jasper/resources/LocalStrings_cs.properties | 26 ++++++++++++-
.../jasper/resources/LocalStrings_de.properties | 21 +++++++----
.../jasper/resources/LocalStrings_es.properties | 25 ++++++++-----
.../jasper/resources/LocalStrings_fr.properties | 19 +++++-----
.../jasper/resources/LocalStrings_ja.properties | 33 +----------------
.../jasper/resources/LocalStrings_ko.properties | 43 +---------------------
.../jasper/resources/LocalStrings_pt_BR.properties | 25 ++++++++++++-
.../jasper/resources/LocalStrings_zh_CN.properties | 37 +++++++++++++++----
8 files changed, 119 insertions(+), 110 deletions(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings_cs.properties
b/java/org/apache/jasper/resources/LocalStrings_cs.properties
index 48e8b9b..afd990e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_cs.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_cs.properties
@@ -64,6 +64,9 @@ jsp.warning.displaySourceFragment=Upozornění: Neplatná
hodnota pro inicializa
jsp.warning.enablePooling=Varování: Neplatná inicializační hodnota parametru
enablePooling. Bude použita výchozí hodnota "true"
jspc.error.fileDoesNotExist=Argument souboru [{0}] neexistuje
+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\
@@ -75,7 +78,26 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
\ <distributable/>\n\
<!--\n\
Automaticky vytvořeno pomocí Apache Tomcat JspC.\n\
--->
-jspc.webxml.footer=</web-app>
+-->\n\
+\n
+jspc.webinc.header=\n\
+<!--\n\
+Automaticky vytvořeno pomocí Apache Tomcat JspC.\n\
+-->\n\
+\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\
+Automaticky vytvořeno pomocí Apache Tomcat JspC.\n\
+-->\n\
+\n
org.apache.jasper.compiler.TldCache.servletContextNull=Poskytovatel
ServletContext je null
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index d787958..33aca1c 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -74,8 +74,10 @@ jsp.warning.enablePooling=Warnung: Ungültiger Wert für den
initParam enablePoo
jsp.warning.unknown.targetVM=Unbekannte Ziel-VM [{0}] ignoriert
jspc.errorCount=Anzahl der Fehler: [{0}]
-jspc.webfrg.header=\n\
-\ <?xml version="1.0" encoding="{0}"?>\n\
+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\
@@ -86,13 +88,17 @@ jspc.webfrg.header=\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\
+-->\n\
+\n
jspc.webxml.footer=\n\
</web-app>\n\
-\n\
\n
-jspc.webxml.header=\n\
-\ <?xml version="1.0" encoding="{0}"?>\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\
@@ -101,7 +107,8 @@ jspc.webxml.header=\n\
\ metadata-complete="false">\n\
<!--\n\
Automatisch erstellt durch Apache Tomcat JspC.\n\
--->
+-->\n\
+\n
jstl.OSAfterWriter=Der OutputStream kann nicht mehr benutzt werden, nachdem
bereits \n\
in den Writer geschrieben wurde.
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index d1f86e2..0bf83b9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -299,8 +299,10 @@ y donde <opciones> incluyen:\n\
\ (if "single", replace such template text with a
single space)\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\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)
-jspc.webfrg.footer=</web-fragment>
+\ -target <version> Set the -target argument to the compiler (default
1.8)\n
+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\
@@ -312,16 +314,18 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
\ <distributable/>\n\
<!--\n\
Creado automaticamente mediante Apache Tomcat JspC.\n\
--->
-jspc.webinc.footer=<!--\n\
-End of content automatically created by Apache Tomcat JspC.\n\
--->
-jspc.webinc.header=<!--\n\
+-->\n\
+\n
+jspc.webinc.header=\n\
+<!--\n\
Creado automaticamente mediante Apache Tomcat JspC.\n\
--->
+-->\n\
+\n
jspc.webinc.insertEnd=<!-- Fin de mapeos de servlet JSPC -->
jspc.webinc.insertStart=<!-- Inicio de mapeos de servlet JSPC -->
-jspc.webxml.footer=</web-app>
+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\
@@ -331,7 +335,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
\ metadata-complete="false">\n\
<!--\n\
Creado automaticamente mediante Apache Tomcat JspC.\n\
--->
+-->\n\
+\n
org.apache.jasper.compiler.TldCache.servletContextNull=El contenido
proporcionado para ServletContext tiene un valor nulo
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index f2f142d..96286e3 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -356,11 +356,10 @@ et où les options sont:\n\
\ -source <version> Fixe l'argument -source pour le compilateur (par
défaut 1.8)\n\
\ -target <version> Fixe l'argument -target pour le compilateur (par
défaut 1.8)\n\
\ -threadCount <count> Nombre de threads à utiliser pour la compilation\n\
-\ ("2.0C" veut dire deux threads par cœur)\n\
-\n
+\ ("2.0C" veut dire deux threads par cœur)\n
jspc.warning.tldInWebInfLib=Les fichiers TLDs ne devraient pas être placés
dans /WEB-INF/lib
-jspc.webfrg.footer=</web-fragment>\n\
-\n\
+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\
@@ -374,20 +373,21 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<!--\n\
Crée automatiquement par JspC de Apache Tomcat.\n\
-->\n\
-\n\
\n
-jspc.webinc.footer=<!--\n\
+jspc.webinc.footer=\n\
+<!--\n\
Fin du contenu généré automatiquement par JspC de Apache Tomcat.\n\
-->\n\
\n
-jspc.webinc.header=<!--\n\
+jspc.webinc.header=\n\
+<!--\n\
Crée automatiquement par JspC de Apache Tomcat.\n\
-->\n\
\n
jspc.webinc.insertEnd=<!-- Fin des mappings des Servlets JSPC -->
jspc.webinc.insertStart=<!-- Début des mappings des Servlets JSPC -->
-jspc.webxml.footer=</web-app>\n\
-\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\
@@ -399,7 +399,6 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<!--\n\
Crée automatiquement par JspC de Apache Tomcat.\n\
-->\n\
-\n\
\n
jstl.OSAfterWriter=Impossible d'utiliser un flux de sortie si un writer a été
utilisé
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 1f244c9..fab60d7 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -355,38 +355,9 @@ jspc.warning.tldInWebInfLib=TLDファイルは/ WEB-INF/libに置かないでく
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\
-Automatically created by Apache Tomcat JspC.\n\
--->\n\
+jspc.webxml.footer=\n\
+</web-app>\n\
\n
-jspc.webinc.footer=<!--\n\
-End of content automatically created by Apache Tomcat JspC.\n\
--->
-jspc.webinc.header=<!--\n\
-Automatically created by Apache Tomcat JspC.\n\
--->
-jspc.webinc.insertEnd=<!-- JSPC servlet mappings end -->
-jspc.webinc.insertStart=<!-- JSPC servlet mappings start -->
-jspc.webxml.footer=</web-app>\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\
-Automatically created by Apache Tomcat JspC.\n\
--->
jstl.OSAfterWriter=Writer が使用されている場合は出力ストリームを使用できません。
jstl.urlMustStartWithSlash='' context ''属性が指定されているURLタグでは、 'url'と '' context
''の両方がスラッシュ文字で始まらなければなりません。
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index f480ab7..19864ac 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -354,52 +354,13 @@ jsp files 아규먼트는 다음과 같음:\n\
\ -source <version> 자바 컴파일러에 -source 아규먼트 설정 (기본값은 1.8)\n\
\ -target <version> 자바 컴파일러에 -target 아규먼트 설정 (기본값은 1.8)\n\
\ -threadCount <count> 컴파일 시 사용할 쓰레드 개수.\n\
-\ ("2.0C"는 코어 당 두 개의 쓰레드를 의미함)\n\
-\n
+\ ("2.0C"는 코어 당 두 개의 쓰레드를 의미함)\n
jspc.warning.tldInWebInfLib=TLD 파일들을 /WEB-INF/lib 내에 두어서는 안됩니다.
jspc.webfrg.footer=\n\
</web-fragment>\n\
-\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\
-\n
-jspc.webinc.footer=\n\
-<!--\n\
-End of content automatically created by Apache Tomcat JspC.\n\
--->\n\
-\n
-jspc.webinc.header=\n\
-<!--\n\
-Automatically created by Apache Tomcat JspC.\n\
--->\n\
\n
-jspc.webinc.insertEnd=<!-- JSPC servlet mappings end -->
-jspc.webinc.insertStart=<!-- JSPC servlet mappings start -->
jspc.webxml.footer=\n\
-</web-app>
-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\
-Automatically created by Apache Tomcat JspC.\n\
--->\n\
-\n\
+</web-app>\n\
\n
jstl.OSAfterWriter=만일 writer가 이미 사용된 경우에는, 출력 스트림을 사용할 수 없습니다.
diff --git a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
index 1d03599..05fa3fa 100644
--- a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
@@ -28,6 +28,9 @@ jsp.error.unknown_attribute_type=Tipo de atributo [{1}]
inválido para atributo
jsp.info.ignoreSetting=Ignorada configuraçõ para [{0}] de [{1}] porque um
SecurityManager foi habilitado
jsp.warning.enablePooling=Aviso: valor inválido para o initParam
enablePooling. Será usado o valor padrão "true"
+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\
@@ -39,6 +42,26 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
\ <distributable/>\n\
<!--\n\
Automaticamente criado pelo Apache Tomcat JspC.\n\
--->
+-->\n\
+\n
+jspc.webinc.header=\n\
+<!--\n\
+Automaticamente criado pelo Apache Tomcat JspC.\n\
+-->\n\
+\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\
+Automaticamente criado pelo Apache Tomcat JspC.\n\
+-->\n\
+\n
org.apache.jasper.compiler.TldCache.servletContextNull=O ServletContext
passado era nulo
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 7642fbf..5c9d165 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -29,8 +29,7 @@ jsp.error.beans.nullbean=尝试获取一个bean 操作在一个空对象上.
jsp.error.cannotAddResolver=在第一次请求发生之后不能调用addELResolver
jsp.error.compilation.source=加载源文件时出错[{0}]
jsp.error.compiler=没有可用的Java编译器
-jsp.error.corresponding.servlet=生成的servlet错误:\n\
-\n
+jsp.error.corresponding.servlet=生成的servlet错误:\n
jsp.error.could.not.add.taglibraries=不能增加一个或者多个tag 库.
jsp.error.data.file.processing=处理文件 [{0}] 错误
jsp.error.el.template.deferred=#{...} 不允许出现在模板文本中
@@ -159,8 +158,10 @@ jsp.文件在哪\n\
\ -source <version> 设置-source.参数到编译器( (默认1.8)\n\
\ -target <version> 设置-target.参数到编译器(默认1.8)\n\
\ -threadCount <count> 编译使用的线程数.\n\
-\ ("2.0C" 意味着每个内核有两个线程)
-jspc.webfrg.footer=</web-fragment>
+\ ("2.0C" 意味着每个内核有两个线程)\n
+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\
@@ -172,13 +173,33 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
\ <distributable/>\n\
<!--\n\
由 Apache Tomcat JspC 自动生成。\n\
--->
-jspc.webinc.footer=<!--\n\
+-->\n\
+\n
+jspc.webinc.footer=\n\
+<!--\n\
由Apache Tomcat JSPC自动创建的内容结束。\n\
--->
+-->\n\
+\n
+jspc.webinc.header=\n\
+<!--\n\
+由 Apache Tomcat JspC 自动生成。\n\
+-->\n\
+\n
jspc.webinc.insertEnd=<!-- JSPC servlet 映射结束 -->
jspc.webinc.insertStart=<!-- JSPC servlet 映射开始 -->
-jspc.webxml.footer=</web-app>\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\
+由 Apache Tomcat JspC 自动生成。\n\
+-->\n\
\n
jstl.OSAfterWriter=如果已使用写入程序，则无法使用输出流
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
