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 f3759ed Fix spellings in org.apache.catalina
f3759ed is described below
commit f3759edf70645bd649fb2403ac40eee981f51b6a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 16:39:19 2020 +0100
Fix spellings in org.apache.catalina
Based on a PR provided by John Bampton
i18n keys, local variables, Javadoc and private methods and private
classes so changes are low risk
---
java/org/apache/catalina/authenticator/AuthenticatorBase.java | 4 ++--
java/org/apache/catalina/core/AsyncContextImpl.java | 2 +-
java/org/apache/catalina/core/LocalStrings.properties | 2 +-
java/org/apache/catalina/core/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/core/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/core/LocalStrings_ko.properties | 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/filters/ExpiresFilter.java | 6 +++---
java/org/apache/catalina/filters/LocalStrings.properties | 2 +-
java/org/apache/catalina/filters/LocalStrings_es.properties | 2 +-
java/org/apache/catalina/filters/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/filters/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/filters/LocalStrings_ko.properties | 2 +-
java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/ha/deploy/FileMessageFactory.java | 4 ++--
java/org/apache/catalina/loader/LocalStrings.properties | 4 ++--
java/org/apache/catalina/loader/LocalStrings_fr.properties | 4 ++--
java/org/apache/catalina/loader/LocalStrings_ja.properties | 4 ++--
java/org/apache/catalina/loader/LocalStrings_ko.properties | 4 ++--
java/org/apache/catalina/loader/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 4 ++--
java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java | 2 +-
java/org/apache/catalina/ssi/SSIConditional.java | 4 ++--
java/org/apache/catalina/startup/Catalina.java | 2 +-
java/org/apache/catalina/startup/LocalStrings.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java | 2 +-
.../apache/catalina/tribes/transport/nio/NioReplicationTask.java | 2 +-
java/org/apache/catalina/tribes/util/StringManager.java | 2 +-
java/org/apache/catalina/tribes/util/UUIDGenerator.java | 4 ++--
java/org/apache/catalina/util/ParameterMap.java | 2 +-
java/org/apache/catalina/valves/rewrite/Substitution.java | 8 ++++----
35 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 0951d00..b053e49 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -229,7 +229,7 @@ public abstract class AuthenticatorBase extends ValveBase
* {@link RemoteIpFilter} mark a forwarded request with the
* {@link Globals#REQUEST_FORWARDED_ATTRIBUTE} this authenticator can
return the
* values of {@link HttpServletRequest#getRemoteUser()} and
- * {@link HttpServletRequest#getAuthType()} as reponse headers {@code
remote-user}
+ * {@link HttpServletRequest#getAuthType()} as response headers {@code
remote-user}
* and {@code auth-type} to a reverse proxy. This is useful, e.g., for
access log
* consistency or other decisions to make.
*/
@@ -1240,7 +1240,7 @@ public abstract class AuthenticatorBase extends ValveBase
}
// Fix for Bug 10040
- // Always associate a session with a new SSO reqistration.
+ // Always associate a session with a new SSO registration.
// SSO entries are only removed from the SSO registry map when
// associated sessions are destroyed; if a new SSO entry is created
// above for this request and the user never revisits the context, the
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 2f6db1c..05743b8 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -580,7 +580,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
try {
applicationDispatcher.dispatch(servletRequest,
servletResponse);
} catch (Exception e) {
- throw new
RuntimeException(sm.getString("asyncContextImpl.asyncDispachError"), e);
+ throw new
RuntimeException(sm.getString("asyncContextImpl.asyncDispatchError"), e);
}
}
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 787d4ba..2332b7d 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -92,7 +92,7 @@ aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has
already been initia
aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already
been initialized
aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of
AprLifecycleListener: [{0}]
-asyncContextImpl.asyncDispachError=Error during asynchronous dispatch
+asyncContextImpl.asyncDispatchError=Error during asynchronous dispatch
asyncContextImpl.asyncRunnableError=Error during processing of asynchronous
Runnable via AsyncContext.start()
asyncContextImpl.dispatchingStarted=Asynchronous dispatch operation has
already been called. Additional asynchronous dispatch operation within the same
asynchronous cycle is not allowed.
asyncContextImpl.fireOnComplete=Firing onComplete() event for any
AsyncListeners
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 0dd5d95..d227738 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -91,7 +91,7 @@ aprListener.tooLateForSSLEngine=Impossible d'appeler
setSSEEngine, SSL a déjà
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible : SSL a déjà
été initialisé
aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de
AprLifecycleListener : [{0}]
-asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
+asyncContextImpl.asyncDispatchError=Erreur lors d'un dispatch asynchrone
asyncContextImpl.asyncRunnableError=Erreur lors du traitement asynchrone du
Runnable via AsyncContext.start()
asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a
déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est
pas autorisé
asyncContextImpl.fireOnComplete=Déclenchement de l'évènement onComplete() sur
tous les AsyncListeners
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 24b73df..018aff9 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -91,7 +91,7 @@ aprListener.tooLateForSSLEngine=setSSLEngine出来ません：SSLはすでに初
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeedできません：SSLは既に初期化されています。
aprListener.wrongFIPSMode=AprLifecycleListener の設定 FIPSMode に予期せぬ値 [{0}]
が指定されました。
-asyncContextImpl.asyncDispachError=非同期ディスパッチの処理中にエラーが発生しました。
+asyncContextImpl.asyncDispatchError=非同期ディスパッチの処理中にエラーが発生しました。
asyncContextImpl.asyncRunnableError=AsyncContext.start() による非同期 Runnable
処理中のエラー
asyncContextImpl.dispatchingStarted=非同期ディスパッチ操作は既に呼び出されています。
同じ非同期サイクル内の追加の非同期ディスパッチ操作は許可されません。
asyncContextImpl.fireOnComplete=非同期リスナに onComploete() イベントを発火しました
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 57906b9..4521d76 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -91,7 +91,7 @@ aprListener.tooLateForSSLEngine=setSSLEngine을 호출할 수 없습니다: SSL
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed를 호출할 수 없습니다: SSL이 이미
초기화되어 있습니다.
aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의 FIPSMode 옵션 값: [{0}]
-asyncContextImpl.asyncDispachError=비동기 디스패치 도중 오류 발생
+asyncContextImpl.asyncDispatchError=비동기 디스패치 도중 오류 발생
asyncContextImpl.asyncRunnableError=AsyncContext.start()를 통해, 비동기로 Runnable을
처리하는 도중 오류 발생
asyncContextImpl.dispatchingStarted=비동기 디스패치 오퍼레이션이 이미 호출되었습니다. 동일한 비동기 사이클
내에서, 추가적인 비동기 디스패치 오퍼레이션은 허용되지 않습니다.
asyncContextImpl.fireOnComplete=등록된 AsyncListener들에 onComplete() 이벤트를 호출합니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 4128ac3..08a37b9 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -92,7 +92,7 @@ aprListener.tooLateForSSLEngine=无法设置引擎：SSL已初始化
aprListener.tooLateForSSLRandomSeed=无法设置 SSLRandomSeed：SSL已经初始化
aprListener.wrongFIPSMode=AprLifecycleListener的FIPSMode选项的意外值：[{0}]
-asyncContextImpl.asyncDispachError=异步调度时出错
+asyncContextImpl.asyncDispatchError=异步调度时出错
asyncContextImpl.asyncRunnableError=通过AsyncContext.start（）处理异步运行时出错
asyncContextImpl.dispatchingStarted=异步调度操作已经被调用。不允许在同一异步周期内进行其他异步调度操作。
asyncContextImpl.fireOnComplete=为任何异步侦听器触发onComplete（）事件
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index c012563..6394985 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -495,7 +495,7 @@ public class ExpiresFilter extends FilterBase {
private final List<Duration> durations;
/**
- * Starting point of the elaspse to set in the response.
+ * Starting point of the elapse to set in the response.
*/
private final StartingPoint startingPoint;
@@ -1140,7 +1140,7 @@ public class ExpiresFilter extends FilterBase {
/**
* @param str The String to check
* @return {@code true} if the given {@code str} has at least one
- * character (can be a withespace).
+ * character (can be a whitespace).
*/
protected static boolean isNotEmpty(String str) {
return !isEmpty(str);
@@ -1220,7 +1220,7 @@ public class ExpiresFilter extends FilterBase {
if (response.isCommitted()) {
if (log.isDebugEnabled()) {
log.debug(sm.getString(
- "expiresFilter.responseAlreadyCommited",
+ "expiresFilter.responseAlreadyCommitted",
httpRequest.getRequestURL()));
}
chain.doFilter(request, response);
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 649fde6..2e9f564 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -35,7 +35,7 @@ expiresFilter.noDurationUnitAfterAmount=Duration unit not
found after amount [{0
expiresFilter.noExpirationConfigured=Request [{0}] with response status [{1}]
content-type [{2}], no expiration configured
expiresFilter.noExpirationConfiguredForContentType=No Expires configuration
found for content-type [{0}]
expiresFilter.numberError=Exception parsing number at position [{0}] (zero
based) in comma delimited list [{1}]
-expiresFilter.responseAlreadyCommited=Request [{0}], cannot apply
ExpiresFilter on already committed response.
+expiresFilter.responseAlreadyCommitted=Request [{0}], cannot apply
ExpiresFilter on already committed response.
expiresFilter.setExpirationDate=Request [{0}] with response status [{1}]
content-type [{2}], set expiration date [{3}]
expiresFilter.skippedStatusCode=Request [{0}] with response status [{1}]
content-type [{1}], skip expiration header generation for given status
expiresFilter.startingPointInvalid=Invalid starting point
(access|now|modification|a<seconds>|m<seconds>) [{0}] in directive [{1}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_es.properties
b/java/org/apache/catalina/filters/LocalStrings_es.properties
index cf6199c..4582477 100644
--- a/java/org/apache/catalina/filters/LocalStrings_es.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_es.properties
@@ -25,7 +25,7 @@ expiresFilter.expirationHeaderAlreadyDefined=Ya se ha
definido cabecera de expir
expiresFilter.filterInitialized=Filtro inicializado con configuración [{0}]
expiresFilter.noExpirationConfigured=No se ha configurado expiración para el
requerimiento [{0}] con status de respuesta [{1}] y content-type [{2}]
expiresFilter.noExpirationConfiguredForContentType=No se ha hallado
configuración de Expiración para content-type [{0}]
-expiresFilter.responseAlreadyCommited=El requerimiento [{0}], no puede aplicar
ExpiresFilter en respuesta ya acometida.
+expiresFilter.responseAlreadyCommitted=El requerimiento [{0}], no puede
aplicar ExpiresFilter en respuesta ya acometida.
expiresFilter.setExpirationDate=El requerimiento [{0}] con status de respuesta
[{1}] y content-type [{2}], pone fecha de expiración a [{3}]
expiresFilter.skippedStatusCode=Generación de cabecera de expiración saltada
para el requerimiento [{0}] con status de respuesta [{1}] y content-type [{2}]
expiresFilter.startingPointInvalid=Punto de arranque inválido
(access|now|modification|a<seconds>|m<seconds>) [{0}] en la directiva [{1}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index 56652ed..734a65c 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -35,7 +35,7 @@ expiresFilter.noDurationUnitAfterAmount=L''unité de durée
n''a pas été trouv
expiresFilter.noExpirationConfigured=Requête [{0}] avec statut de réponse
[{1}] et content-type [{2}], pas d''expiration configurée
expiresFilter.noExpirationConfiguredForContentType=La configuration "Expires"
pour le type de contenu [{0}] n''est pas trouvée.
expiresFilter.numberError=Erreur lors de l''analyse du nombre à la position
[{0}] (basée sur zéro) de la liste délimitée par une virgule [{1}]
-expiresFilter.responseAlreadyCommited=Impossible d''appliquer le ExpiresFilter
pour la requête [{0}] car la réponse a déjà été envoyée
+expiresFilter.responseAlreadyCommitted=Impossible d''appliquer le
ExpiresFilter pour la requête [{0}] car la réponse a déjà été envoyée
expiresFilter.setExpirationDate=La requête [{0}] avec le status de réponse
[{1}] content-type [{2}], a fixé la date d''expiration [{3}]
expiresFilter.skippedStatusCode=La requête [{0}] avec le code de réponse [{1}]
content-type [{2}], l''en-tête expiration ne sera pas généré pour ce statut
expiresFilter.startingPointInvalid=Point de départ invalide
(access|now|modification|a<secondes>|m<secondes>) [{0}] dans la directive
[{1}]\n
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index 11e25fe..a2e5a4b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -35,7 +35,7 @@
expiresFilter.noDurationUnitAfterAmount=ディレクティブ[{1}]のamount[{0}]
expiresFilter.noExpirationConfigured=リクエスト [{0}] に対するレスポンスは応答コード [{1} コンテントタイプ
[{2}] です。有効期限は未設定です。
expiresFilter.noExpirationConfiguredForContentType=Content-Type [{0}]
に有効期限が設定されていません。
expiresFilter.numberError=カンマ区切りリスト [{1}] の [{0}] 番目（ゼロ開始）の数値を解析中の例外
-expiresFilter.responseAlreadyCommited=リクエスト[{0}]は、すでにコミットされたレスポンスに対してExpiresFilterを適用できません。
+expiresFilter.responseAlreadyCommitted=リクエスト[{0}]は、すでにコミットされたレスポンスに対してExpiresFilterを適用できません。
expiresFilter.setExpirationDate=レスポンスステータス[{1}]のコンテンツタイプ[{2}]、有効期限[{3}]を設定するリクエスト[{0}]
expiresFilter.skippedStatusCode=レスポンスステータス[{1}] content-type
[{1}]のリクエスト[{0}]、指定されたステータスのexpiration ヘッダーの生成をスキップします。
expiresFilter.startingPointInvalid=ディレクティブ[{1}]の無効な開始点（access|now|modification|a<seconds>|m<seconds>）[{0}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_ko.properties
b/java/org/apache/catalina/filters/LocalStrings_ko.properties
index bf28787..4b6d189 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ko.properties
@@ -35,7 +35,7 @@ expiresFilter.noDurationUnitAfterAmount=지시어 [{1}] 내에서, 수량 값 [{
expiresFilter.noExpirationConfigured=요청 [{0}]에 대하여, 응답 상태: [{1}],
content-type: [{2}], expiration헤더는 설정 안됨.
expiresFilter.noExpirationConfiguredForContentType=Content-type [{0}]을(를) 위한
Expires 설정이 존재하지 않습니다.
expiresFilter.numberError=쉼표로 구분된 목록 [{1}] 내의, [{0}]번째 (첫번째 인덱스는 0) 숫자를 파싱하는 중
예외 발생
-expiresFilter.responseAlreadyCommited=요청 [{0}]: 이미 커밋된 응답에 ExpiresFilter를 적용할
수 없습니다.
+expiresFilter.responseAlreadyCommitted=요청 [{0}]: 이미 커밋된 응답에 ExpiresFilter를 적용할
수 없습니다.
expiresFilter.setExpirationDate=요청: [{0}], 응답 상태: [{1}], Content-Type: [{2}].
만료 시간 설정: [{3}]
expiresFilter.skippedStatusCode=응답 상태가 [{1}](이)고 Content-Type이 [{1}]인 요청
[{0}]에 대하여, 주어진 상태를 고려하여 Expiration 헤더 생성을 건너뜁니다.
expiresFilter.startingPointInvalid=지시어 [{1}]에 있는 [{0}]은(는) Expiration 설정의 시작 점
(access|now|modification|a<seconds>|m<seconds>)로서 유효하지 않습니다.
diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index 3cdf7f6..81536ee 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -35,7 +35,7 @@
expiresFilter.noDurationUnitAfterAmount=在指令[{1}]中的amount[{0}]之后找
expiresFilter.noExpirationConfigured=请求[{0}]，其响应状态为[{1}]内容类型[{2}]，未配置到期日期
expiresFilter.noExpirationConfiguredForContentType=没有为 content-type [{0}]
找到过期配置
expiresFilter.numberError=分析逗号分隔列表[{1}中位置[{0}（基于零）处的数字时发生异常
-expiresFilter.responseAlreadyCommited=请求[{0}]，无法对已提交的响应应用ExpiresFilter。
+expiresFilter.responseAlreadyCommitted=请求[{0}]，无法对已提交的响应应用ExpiresFilter。
expiresFilter.setExpirationDate=请求{0}，响应状态为{1}，内容类型为{2}，设置过期日期{3}
expiresFilter.skippedStatusCode=请求{0}，响应状态为{1}，内容类型为{1}，跳过给定状态的过期头生成。
expiresFilter.startingPointInvalid=在指令[{1}]中无效的起点(访问|现在|修改|a<秒>|m<秒>)[{0}]
diff --git a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
index 4c4ab70..020126d 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
@@ -193,8 +193,8 @@ public class FileMessageFactory {
* If EOF is reached, the factory returns null, and closes itself,
otherwise
* the same message is returned as was passed in. This makes sure that not
* more memory is ever used. To remember, neither the file message or the
- * factory are thread safe. dont hand off the message to one thread and
read
- * the same with another.
+ * factory are thread safe. Don't hand off the message to one thread and
+ * read the same with another.
*
* @param f
* FileMessage - the message to be populated with file data
diff --git a/java/org/apache/catalina/loader/LocalStrings.properties
b/java/org/apache/catalina/loader/LocalStrings.properties
index f1b1bf7..d134f04 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -15,8 +15,8 @@
webappClassLoader.addExportsRmi=When running on Java 9 you need to add
"--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" to the JVM command line
arguments to enable RMI Target memory leak detection. Alternatively, you can
suppress this warning by disabling RMI Target memory leak detection.
webappClassLoader.addExportsThreadLocal=When running on Java 9 you need to add
"--add-opens=java.base/java.lang=ALL-UNNAMED" to the JVM command line arguments
to enable ThreadLocal memory leak detection. Alternatively, you can suppress
this warning by disabling ThreadLocal memory leak detection.
-webappClassLoader.addPermisionNoCanonicalFile=Unable to obtain a canonical
file path from the URL [{0}]
-webappClassLoader.addPermisionNoProtocol=The protocol [{0}] in the URL [{1}]
is not supported so no read permission was granted for resources located at
this URL
+webappClassLoader.addPermissionNoCanonicalFile=Unable to obtain a canonical
file path from the URL [{0}]
+webappClassLoader.addPermissionNoProtocol=The protocol [{0}] in the URL [{1}]
is not supported so no read permission was granted for resources located at
this URL
webappClassLoader.addTransformer=Added class file transformer [{0}] to web
application [{1}].
webappClassLoader.addTransformer.duplicate=Duplicate call to add class file
transformer [{0}] to web application [{1}] ignored.
webappClassLoader.addTransformer.illegalArgument=The web application [{0}]
attempted to add a null class file transformer.
diff --git a/java/org/apache/catalina/loader/LocalStrings_fr.properties
b/java/org/apache/catalina/loader/LocalStrings_fr.properties
index 8d1a9a4..0742989 100644
--- a/java/org/apache/catalina/loader/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_fr.properties
@@ -15,8 +15,8 @@
webappClassLoader.addExportsRmi=Quand Java 9 est utilisé, il faut utiliser
"--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" sur la ligne de commande
de la JVM pour activer la détection de fuites de mémoire des cibles RMI ; sinon
cet avertissement peut être supprimé en désactivant cette détection
webappClassLoader.addExportsThreadLocal=Quand Java 9 est utilisé, il faut
utiliser "--add-opens=java.base/java.lang=ALL-UNNAMED" sur la ligne de commande
de la JVM pour activer la détection de fuites de mémoire des ThreadLocal ;
sinon cet avertissement peut être supprimé en désactivant cette détection
-webappClassLoader.addPermisionNoCanonicalFile=Impossible d’obtenir le chemin
de fichier canonique pour l''URL [{0}]
-webappClassLoader.addPermisionNoProtocol=Le protocole [{0}] dans l''URL [{1}]
n''est pas supporté donc aucune permission de lecture n''a été assignée pour
les ressources situées à cette URL
+webappClassLoader.addPermissionNoCanonicalFile=Impossible d’obtenir le chemin
de fichier canonique pour l''URL [{0}]
+webappClassLoader.addPermissionNoProtocol=Le protocole [{0}] dans l''URL [{1}]
n''est pas supporté donc aucune permission de lecture n''a été assignée pour
les ressources situées à cette URL
webappClassLoader.addTransformer=Ajout d''un transformateur de fichier de
class [{0}] pour l''application web [{1}]
webappClassLoader.addTransformer.duplicate=Ajout en double ignoré du
transformateur de fichiers de classe [{0}] à l''application web [{1}]
webappClassLoader.addTransformer.illegalArgument=L''application web [{0}] a
essayé d''ajouter un transformateur de fichiers de classe null
diff --git a/java/org/apache/catalina/loader/LocalStrings_ja.properties
b/java/org/apache/catalina/loader/LocalStrings_ja.properties
index 58fcb93..cd3b15d 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ja.properties
@@ -15,8 +15,8 @@
webappClassLoader.addExportsRmi=Java 9以降で実行する場合は、JVMコマンドライン引数に "--add-opens =
java.rmi / sun.rmi.transport = ALL-UNNAMED"を追加して、RMIターゲットメモリリーク検出を有効にする必要があります。
また、RMIターゲットメモリリーク検出を無効にすることで、この警告を抑制することも可能です。
webappClassLoader.addExportsThreadLocal=Java 9以降で実行する場合は、JVMコマンドライン引数に
"--add-opens = java.base / java.lang =
ALL-UNNAMED"を追加して、ThreadLocalメモリリーク検出を有効にする必要があります。
また、ThreadLocalメモリリーク検出を無効にすることで、この警告を抑制することもできます。
-webappClassLoader.addPermisionNoCanonicalFile=URL [{0}] の正規化パスを取得できません。
-webappClassLoader.addPermisionNoProtocol=URL [{1}] に含まれるプロトコル [{0}] は未対応です。この
URL で参照できるリソースには読み取り権限を付与できません。
+webappClassLoader.addPermissionNoCanonicalFile=URL [{0}] の正規化パスを取得できません。
+webappClassLoader.addPermissionNoProtocol=URL [{1}] に含まれるプロトコル [{0}] は未対応です。この
URL で参照できるリソースには読み取り権限を付与できません。
webappClassLoader.addTransformer=Web アプリケーション [{1}] にクラスファイル変換器 [{0}] を追加しました。
webappClassLoader.addTransformer.duplicate=クラスファイルトランスフォーマー[{0}]をWebアプリケーション[{1}]に追加する呼び出しが重複しました。
webappClassLoader.addTransformer.illegalArgument=Webアプリケーション[{0}]がNullクラスファイルトランスフォーマーを追加しようとしました。
diff --git a/java/org/apache/catalina/loader/LocalStrings_ko.properties
b/java/org/apache/catalina/loader/LocalStrings_ko.properties
index adb2b26..e8c40e4 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ko.properties
@@ -15,8 +15,8 @@
webappClassLoader.addExportsRmi=Java 9에서 실행하면서 RMI Target 메모리 누수 탐지를 사용 가능하게
하려면, "--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"를 JVM 명령 행 아규먼트에 추가해야
합니다. 또는, RMI Target 메모리 누수 탐지를 사용불능 상태로 설정함으로써, 이 경고를 없앨 수도 있습니다.
webappClassLoader.addExportsThreadLocal=Java 9 환경에서 실행할 때에는, ThreadLocal 메모리
누수 탐지를 위하여, "--add-opens=java.base/java.lang=ALL-UNNAMED"를 JVM 명령 행 아규먼트들에 추가해야
합니다. 또는, ThreadLocal 메모리 누수 탐지를 사용불능 상태로 설정함으로써, 이 경고 메시지를 없앨 수도 있습니다.
-webappClassLoader.addPermisionNoCanonicalFile=URL [{0}](으)로부터 canonical 파일 경로를
얻을 수 없습니다.
-webappClassLoader.addPermisionNoProtocol=URL [{1}] 내의 프로토콜 [{0}]은(는) 지원되지
않으므로, 이 URL의 리소스에 대한 읽기가 승인되지 않았습니다.
+webappClassLoader.addPermissionNoCanonicalFile=URL [{0}](으)로부터 canonical 파일
경로를 얻을 수 없습니다.
+webappClassLoader.addPermissionNoProtocol=URL [{1}] 내의 프로토콜 [{0}]은(는) 지원되지
않으므로, 이 URL의 리소스에 대한 읽기가 승인되지 않았습니다.
webappClassLoader.addTransformer=클래스 파일 Transformer [{0}]을(를) 웹 애플리케이션 [{1}]에
추가했습니다.
webappClassLoader.addTransformer.duplicate=웹 애플리케이션 [{1}]에 클래스 파일 변환기
[{0}]을(를) 추가하기 위한, 중복된 호출을 무시합니다.
webappClassLoader.addTransformer.illegalArgument=웹 애플리케이션 [{0}]이(가) 널인, 클래스 파일
Transformer을 추가하려 시도했습니다.
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index a944485..566ddbf 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -15,8 +15,8 @@
webappClassLoader.addExportsRmi=在Java 9上运行时，需要在JVM命令行参数中添加“-add
opens=Java.rmi/sun.rmi.transport=ALL-UNNAMED”，以启用rmi目标内存泄漏检测。或者，可以通过禁用RMI目标内存泄漏检测来抑制此警告。
webappClassLoader.addExportsThreadLocal=在Java 9上运行时，需要在JVM命令行参数中添加“-add
opens=Java.base/Java.lang=ALL-UNNAMED”，以启用线程本地内存泄漏检测。或者，可以通过禁用ThreadLocal内存泄漏检测来抑制此警告。
-webappClassLoader.addPermisionNoCanonicalFile=无法从URL[{0}]获取规范文件路径
-webappClassLoader.addPermisionNoProtocol=不支持URL[{1}]中的协议[{0}]，因此未授予位于此URL的资源的读取权限
+webappClassLoader.addPermissionNoCanonicalFile=无法从URL[{0}]获取规范文件路径
+webappClassLoader.addPermissionNoProtocol=不支持URL[{1}]中的协议[{0}]，因此未授予位于此URL的资源的读取权限
webappClassLoader.addTransformer=将类文件转换器[{0}]添加到Web应用程序[{1}]。
webappClassLoader.addTransformer.duplicate=将类文件转换器[{0}]添加到web应用程序[{1}]的重复调用被忽略。
webappClassLoader.addTransformer.illegalArgument=Web应用程序[{0}]试图添加空类文件转换器。
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 57d2810..fcd0310 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -505,7 +505,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
path = f.getCanonicalPath();
} catch (IOException | URISyntaxException e) {
log.warn(sm.getString(
- "webappClassLoader.addPermisionNoCanonicalFile",
+ "webappClassLoader.addPermissionNoCanonicalFile",
url.toExternalForm()));
return;
}
@@ -522,7 +522,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
} else {
// Unsupported URL protocol
log.warn(sm.getString(
- "webappClassLoader.addPermisionNoProtocol",
+ "webappClassLoader.addPermissionNoProtocol",
protocol, url.toExternalForm()));
}
}
diff --git a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
index 6769425..3a60ddb 100644
--- a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
+++ b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
@@ -24,7 +24,7 @@ import javax.servlet.WriteListener;
/**
- * Class that extends ServletOuputStream, used as a wrapper from within
+ * Class that extends ServletOutputStream, used as a wrapper from within
* <code>SsiInclude</code>
*
* @author Bip Thelin
diff --git a/java/org/apache/catalina/ssi/SSIConditional.java
b/java/org/apache/catalina/ssi/SSIConditional.java
index 6ac2583..0fbe778 100644
--- a/java/org/apache/catalina/ssi/SSIConditional.java
+++ b/java/org/apache/catalina/ssi/SSIConditional.java
@@ -107,7 +107,7 @@ public class SSIConditional implements SSICommand {
/**
- * Retrieves the expression from the specified arguments and peforms the
+ * Retrieves the expression from the specified arguments and performs the
* necessary evaluation steps.
*/
private boolean evaluateArguments(String[] names, String[] values,
@@ -136,4 +136,4 @@ public class SSIConditional implements SSICommand {
if ("expr".equalsIgnoreCase(paramNames[0])) return paramValues[0];
return null;
}
-}
\ No newline at end of file
+}
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index dbfcc1b..15e16a9 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -810,7 +810,7 @@ public class Catalina {
protected void initNaming() {
// Setting additional variables
if (!useNaming) {
- log.info( "Catalina naming disabled");
+ log.info(sm.getString("catalina.noNaming"));
System.setProperty("catalina.useNaming", "false");
} else {
System.setProperty("catalina.useNaming", "true");
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 0197b39..44e48a5 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -15,6 +15,7 @@
catalina.configFail=Unable to load server configuration from [{0}]
catalina.noCluster=Cluster RuleSet not found due to [{0}]. Cluster
configuration disabled.
+catalina.noNaming=Naming environment is disabled
catalina.serverStartFail=The required Server component failed to start so
Tomcat is unable to start.
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties
b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index 8fdab27..6a41da1 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -15,6 +15,7 @@
catalina.configFail=Impossible de charger la configuration du serveur depuis
[{0}]
catalina.noCluster=le RuleSet du cluster n''a pas été trouvé à cause de [{0}],
la configuration du cluster est désactivée
+catalina.noNaming=L'environnement de noms JNDI est désactivé
catalina.serverStartFail=Le composant Server requis n'a pas démarré, en
conséquence Tomcat ne peut démarrer.
catalina.shutdownHookFail=Le crochet d'arrêt a rencontré une erreur en tentant
d'arrêter le serveur
catalina.stopServer=Pas de port d'arrêt configuré, l'arrêt du serveur se fera
via un signal du système d'exploitation ; le serveur est en cours d'exécution
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties
b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index d446da4..b3dcefd 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -15,6 +15,7 @@
catalina.configFail=[{0}]からサーバー設定を読み込めません
catalina.noCluster=[{0}]のためにクラスタルールセットが見つかりません。 クラスタ構成が無効になっています。
+catalina.noNaming=ネーミング環境が無効です。
catalina.serverStartFail=必要なサーバーコンポーネントを開始できなかったため、Tomcat を開始できませんでした。
catalina.shutdownHookFail=サーバーの停止中にシャットダウンフックでエラーが発生しました。
catalina.stopServer=シャットダウンポートが設定されていません。 OSシグナルでServerをシャットダウンします。
サーバはシャットダウンしません。
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index 26afe9f..ea7031f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -15,6 +15,7 @@
catalina.configFail=[{0}](으)로부터 서버 설정을 로드할 수 없습니다.
catalina.noCluster=[{0}](으)로 인하여 클러스터 RuleSet을 찾을 수 없습니다. 클러스터 설정은 사용불능 상태입니다.
+catalina.noNaming=Naming 환경은 사용 불능 상태입니다.
catalina.serverStartFail=필수 항목인 서버 구성요소가 제대로 시작되지 못하여, Tomcat이 시작될 수 없습니다.
catalina.shutdownHookFail=서버를 중지시키려는 과정에서, 셧다운 훅에서 오류가 발생했습니다.
catalina.stopServer=셧다운 포트가 설정되지 않았습니다. OS 시그널을 통해 서버를 셧다운합니다. 서버는 아직 셧다운되지
않았습니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 5fa3049..a19552e 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -15,6 +15,7 @@
catalina.configFail=无法从[{0}]加载服务器配置
catalina.noCluster=由于[{0}]未找到群集Ruleset。已禁用群集配置。
+catalina.noNaming=命名环境已禁用
catalina.serverStartFail=所必需的服务组件启动失败，所以无法启动Tomcat
catalina.shutdownHookFail=关闭挂钩在尝试停止服务器时遇到错误
catalina.stopServer=未配置关闭端口。通过OS信号关闭服务器。服务器未关闭。
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index d6f9ab4..ef0820e 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -581,7 +581,7 @@ public abstract class AbstractReplicatedMap<K,V>
//state transfer request
if (mapmsg.getMsgType() == MapMessage.MSG_STATE || mapmsg.getMsgType()
== MapMessage.MSG_STATE_COPY) {
- synchronized (stateMutex) { //make sure we dont do two things at
the same time
+ synchronized (stateMutex) { //make sure we don't do two things at
the same time
ArrayList<MapMessage> list = new ArrayList<>();
for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
diff --git
a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
index 7664afa..6ee8c82 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
@@ -106,7 +106,7 @@ public class NioReplicationTask extends AbstractRxTask {
if ( e instanceof CancelledKeyException ) {
//do nothing
} else if ( e instanceof IOException ) {
- //dont spew out stack traces for IO exceptions unless debug is
enabled.
+ //don't spew out stack traces for IO exceptions unless debug
is enabled.
if (log.isDebugEnabled()) log.debug ("IOException in
replication worker, unable to drain channel. Probable cause: Keep alive socket
closed["+e.getMessage()+"].", e);
else log.warn
(sm.getString("nioReplicationTask.unable.drainChannel.ioe", e.getMessage()));
} else if ( log.isErrorEnabled() ) {
diff --git a/java/org/apache/catalina/tribes/util/StringManager.java
b/java/org/apache/catalina/tribes/util/StringManager.java
index 2be3758..b3f96c1 100644
--- a/java/org/apache/catalina/tribes/util/StringManager.java
+++ b/java/org/apache/catalina/tribes/util/StringManager.java
@@ -30,7 +30,7 @@ import java.util.ResourceBundle;
/**
* An internationalization / localization helper class which reduces
* the bother of handling ResourceBundles and takes care of the
- * common cases of message formating which otherwise require the
+ * common cases of message formatting which otherwise require the
* creation of Object arrays and such.
*
* <p>The StringManager operates on a package basis. One StringManager
diff --git a/java/org/apache/catalina/tribes/util/UUIDGenerator.java
b/java/org/apache/catalina/tribes/util/UUIDGenerator.java
index 44dfffc..04148c8 100644
--- a/java/org/apache/catalina/tribes/util/UUIDGenerator.java
+++ b/java/org/apache/catalina/tribes/util/UUIDGenerator.java
@@ -71,7 +71,7 @@ public class UUIDGenerator {
}
/**
- * Same as java.util.Random.nextBytes except this one we dont have to
allocate a new byte array
+ * Same as java.util.Random.nextBytes except this one we don't have to
allocate a new byte array
* @param into byte[]
* @param offset int
* @param length int
@@ -90,4 +90,4 @@ public class UUIDGenerator {
}
}
-}
\ No newline at end of file
+}
diff --git a/java/org/apache/catalina/util/ParameterMap.java
b/java/org/apache/catalina/util/ParameterMap.java
index 96bc014..b9de052 100644
--- a/java/org/apache/catalina/util/ParameterMap.java
+++ b/java/org/apache/catalina/util/ParameterMap.java
@@ -30,7 +30,7 @@ import org.apache.tomcat.util.res.StringManager;
* <code>locked</code> property. This class can be used to safely expose
* Catalina internal parameter map objects to user classes without having
* to clone them in order to avoid modifications. When first created, a
- * <code>ParmaeterMap</code> instance is not locked.
+ * <code>ParameterMap</code> instance is not locked.
*
* @param <K> The type of Key
* @param <V> The type of Value
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 3470810..a4191eb 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -125,10 +125,10 @@ public class Substitution {
}
public void parse(Map<String, RewriteMap> maps) {
- this.elements = parseSubtitution(sub, maps);
+ this.elements = parseSubstitution(sub, maps);
}
- private SubstitutionElement[] parseSubtitution(String sub, Map<String,
RewriteMap> maps) {
+ private SubstitutionElement[] parseSubstitution(String sub, Map<String,
RewriteMap> maps) {
List<SubstitutionElement> elements = new ArrayList<>();
int pos = 0;
@@ -197,9 +197,9 @@ public class Substitution {
} else {
key = sub.substring(colon + 1, close);
}
- newElement.key = parseSubtitution(key, maps);
+ newElement.key = parseSubstitution(key, maps);
if (defaultValue != null) {
- newElement.defaultValue =
parseSubtitution(defaultValue, maps);
+ newElement.defaultValue =
parseSubstitution(defaultValue, maps);
}
pos = close + 1;
elements.add(newElement);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
