[tomcat] 01/05: Improvements to Chinese translations. Provided by leeyazhou.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a97d332a6fb440123540a2035d400fff10290b97
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:46:30 2020 +0100
Improvements to Chinese translations. Provided by leeyazhou.
---
java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties| 2 ++
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 4
webapps/docs/changelog.xml | 3 +++
5 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index b2830bf..b926e7b 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -68,6 +68,7 @@ inputBuffer.streamClosed=关闭的流。
request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作。
request.fragmentInDispatchPath=调度路径[{0}]中的片段已被删除
request.notAsync=如果当前请求不在异步模式下，则调用此方法是非法的（即isAsyncStarted（）返回false）
+request.session.failed=由于[{1}]，加载会话[{0}]失败
requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index b082234..7e98915 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=无法打开 JNDI 数据源 [{0}]
fileStore.createFailed=无法创建用于存储会话数据的目录[{0}]。
fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}]
fileStore.deleteSessionFailed=无法删除不再需要的文件[{0}]
+fileStore.invalid=无效的持久化文件[{0}]，会话ID为[{1}]
fileStore.loading=正在从文件[{1}]加载会话[{0}]
fileStore.removing=正在删除文件{1}处的会话{0}]
fileStore.saving=保存会话[{0}]到文件[{1}]
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
index 6863c23..fb5619f 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -15,6 +15,8 @@
b2cConverter.unknownEncoding=不支持字符编码[{0}]
+encodedSolidusHandling.invalid=值[{0}]未识别
+
uDecoder.convertHexDigit.notHex=[{0}] 不是十六进制数字
uDecoder.eof=文件结尾（EOF）
uDecoder.noSlash=不允许使用编码的斜杠字符
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index a829fb0..91a4408 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -59,6 +59,7 @@ wsFrame.noContinuation=当需要延续帧时启动了新消息。
wsFrame.notMasked=客户端帧未被屏蔽，但必须屏蔽所有客户端帧
wsFrame.oneByteCloseCode=客户端发送了一个包含无效单字节有效负载的关闭帧。
wsFrame.partialHeaderComplete=接收到WebSocket帧. fin [{0}], rsv [{1}], OpCode
[{2}], payload 长度 [{3}]
+wsFrame.readFailed=异步客户端读取失败
wsFrame.sessionClosed=无法处理客户端数据，因为会话已被关闭
wsFrame.textMessageTooBig=解码的文本消息对于输出缓冲区太大，终结点不支持部分消息
wsFrame.wrongRsv=对于具有opCode [{1}]的消息，客户端帧将保留位设置为[{0}]，此端点不支持
@@ -94,6 +95,8 @@ wsSession.messageFailed=无法写入完整消息，因为WebSocket连接已关
wsSession.removeHandlerFailed=无法删除处理程序[{0}]，因为它未在此会话中注册
wsSession.sendCloseFail=给远程端点发送关闭消息失败，session：[{0}]
wsSession.timeout=WebSocket会话[{0}]超时已过期
+wsSession.timeoutRead=WebSocket会话[{0}]读取空闲超时过期
+wsSession.timeoutWrite=WebSocket会话[{0}]写入空闲超时过期
wsSession.unknownHandler=无法添加消息处理程序[{0}]，因为它是针对无法识别的类型[{1}]
wsSession.unknownHandlerType=无法添加消息处理程序[{0}]，因为它被包装为无法识别的类型[{1}]。
@@ -114,6 +117,7 @@ wsWebSocketContainer.pathNoHost=URI中未指定主机
wsWebSocketContainer.pathWrongScheme=不支持方案[{0}]。支持的方案是ws和wss
wsWebSocketContainer.proxyConnectFail=失败连接到已配置的代理 [{0}]。HTTP 响应码是 [{1}]
wsWebSocketContainer.redirectThreshold=循环位置头[{0}]检测到/达到最大重定向数[{1}]的最大值[{2}]
+wsWebSocketContainer.responseFail=HTTP升级WebSocket失败，但是部分数据已被接收：状态码：[{0}],HTTP请求头[{1}]
wsWebSocketContainer.sessionCloseFail=ID 为 [{0}] 的session 没有彻底关闭
wsWebSocketContainer.shutdown=web应用程序正在停止
wsWebSocketContainer.sslEngineFail=无法创建SSLEngine以支持SSL/TLS连接
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5345516..7061651 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,9 @@
href="https://bugs.openjdk.java.net/browse/JDK-8234808;>JDK-8234808.
(markt)
+
+Improvements to Chinese translations. Provided by leeyazhou. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Improvements to Korean translations. (woonsan)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 079945a8a7eb03a8ab118af7eb2a56778f7130eb
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:47:10 2020 +0100
Improvements to Korean translations. (woonsan)
---
java/org/apache/catalina/session/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index 29d0f12..de6b323 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=JNDI DataSource [{0}]을(를) 열 수 없습니다.
fileStore.createFailed=세션 데이터 저장소를 위한 디렉토리[{0}]을(를) 생성할 수 없습니다.
fileStore.deleteFailed=파일 [{0}]을(를) 삭제할 수 없습니다. 이는 세션 저장소 위치의 생성을 방해하고 있습니다.
fileStore.deleteSessionFailed=더 이상 필요하지 않은 파일 [{0}]을(를) 삭제할 수 없습니다.
+fileStore.invalid=세션 ID [{1}]을(를) 위한 세션 저장소 파일 [{0}]이(가) 유효하지 않습니다.
fileStore.loading=파일 [{1}](으)로부터 세션 [{0}]을(를) 로드합니다.
fileStore.removing=파일 [{1}]에 저장된 세션 [{0}]을(를) 제거합니다.
fileStore.saving=세션 [{0}]을(를) 파일 [{1}]에 저장합니다.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index d6869c4..872ffb5 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -27,5 +27,6 @@ ajpprocessor.header.error=헤더 메시지를 파싱하지 못했습니다.
ajpprocessor.header.tooLong=길이가 [{0}]인 헤더 메시지를 받았지만, 패킷 크기는 단지 [{1}]입니다.
ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
ajpprocessor.request.process=요청 처리 중 오류 발생
+ajpprocessor.unknownAttribute=리버스 프록시 서버로부터 알 수 없는 요청 속성 [{0}]이(가) 접수되어 요청 처리를
거부합니다.
ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 4cfcdd9..1927e87 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -59,6 +59,7 @@ wsFrame.noContinuation=Continuation 프레임이 요구될 때에, 새로운 메
wsFrame.notMasked=클라이언트 프레임이 마스크 되어 있지 않습니다. 모든 클라이언트 프레임들은 반드시 마스크 되어야 합니다.
wsFrame.oneByteCloseCode=클라이언트가 단일 바이트의 payload를 가진 닫기 프레임을 보냈는데, 이는 유효하지 않습니다.
wsFrame.partialHeaderComplete=웹소켓 프레임을 받았습니다. fin [{0}], rsv [{1}], OpCode
[{2}], payload 길이 [{3}]
+wsFrame.payloadMsbInvalid=유효하지 않은 웹소켓 프레임이 접수되었습니다 - 64 비트의 payload에, 허용되지 않는
최상위 비트가 설정되었습니다.
wsFrame.sessionClosed=해당 세션이 이미 닫혔기 때문에, 클라이언트 데이터가 처리될 수 없습니다.
wsFrame.textMessageTooBig=디코드된 텍스트 메시지가 출력 버퍼에 비해 너무 크며, 해당 엔드포인트는 partial
메시지들을 지원하지 않습니다.
wsFrame.wrongRsv=클라이언트 프레임이, opCode [{1}]을(를) 포함한 메시지를 위해, reserved 비트들을
[{0}](으)로 설정했는데, 이는 이 엔드포인트에 의해 지원되지 않습니다.
@@ -114,6 +115,7 @@ wsWebSocketContainer.pathNoHost=URI 내에 호스트가 지정되지 않았습
wsWebSocketContainer.pathWrongScheme=스킴 [{0}]은(는) 지원되지 않습니다. 지원되는 스킴들은 ws와
wss입니다.
wsWebSocketContainer.proxyConnectFail=설정된 프록시 [{0}](으)로 연결하지 못했습니다. HTTP 응답
코드는 [{1}]이었습니다.
wsWebSocketContainer.redirectThreshold=순환 Location 헤더 [{0}]이(가) 탐지되었고, 최대
redirect 회수에 도달했습니다. 최대 [{2}]회 중 [{1}]회.
+wsWebSocketContainer.responseFail=웹소켓으로의 HTTP 업그레이드가 실패했습니만, 일부 데이터가 접수되었을 수
있습니다: 상태 코드 [{0}], HTTP 헤더들 [{1}]
wsWebSocketContainer.sessionCloseFail=ID가 [{0}]인 세션이 깨끗하게 닫히지 않았습니다.
wsWebSocketContainer.shutdown=웹 애플리케이션이 중지되고 있습니다.
wsWebSocketContainer.sslEngineFail=SSL/TLS 연결들을 지원하는 SSLEngine을 생성할 수 없습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bee2538..7cbce9c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,9 @@
Improvements to French translations. (remm)
+
+Improvements to Korean translations. (woonsan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (ba18fcd -> b0b79b8)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from ba18fcd Better error messages when running under JPMS new a97d332 Improvements to Chinese translations. Provided by leeyazhou. new c529d56 Improvements to French translations. (remm) new 079945a Improvements to Korean translations. (woonsan) new bbee0b9 Improvements to Spanish translations. Provided by Andrewlanecarr. new b0b79b8 Remove unused The 5 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: .../apache/catalina/connector/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/core/LocalStrings_ru.properties| 1 - java/org/apache/catalina/manager/LocalStrings_es.properties | 1 + java/org/apache/catalina/session/LocalStrings_ko.properties | 1 + .../apache/catalina/session/LocalStrings_zh_CN.properties | 1 + java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 + java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 + .../apache/tomcat/util/buf/LocalStrings_zh_CN.properties| 2 ++ java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 5 + java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 ++ .../apache/tomcat/websocket/LocalStrings_zh_CN.properties | 4 webapps/docs/changelog.xml | 13 + 12 files changed, 32 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/05: Improvements to French translations. (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c529d56d998e60f7c5bb1d51f8aa3e4ce5d24d20
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:46:50 2020 +0100
Improvements to French translations. (remm)
---
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 5 +
webapps/docs/changelog.xml | 3 +++
3 files changed, 9 insertions(+)
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index 8a56641..207d334 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -27,5 +27,6 @@ ajpprocessor.header.error=Erreur de traitement du message
d'en-tête
ajpprocessor.header.tooLong=Un en-tête de message de taille [{0}] a été reçu
mais la packtSize est de seulement [{1}]
ajpprocessor.request.prepare=Erreur lors de la préparation de la requête
ajpprocessor.request.process=Erreur de traitement de la requête
+ajpprocessor.unknownAttribute=La requête est rejetée à cause de l''attribut de
requête [{0}] inconnu reçu du reverse proxy
ajpprotocol.noSecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index a979041..130243a 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -59,6 +59,8 @@ wsFrame.noContinuation=Un nouveau message a été démarré quand
une trame de c
wsFrame.notMasked=La trame du client n'a pas de masque alors que toutes les
trames des clients doivent en avoir un
wsFrame.oneByteCloseCode=Le client a envoyé une trame de fermeture avec un
octet de données ce qui est invalide
wsFrame.partialHeaderComplete=Une trame Websocket a été recue, fin [{0}], rsv
[{1}], opCode [{2}], taille de données [{3}]
+wsFrame.payloadMsbInvalid=Une trame WebSocket invalide a été reçue, le bit le
plus significatif d'un bloc de 64 bits ne peut être mis
+wsFrame.readFailed=La lecture asynchrone du client a échoué
wsFrame.sessionClosed=Les données du client ne peuvent pas être traitées car
la session a déjà été fermée
wsFrame.textMessageTooBig=Le message texte décodé était trop grand pour le
tampon de sortie et la terminaison ne supporte pas les messages partiels
wsFrame.wrongRsv=La trame cliente (client frame) a les bits réservés d''un
message dont l''opCode est [{1}] définis à [{0}], et ce n''est pas supporté par
cette terminaison
@@ -94,6 +96,8 @@ wsSession.messageFailed=Impossible d'écrire le message
WebSocket complet car la
wsSession.removeHandlerFailed=Impossible d''enlever le gestionnaire [{0}] car
il n''était pas enregistré dans la session
wsSession.sendCloseFail=Impossible d''envoyer le message de fermeture pour la
session [{0}] à la terminaison distante
wsSession.timeout=Le délai d''attente maximum de la session WebSocket [{0}] a
été dépassé
+wsSession.timeoutRead=Le délai d''inactivité en lecture de la session
WebSocket [{0}] a expiré
+wsSession.timeoutWrite=Le délai d''inactivité en écriture de la session
WebSocket [{0}] a expiré
wsSession.unknownHandler=Impossible d''ajouter le gestionnaire de messages
[{0}] pour le type non reconnu [{1}]
wsSession.unknownHandlerType=Incapable d''ajouter le gestionnaire de messages
[{0}] puisqu''il est enveloppé (wrapped) comme le type non reconnu [{1}]
@@ -114,6 +118,7 @@ wsWebSocketContainer.pathNoHost=Aucun hôte n'est spécifié
dans l'URI
wsWebSocketContainer.pathWrongScheme=Le schéma [{0}] n''est pas supporté,
seuls sont supportés ws et wss
wsWebSocketContainer.proxyConnectFail=Impossible de se connecter au Proxy
[{0}] configuré, le code HTTP de la réponse est [{0}]
wsWebSocketContainer.redirectThreshold=L''en-tête Location [{0}] est cyclique,
le nombre de redirections [{1}] a été atteint sur le maximum [{2}]
+wsWebSocketContainer.responseFail=L''upgrade de HTTP vers WebSocket a échouée
mais des données partielles peuvent avoir été reçues: Status Code [{0}], En
têtes HTTP [{1}]
wsWebSocketContainer.sessionCloseFail=La session avec ID [{0}] n''a pas été
fermée proprement.
wsWebSocketContainer.shutdown=L'application web s'arrête
wsWebSocketContainer.sslEngineFail=Impossible de créer un SSLEngine pour
supporter les connections TLS
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7061651..bee2538 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,9 @@
Improvements to Chinese translations. Provided by leeyazhou. (markt)
+
+Improvements to French
[tomcat] 04/05: Improvements to Spanish translations. Provided by Andrewlanecarr.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit bbee0b925a889a70516df74c852f3e8adf3deedd Author: Mark Thomas AuthorDate: Mon Oct 5 20:47:29 2020 +0100 Improvements to Spanish translations. Provided by Andrewlanecarr. --- java/org/apache/catalina/manager/LocalStrings_es.properties | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties b/java/org/apache/catalina/manager/LocalStrings_es.properties index 7ff7931..1aae149 100644 --- a/java/org/apache/catalina/manager/LocalStrings_es.properties +++ b/java/org/apache/catalina/manager/LocalStrings_es.properties @@ -60,6 +60,7 @@ htmlManagerServlet.manager=Gestor htmlManagerServlet.messageLabel=Mensaje: htmlManagerServlet.noManager=- htmlManagerServlet.noVersion=Ninguno especificado +htmlManagerServlet.osFreePageFile=Archivo de página gratis: htmlManagerServlet.osTotalPageFile=Tamaño total de archivo de página: htmlManagerServlet.serverHostname=NombreDeMáquina htmlManagerServlet.serverIPAddress=Dirección IP diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7cbce9c..6ea8ec4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -132,6 +132,10 @@ Improvements to Korean translations. (woonsan) + +Improvements to Spanish translations. Provided by Andrewlanecarr. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Remove unused
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b0b79b801df388b4fc6b6e3e08d24eea1d586e47
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:47:54 2020 +0100
Remove unused
---
java/org/apache/catalina/core/LocalStrings_ru.properties | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 9192eb9..afe5df1 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -24,7 +24,6 @@ standardWrapper.destroyInstance=InstanceManager.destroy() для
сервлет
standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
-standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
standardWrapper.notContext=Родительский контейнер обертки должен быть
контекстом
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 08/08: Back-port additional translations from 9.0.x
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 602fbe93c54259d92b52fdb228223bde55b30f98
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:44:07 2020 +0100
Back-port additional translations from 9.0.x
---
java/org/apache/catalina/core/LocalStrings_ru.properties | 1 -
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 6759ce9..2bd49cb 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -25,7 +25,6 @@ standardWrapper.destroyInstance=InstanceManager.destroy() для
сервлет
standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
-standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
standardWrapper.notContext=Родительский контейнер обертки должен быть
контекстом
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index d6e95af..6a114c7 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -79,6 +79,7 @@ stream.header.connection=コネクション [{0}]、ストリーム [{1}]、HTTP
stream.header.contentLength=コネクション [{0}]、ストリーム [{1}]、content length ヘッダーの値
[{2}] と受信したデータ長 [{3}] は一致しません。
stream.header.debug=コネクション [{0}]、ストリーム [{1}]、HTTP ヘッダー [{2}]、値は [{3}]
stream.header.duplicate=コネクション [{0}]、ストリーム [{1}]、ヘッダー [{3}] を複数受信しました。
+stream.header.empty=接続 [{0}]、ストリーム [{1}]、無効な空ヘッダ名です
stream.header.invalid=コネクション [{0}]、ストリーム [{1}]、ヘッダー [{2}] に不正な値 [{3}] が含まれています。
stream.header.noPath=コネクション [{0}]、ストリーム [{1}]、疑似ヘッダー [:path] が空です。
stream.header.required=コネクション [{0}]、ストリーム [{1}]、１つ以上の必須ヘッダがありません。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/08: Alphabetical order
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 45e0275a90f9e5a6196b9416e17bfe8e637dc66a
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:40:15 2020 +0100
Alphabetical order
---
java/org/apache/catalina/session/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 4 ++--
java/org/apache/tomcat/util/net/LocalStrings.properties | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/session/LocalStrings.properties
b/java/org/apache/catalina/session/LocalStrings.properties
index dae4f68..7676cf4 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -20,12 +20,12 @@ JDBCStore.checkConnectionDBReOpenFail=The re-open on the
database failed. The da
JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
JDBCStore.close=Exception closing database connection [{0}]
JDBCStore.commitSQLException=SQLException committing connection before closing
+JDBCStore.connectError=Cannot connect to database [{0}]
JDBCStore.loading=Loading Session [{0}] from database [{1}]
JDBCStore.missingDataSourceName=No valid JNDI name was given.
JDBCStore.removing=Removing Session [{0}] at database [{1}]
JDBCStore.saving=Saving Session [{0}] to database [{1}]
JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
-JDBCStore.connectError=Cannot connect to database [{0}]
fileStore.createFailed=Unable to create directory [{0}] for the storage of
session data
fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the
creation of the session storage location
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 32fe151..89fcb46 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -127,6 +127,8 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=Failed to close database
jdbcAccessLogValve.exception=Exception performing insert access entry
+persistentValve.filter.failure=Unable to compile filter=[{0}]
+
remoteCidrValve.invalid=Invalid configuration provided for [{0}]. See previous
messages for details.
remoteCidrValve.noRemoteIp=Client does not have an IP address. Request denied.
@@ -143,5 +145,3 @@ sslValve.invalidProvider=The SSL provider specified on the
connector associated
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}])
was previously reported to be stuck but has completed. It was active for
approximately [{1}] milliseconds.{2,choice,0#|0< There is/are still [{2}]
thread(s) that are monitored by this Valve and may be stuck.}
stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id=[{6}])
has been active for [{1}] milliseconds (since [{2}]) to serve the same request
for [{4}] and may be stuck (configured threshold for this
StuckThreadDetectionValve is [{5}] seconds). There is/are [{3}] thread(s) in
total that are monitored by this Valve and may be stuck.
stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id=[{5}])
has been interrupted because it was active for [{1}] milliseconds (since [{2}])
to serve the same request for [{3}] and was probably stuck (configured
interruption threshold for this StuckThreadDetectionValve is [{4}] seconds).
-
-persistentValve.filter.failure=Unable to compile filter=[{0}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 4cfb76c..b6d7861 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -146,8 +146,8 @@ sslHostConfigCertificate.mismatch=The property [{0}] was
set on the SSLHostConfi
sslImplementation.cnfe=Unable to create SSLImplementation for class [{0}]
sslUtilBase.active=The [{0}] that are active are : [{1}]
-sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
sslUtilBase.aliasIgnored=FIPS enabled so alias name [{0}] will be ignored. If
there is more than one key in the key store, the key used will depend on the
key store implementation
+sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
sslUtilBase.invalidTrustManagerClassName=The trustManagerClassName provided
[{0}] does not implement javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=Failed to load keystore type [{0}] with path
[{1}] due to [{2}]
sslUtilBase.noCertFile=SSLHostConfig attribute certificateFile must be defined
when using an SSL connector
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
[tomcat] 03/08: Correct replacement, fix format
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 0fb435b63711fcb925f226263317055bfd6e2ca4
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:40:43 2020 +0100
Correct replacement, fix format
---
java/org/apache/coyote/http2/LocalStrings.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 2b9c586..2c17966 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -59,7 +59,7 @@ http2Parser.processFrame=Connection [{0}], Stream [{1}],
Frame type [{2}], Flags
http2Parser.processFrame.tooMuchPadding=Connection [{0}], Stream [{1}], The
padding length [{2}] was too big for the payload [{3}]
http2Parser.processFrame.unexpectedType=Expected frame type [{0}] but received
frame type [{1}]
http2Parser.processFrameContinuation.notExpected=Connection [{0}],
Continuation frame received for stream [{1}] when no headers were in progress
-http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length, [{2}], Padding length [{3}]
+http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length [{2}], Padding length [{3}]
http2Parser.processFrameData.window=Connection [{0}], Client sent more data
than stream window allowed
http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK
decoding - it should have been consumed
http2Parser.processFrameHeaders.decodingFailed=There was an error during the
HPACK decoding of HTTP headers
@@ -79,7 +79,7 @@ stream.header.case=Connection [{0}], Stream [{1}], HTTP
header name [{2}] must b
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header
[connection] is not permitted in an HTTP/2 request
stream.header.contentLength=Connection [{0}], Stream [{1}], The content length
header value [{2}] does not agree with the size of the data received [{3}]
stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value
[{3}]
-stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{3}] headers
+stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{2}] headers
stream.header.empty=Connection [{0}], Stream [{1}], Invalid empty header name
stream.header.invalid=Connection [{0}], Stream [{1}], The header [{2}]
contained invalid value [{3}]
stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header
was empty
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (c1087c8 -> 602fbe9)
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 c1087c8 Allow for path length in cached resource size new 3656681 http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody new 45e0275 Alphabetical order new 0fb435b Correct replacement, fix format new 806d06a Improvements to Chinese translations. Provided by leeyazhou. (markt) new 3b7b81e Improvements to French translations (remm) new 084f3b0 Improvements to Korean translations. (woonsan) new 90d1710 Improvements to Spanish translations. Provided by Andrewlanecarr new 602fbe9 Back-port additional translations from 9.0.x The 8 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: .../apache/catalina/connector/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/core/LocalStrings_ru.properties| 1 - java/org/apache/catalina/manager/LocalStrings_es.properties | 1 + .../apache/catalina/manager/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/session/LocalStrings.properties| 2 +- java/org/apache/catalina/session/LocalStrings_ko.properties | 1 + .../apache/catalina/session/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/startup/LocalStrings_fr.properties | 1 + java/org/apache/catalina/startup/LocalStrings_ko.properties | 1 + .../apache/catalina/startup/LocalStrings_zh_CN.properties | 1 + .../apache/catalina/tribes/group/LocalStrings_es.properties | 1 + java/org/apache/catalina/valves/LocalStrings.properties | 4 ++-- java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 ++ .../apache/catalina/valves/LocalStrings_zh_CN.properties| 2 ++ .../catalina/valves/rewrite/LocalStrings_ko.properties | 2 ++ java/org/apache/coyote/LocalStrings_fr.properties | 2 ++ java/org/apache/coyote/LocalStrings_zh_CN.properties| 2 ++ java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 + java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 + java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 --- java/org/apache/coyote/http2/LocalStrings.properties| 8 java/org/apache/coyote/http2/LocalStrings_fr.properties | 3 +++ java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 + java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 + java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +++ .../apache/tomcat/util/buf/LocalStrings_zh_CN.properties| 2 ++ java/org/apache/tomcat/util/net/LocalStrings.properties | 2 +- java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 + .../apache/tomcat/util/net/LocalStrings_zh_CN.properties| 1 + .../tomcat/util/net/openssl/LocalStrings_es.properties | 1 + java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 7 +++ java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 ++ .../apache/tomcat/websocket/LocalStrings_zh_CN.properties | 4 webapps/docs/changelog.xml | 13 + 34 files changed, 72 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/08: http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
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 3656681ad5ee2d72a9a935dcffe1238ec4419e75
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 24 13:46:31 2020 +0300
http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
Call streams.size() just once.
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 ---
java/org/apache/coyote/http2/LocalStrings.properties | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 2a2fee5..d5d11e5 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -662,7 +662,7 @@ public class Http2UpgradeHandler extends AbstractStream
implements InternalHttpU
if (log.isDebugEnabled()) {
if (pushedStreamId == 0) {
log.debug(sm.getString("upgradeHandler.writeHeaders",
connectionId,
-stream.getIdAsString()));
+stream.getIdAsString(), Boolean.valueOf(endOfStream)));
} else {
log.debug(sm.getString("upgradeHandler.writePushHeaders",
connectionId,
stream.getIdAsString(),
Integer.valueOf(pushedStreamId),
@@ -1171,9 +1171,10 @@ public class Http2UpgradeHandler extends AbstractStream
implements InternalHttpU
// maximum number of concurrent streams.
long max = localSettings.getMaxConcurrentStreams();
+final int size = streams.size();
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
-Long.toString(max), Integer.toString(streams.size(;
+Long.toString(max), Integer.toString(size)));
}
// Only need ~+10% for streams that are in the priority tree,
@@ -1187,7 +1188,7 @@ public class Http2UpgradeHandler extends AbstractStream
implements InternalHttpU
max = Integer.MAX_VALUE;
}
-int toClose = streams.size() - (int) max;
+int toClose = size - (int) max;
if (toClose < 1) {
return;
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 9c34e93..2b9c586 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -148,8 +148,8 @@ upgradeHandler.upgradeDispatch.entry=Entry, Connection
[{0}], SocketStatus [{1}]
upgradeHandler.upgradeDispatch.exit=Exit, Connection [{0}], SocketState [{1}]
upgradeHandler.windowSizeReservationInterrupted=Connection [{0}], Stream
[{1}], reservation for [{2}] bytes
upgradeHandler.windowSizeTooBig=Connection [{0}], Stream [{1}], Window size
too big
-upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}]
-upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}]
+upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}],
EndOfStream [{3}]
+upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}], Writing the
headers, EndOfStream [{2}]
upgradeHandler.writePushHeaders=Connection [{0}], Stream [{1}], Pushed stream
[{2}], EndOfStream [{3}]
windowAllocationManager.dispatched=Connection [{0}], Stream [{1}], Dispatched
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/08: Improvements to Spanish translations. Provided by Andrewlanecarr
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 90d1710deffd2ddc4a7f35f7f32f4a3cf810a55b
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:43:47 2020 +0100
Improvements to Spanish translations. Provided by Andrewlanecarr
---
java/org/apache/catalina/manager/LocalStrings_es.properties| 1 +
java/org/apache/catalina/tribes/group/LocalStrings_es.properties | 1 +
java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties | 1 +
webapps/docs/changelog.xml | 4
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 743e99c..298767f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -62,6 +62,7 @@ htmlManagerServlet.manager=Gestor
htmlManagerServlet.messageLabel=Mensaje:
htmlManagerServlet.noManager=-
htmlManagerServlet.noVersion=Ninguno especificado
+htmlManagerServlet.osFreePageFile=Archivo de página gratis:
htmlManagerServlet.osTotalPageFile=Tamaño total de archivo de página:
htmlManagerServlet.serverHostname=NombreDeMáquina
htmlManagerServlet.serverIPAddress=Dirección IP
diff --git a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
index 0a03ba0..7aae463 100644
--- a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+channelCoordinator.alreadyStarted=Canal ya iniciado para nivel:[{0}]
channelCoordinator.invalid.startLevel=Nivel de inicion inválido, los niveles
válidos son:SND_RX_SEQ,SND_TX_SEQ,MBR_TX_SEQ,MBR_RX_SEQ\n
groupChannel.listener.alreadyExist=El escuchador ya existe:[{0}][{1}]
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
index ea47f45..fe54155 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
@@ -20,6 +20,7 @@ engine.openSSLError=Error de OpenSSL: [{0}] mensage: [{1}]\n
engine.writeToSSLFailed=Fallo al escribir hacia SSL, resultado: [{0}]
openssl.addedClientCaCert=Ceritifcado CA de cliente adicionado: [{0}]
+openssl.keyManagerMissing=No se encontró gerente de llave
openssl.trustManagerMissing=No se encontró un manejador confiable
opensslconf.checkFailed=Fallo mientras se chequeaba OpenSSLConf\n
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8370d7d..ba638f4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -187,6 +187,10 @@
Improvements to Korean translations. (woonsan)
+
+Improvements to Spanish translations. Provided by Andrewlanecarr.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/08: Improvements to French translations (remm)
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 3b7b81efe0cb703c637580b2c185eb7884735d4d
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:42:52 2020 +0100
Improvements to French translations (remm)
---
java/org/apache/catalina/startup/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_fr.properties | 3 +++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 7 +++
7 files changed, 17 insertions(+)
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties
b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index 6a41da1..ca98d92 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -54,6 +54,7 @@ contextConfig.jarFile=Impossible de traiter les annotations
du JAR [{0}]
contextConfig.jspFile.error=Le fichier JSP [{0}] doit commencer par un ''/''
contextConfig.jspFile.warning=WARNING : Le fichier JSP [{0}] doit commencer
par un ''/'' dans l''API Servlet 2.4
contextConfig.missingRealm=Aucun royaume (realm) n'a été configuré pour
réaliser l'authentification
+contextConfig.noAntiLocking=La valeur [{0}] configurée pour java.io.tmpdir ne
correspond pas à un répertoire valide, le paramètre antiResourceLocking
configuré pour l''application [{1}] sera ignoré
contextConfig.processAnnotationsDir.debug=Balayage du répertoire pour trouver
des fichiers de classe avec annotations [{0}]
contextConfig.processAnnotationsJar.debug=Analyse du fichier jars pour des
classes annotées avec [{0}]
contextConfig.processAnnotationsWebDir.debug=Balayage du répertoire
d''applications web, pour fichiers de classe avec annotations [{0}]
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 5a8d47b..9f9024a 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -125,6 +125,8 @@ http.511.reason=L’authentification du réseau est nécessaire
jdbcAccessLogValve.close=Echec de fermeture de la base de donnée
jdbcAccessLogValve.exception=Exception en insérant l'entrée de l'accès
+persistentValve.filter.failure=Impossible de compiler le filtre=[{0}]
+
remoteCidrValve.invalid=La configuration fournie pour [{0}] est invalide, voir
les précédents messages pour plus de détails
remoteCidrValve.noRemoteIp=Le client n'a pas d'adresse IP, requête interdite
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index a7e5a12..0d6f30e 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -49,6 +49,8 @@ asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est
pas valide pour une
compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête
Content-Encoding en vérifiant si la compression était déjà utilisée
+continueResponseTiming.invalid=La valeur [{0}] n''est pas valide pour
continueResponseTiming
+
request.notAsync=Il n'est possible de passer en mode d'entrée-sorties non
bloquantes que lors de traitements asynchrones ou après mise à niveau depuis
HTTP
request.nullReadListener=L'écouteur passé à setReadListener() ne peut pas être
null
request.readListenerSet=L'écouteur des lectures non bloquantes a déjà été
défini
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index c741323..adb09dd 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -26,6 +26,7 @@ ajpprocessor.header.tooLong=Un en-tête de message de taille
[{0}] a été reçu
ajpprocessor.readtimeout=Timeout lors de la lecture de données sur le socket
ajpprocessor.request.prepare=Erreur lors de la préparation de la requête
ajpprocessor.request.process=Erreur de traitement de la requête
+ajpprocessor.unknownAttribute=La requête est rejetée à cause de l''attribut de
requête [{0}] inconnu reçu du reverse proxy
ajpprotocol.noSSL=SSL n''est pas supporté par AJP, la configuration de l''hôte
SSL pour [{0}] a été ignorée
ajpprotocol.noSecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 1423779..b2df537 100644
---
[tomcat] 06/08: Improvements to Korean translations. (woonsan)
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 084f3b0241dde337cf106702a4f467ef67d7f9c0
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:43:20 2020 +0100
Improvements to Korean translations. (woonsan)
---
java/org/apache/catalina/session/LocalStrings_ko.properties| 1 +
java/org/apache/catalina/startup/LocalStrings_ko.properties| 1 +
java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties| 1 +
java/org/apache/tomcat/websocket/LocalStrings_ko.properties| 2 ++
webapps/docs/changelog.xml | 6 ++
7 files changed, 14 insertions(+)
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index 42ed1fe..d12d230 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=JNDI DataSource [{0}]을(를) 열 수 없습니다.
fileStore.createFailed=세션 데이터 저장소를 위한 디렉토리[{0}]을(를) 생성할 수 없습니다.
fileStore.deleteFailed=파일 [{0}]을(를) 삭제할 수 없습니다. 이는 세션 저장소 위치의 생성을 방해하고 있습니다.
fileStore.deleteSessionFailed=더 이상 필요하지 않은 파일 [{0}]을(를) 삭제할 수 없습니다.
+fileStore.invalid=세션 ID [{1}]을(를) 위한 세션 저장소 파일 [{0}]이(가) 유효하지 않습니다.
fileStore.loading=파일 [{1}](으)로부터 세션 [{0}]을(를) 로드합니다.
fileStore.removing=파일 [{1}]에 저장된 세션 [{0}]을(를) 제거합니다.
fileStore.saving=세션 [{0}]을(를) 파일 [{1}]에 저장합니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index ea7031f..9f599ee 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -54,6 +54,7 @@ contextConfig.jarFile=Annotation들을 위해 Jar [{0}]을(를) 처리할 수
contextConfig.jspFile.error=JSP 파일 [{0}]은(는) 반드시 ''/''로 시작해야 합니다.
contextConfig.jspFile.warning=경고: Servlet 2.4에서 JSP 파일 [{0}]은(는) 반드시 ''/''로
시작해야 합니다.
contextConfig.missingRealm=인증 처리 시 사용할 Realm이 설정되지 않았습니다.
+contextConfig.noAntiLocking=java.io.tmpdir 프로퍼티 값 [{0}]이(가) 유효한 디렉토리 경로가 아닙니다.
해당 웹 애플리케이션 [{1}]을(를) 위한 antiResourceLocking 설정은 무시됩니다.
contextConfig.processAnnotationsDir.debug=Annotation들을 가진 클래스 파일들을 찾기 위해 디렉토리
[{0}]을(를) 스캔합니다.
contextConfig.processAnnotationsJar.debug=Annotation들, [{0}]을(를) 가진 클래스 파일들을
찾기 위해, JAR 파일을 스캔합니다.
contextConfig.processAnnotationsWebDir.debug=Annotation들인 [{0}]을(를) 가진 클래스
파일들을 찾기 위해, 웹 애플리케이션 디렉토리를 스캔합니다.
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
index 2161de4..7826877 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+quotedStringTokenizer.tokenizeError=토큰으로 파싱하는 중 오류 발생 (문자열: [{0}], 위치: [{1}],
현재 모드: [{2}])
+
rewriteValve.closeError=설정 리소스의 스트림을 닫는 중 오류 발생
rewriteValve.invalidFlags=[{0}] 내에 유효하지 않은 플래그입니다 (플래그들: [{1}]).
rewriteValve.invalidLine=유효하지 않은 행 [{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index b8927d8..4cfc255 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -26,6 +26,7 @@ ajpprocessor.header.tooLong=길이가 [{0}]인 헤더 메시지를 받았지만,
ajpprocessor.readtimeout=소켓으로부터 데이터를 읽으려는 시도가 제한 시간 초과되었습니다.
ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
ajpprocessor.request.process=요청 처리 중 오류 발생
+ajpprocessor.unknownAttribute=리버스 프록시 서버로부터 알 수 없는 요청 속성 [{0}]이(가) 접수되어 요청 처리를
거부합니다.
ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index c78ed8f..0db0dad 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -79,6 +79,7 @@ stream.header.connection=연결 [{0}], 스트림 [{1}], HTTP 헤더
[connection]
stream.header.contentLength=연결 [{0}], 스트림 [{1}], 해당 Content-Length 헤더 값
[{2}]은(는) 수신된 데이터의 크기 [{3}]와(과) 일치하지 않습니다.
stream.header.debug=연결 [{0}], 스트림 [{1}], HTTP 헤더: [{2}], 값: [{3}]
stream.header.duplicate=연결 [{0}], 스트림 [{1}], 여러 개의 [{3}] 헤더들을 받았습니다.
+stream.header.empty=연결 [{0}], 스트림 [{1}], 헤더 이름이 빈 문자열이어서 유효하지 않습니다.
stream.header.invalid=연결 [{0}], 스트림 [{1}], 헤더 [{2}]이(가) 유효하지 않은 값을 포함했습니다:
[{3}]
[tomcat] 04/08: Improvements to Chinese translations. Provided by leeyazhou. (markt)
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 806d06aa4598bc367059e61c8157d61e85035c41
Author: Mark Thomas
AuthorDate: Mon Oct 5 20:41:57 2020 +0100
Improvements to Chinese translations. Provided by leeyazhou. (markt)
---
java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/manager/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties| 2 ++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties| 2 ++
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties| 1 +
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 4
webapps/docs/changelog.xml | 3 +++
11 files changed, 21 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 42fcf30..c368e6e 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -82,6 +82,7 @@ request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作
request.fragmentInDispatchPath=调度路径[{0}]中的片段已被删除
request.illegalWrap=请求包装器必须包装从getRequest（）获得的请求
request.notAsync=如果当前请求不在异步模式下，则调用此方法是非法的（即isAsyncStarted（）返回false）
+request.session.failed=由于[{1}]，加载会话[{0}]失败
requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 0d1664d..6c177ce 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -146,6 +146,7 @@ managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单
managerServlet.saveFail=失败 - 配置保存失败：[{0}]
managerServlet.saved=OK - 服务器配置已保存
managerServlet.savedContext=OK - 上下文[{0}]配置已保存
+managerServlet.savedContextFail=失败 - 上下文[{0}]配置保存失败
managerServlet.serverInfo=OK - 服务器信息\n\
Tomcat版本: [{0}]\n\
操作系统名称: [{1}]\n\
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index 2354b3f..7a1cc2c 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=无法打开 JNDI 数据源 [{0}]
fileStore.createFailed=无法创建用于存储会话数据的目录[{0}]。
fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}]
fileStore.deleteSessionFailed=无法删除不再需要的文件[{0}]
+fileStore.invalid=无效的持久化文件[{0}]，会话ID为[{1}]
fileStore.loading=正在从文件[{1}]加载会话[{0}]
fileStore.removing=正在删除文件{1}处的会话{0}]
fileStore.saving=保存会话[{0}]到文件[{1}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index c1eb7fd..f8a6b9f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -54,6 +54,7 @@ contextConfig.jarFile=无法处理Jar[{0}]的注解
contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
contextConfig.jspFile.warning=警告：在Servlet 2.4 中，JSP文件[{0}]必须以‘/’开头
contextConfig.missingRealm=对应的认证领域未配置
+contextConfig.noAntiLocking=配置
java.io.tmpdir的值[{0}]未指向有效路径。Web应用[{1}]antiResourceLocking配置将被忽略
contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
contextConfig.processAnnotationsJar.debug=扫描jar文件中注解[{0}]的类文件
contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class
文件
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index e5c1be8..163cba1 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -125,6 +125,8 @@ http.511.reason=需要网络身份验证
jdbcAccessLogValve.close=无法关闭数据库。
jdbcAccessLogValve.exception=执行插入访问项时发生异常
+persistentValve.filter.failure=无法编译filter=[{0}]
+
remoteCidrValve.invalid=为{0}提供的配置无效。有关详细信息，请参阅以前的消息
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 8cbffeb..f5c064a 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -49,6 +49,8 @@ asyncStateMachine.invalidAsyncState=调用[{0}]对于具有异步状态[{1}]的
compressionConfig.ContentEncodingParseFail=检查压缩是否已经在使用时，解析Content-Encoding头失败
[tomcat] 01/07: Fix alphabetical order
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6fc36ede1ed444b63f17ed973eec77e771709955
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:49:36 2020 +0100
Fix alphabetical order
---
java/org/apache/catalina/session/LocalStrings.properties | 2 +-
java/org/apache/catalina/startup/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 4 ++--
java/org/apache/tomcat/util/net/LocalStrings.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/session/LocalStrings.properties
b/java/org/apache/catalina/session/LocalStrings.properties
index dae4f68..7676cf4 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -20,12 +20,12 @@ JDBCStore.checkConnectionDBReOpenFail=The re-open on the
database failed. The da
JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
JDBCStore.close=Exception closing database connection [{0}]
JDBCStore.commitSQLException=SQLException committing connection before closing
+JDBCStore.connectError=Cannot connect to database [{0}]
JDBCStore.loading=Loading Session [{0}] from database [{1}]
JDBCStore.missingDataSourceName=No valid JNDI name was given.
JDBCStore.removing=Removing Session [{0}] at database [{1}]
JDBCStore.saving=Saving Session [{0}] to database [{1}]
JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
-JDBCStore.connectError=Cannot connect to database [{0}]
fileStore.createFailed=Unable to create directory [{0}] for the storage of
session data
fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the
creation of the session storage location
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 6d503e1..271ca31 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -70,9 +70,9 @@ contextConfig.jspFile.warning=WARNING: JSP file [{0}] must
start with a ''/'' in
contextConfig.missingRealm=No Realm has been configured to authenticate against
contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
+contextConfig.processAnnotationsInParallelFailure=Parallel execution failed
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
-contextConfig.processAnnotationsInParallelFailure=Parallel execution failed
contextConfig.resourceJarFail=Failed to process JAR found at URL [{0}] for
static resources to be included in context with name [{1}]
contextConfig.role.auth=Security role name [{0}] used in an
without being defined in a
contextConfig.role.link=Security role name [{0}] used in a without
being defined in a
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 321d2be..eebf3cf 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -129,6 +129,8 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=Failed to close database
jdbcAccessLogValve.exception=Exception performing insert access entry
+persistentValve.filter.failure=Unable to compile filter=[{0}]
+
remoteCidrValve.invalid=Invalid configuration provided for [{0}]. See previous
messages for details.
remoteCidrValve.noRemoteIp=Client does not have an IP address. Request denied.
@@ -145,5 +147,3 @@ sslValve.invalidProvider=The SSL provider specified on the
connector associated
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}])
was previously reported to be stuck but has completed. It was active for
approximately [{1}] milliseconds.{2,choice,0#|0< There is/are still [{2}]
thread(s) that are monitored by this Valve and may be stuck.}
stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id=[{6}])
has been active for [{1}] milliseconds (since [{2}]) to serve the same request
for [{4}] and may be stuck (configured threshold for this
StuckThreadDetectionValve is [{5}] seconds). There is/are [{3}] thread(s) in
total that are monitored by this Valve and may be stuck.
stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id=[{5}])
has been interrupted because it was active for [{1}] milliseconds (since [{2}])
to serve the same request for [{3}] and was probably stuck
[tomcat] branch 9.0.x updated (e0d344f -> ecd5e96)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from e0d344f Allow for path length in cached resource size new 6fc36ed Fix alphabetical order new 2364f9a Improve Chinese translations. Provided by leeyazhou. new dc9aa03 Improvements to Czech translations new cf26a6b Improvements to French translations. (remm) new 56be5a4 Improvements to Korean translations. (woonsan) new 53f1687 Improvements to Spanish translations. Provided by Andrewlanecarr new ecd5e96 Improvements to Japanese translations The 7 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: java/javax/el/LocalStrings_cs.properties | 2 +- .../authenticator/LocalStrings_cs.properties | 4 ++-- .../catalina/connector/LocalStrings_cs.properties | 2 +- .../connector/LocalStrings_zh_CN.properties| 1 + .../catalina/core/LocalStrings_cs.properties | 10 - .../catalina/deploy/LocalStrings_cs.properties | 2 +- .../catalina/filters/LocalStrings_cs.properties| 6 +++--- .../catalina/ha/deploy/LocalStrings_cs.properties | 2 +- .../catalina/ha/session/LocalStrings_cs.properties | 4 ++-- .../catalina/ha/tcp/LocalStrings_cs.properties | 2 +- .../catalina/manager/LocalStrings_cs.properties| 8 .../catalina/manager/LocalStrings_es.properties| 1 + .../catalina/manager/LocalStrings_zh_CN.properties | 1 + .../manager/host/LocalStrings_cs.properties| 2 +- .../catalina/realm/LocalStrings_cs.properties | 4 ++-- .../catalina/realm/LocalStrings_fr.properties | 1 + .../catalina/realm/LocalStrings_ja.properties | 1 + .../catalina/realm/LocalStrings_ko.properties | 1 + .../catalina/realm/LocalStrings_zh_CN.properties | 1 + .../catalina/servlets/LocalStrings_cs.properties | 4 ++-- .../catalina/session/LocalStrings.properties | 2 +- .../catalina/session/LocalStrings_cs.properties| 2 +- .../catalina/session/LocalStrings_ko.properties| 1 + .../catalina/session/LocalStrings_zh_CN.properties | 1 + .../catalina/startup/LocalStrings.properties | 2 +- .../catalina/startup/LocalStrings_cs.properties| 4 ++-- .../catalina/startup/LocalStrings_fr.properties| 3 +++ .../catalina/startup/LocalStrings_ko.properties| 3 +++ .../catalina/startup/LocalStrings_zh_CN.properties | 1 + .../tribes/group/LocalStrings_cs.properties| 2 +- .../tribes/group/LocalStrings_es.properties| 1 + .../group/interceptors/LocalStrings_cs.properties | 24 +++--- .../catalina/tribes/io/LocalStrings_cs.properties | 2 +- .../membership/cloud/LocalStrings_cs.properties| 4 ++-- .../tribes/tipis/LocalStrings_cs.properties| 6 +++--- .../tribes/util/LocalStrings_cs.properties | 2 +- .../catalina/users/LocalStrings_cs.properties | 2 +- .../catalina/util/LocalStrings_cs.properties | 2 +- .../apache/catalina/valves/LocalStrings.properties | 4 ++-- .../catalina/valves/LocalStrings_cs.properties | 6 +++--- .../catalina/valves/LocalStrings_fr.properties | 2 ++ .../catalina/valves/LocalStrings_zh_CN.properties | 2 ++ .../valves/rewrite/LocalStrings_ko.properties | 4 .../valves/rewrite/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/coyote/LocalStrings_cs.properties | 2 +- java/org/apache/coyote/LocalStrings_fr.properties | 2 ++ .../apache/coyote/LocalStrings_zh_CN.properties| 2 ++ .../apache/coyote/ajp/LocalStrings_cs.properties | 2 +- .../apache/coyote/ajp/LocalStrings_fr.properties | 1 + .../apache/coyote/ajp/LocalStrings_ko.properties | 1 + .../coyote/http11/LocalStrings_cs.properties | 4 ++-- .../http11/upgrade/LocalStrings_cs.properties | 2 +- .../apache/coyote/http2/LocalStrings_cs.properties | 4 ++-- .../apache/coyote/http2/LocalStrings_fr.properties | 2 ++ .../coyote/http2/LocalStrings_zh_CN.properties | 2 ++ .../jasper/resources/LocalStrings_cs.properties| 22 ++-- .../apache/tomcat/util/LocalStrings_cs.properties | 2 +- .../tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++ .../tomcat/util/compat/LocalStrings_cs.properties | 2 +- .../util/descriptor/web/LocalStrings_cs.properties | 4 ++-- .../apache/tomcat/util/net/LocalStrings.properties | 2 +- .../tomcat/util/net/LocalStrings_cs.properties | 8 .../tomcat/util/net/LocalStrings_fr.properties | 1 + .../tomcat/util/net/LocalStrings_zh_CN.properties | 1 + .../util/net/jsse/LocalStrings_cs.properties | 2 +- .../util/net/openssl/LocalStrings_es.properties| 1 +
[tomcat] 03/07: Improvements to Czech translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dc9aa03b1e26a918b6ba27c99ad68a73161b605b
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:52:02 2020 +0100
Improvements to Czech translations
Provided by Dušan Hlaváč and Arnošt Havelka
---
java/javax/el/LocalStrings_cs.properties | 2 +-
.../authenticator/LocalStrings_cs.properties | 4 ++--
.../catalina/connector/LocalStrings_cs.properties | 2 +-
.../catalina/core/LocalStrings_cs.properties | 10 -
.../catalina/deploy/LocalStrings_cs.properties | 2 +-
.../catalina/filters/LocalStrings_cs.properties| 6 +++---
.../catalina/ha/deploy/LocalStrings_cs.properties | 2 +-
.../catalina/ha/session/LocalStrings_cs.properties | 4 ++--
.../catalina/ha/tcp/LocalStrings_cs.properties | 2 +-
.../catalina/manager/LocalStrings_cs.properties| 8
.../manager/host/LocalStrings_cs.properties| 2 +-
.../catalina/realm/LocalStrings_cs.properties | 4 ++--
.../catalina/servlets/LocalStrings_cs.properties | 4 ++--
.../catalina/session/LocalStrings_cs.properties| 2 +-
.../catalina/startup/LocalStrings_cs.properties| 4 ++--
.../tribes/group/LocalStrings_cs.properties| 2 +-
.../group/interceptors/LocalStrings_cs.properties | 24 +++---
.../catalina/tribes/io/LocalStrings_cs.properties | 2 +-
.../membership/cloud/LocalStrings_cs.properties| 4 ++--
.../tribes/tipis/LocalStrings_cs.properties| 6 +++---
.../tribes/util/LocalStrings_cs.properties | 2 +-
.../catalina/users/LocalStrings_cs.properties | 2 +-
.../catalina/util/LocalStrings_cs.properties | 2 +-
.../catalina/valves/LocalStrings_cs.properties | 6 +++---
java/org/apache/coyote/LocalStrings_cs.properties | 2 +-
.../apache/coyote/ajp/LocalStrings_cs.properties | 2 +-
.../coyote/http11/LocalStrings_cs.properties | 4 ++--
.../http11/upgrade/LocalStrings_cs.properties | 2 +-
.../apache/coyote/http2/LocalStrings_cs.properties | 4 ++--
.../jasper/resources/LocalStrings_cs.properties| 22 ++--
.../apache/tomcat/util/LocalStrings_cs.properties | 2 +-
.../tomcat/util/compat/LocalStrings_cs.properties | 2 +-
.../util/descriptor/web/LocalStrings_cs.properties | 4 ++--
.../tomcat/util/net/LocalStrings_cs.properties | 8
.../util/net/jsse/LocalStrings_cs.properties | 2 +-
.../tomcat/util/scan/LocalStrings_cs.properties| 2 +-
.../tomcat/websocket/LocalStrings_cs.properties| 12 +--
webapps/docs/changelog.xml | 4
38 files changed, 92 insertions(+), 88 deletions(-)
diff --git a/java/javax/el/LocalStrings_cs.properties
b/java/javax/el/LocalStrings_cs.properties
index d5c1a75..1d4eed0 100644
--- a/java/javax/el/LocalStrings_cs.properties
+++ b/java/javax/el/LocalStrings_cs.properties
@@ -17,4 +17,4 @@ elProcessor.defineFunctionInvalidMethod=Metoda [{0}] třídy
[{1}] není public
importHandler.ambiguousStaticImport=Statický import [{0}] nelze zpracovat,
neboť koliduje s [{1}] (který byl již naimportován)
importHandler.classNotFound=Třídu [{0}] nelze naimportovat, neboť nebyla
nalezena
-importHandler.invalidClassNameForStatic=Uvedená třída [{0}] pro statický
import [{1}] není platná
+importHandler.invalidClassNameForStatic=Třída [{0}] uvedená pro statický
import [{1}] není platná
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
b/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
index 2dabeb0..80cd0b7 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
@@ -20,7 +20,7 @@ authenticator.sessionExpired=Časový rámec pro přihlášení byl
překročen.
singleSignOn.debug.principalFound=SSO našlo cachovaný objekt Principal [{0}] s
autentizačním typem [{1}]
singleSignOn.debug.removeSession=SSO odstraňuje aplikační session [{0}] z SSO
session [{1}]
-singleSignOn.sessionExpire.hostNotFound=SSO nemůže ukončit session [{0}],
protože server (Host) nemůže najít
-singleSignOn.sessionExpire.managerError=SSO nemúže ukončit relaci [{0}],
protože Manager vyhodil Exception při hledání relace
+singleSignOn.sessionExpire.hostNotFound=SSO nemůže ukončit session [{0}],
protože host nebyl nalezen
+singleSignOn.sessionExpire.managerError=SSO nemůže expirovat relaci [{0}],
protože Manager vyhodil Exception při vyhledávání relace
spnegoAuthenticator.authHeaderNoToken=Domlouvací autorizační hlavička zaslaná
klientem neobsahuje token
diff --git a/java/org/apache/catalina/connector/LocalStrings_cs.properties
b/java/org/apache/catalina/connector/LocalStrings_cs.properties
index 6c371d2..8914ecc 100644
--- a/java/org/apache/catalina/connector/LocalStrings_cs.properties
+++
[tomcat] 06/07: Improvements to Spanish translations. Provided by Andrewlanecarr
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 53f168705d5529b7a47868c738bf4cde9e337289
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:53:27 2020 +0100
Improvements to Spanish translations. Provided by Andrewlanecarr
---
java/org/apache/catalina/manager/LocalStrings_es.properties| 1 +
java/org/apache/catalina/tribes/group/LocalStrings_es.properties | 1 +
java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties | 1 +
webapps/docs/changelog.xml | 4
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 743e99c..298767f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -62,6 +62,7 @@ htmlManagerServlet.manager=Gestor
htmlManagerServlet.messageLabel=Mensaje:
htmlManagerServlet.noManager=-
htmlManagerServlet.noVersion=Ninguno especificado
+htmlManagerServlet.osFreePageFile=Archivo de página gratis:
htmlManagerServlet.osTotalPageFile=Tamaño total de archivo de página:
htmlManagerServlet.serverHostname=NombreDeMáquina
htmlManagerServlet.serverIPAddress=Dirección IP
diff --git a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
index 0a03ba0..7aae463 100644
--- a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+channelCoordinator.alreadyStarted=Canal ya iniciado para nivel:[{0}]
channelCoordinator.invalid.startLevel=Nivel de inicion inválido, los niveles
válidos son:SND_RX_SEQ,SND_TX_SEQ,MBR_TX_SEQ,MBR_RX_SEQ\n
groupChannel.listener.alreadyExist=El escuchador ya existe:[{0}][{1}]
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
index ea47f45..fe54155 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
@@ -20,6 +20,7 @@ engine.openSSLError=Error de OpenSSL: [{0}] mensage: [{1}]\n
engine.writeToSSLFailed=Fallo al escribir hacia SSL, resultado: [{0}]
openssl.addedClientCaCert=Ceritifcado CA de cliente adicionado: [{0}]
+openssl.keyManagerMissing=No se encontró gerente de llave
openssl.trustManagerMissing=No se encontró un manejador confiable
opensslconf.checkFailed=Fallo mientras se chequeaba OpenSSLConf\n
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cdbc41e..f8e3fc1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -234,6 +234,10 @@
Improvements to Korean translations. (woonsan)
+
+Improvements to Spanish translations. Provided by Andrewlanecarr.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/07: Improvements to Japanese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ecd5e960ca8229c18c6499217afab51c78afd35e
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:54:01 2020 +0100
Improvements to Japanese translations
---
java/org/apache/catalina/realm/LocalStrings_ja.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties
b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index a7d46a3..1e306cd 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -77,6 +77,7 @@ jndiRealm.exception.retry=認証中に例外が発生しました。再試行し
jndiRealm.invalidHostnameVerifier=[{0}]はHostnameVerifierの有効なクラス名ではありません。
jndiRealm.invalidSslProtocol=指定されたプロトコル[{0}]は無効です。 [{1}]のいずれかでなければなりません。
jndiRealm.invalidSslSocketFactory=[{0}]はSSLSocketFactoryの有効なクラス名ではありません
+jndiRealm.multipleEntries=ユーザ名 [{0}] は複数のエントリを持っています
jndiRealm.negotiatedTls=プロトコル[{0}]を使用して交渉されたTLS接続
jndiRealm.open=ディレクトリサーバ接続オープン中の例外です
jndiRealm.tlsClose=TLSレスポンスを閉じる際の例外
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/07: Improve Chinese translations. Provided by leeyazhou.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2364f9a476d4c77c4a1afe719a693699e1016fbe
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:50:57 2020 +0100
Improve Chinese translations. Provided by leeyazhou.
---
java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/manager/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties| 4
webapps/docs/changelog.xml| 3 +++
13 files changed, 23 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 405d80f..0dc26ad 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -83,6 +83,7 @@ request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作
request.fragmentInDispatchPath=调度路径[{0}]中的片段已被删除
request.illegalWrap=请求包装器必须包装从getRequest（）获得的请求
request.notAsync=如果当前请求不在异步模式下，则调用此方法是非法的（即isAsyncStarted（）返回false）
+request.session.failed=由于[{1}]，加载会话[{0}]失败
requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index a4084f3..3058278 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -162,6 +162,7 @@ managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单
managerServlet.saveFail=失败 - 配置保存失败：[{0}]
managerServlet.saved=OK - 服务器配置已保存
managerServlet.savedContext=OK - 上下文[{0}]配置已保存
+managerServlet.savedContextFail=失败 - 上下文[{0}]配置保存失败
managerServlet.serverInfo=OK - 服务器信息\n\
Tomcat版本: [{0}]\n\
操作系统名称: [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index eabfb55..36c5f22 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -76,6 +76,7 @@ jndiRealm.exception.retry=执行身份验证时发生异常。正在重试。。
jndiRealm.invalidHostnameVerifier=[{0}]不是HostnameVerifier的有效类名
jndiRealm.invalidSslProtocol=给定的协议[{0}]无效。它必须是[{1}]之一
jndiRealm.invalidSslSocketFactory=[{0}]不是SSLSocketFactory的有效类名。
+jndiRealm.multipleEntries=用户名称[{0}]拥有多个实体
jndiRealm.negotiatedTls=使用协议[{0}]协商的TLS连接
jndiRealm.open=打开目录服务器链接异常
jndiRealm.tlsClose=关闭tls响应时出现异常
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index 2354b3f..7a1cc2c 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=无法打开 JNDI 数据源 [{0}]
fileStore.createFailed=无法创建用于存储会话数据的目录[{0}]。
fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}]
fileStore.deleteSessionFailed=无法删除不再需要的文件[{0}]
+fileStore.invalid=无效的持久化文件[{0}]，会话ID为[{1}]
fileStore.loading=正在从文件[{1}]加载会话[{0}]
fileStore.removing=正在删除文件{1}处的会话{0}]
fileStore.saving=保存会话[{0}]到文件[{1}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 8155d5d..c7e6a59 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -65,6 +65,7 @@ contextConfig.jarFile=无法处理Jar[{0}]的注解
contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
contextConfig.jspFile.warning=警告：在Servlet 2.4 中，JSP文件[{0}]必须以‘/’开头
contextConfig.missingRealm=对应的认证领域未配置
+contextConfig.noAntiLocking=配置
java.io.tmpdir的值[{0}]未指向有效路径。Web应用[{1}]antiResourceLocking配置将被忽略
contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
contextConfig.processAnnotationsJar.debug=扫描jar文件中注解[{0}]的类文件
contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class
文件
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
[tomcat] branch 9.0.x updated: Improvements to native (tomcat-embed-programmatic)
This is an automated email from the ASF dual-hosted git repository.
fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 6d04ef8 Improvements to native (tomcat-embed-programmatic)
6d04ef8 is described below
commit 6d04ef8952aad6ff07077c8497a7ecd89cf55759
Author: Filip Hanik
AuthorDate: Fri Oct 2 15:17:35 2020 -0700
Improvements to native (tomcat-embed-programmatic)
1. script to run the embedded-programmatic in JVM or native mode
2. enable one line logging in native image sample
3. add logging to sample native servlet
---
java/org/apache/catalina/startup/Tomcat.java | 7 ++-
res/graal/run-tomcat-native.sh | 63 ++
.../native-image/tomcat-reflection.json| 7 +++
.../apache/catalina/startup/EmbeddedTomcat.java| 10 +++-
4 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index 88859e8..430a635 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -1162,8 +1162,11 @@ public class Tomcat {
if (event.getType().equals(Lifecycle.CONFIGURE_START_EVENT)) {
context.setConfigured(true);
-// Process annotations
-WebAnnotationSet.loadApplicationAnnotations(context);
+// Process annotations when not running in a Graal image
+// annotations require reflections and additional
configuration
+if (!JreCompat.isGraalAvailable()) {
+WebAnnotationSet.loadApplicationAnnotations(context);
+}
// LoginConfig is required to process @ServletSecurity
// annotations
diff --git a/res/graal/run-tomcat-native.sh b/res/graal/run-tomcat-native.sh
new file mode 100755
index 000..e136a01
--- /dev/null
+++ b/res/graal/run-tomcat-native.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+CURDIR=`pwd`
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+while [ -h "$PRG" ]; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+PRG="$link"
+ else
+PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+# directory of this script
+PRGDIR=`dirname "$PRG"`
+PRGDIR=`cd "$PRGDIR" >/dev/null; pwd`
+
+if [ "$1" == "build" ]; then
+ $PRGDIR/build-tomcat-native-image.sh
+ shift
+fi
+
+echo "Script Directory: $PRGDIR"
+if [ "$1" == "jvm" ]; then
+ cd $PRGDIR/../..
+ if [ ! -f output/graal/tomcat-embedded-sample.jar ]; then
+$PRGDIR/build-tomcat-native-image.sh
+ fi
+ cd $PRGDIR/../../output/graal
+ java -Dorg.graalvm.nativeimage.imagecode=true \
+-cp ../embed/tomcat-embed-programmatic.jar:tomcat-embedded-sample.jar \
+org.apache.catalina.startup.EmbeddedTomcat
+elif [ "$1" == "native" ]; then
+ if [ ! -f $PRGDIR/../../output/graal/tc-graal-image ]; then
+$PRGDIR/build-tomcat-native-image.sh
+ fi
+ $PRGDIR/../../output/graal/tc-graal-image
+else
+ echo "Usage: run-tomcat-native.sh [build] jvm|native"
+ exit 1
+fi
+
+cd $CURDIR
\ No newline at end of file
diff --git
a/res/graal/tomcat-embed-programmatic/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-programmatic/native-image/tomcat-reflection.json
index 0d4f101..7eafd10 100644
--- a/res/graal/tomcat-embed-programmatic/native-image/tomcat-reflection.json
+++ b/res/graal/tomcat-embed-programmatic/native-image/tomcat-reflection.json
@@ -1,2 +1,9 @@
[
+ {
+"name": "org.apache.juli.OneLineFormatter",
+"allPublicMethods": true,
+"allDeclaredFields":true,
+"allDeclaredMethods":true,
+"allDeclaredConstructors":true
+ }
]
diff --git a/test/org/apache/catalina/startup/EmbeddedTomcat.java
b/test/org/apache/catalina/startup/EmbeddedTomcat.java
index 9338761..bf5820b 100644
--- a/test/org/apache/catalina/startup/EmbeddedTomcat.java
+++ b/test/org/apache/catalina/startup/EmbeddedTomcat.java
@@ -32,6 +32,7 @@ import
[tomcat] 04/07: Improvements to French translations. (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cf26a6b544defeb8581ca34803ce0ad4abf45af1
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:52:33 2020 +0100
Improvements to French translations. (remm)
---
java/org/apache/catalina/realm/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 7 +++
webapps/docs/changelog.xml | 3 +++
9 files changed, 22 insertions(+)
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties
b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index 53642c5..f3f2382 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -77,6 +77,7 @@ jndiRealm.exception.retry=Erreur pendant l'authentification,
nouvel essai
jndiRealm.invalidHostnameVerifier=[{0}] n''est pas un nom de classe valide
pour un HostnameVerifier
jndiRealm.invalidSslProtocol=Le protocole fourni [{0}] est invalide, il doit
être parmi [{1}]
jndiRealm.invalidSslSocketFactory=[{0}] n''est pas un nom de classe valide
pour une SSLSocketFactory
+jndiRealm.multipleEntries=Le nom d''utilisateur [{0}] a plusieurs entrées
jndiRealm.negotiatedTls=La connection TLS a été négociée en utilisant le
protocole [{0}]
jndiRealm.open=Exception lors de l'ouverture de la connexion au serveur
d'accès (directory server)
jndiRealm.tlsClose=Exception en fermant la réponse TLS
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties
b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index c4efe2b..6b7760f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -14,10 +14,12 @@
# limitations under the License.
catalina.configFail=Impossible de charger la configuration du serveur depuis
[{0}]
+catalina.generatedCodeLocationError=Impossible d''utiliser l''emplacement
configuré [{0}] pour générer le code utilisant Tomcat embedded
catalina.incorrectPermissions=Les permissions sont incorrectes, la lecture
n'est pas autorisée sur le fichier
catalina.init=L''initialisation du serveur a pris [{0}] millisecondes
catalina.initError=Erreur lors de l'initialisation de Catalina
catalina.noCluster=le RuleSet du cluster n''a pas été trouvé à cause de [{0}],
la configuration du cluster est désactivée
+catalina.noLoader=Le chargeur du code de configuration [{0}] n''a pas été
trouvé, le code généré ne sera pas utilisé
catalina.noNaming=L'environnement de noms JNDI est désactivé
catalina.noServer=Impossible de démarrer le serveur, l'instance n'est pas
configurée
catalina.serverStartFail=Le composant Server requis n'a pas démarré, en
conséquence Tomcat ne peut démarrer.
@@ -66,6 +68,7 @@ contextConfig.jarFile=Impossible de traiter les annotations
du JAR [{0}]
contextConfig.jspFile.error=Le fichier JSP [{0}] doit commencer par un ''/''
contextConfig.jspFile.warning=WARNING : Le fichier JSP [{0}] doit commencer
par un ''/'' dans l''API Servlet 2.4
contextConfig.missingRealm=Aucun royaume (realm) n'a été configuré pour
réaliser l'authentification
+contextConfig.noAntiLocking=La valeur [{0}] configurée pour java.io.tmpdir ne
correspond pas à un répertoire valide, le paramètre antiResourceLocking
configuré pour l''application [{1}] sera ignoré
contextConfig.processAnnotationsDir.debug=Balayage du répertoire pour trouver
des fichiers de classe avec annotations [{0}]
contextConfig.processAnnotationsJar.debug=Analyse du fichier jars pour des
classes annotées avec [{0}]
contextConfig.processAnnotationsWebDir.debug=Balayage du répertoire
d''applications web, pour fichiers de classe avec annotations [{0}]
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 41da61c..228e68e 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -127,6 +127,8 @@ http.511.reason=L’authentification du réseau est nécessaire
jdbcAccessLogValve.close=Echec de fermeture de la base de donnée
jdbcAccessLogValve.exception=Exception en insérant l'entrée de l'accès
+persistentValve.filter.failure=Impossible de compiler le filtre=[{0}]
+
remoteCidrValve.invalid=La configuration fournie pour [{0}] est invalide, voir
les précédents messages pour plus de détails
[tomcat] 05/07: Improvements to Korean translations. (woonsan)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 56be5a47d4c0782e95e0d0e368ae01e0d3234e02
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:53:02 2020 +0100
Improvements to Korean translations. (woonsan)
---
java/org/apache/catalina/realm/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/session/LocalStrings_ko.properties| 1 +
java/org/apache/catalina/startup/LocalStrings_ko.properties| 3 +++
java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties | 4
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_ko.properties| 2 ++
webapps/docs/changelog.xml | 3 +++
7 files changed, 15 insertions(+)
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index fb22c6c..a3cfcc2 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -77,6 +77,7 @@ jndiRealm.exception.retry=인증 처리 수행 중 예외 발생. 재시도합
jndiRealm.invalidHostnameVerifier=[{0}]은(는), HostnameVerifier를 위한 클래스 이름으로서,
유효하지 않습니다.
jndiRealm.invalidSslProtocol=주어진 프로토콜 [{0}]은(는) 유효하지 않습니다. 반드시 [{1}] 중의 하나여야
합니다.
jndiRealm.invalidSslSocketFactory=[{0}]은(는) SSLSocketFactory 객체를 위해 유효한 클래스
이름이 아닙니다.
+jndiRealm.multipleEntries=[{0}] 사용자 이름은 여러 개의 엔트리들을 가지고 있습니다
jndiRealm.negotiatedTls=프로토콜 [{0}]을(를) 사용하여 TLS 연결을 negotiate 했습니다.
jndiRealm.open=디렉토리 서버 연결을 여는 중 예외 발생
jndiRealm.tlsClose=tls 응답을 닫는 중 예외 발생
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index 42ed1fe..d12d230 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=JNDI DataSource [{0}]을(를) 열 수 없습니다.
fileStore.createFailed=세션 데이터 저장소를 위한 디렉토리[{0}]을(를) 생성할 수 없습니다.
fileStore.deleteFailed=파일 [{0}]을(를) 삭제할 수 없습니다. 이는 세션 저장소 위치의 생성을 방해하고 있습니다.
fileStore.deleteSessionFailed=더 이상 필요하지 않은 파일 [{0}]을(를) 삭제할 수 없습니다.
+fileStore.invalid=세션 ID [{1}]을(를) 위한 세션 저장소 파일 [{0}]이(가) 유효하지 않습니다.
fileStore.loading=파일 [{1}](으)로부터 세션 [{0}]을(를) 로드합니다.
fileStore.removing=파일 [{1}]에 저장된 세션 [{0}]을(를) 제거합니다.
fileStore.saving=세션 [{0}]을(를) 파일 [{1}]에 저장합니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index b516cd9..4cbd10b 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -14,10 +14,12 @@
# limitations under the License.
catalina.configFail=[{0}](으)로부터 서버 설정을 로드할 수 없습니다.
+catalina.generatedCodeLocationError=설정 파일들로부터 톰캣 임베디드 코드를 생성하는 중 오류 발생 (코드 생성
위치: [{0}])
catalina.incorrectPermissions=권한 설정들이 올바르지 않습니다. 해당 파일에 읽기 권한이 허용되지 않습니다.
catalina.init=[{0}] 밀리초 내에 서버가 초기화되었습니다.
catalina.initError=Catalina를 초기화하는 중 오류 발생
catalina.noCluster=[{0}](으)로 인하여 클러스터 RuleSet을 찾을 수 없습니다. 클러스터 설정은 사용불능 상태입니다.
+catalina.noLoader=설정 파일 코드 로더 [{0}]이(가) 발견되지 않습니다. 생성된 코드는 사용되지 않을 것입니다.
catalina.noNaming=Naming 환경은 사용 불능 상태입니다.
catalina.noServer=서버를 시작할 수 없습니다. 서버 인스턴스가 설정되지 않았습니다.
catalina.serverStartFail=필수 항목인 서버 구성요소가 제대로 시작되지 못하여, Tomcat이 시작될 수 없습니다.
@@ -66,6 +68,7 @@ contextConfig.jarFile=Annotation들을 위해 Jar [{0}]을(를) 처리할 수
contextConfig.jspFile.error=JSP 파일 [{0}]은(는) 반드시 ''/''로 시작해야 합니다.
contextConfig.jspFile.warning=경고: Servlet 2.4에서 JSP 파일 [{0}]은(는) 반드시 ''/''로
시작해야 합니다.
contextConfig.missingRealm=인증 처리 시 사용할 Realm이 설정되지 않았습니다.
+contextConfig.noAntiLocking=java.io.tmpdir 프로퍼티 값 [{0}]이(가) 유효한 디렉토리 경로가 아닙니다.
해당 웹 애플리케이션 [{1}]을(를) 위한 antiResourceLocking 설정은 무시됩니다.
contextConfig.processAnnotationsDir.debug=Annotation들을 가진 클래스 파일들을 찾기 위해 디렉토리
[{0}]을(를) 스캔합니다.
contextConfig.processAnnotationsJar.debug=Annotation들, [{0}]을(를) 가진 클래스 파일들을
찾기 위해, JAR 파일을 스캔합니다.
contextConfig.processAnnotationsWebDir.debug=Annotation들인 [{0}]을(를) 가진 클래스
파일들을 찾기 위해, 웹 애플리케이션 디렉토리를 스캔합니다.
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
index 2161de4..7d3d3e0 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
@@ -13,6 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+quotedStringTokenizer.tokenizeError=토큰으로 파싱하는 중 오류 발생 (문자열: [{0}], 위치: [{1}],
현재 모드: [{2}])
+
+rewriteMap.tooManyParameters=RewriteMap 디렉티브에 너무 많은 파라미터들이 설정되었습니다.
+
rewriteValve.closeError=설정 리소스의 스트림을 닫는 중 오류 발생
rewriteValve.invalidFlags=[{0}] 내에 유효하지 않은 플래그입니다 (플래그들: [{1}]).
[tomcat] 03/05: Improvements to French translations (remm)
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 3156014f9bd592a918308999f7827993ed3a8d1f
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:34:47 2020 +0100
Improvements to French translations (remm)
---
java/org/apache/catalina/startup/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 7 +++
webapps/docs/changelog.xml | 3 +++
8 files changed, 21 insertions(+)
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties
b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index c4efe2b..6b7760f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -14,10 +14,12 @@
# limitations under the License.
catalina.configFail=Impossible de charger la configuration du serveur depuis
[{0}]
+catalina.generatedCodeLocationError=Impossible d''utiliser l''emplacement
configuré [{0}] pour générer le code utilisant Tomcat embedded
catalina.incorrectPermissions=Les permissions sont incorrectes, la lecture
n'est pas autorisée sur le fichier
catalina.init=L''initialisation du serveur a pris [{0}] millisecondes
catalina.initError=Erreur lors de l'initialisation de Catalina
catalina.noCluster=le RuleSet du cluster n''a pas été trouvé à cause de [{0}],
la configuration du cluster est désactivée
+catalina.noLoader=Le chargeur du code de configuration [{0}] n''a pas été
trouvé, le code généré ne sera pas utilisé
catalina.noNaming=L'environnement de noms JNDI est désactivé
catalina.noServer=Impossible de démarrer le serveur, l'instance n'est pas
configurée
catalina.serverStartFail=Le composant Server requis n'a pas démarré, en
conséquence Tomcat ne peut démarrer.
@@ -66,6 +68,7 @@ contextConfig.jarFile=Impossible de traiter les annotations
du JAR [{0}]
contextConfig.jspFile.error=Le fichier JSP [{0}] doit commencer par un ''/''
contextConfig.jspFile.warning=WARNING : Le fichier JSP [{0}] doit commencer
par un ''/'' dans l''API Servlet 2.4
contextConfig.missingRealm=Aucun royaume (realm) n'a été configuré pour
réaliser l'authentification
+contextConfig.noAntiLocking=La valeur [{0}] configurée pour java.io.tmpdir ne
correspond pas à un répertoire valide, le paramètre antiResourceLocking
configuré pour l''application [{1}] sera ignoré
contextConfig.processAnnotationsDir.debug=Balayage du répertoire pour trouver
des fichiers de classe avec annotations [{0}]
contextConfig.processAnnotationsJar.debug=Analyse du fichier jars pour des
classes annotées avec [{0}]
contextConfig.processAnnotationsWebDir.debug=Balayage du répertoire
d''applications web, pour fichiers de classe avec annotations [{0}]
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 41da61c..228e68e 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -127,6 +127,8 @@ http.511.reason=L’authentification du réseau est nécessaire
jdbcAccessLogValve.close=Echec de fermeture de la base de donnée
jdbcAccessLogValve.exception=Exception en insérant l'entrée de l'accès
+persistentValve.filter.failure=Impossible de compiler le filtre=[{0}]
+
remoteCidrValve.invalid=La configuration fournie pour [{0}] est invalide, voir
les précédents messages pour plus de détails
remoteCidrValve.noRemoteIp=Le client n'a pas d'adresse IP, requête interdite
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index 30e2465..80af8e6 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -52,6 +52,8 @@ asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est
pas valide pour une
compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête
Content-Encoding en vérifiant si la compression était déjà utilisée
+continueResponseTiming.invalid=La valeur [{0}] n''est pas valide pour
continueResponseTiming
+
request.notAsync=Il n'est possible de passer en mode d'entrée-sorties non
bloquantes que lors de traitements asynchrones ou après mise à niveau depuis
HTTP
request.nullReadListener=L'écouteur passé à setReadListener() ne peut pas être
null
request.readListenerSet=L'écouteur des lectures non bloquantes a déjà été
défini
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
[tomcat] 02/05: Improvements to Czech translations
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 3cf5df4a8d58bc454b06e648cc19b9e7cdd55ef9
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:32:37 2020 +0100
Improvements to Czech translations
---
java/jakarta/el/LocalStrings_cs.properties | 2 +-
.../authenticator/LocalStrings_cs.properties | 4 ++--
.../catalina/connector/LocalStrings_cs.properties | 2 +-
.../catalina/core/LocalStrings_cs.properties | 10 -
.../catalina/deploy/LocalStrings_cs.properties | 2 +-
.../catalina/filters/LocalStrings_cs.properties| 6 +++---
.../catalina/ha/deploy/LocalStrings_cs.properties | 2 +-
.../catalina/ha/session/LocalStrings_cs.properties | 4 ++--
.../catalina/ha/tcp/LocalStrings_cs.properties | 2 +-
.../catalina/manager/LocalStrings_cs.properties| 8
.../manager/host/LocalStrings_cs.properties| 2 +-
.../catalina/realm/LocalStrings_cs.properties | 4 ++--
.../catalina/servlets/LocalStrings_cs.properties | 4 ++--
.../catalina/session/LocalStrings_cs.properties| 2 +-
.../catalina/startup/LocalStrings_cs.properties| 4 ++--
.../tribes/group/LocalStrings_cs.properties| 2 +-
.../group/interceptors/LocalStrings_cs.properties | 24 +++---
.../catalina/tribes/io/LocalStrings_cs.properties | 2 +-
.../membership/cloud/LocalStrings_cs.properties| 4 ++--
.../tribes/tipis/LocalStrings_cs.properties| 6 +++---
.../tribes/util/LocalStrings_cs.properties | 2 +-
.../catalina/users/LocalStrings_cs.properties | 2 +-
.../catalina/util/LocalStrings_cs.properties | 2 +-
.../catalina/valves/LocalStrings_cs.properties | 6 +++---
java/org/apache/coyote/LocalStrings_cs.properties | 2 +-
.../apache/coyote/ajp/LocalStrings_cs.properties | 2 +-
.../coyote/http11/LocalStrings_cs.properties | 4 ++--
.../http11/upgrade/LocalStrings_cs.properties | 2 +-
.../apache/coyote/http2/LocalStrings_cs.properties | 4 ++--
.../jasper/resources/LocalStrings_cs.properties| 22 ++--
.../apache/tomcat/util/LocalStrings_cs.properties | 2 +-
.../tomcat/util/compat/LocalStrings_cs.properties | 2 +-
.../util/descriptor/web/LocalStrings_cs.properties | 4 ++--
.../tomcat/util/net/LocalStrings_cs.properties | 8
.../util/net/jsse/LocalStrings_cs.properties | 2 +-
.../tomcat/util/scan/LocalStrings_cs.properties| 2 +-
.../tomcat/websocket/LocalStrings_cs.properties| 12 +--
webapps/docs/changelog.xml | 4
38 files changed, 92 insertions(+), 88 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_cs.properties
b/java/jakarta/el/LocalStrings_cs.properties
index d5c1a75..1d4eed0 100644
--- a/java/jakarta/el/LocalStrings_cs.properties
+++ b/java/jakarta/el/LocalStrings_cs.properties
@@ -17,4 +17,4 @@ elProcessor.defineFunctionInvalidMethod=Metoda [{0}] třídy
[{1}] není public
importHandler.ambiguousStaticImport=Statický import [{0}] nelze zpracovat,
neboť koliduje s [{1}] (který byl již naimportován)
importHandler.classNotFound=Třídu [{0}] nelze naimportovat, neboť nebyla
nalezena
-importHandler.invalidClassNameForStatic=Uvedená třída [{0}] pro statický
import [{1}] není platná
+importHandler.invalidClassNameForStatic=Třída [{0}] uvedená pro statický
import [{1}] není platná
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
b/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
index 2dabeb0..80cd0b7 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
@@ -20,7 +20,7 @@ authenticator.sessionExpired=Časový rámec pro přihlášení byl
překročen.
singleSignOn.debug.principalFound=SSO našlo cachovaný objekt Principal [{0}] s
autentizačním typem [{1}]
singleSignOn.debug.removeSession=SSO odstraňuje aplikační session [{0}] z SSO
session [{1}]
-singleSignOn.sessionExpire.hostNotFound=SSO nemůže ukončit session [{0}],
protože server (Host) nemůže najít
-singleSignOn.sessionExpire.managerError=SSO nemúže ukončit relaci [{0}],
protože Manager vyhodil Exception při hledání relace
+singleSignOn.sessionExpire.hostNotFound=SSO nemůže ukončit session [{0}],
protože host nebyl nalezen
+singleSignOn.sessionExpire.managerError=SSO nemůže expirovat relaci [{0}],
protože Manager vyhodil Exception při vyhledávání relace
spnegoAuthenticator.authHeaderNoToken=Domlouvací autorizační hlavička zaslaná
klientem neobsahuje token
diff --git a/java/org/apache/catalina/connector/LocalStrings_cs.properties
b/java/org/apache/catalina/connector/LocalStrings_cs.properties
index 6c371d2..8914ecc 100644
--- a/java/org/apache/catalina/connector/LocalStrings_cs.properties
+++
[tomcat] 04/05: Improvements to Korean translations (woonsan)
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 f36edc9842b5e7149846d8f7d40ab044359f8a51
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:37:04 2020 +0100
Improvements to Korean translations (woonsan)
---
java/org/apache/catalina/session/LocalStrings_ko.properties| 1 +
java/org/apache/catalina/startup/LocalStrings_ko.properties| 3 +++
java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties | 4
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_ko.properties| 2 ++
webapps/docs/changelog.xml | 3 +++
6 files changed, 14 insertions(+)
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index 42ed1fe..d12d230 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=JNDI DataSource [{0}]을(를) 열 수 없습니다.
fileStore.createFailed=세션 데이터 저장소를 위한 디렉토리[{0}]을(를) 생성할 수 없습니다.
fileStore.deleteFailed=파일 [{0}]을(를) 삭제할 수 없습니다. 이는 세션 저장소 위치의 생성을 방해하고 있습니다.
fileStore.deleteSessionFailed=더 이상 필요하지 않은 파일 [{0}]을(를) 삭제할 수 없습니다.
+fileStore.invalid=세션 ID [{1}]을(를) 위한 세션 저장소 파일 [{0}]이(가) 유효하지 않습니다.
fileStore.loading=파일 [{1}](으)로부터 세션 [{0}]을(를) 로드합니다.
fileStore.removing=파일 [{1}]에 저장된 세션 [{0}]을(를) 제거합니다.
fileStore.saving=세션 [{0}]을(를) 파일 [{1}]에 저장합니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index b516cd9..4cbd10b 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -14,10 +14,12 @@
# limitations under the License.
catalina.configFail=[{0}](으)로부터 서버 설정을 로드할 수 없습니다.
+catalina.generatedCodeLocationError=설정 파일들로부터 톰캣 임베디드 코드를 생성하는 중 오류 발생 (코드 생성
위치: [{0}])
catalina.incorrectPermissions=권한 설정들이 올바르지 않습니다. 해당 파일에 읽기 권한이 허용되지 않습니다.
catalina.init=[{0}] 밀리초 내에 서버가 초기화되었습니다.
catalina.initError=Catalina를 초기화하는 중 오류 발생
catalina.noCluster=[{0}](으)로 인하여 클러스터 RuleSet을 찾을 수 없습니다. 클러스터 설정은 사용불능 상태입니다.
+catalina.noLoader=설정 파일 코드 로더 [{0}]이(가) 발견되지 않습니다. 생성된 코드는 사용되지 않을 것입니다.
catalina.noNaming=Naming 환경은 사용 불능 상태입니다.
catalina.noServer=서버를 시작할 수 없습니다. 서버 인스턴스가 설정되지 않았습니다.
catalina.serverStartFail=필수 항목인 서버 구성요소가 제대로 시작되지 못하여, Tomcat이 시작될 수 없습니다.
@@ -66,6 +68,7 @@ contextConfig.jarFile=Annotation들을 위해 Jar [{0}]을(를) 처리할 수
contextConfig.jspFile.error=JSP 파일 [{0}]은(는) 반드시 ''/''로 시작해야 합니다.
contextConfig.jspFile.warning=경고: Servlet 2.4에서 JSP 파일 [{0}]은(는) 반드시 ''/''로
시작해야 합니다.
contextConfig.missingRealm=인증 처리 시 사용할 Realm이 설정되지 않았습니다.
+contextConfig.noAntiLocking=java.io.tmpdir 프로퍼티 값 [{0}]이(가) 유효한 디렉토리 경로가 아닙니다.
해당 웹 애플리케이션 [{1}]을(를) 위한 antiResourceLocking 설정은 무시됩니다.
contextConfig.processAnnotationsDir.debug=Annotation들을 가진 클래스 파일들을 찾기 위해 디렉토리
[{0}]을(를) 스캔합니다.
contextConfig.processAnnotationsJar.debug=Annotation들, [{0}]을(를) 가진 클래스 파일들을
찾기 위해, JAR 파일을 스캔합니다.
contextConfig.processAnnotationsWebDir.debug=Annotation들인 [{0}]을(를) 가진 클래스
파일들을 찾기 위해, 웹 애플리케이션 디렉토리를 스캔합니다.
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
index 2161de4..7d3d3e0 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
@@ -13,6 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+quotedStringTokenizer.tokenizeError=토큰으로 파싱하는 중 오류 발생 (문자열: [{0}], 위치: [{1}],
현재 모드: [{2}])
+
+rewriteMap.tooManyParameters=RewriteMap 디렉티브에 너무 많은 파라미터들이 설정되었습니다.
+
rewriteValve.closeError=설정 리소스의 스트림을 닫는 중 오류 발생
rewriteValve.invalidFlags=[{0}] 내에 유효하지 않은 플래그입니다 (플래그들: [{1}]).
rewriteValve.invalidLine=유효하지 않은 행 [{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index b8927d8..4cfc255 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -26,6 +26,7 @@ ajpprocessor.header.tooLong=길이가 [{0}]인 헤더 메시지를 받았지만,
ajpprocessor.readtimeout=소켓으로부터 데이터를 읽으려는 시도가 제한 시간 초과되었습니다.
ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
ajpprocessor.request.process=요청 처리 중 오류 발생
+ajpprocessor.unknownAttribute=리버스 프록시 서버로부터 알 수 없는 요청 속성 [{0}]이(가) 접수되어 요청 처리를
거부합니다.
ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
[tomcat] branch master updated (b8819c3 -> 0e1c280)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from b8819c3 Allow for path length in cached resource size new 446d4b4 Improve Chinese translations. Provided by leeyazhou new 3cf5df4 Improvements to Czech translations new 3156014 Improvements to French translations (remm) new f36edc9 Improvements to Korean translations (woonsan) new 0e1c280 Improvements to Spanish translations The 5 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: java/jakarta/el/LocalStrings_cs.properties | 2 +- .../authenticator/LocalStrings_cs.properties | 4 ++-- .../catalina/connector/LocalStrings_cs.properties | 2 +- .../connector/LocalStrings_zh_CN.properties| 1 + .../catalina/core/LocalStrings_cs.properties | 10 - .../catalina/deploy/LocalStrings_cs.properties | 2 +- .../catalina/filters/LocalStrings_cs.properties| 6 +++--- .../catalina/ha/deploy/LocalStrings_cs.properties | 2 +- .../catalina/ha/session/LocalStrings_cs.properties | 4 ++-- .../catalina/ha/tcp/LocalStrings_cs.properties | 2 +- .../catalina/manager/LocalStrings_cs.properties| 8 .../catalina/manager/LocalStrings_es.properties| 1 + .../catalina/manager/LocalStrings_zh_CN.properties | 1 + .../manager/host/LocalStrings_cs.properties| 2 +- .../catalina/realm/LocalStrings_cs.properties | 4 ++-- .../catalina/servlets/LocalStrings_cs.properties | 4 ++-- .../catalina/session/LocalStrings_cs.properties| 2 +- .../catalina/session/LocalStrings_ko.properties| 1 + .../catalina/session/LocalStrings_zh_CN.properties | 1 + .../catalina/startup/LocalStrings_cs.properties| 4 ++-- .../catalina/startup/LocalStrings_fr.properties| 3 +++ .../catalina/startup/LocalStrings_ko.properties| 3 +++ .../catalina/startup/LocalStrings_zh_CN.properties | 1 + .../tribes/group/LocalStrings_cs.properties| 2 +- .../tribes/group/LocalStrings_es.properties| 1 + .../group/interceptors/LocalStrings_cs.properties | 24 +++--- .../catalina/tribes/io/LocalStrings_cs.properties | 2 +- .../membership/cloud/LocalStrings_cs.properties| 4 ++-- .../tribes/tipis/LocalStrings_cs.properties| 6 +++--- .../tribes/util/LocalStrings_cs.properties | 2 +- .../catalina/users/LocalStrings_cs.properties | 2 +- .../catalina/util/LocalStrings_cs.properties | 2 +- .../catalina/valves/LocalStrings_cs.properties | 6 +++--- .../catalina/valves/LocalStrings_fr.properties | 2 ++ .../catalina/valves/LocalStrings_zh_CN.properties | 2 ++ .../valves/rewrite/LocalStrings_ko.properties | 4 .../valves/rewrite/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/coyote/LocalStrings_cs.properties | 2 +- java/org/apache/coyote/LocalStrings_fr.properties | 2 ++ .../apache/coyote/LocalStrings_zh_CN.properties| 2 ++ .../apache/coyote/ajp/LocalStrings_cs.properties | 2 +- .../apache/coyote/ajp/LocalStrings_fr.properties | 1 + .../apache/coyote/ajp/LocalStrings_ko.properties | 1 + .../coyote/http11/LocalStrings_cs.properties | 4 ++-- .../http11/upgrade/LocalStrings_cs.properties | 2 +- .../apache/coyote/http2/LocalStrings_cs.properties | 4 ++-- .../apache/coyote/http2/LocalStrings_fr.properties | 2 ++ .../coyote/http2/LocalStrings_zh_CN.properties | 2 ++ .../jasper/resources/LocalStrings_cs.properties| 22 ++-- .../jasper/resources/LocalStrings_zh_CN.properties | 4 .../apache/tomcat/util/LocalStrings_cs.properties | 2 +- .../tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++ .../tomcat/util/compat/LocalStrings_cs.properties | 2 +- .../util/descriptor/web/LocalStrings_cs.properties | 4 ++-- .../tomcat/util/net/LocalStrings_cs.properties | 8 .../tomcat/util/net/LocalStrings_fr.properties | 1 + .../tomcat/util/net/LocalStrings_zh_CN.properties | 1 + .../util/net/jsse/LocalStrings_cs.properties | 2 +- .../util/net/openssl/LocalStrings_es.properties| 1 + .../tomcat/util/scan/LocalStrings_cs.properties| 2 +- .../tomcat/websocket/LocalStrings_cs.properties| 12 +-- .../tomcat/websocket/LocalStrings_fr.properties| 7 +++ .../tomcat/websocket/LocalStrings_ko.properties| 2 ++ .../tomcat/websocket/LocalStrings_zh_CN.properties | 4 webapps/docs/changelog.xml | 17 +++ 65 files changed, 160 insertions(+), 88 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For
[tomcat] 01/05: Improve Chinese translations. Provided by leeyazhou
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 446d4b48a635495f0432ebf2823ee4ba596122bb
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:28:24 2020 +0100
Improve Chinese translations. Provided by leeyazhou
---
java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/manager/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties| 2 ++
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties| 4
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties| 4
webapps/docs/changelog.xml| 3 +++
13 files changed, 26 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 405d80f..0dc26ad 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -83,6 +83,7 @@ request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作
request.fragmentInDispatchPath=调度路径[{0}]中的片段已被删除
request.illegalWrap=请求包装器必须包装从getRequest（）获得的请求
request.notAsync=如果当前请求不在异步模式下，则调用此方法是非法的（即isAsyncStarted（）返回false）
+request.session.failed=由于[{1}]，加载会话[{0}]失败
requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index a4084f3..3058278 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -162,6 +162,7 @@ managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单
managerServlet.saveFail=失败 - 配置保存失败：[{0}]
managerServlet.saved=OK - 服务器配置已保存
managerServlet.savedContext=OK - 上下文[{0}]配置已保存
+managerServlet.savedContextFail=失败 - 上下文[{0}]配置保存失败
managerServlet.serverInfo=OK - 服务器信息\n\
Tomcat版本: [{0}]\n\
操作系统名称: [{1}]\n\
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index 2354b3f..7a1cc2c 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=无法打开 JNDI 数据源 [{0}]
fileStore.createFailed=无法创建用于存储会话数据的目录[{0}]。
fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}]
fileStore.deleteSessionFailed=无法删除不再需要的文件[{0}]
+fileStore.invalid=无效的持久化文件[{0}]，会话ID为[{1}]
fileStore.loading=正在从文件[{1}]加载会话[{0}]
fileStore.removing=正在删除文件{1}处的会话{0}]
fileStore.saving=保存会话[{0}]到文件[{1}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 8155d5d..c7e6a59 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -65,6 +65,7 @@ contextConfig.jarFile=无法处理Jar[{0}]的注解
contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
contextConfig.jspFile.warning=警告：在Servlet 2.4 中，JSP文件[{0}]必须以‘/’开头
contextConfig.missingRealm=对应的认证领域未配置
+contextConfig.noAntiLocking=配置
java.io.tmpdir的值[{0}]未指向有效路径。Web应用[{1}]antiResourceLocking配置将被忽略
contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
contextConfig.processAnnotationsJar.debug=扫描jar文件中注解[{0}]的类文件
contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class
文件
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index b5093ec..7a47a98 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -127,6 +127,8 @@ http.511.reason=需要网络身份验证
jdbcAccessLogValve.close=无法关闭数据库。
jdbcAccessLogValve.exception=执行插入访问项时发生异常
+persistentValve.filter.failure=无法编译filter=[{0}]
+
remoteCidrValve.invalid=为{0}提供的配置无效。有关详细信息，请参阅以前的消息
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
diff --git
a/java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties
index 1053848..9061943 100644
---
[tomcat] 05/05: Improvements to Spanish translations
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 0e1c28061a962d016580317117d6577495e6fbfd
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:39:46 2020 +0100
Improvements to Spanish translations
Provided by Andrewlanecarr
---
java/org/apache/catalina/manager/LocalStrings_es.properties| 1 +
java/org/apache/catalina/tribes/group/LocalStrings_es.properties | 1 +
java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties | 1 +
webapps/docs/changelog.xml | 4
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 743e99c..298767f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -62,6 +62,7 @@ htmlManagerServlet.manager=Gestor
htmlManagerServlet.messageLabel=Mensaje:
htmlManagerServlet.noManager=-
htmlManagerServlet.noVersion=Ninguno especificado
+htmlManagerServlet.osFreePageFile=Archivo de página gratis:
htmlManagerServlet.osTotalPageFile=Tamaño total de archivo de página:
htmlManagerServlet.serverHostname=NombreDeMáquina
htmlManagerServlet.serverIPAddress=Dirección IP
diff --git a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
index 0a03ba0..7aae463 100644
--- a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+channelCoordinator.alreadyStarted=Canal ya iniciado para nivel:[{0}]
channelCoordinator.invalid.startLevel=Nivel de inicion inválido, los niveles
válidos son:SND_RX_SEQ,SND_TX_SEQ,MBR_TX_SEQ,MBR_RX_SEQ\n
groupChannel.listener.alreadyExist=El escuchador ya existe:[{0}][{1}]
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
index ea47f45..fe54155 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
@@ -20,6 +20,7 @@ engine.openSSLError=Error de OpenSSL: [{0}] mensage: [{1}]\n
engine.writeToSSLFailed=Fallo al escribir hacia SSL, resultado: [{0}]
openssl.addedClientCaCert=Ceritifcado CA de cliente adicionado: [{0}]
+openssl.keyManagerMissing=No se encontró gerente de llave
openssl.trustManagerMissing=No se encontró un manejador confiable
opensslconf.checkFailed=Fallo mientras se chequeaba OpenSSLConf\n
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4dbd5d6..a9e1e46 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -237,6 +237,10 @@
Improvements to Korean translations. (woonsan)
+
+Improvements to Spanish translations. Provided by Andrewlanecarr.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #361: Add a GitHub action to lint the Markdown and YAML files.
markt-asf commented on pull request #361: URL: https://github.com/apache/tomcat/pull/361#issuecomment-703802985 A couple of those files appear to be missing ALv2 headers. On that topic, it looks like the markdown files need an ALv2 header if possible as well. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #368: fix: CachedResource add path length
markt-asf commented on pull request #368: URL: https://github.com/apache/tomcat/pull/368#issuecomment-703797902 Fixed in: - master for 10.0.0-M9 onwards - 9.0.x for 9.0.39 onwards - 8.5.x for 8.5.59 onwards This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #368: fix: CachedResource add path length
markt-asf closed pull request #368: URL: https://github.com/apache/tomcat/pull/368 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Allow for path length in cached resource size
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
The following commit(s) were added to refs/heads/8.5.x by this push:
new c1087c8 Allow for path length in cached resource size
c1087c8 is described below
commit c1087c8c880e1b52f7865807a119aee9b741bd3b
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:05:57 2020 +0100
Allow for path length in cached resource size
Based on PR #368
---
java/org/apache/catalina/webresources/CachedResource.java | 4
webapps/docs/changelog.xml| 5 +
2 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index db4c6d5..ea15590 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -414,6 +414,10 @@ public class CachedResource implements WebResource {
// case but it makes tracking the current cache size easier.
long getSize() {
long result = CACHE_ENTRY_SIZE;
+// Longer paths use a noticeable amount of memory so account for this
in
+// the cache size. The fixed component of a String instance's memory
+// usage is accounted for in the 500 bytes above.
+result += getWebappPath().length() * 2;
if (getContentLength() <= objectMaxSizeBytes) {
result += getContentLength();
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1bd2ef3..3ea042d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -84,6 +84,11 @@
options to enable reflection required by the memory leak prevention /
detection code. (markt)
+
+When estimating the size of a resource in the static resource cache,
+include a specific allowance for the path to the resource. Based on a
+pull request by blueSky1825821. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Allow for path length in cached resource size
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e0d344f Allow for path length in cached resource size
e0d344f is described below
commit e0d344fa717b297d6569a2ce7d60c2e18283d8a0
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:05:57 2020 +0100
Allow for path length in cached resource size
Based on PR #368
---
java/org/apache/catalina/webresources/CachedResource.java | 4
webapps/docs/changelog.xml| 5 +
2 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index db4c6d5..ea15590 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -414,6 +414,10 @@ public class CachedResource implements WebResource {
// case but it makes tracking the current cache size easier.
long getSize() {
long result = CACHE_ENTRY_SIZE;
+// Longer paths use a noticeable amount of memory so account for this
in
+// the cache size. The fixed component of a String instance's memory
+// usage is accounted for in the 500 bytes above.
+result += getWebappPath().length() * 2;
if (getContentLength() <= objectMaxSizeBytes) {
result += getContentLength();
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 55b3b94..b715981 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,6 +108,11 @@
Add connection pooling to JNDI realm. (remm)
+
+When estimating the size of a resource in the static resource cache,
+include a specific allowance for the path to the resource. Based on a
+pull request by blueSky1825821. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Allow for path length in cached resource size
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
The following commit(s) were added to refs/heads/master by this push:
new b8819c3 Allow for path length in cached resource size
b8819c3 is described below
commit b8819c3d137007b3f2957aa83eee4bbdd7e65a38
Author: Mark Thomas
AuthorDate: Mon Oct 5 19:05:57 2020 +0100
Allow for path length in cached resource size
Based on PR #368
---
java/org/apache/catalina/webresources/CachedResource.java | 4
webapps/docs/changelog.xml| 5 +
2 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index db4c6d5..ea15590 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -414,6 +414,10 @@ public class CachedResource implements WebResource {
// case but it makes tracking the current cache size easier.
long getSize() {
long result = CACHE_ENTRY_SIZE;
+// Longer paths use a noticeable amount of memory so account for this
in
+// the cache size. The fixed component of a String instance's memory
+// usage is accounted for in the 500 bytes above.
+result += getWebappPath().length() * 2;
if (getContentLength() <= objectMaxSizeBytes) {
result += getContentLength();
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 37185e9..57077e9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,6 +106,11 @@
options to enable reflection required by the memory leak prevention /
detection code. (markt)
+
+When estimating the size of a resource in the static resource cache,
+include a specific allowance for the path to the resource. Based on a
+pull request by blueSky1825821. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #368: fix: CachedResource add path length
markt-asf commented on pull request #368: URL: https://github.com/apache/tomcat/pull/368#issuecomment-703794569 I've done some calculations and the absolute upper limit (the actual upper limit will be lower) is that a cache with a 10MB limit on size will actually use a little under 175MB. That isn't great but it isn't terrible either. I'll tweak the resource size calculation so it includes an approximate of the memory required to store the path. The proposed patch has a couple of issues: - It converts the string to bytes to determine the size. This is both expensive and wrong. String length *2 +38 is a much closer approximation and I intend to ignore the 38 as that is already accounted for in the 500 byte overhead for each entry. - It includes the path size when determining if the resource exceeds the max object size (and hence won't have the content cached) but does not include the path size when performing the same check to determine when deciding whether to cache the content or not. I should have a fix for this committed shortly. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/478 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] d476fd67a6899dd62c64d6a1381460aeef304d98 Blamelist: Mark Thomas ,remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Remove unnecessary code and avoid potential NPEs. Thanks to SpotBugs.
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 95658dfd868216db0773c38aad8eebf544024b09
Author: Mark Thomas
AuthorDate: Fri Mar 6 12:17:03 2020 +
Remove unnecessary code and avoid potential NPEs. Thanks to SpotBugs.
---
java/org/apache/catalina/realm/JNDIRealm.java | 6 --
1 file changed, 6 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 9bfa7a2..b0020c0 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1321,9 +1321,6 @@ public class JNDIRealm extends RealmBase {
// Log the problem for posterity
containerLog.error(sm.getString("jndiRealm.exception"), e);
-// Close the connection so that it gets reopened next time
-close(connection);
-
// Return "not authenticated" for this request
if (containerLog.isDebugEnabled())
containerLog.debug("Returning null principal.");
@@ -2295,9 +2292,6 @@ System.out.println("getUserBySearch " + username);
// Log the problem for posterity
containerLog.error(sm.getString("jndiRealm.exception"), e);
-// Close the connection so that it gets reopened next time
-close(connection);
-
// Return "not authenticated" for this request
return null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Remove leftover debug
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 659cfc62fda871dba53fd908677017cf05fbbcf7
Author: remm
AuthorDate: Thu Jan 30 18:02:43 2020 +0100
Remove leftover debug
---
java/org/apache/catalina/realm/JNDIRealm.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index a6f5a7c..9bfa7a2 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1718,7 +1718,6 @@ System.out.println("getUserBySearch " + username);
// Retrieve values of userRoleName attribute
ArrayList roles = null;
-System.out.println("userRoleName " + userRoleName + " " +
attrs.get(userRoleName));
if (userRoleName != null)
roles = addAttributeValues(userRoleName, attrs, roles);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Remove leftover debug
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d476fd67a6899dd62c64d6a1381460aeef304d98
Author: remm
AuthorDate: Mon Oct 5 13:39:53 2020 +0200
Remove leftover debug
---
java/org/apache/catalina/realm/JNDIRealm.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index b0020c0..b9acc42 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1659,7 +1659,6 @@ public class JNDIRealm extends RealmBase {
if (attrIds == null)
attrIds = new String[0];
constraints.setReturningAttributes(attrIds);
-System.out.println("getUserBySearch " + username);
NamingEnumeration results =
connection.context.search(userBase, filter, constraints);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/05: Add connection pool to JNDI realm
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f931272639155d11a133e974ca8349243ae9c403
Author: remm
AuthorDate: Thu Jan 30 17:22:51 2020 +0100
Add connection pool to JNDI realm
This implements a TODO from the class javadoc header.
As described in the javadoc, the idea is to use a pool to avoid blocking
on a single connection, which could possibly become a bottleneck in some
cases. The message formats need to be kept along with the connection
since they are not thread safe.
Preserve the default behavior: sync without pooling (using a Lock object
which is more flexible).
I may backport this since this is limited to the JNDI realm, but only
once it is confirmed to be regression free. Tested with ApacheDS but my
LDAP skills are very limited.
---
java/org/apache/catalina/realm/JNDIRealm.java | 442 -
.../apache/catalina/realm/LocalStrings.properties | 1 +
test/org/apache/catalina/realm/TestJNDIRealm.java | 7 +-
webapps/docs/changelog.xml | 3 +
webapps/docs/config/realm.xml | 7 +
5 files changed, 276 insertions(+), 184 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index cc570b1..a6f5a7c 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -32,6 +32,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
import javax.naming.AuthenticationException;
import javax.naming.CommunicationException;
@@ -61,6 +63,7 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory;
import org.apache.catalina.LifecycleException;
+import org.apache.tomcat.util.collections.SynchronizedStack;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSName;
@@ -166,10 +169,6 @@ import org.ietf.jgss.GSSName;
* directory server itself.
*
*
- * TODO - Support connection pooling (including message
- * format objects) so that authenticate() does not have to be
- * synchronized.
- *
* WARNING - There is a reported bug against the Netscape
* provider code (com.netscape.jndi.ldap.LdapContextFactory) with respect to
* successfully authenticated a non-existing user. The
@@ -209,12 +208,6 @@ public class JNDIRealm extends RealmBase {
/**
- * The directory context linking us to our directory server.
- */
-protected DirContext context = null;
-
-
-/**
* The JNDI context factory used to acquire our InitialContext. By
* default, assumes use of an LDAP server using the standard JNDI LDAP
* provider.
@@ -283,13 +276,6 @@ public class JNDIRealm extends RealmBase {
/**
- * The MessageFormat object associated with the current
- * userSearch.
- */
-protected MessageFormat userSearchFormat = null;
-
-
-/**
* Should we search the entire subtree for matching users?
*/
protected boolean userSubtree = false;
@@ -329,32 +315,12 @@ public class JNDIRealm extends RealmBase {
/**
- * An array of MessageFormat objects associated with the current
- * userPatternArray.
- */
-protected MessageFormat[] userPatternFormatArray = null;
-
-/**
* The base element for role searches.
*/
protected String roleBase = "";
/**
- * The MessageFormat object associated with the current
- * roleBase.
- */
-protected MessageFormat roleBaseFormat = null;
-
-
-/**
- * The MessageFormat object associated with the current
- * roleSearch.
- */
-protected MessageFormat roleFormat = null;
-
-
-/**
* The name of an attribute in the user's entry containing
* roles for that user
*/
@@ -500,6 +466,30 @@ public class JNDIRealm extends RealmBase {
private boolean forceDnHexEscape = false;
+/**
+ * Non pooled connection to our directory server.
+ */
+protected JNDIConnection singleConnection = new JNDIConnection();
+
+
+/**
+ * The lock to ensure single connection thread safety.
+ */
+protected final Lock singleConnectionLock = new ReentrantLock();
+
+
+/**
+ * Connection pool.
+ */
+protected SynchronizedStack connectionPool = null;
+
+
+/**
+ * The pool size limit. If 1, pooling is not used.
+ */
+protected int connectionPoolSize = 1;
+
+
// - Properties
public boolean getForceDnHexEscape() {
@@ -728,13 +718,8 @@ public class JNDIRealm extends RealmBase {
* @param userSearch The new user search pattern
*/
public void setUserSearch(String userSearch) {
-
[tomcat] 02/05: Fix changelog
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 77db3cc10a3e8b98e06c95468c110d2b43c6560c Author: remm AuthorDate: Mon Oct 5 16:13:34 2020 +0200 Fix changelog --- webapps/docs/changelog.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ac75daa..55b3b94 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,9 @@ options to enable reflection required by the memory leak prevention / detection code. (markt) + +Add connection pooling to JNDI realm. (remm) + @@ -10186,9 +10189,6 @@ Update the internal fork of Commons Codec to r1725746 (1.9 plus additional fixes). (markt) - -Add connection pooling to JNDI realm. (remm) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (dac7109 -> d476fd6)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from dac7109 Added .vscode to gitignore new f931272 Add connection pool to JNDI realm new 77db3cc Fix changelog new 659cfc6 Remove leftover debug new 95658df Remove unnecessary code and avoid potential NPEs. Thanks to SpotBugs. new d476fd6 Remove leftover debug The 5 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: java/org/apache/catalina/realm/JNDIRealm.java | 442 - .../apache/catalina/realm/LocalStrings.properties | 1 + test/org/apache/catalina/realm/TestJNDIRealm.java | 7 +- webapps/docs/changelog.xml | 3 + webapps/docs/config/realm.xml | 7 + 5 files changed, 272 insertions(+), 188 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove leftover debug
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 48f947e Remove leftover debug
48f947e is described below
commit 48f947e6f358b38ac5f59a774369d4a099d30496
Author: remm
AuthorDate: Mon Oct 5 13:39:53 2020 +0200
Remove leftover debug
---
java/org/apache/catalina/realm/JNDIRealm.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 445834e..9ab4c10 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1659,7 +1659,6 @@ public class JNDIRealm extends RealmBase {
if (attrIds == null)
attrIds = new String[0];
constraints.setReturningAttributes(attrIds);
-System.out.println("getUserBySearch " + username);
NamingEnumeration results =
connection.context.search(userBase, filter, constraints);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #4: Download of Release
markt-asf commented on issue #4: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/4#issuecomment-703474248 We'd need to go through the ASF release process (not arduous but requires a little setting up as this is a new deliverable for the Tomcat project) and the primary release channel would need to be via the Tomcat website and the ASF mirror system. Additional channels, such as GitHub, could be added fairly easily if required. I can see this module being used as a component in other tools so Maven Central may make sense as well. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] martin-g commented on issue #4: Download of Release
martin-g commented on issue #4: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/4#issuecomment-703465446 Since this tool is not supposed to be used as a (Maven/Gradle) dependency there is no really point in uploading it to Maven Central. But we can publish GitHub releases - https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/managing-releases-in-a-repository. WDYT ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: TCK status
Thanks Mark for the update. Some specs are final already. Some are still being worked on, like WebSocket which is a bit late at the moment. If you are willing to help on this one, feel free to jump in. Le sam. 3 oct. 2020 à 20:39, Mark Thomas a écrit : > Hi all, > > I mentioned TCK status during a couple of ApacheCon presentations. > Having checked the current status I thought it would be worth sending a > brief note to the list. More detail is on the wiki: > https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs > > The short version is: > > - EL: all tests pass > - JSP: all tests pass (once the TCK regression is fixed) > - WebSocket: all tests pass > - Servlet: one failure (expected) > > So, all good. No issues. > > Mark > > P.S. If you are wondering the servlet failure is because Tomcat ignores > any suggested context path in web.xml and will ALWAYS derive the context > path from the file name to avoid ambiguities and conflicts. > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Jean-Louis
