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 6fe586a91b1f162d6a41965f4134cc6a48caa08d
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/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 +-
28 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 27978fa..cc4a9c7 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -190,7 +190,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.
*/
@@ -974,7 +974,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 a92a629..ccaf245 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -633,7 +633,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 06fc87d..4dead61 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 f5fc3dc..e3143ca 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 cf8ac73..dc19482 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 ee81f81..4862bc0 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -83,7 +83,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 2156a2e..3aaf6d7 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -84,7 +84,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 213c4f9..56cd78d 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -490,7 +490,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;
@@ -1120,7 +1120,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);
@@ -1200,7 +1200,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 892ea0c..14f96ec 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/ssi/ByteArrayServletOutputStream.java
b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
index 2209cf4..7965894 100644
--- a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
+++ b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
@@ -23,7 +23,7 @@ import javax.servlet.ServletOutputStream;
/**
- * 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 d5f3653..78be393 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -877,7 +877,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 ad59161..6b3d4f5 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 99b9f98..f4e53b5 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 a970f94..9b9840f 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 2be5457..5ab33f3 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 a5483d8..4c18965 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 9d39ba2..50a65cd 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -591,7 +591,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<MapMessage>();
Iterator<Map.Entry<K,MapEntry<K,V>>> i =
innerMap.entrySet().iterator();
while (i.hasNext()) {
diff --git
a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
index 0198f8e..f771d63 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
@@ -104,7 +104,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 ("IOException in replication worker, unable to
drain channel. Probable cause: Keep alive socket closed["+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 53caf03..1909470 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 5567454..c8ebd91 100644
--- a/java/org/apache/catalina/tribes/util/UUIDGenerator.java
+++ b/java/org/apache/catalina/tribes/util/UUIDGenerator.java
@@ -70,7 +70,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
@@ -89,4 +89,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 2ac63a5..0e4b64b 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.
*
* @author Craig R. McClanahan
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
