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 77ad603e5e1201a754f357b1f648f4e65e8f8635
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 17:10:04 2020 +0100
More spelling fixes for org.apache.catalina
---
java/org/apache/catalina/manager/LocalStrings.properties | 2 +-
.../org/apache/catalina/manager/LocalStrings_fr.properties | 2 +-
.../org/apache/catalina/manager/LocalStrings_ja.properties | 2 +-
.../org/apache/catalina/manager/LocalStrings_ko.properties | 2 +-
.../org/apache/catalina/manager/LocalStrings_ru.properties | 2 +-
.../apache/catalina/manager/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/manager/StatusManagerServlet.java | 2 +-
java/org/apache/catalina/servlets/LocalStrings.properties | 2 +-
.../apache/catalina/servlets/LocalStrings_es.properties | 2 +-
.../apache/catalina/servlets/LocalStrings_fr.properties | 2 +-
.../apache/catalina/servlets/LocalStrings_ja.properties | 2 +-
.../apache/catalina/servlets/LocalStrings_ko.properties | 2 +-
.../apache/catalina/servlets/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/servlets/WebdavServlet.java | 2 +-
.../tribes/group/interceptors/NonBlockingCoordinator.java | 4 ++--
.../org/apache/catalina/valves/AbstractAccessLogValve.java | 14 +++++++-------
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties
b/java/org/apache/catalina/manager/LocalStrings.properties
index a1116c5..1f0e3de 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -30,7 +30,7 @@ htmlManagerServlet.configSslHostName=TLS host name (optional)
htmlManagerServlet.configSslReloadTitle=Re-read TLS configuration files
htmlManagerServlet.configTitle=Configuration
htmlManagerServlet.connectorStateAliveSocketCount=Keep alive sockets count:
-htmlManagerServlet.connectorStateBytesRecieved=Bytes received:
+htmlManagerServlet.connectorStateBytesReceived=Bytes received:
htmlManagerServlet.connectorStateBytesSent=Bytes sent:
htmlManagerServlet.connectorStateErrorCount=Error count:
htmlManagerServlet.connectorStateHint=P: Parse and prepare request S: Service
F: Finishing R: Ready K: Keepalive
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index d1a5e2e..597b38b 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -30,7 +30,7 @@ htmlManagerServlet.configSslHostName=Nom d'hôte TLS
(optionnel)
htmlManagerServlet.configSslReloadTitle=Relisant les fichiers de configuration
TLS
htmlManagerServlet.configTitle=Configuration
htmlManagerServlet.connectorStateAliveSocketCount=Nombre de sockets connectés :
-htmlManagerServlet.connectorStateBytesRecieved=Octets reçus :
+htmlManagerServlet.connectorStateBytesReceived=Octets reçus :
htmlManagerServlet.connectorStateBytesSent=Octets envoyés :
htmlManagerServlet.connectorStateErrorCount=Nombre d'erreurs :
htmlManagerServlet.connectorStateHint=P : Traitement et préparation de la
requête S : Service F : Fin R : Prêt K : Connecté
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 044bac2..5782138 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -30,7 +30,7 @@ htmlManagerServlet.configSslHostName=TLSホスト名（オプション）
htmlManagerServlet.configSslReloadTitle=TLS構成ファイルを再読み込みします。
htmlManagerServlet.configTitle=構成ファイル
htmlManagerServlet.connectorStateAliveSocketCount=キープアライブソケット数：
-htmlManagerServlet.connectorStateBytesRecieved=受信バイト数：
+htmlManagerServlet.connectorStateBytesReceived=受信バイト数：
htmlManagerServlet.connectorStateBytesSent=送信バイト：
htmlManagerServlet.connectorStateErrorCount=エラー数：
htmlManagerServlet.connectorStateHint=P：パースとリクエスト準備 S：サービス F：終了 R：Ready
K：キープアライブ
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties
b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 3307f95..d366f23 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -30,7 +30,7 @@ htmlManagerServlet.configSslHostName=TLS 호스트 이름 (선택 사항)
htmlManagerServlet.configSslReloadTitle=TLS 설정 파일들을 다시 읽습니다.
htmlManagerServlet.configTitle=설정
htmlManagerServlet.connectorStateAliveSocketCount=Keep alive 소켓 개수:
-htmlManagerServlet.connectorStateBytesRecieved=수신된 바이트 크기:
+htmlManagerServlet.connectorStateBytesReceived=수신된 바이트 크기:
htmlManagerServlet.connectorStateBytesSent=전송된 바이트 크기:
htmlManagerServlet.connectorStateErrorCount=오류 개수:
htmlManagerServlet.connectorStateHint=P: 요청을 파싱 또는 준비, S: 서비스, F: 완료 R: 준비 K:
Keepalive
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 7dfa87b..0cd21dd 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -30,7 +30,7 @@ htmlManagerServlet.configSslHostName=Имя TLS хоста (не обязате
htmlManagerServlet.configSslReloadTitle=Перечитать конфигурационные файлы TLS
htmlManagerServlet.configTitle=Конфигурация
htmlManagerServlet.connectorStateAliveSocketCount=Количество всё ещё живых
сокетов:
-htmlManagerServlet.connectorStateBytesRecieved=Байтов получено:
+htmlManagerServlet.connectorStateBytesReceived=Байтов получено:
htmlManagerServlet.connectorStateBytesSent=Байтов отправлено:
htmlManagerServlet.connectorStateErrorCount=Количество ошибок:
htmlManagerServlet.connectorStateHint=P: Разбирается и готовится к обработке,
S: Сервис, F: Завершение, R: Готов, K: Продолжает существовать
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index fc9c225..0d1664d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -30,7 +30,7 @@ htmlManagerServlet.configSslHostName=TLS 主机名字（可选)
htmlManagerServlet.configSslReloadTitle=重新读取 TLS 配置文件
htmlManagerServlet.configTitle=配置
htmlManagerServlet.connectorStateAliveSocketCount=存活套接字总数：
-htmlManagerServlet.connectorStateBytesRecieved=收到字节：
+htmlManagerServlet.connectorStateBytesReceived=收到字节：
htmlManagerServlet.connectorStateBytesSent=发送.字节:
htmlManagerServlet.connectorStateErrorCount=错误数：
htmlManagerServlet.connectorStateHint=P：解析和准备request S：服务 F：结束 R：就绪 K：存活
diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java
b/java/org/apache/catalina/manager/StatusManagerServlet.java
index ec02588..f39370d 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -323,7 +323,7 @@ public class StatusManagerServlet
args[5] =
smClient.getString("htmlManagerServlet.connectorStateProcessingTime");
args[6] =
smClient.getString("htmlManagerServlet.connectorStateRequestCount");
args[7] =
smClient.getString("htmlManagerServlet.connectorStateErrorCount");
- args[8] =
smClient.getString("htmlManagerServlet.connectorStateBytesRecieved");
+ args[8] =
smClient.getString("htmlManagerServlet.connectorStateBytesReceived");
args[9] =
smClient.getString("htmlManagerServlet.connectorStateBytesSent");
args[10] =
smClient.getString("htmlManagerServlet.connectorStateTableTitleStage");
args[11] =
smClient.getString("htmlManagerServlet.connectorStateTableTitleTime");
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 984766f..226a3ae 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -50,6 +50,6 @@ directory.parent=Up To [{0}]
directory.size=Size
directory.title=Directory Listing For [{0}]
-webdavservlet.enternalEntityIgnored=The request included a reference to an
external entity with PublicID [{0}] and SystemID [{1}] which was ignored
+webdavservlet.externalEntityIgnored=The request included a reference to an
external entity with PublicID [{0}] and SystemID [{1}] which was ignored
webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
webdavservlet.jaxpfailed=JAXP initialization failed
diff --git a/java/org/apache/catalina/servlets/LocalStrings_es.properties
b/java/org/apache/catalina/servlets/LocalStrings_es.properties
index c96df05..d56dc2c 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_es.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_es.properties
@@ -32,5 +32,5 @@ directory.parent=Atrás A [{0}]
directory.size=Medida
directory.title=Listado de Directorio Para [{0}]
-webdavservlet.enternalEntityIgnored=El requerimiento incluía una referencia a
una entidad externa con PublicID [{0}] y SystemID [{1}] que fue ignorada
+webdavservlet.externalEntityIgnored=El requerimiento incluía una referencia a
una entidad externa con PublicID [{0}] y SystemID [{1}] que fue ignorada
webdavservlet.jaxpfailed=Falló la inicialización de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index ba4fb38..e9604af 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -50,6 +50,6 @@ directory.parent=Jusqu''à [{0}]
directory.size=Taille
directory.title=Liste du répertoire pour [{0}]
-webdavservlet.enternalEntityIgnored=La requête a inclus une référence à une
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
+webdavservlet.externalEntityIgnored=La requête a inclus une référence à une
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
webdavservlet.inputstreamclosefail=Impossible de fermer le flux d''entrée pour
[{0}]
webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index bc7e932..c927cbc 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -50,6 +50,6 @@ directory.parent=[{0}] に移動
directory.size=サイズ
directory.title=[{0}] のディレクトリの一覧
-webdavservlet.enternalEntityIgnored=PublicID [{0}]およびSystemID
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
+webdavservlet.externalEntityIgnored=PublicID [{0}]およびSystemID
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
webdavservlet.inputstreamclosefail=入力ストリーム [{0}] を切断できません。
webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ko.properties
b/java/org/apache/catalina/servlets/LocalStrings_ko.properties
index 3a02021..acf1a25 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ko.properties
@@ -50,6 +50,6 @@ directory.parent=상위로: [{0}]
directory.size=크기
directory.title=[{0}]을(를) 위한 디렉토리 목록 표시
-webdavservlet.enternalEntityIgnored=요청이, PublicID가 [{0}]이고 SystemID가 [{1}]인 외부
엔티티에 대한 참조를 포함했는데, 이는 무시되었습니다.
+webdavservlet.externalEntityIgnored=요청이, PublicID가 [{0}]이고 SystemID가 [{1}]인 외부
엔티티에 대한 참조를 포함했는데, 이는 무시되었습니다.
webdavservlet.inputstreamclosefail=[{0}]의 입력 스트림을 닫지 못했습니다.
webdavservlet.jaxpfailed=JAXP의 초기화가 실패했습니다.
diff --git a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
index 3bf7e35..b28dc2c 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
@@ -50,6 +50,6 @@ directory.parent=最多[{0}]
directory.size=大小
directory.title=[{0}]的目录列表
-webdavservlet.enternalEntityIgnored=请求包含对PublicID[{0}]和SystemID[{1}]的外部实体的引用，该引用被忽略。
+webdavservlet.externalEntityIgnored=请求包含对PublicID[{0}]和SystemID[{1}]的外部实体的引用，该引用被忽略。
webdavservlet.inputstreamclosefail=无法关闭[{0}]的输入流
webdavservlet.jaxpfailed=JAXP 初始化失败
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 30db796..d0a9e69 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -2505,7 +2505,7 @@ public class WebdavServlet extends DefaultServlet {
@Override
public InputSource resolveEntity (String publicId, String systemId) {
- context.log(sm.getString("webdavservlet.enternalEntityIgnored",
+ context.log(sm.getString("webdavservlet.externalEntityIgnored",
publicId, systemId));
return new InputSource(
new StringReader("Ignored external entity"));
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index 5c2c534..f00b380 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -46,7 +46,7 @@ import org.apache.juli.logging.LogFactory;
* <p>Title: Auto merging leader election algorithm</p>
*
* <p>Description: Implementation of a simple coordinator algorithm that not
only selects a coordinator,
- * it also merges groups automatically when members are discovered that
werent part of the
+ * it also merges groups automatically when members are discovered that
weren't part of the
* </p>
* <p>This algorithm is non blocking meaning it allows for transactions while
the coordination phase is going on
* </p>
@@ -845,4 +845,4 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
}
-}
\ No newline at end of file
+}
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index a6c1622..1d113ed 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -1030,7 +1030,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
* formatting of SimpleDateFormat by our own handling
*/
private static final String msecPattern = "{#}";
- private static final String trippleMsecPattern =
+ private static final String tripleMsecPattern =
msecPattern + msecPattern + msecPattern;
/* Our format description string, null if CLF */
@@ -1149,17 +1149,17 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
String temp = localDateCache.get().getFormat(format, locale,
timestamp);
if (usesMsecs) {
frac = timestamp % 1000;
- StringBuilder trippleMsec = new StringBuilder(4);
+ StringBuilder tripleMsec = new StringBuilder(4);
if (frac < 100) {
if (frac < 10) {
- trippleMsec.append('0');
- trippleMsec.append('0');
+ tripleMsec.append('0');
+ tripleMsec.append('0');
} else {
- trippleMsec.append('0');
+ tripleMsec.append('0');
}
}
- trippleMsec.append(frac);
- temp = temp.replace(trippleMsecPattern, trippleMsec);
+ tripleMsec.append(frac);
+ temp = temp.replace(tripleMsecPattern, tripleMsec);
temp = temp.replace(msecPattern, Long.toString(frac));
}
buf.append(temp);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
