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 d62277e40e3936d87179f8bcced136f4db53d58c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++++++------
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html | 6 +++---
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
- for (String langauge : targetTranslations.keySet()) {
+ for (String language : targetTranslations.keySet()) {
// Skip source
- if (langauge.length() == 0) {
+ if (language.length() == 0) {
continue;
}
- Properties sourceTranslated = sourceTranslations.get(langauge);
- Properties targetTranslated = targetTranslations.get(langauge);
+ Properties sourceTranslated = sourceTranslations.get(language);
+ Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
- targetTranslations.put(langauge, targetTranslated);
+ targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
- Utils.export(langauge, targetTranslated, storageDir);
+ Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index d3ec97c..3ba68af 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -423,7 +423,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index f551ca6..0f66453 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends Jre8Compat {
@Override
- public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+ public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 5cb26d2..e61dd03 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -232,7 +232,7 @@ public class JreCompat {
* @return {code true} if the AccessibleObject can be accessed otherwise
* {code false}
*/
- public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+ public boolean canAccess(Object base, AccessibleObject accessibleObject) {
// Java 8 doesn't support modules so default to true
return true;
}
diff --git a/java/org/apache/tomcat/util/digester/ArrayStack.java
b/java/org/apache/tomcat/util/digester/ArrayStack.java
index 580d6e1..97073f0 100644
--- a/java/org/apache/tomcat/util/digester/ArrayStack.java
+++ b/java/org/apache/tomcat/util/digester/ArrayStack.java
@@ -23,7 +23,7 @@ import java.util.EmptyStackException;
* <p>Imported copy of the <code>ArrayStack</code> class from
* Commons Collections, which was the only direct dependency from Digester.</p>
*
- * <p><strong>WARNNG</strong> - This class is public solely to allow it to be
+ * <p><strong>WARNING</strong> - This class is public solely to allow it to be
* used from subpackages of <code>org.apache.commons.digester</code>.
* It should not be considered part of the public API of Commons Digester.
* If you want to use such a class yourself, you should use the one from
diff --git a/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
b/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
index 3000a3a..b95947a 100644
--- a/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
+++ b/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
@@ -37,7 +37,7 @@ public interface ObjectCreationFactory {
* object based on the element's attributes.
*
* @param attributes the element's attributes
- * @return the creted object
+ * @return the created object
* @throws Exception any exception thrown will be propagated upwards
*/
public Object createObject(Attributes attributes) throws Exception;
diff --git a/java/org/apache/tomcat/util/digester/package.html
b/java/org/apache/tomcat/util/digester/package.html
index 4438ac5..3d20be4 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -256,7 +256,7 @@ features of the Digester functionality:</p>
parser is that the Digester automatically navigates the element hierarchy of
the XML document you are parsing for you, without requiring any developer
attention to this process. Instead, you focus on deciding what functions you
-would like to have performed whenver a certain arrangement of nested elements
+would like to have performed whenever a certain arrangement of nested elements
is encountered in the XML document being parsed. The mechanism for specifying
such arrangements are called <em>element matching patterns</em>.
@@ -936,7 +936,7 @@ public class MyRuleSet extends RuleSetBase {
<ul>
<li>The application that is using these rules does not need to know anything
about the fact that the <code>RuleSet</code> being used is associated
- with a particular namespace URI. That knowledge is emedded inside the
+ with a particular namespace URI. That knowledge is embedded inside the
<code>RuleSet</code> class itself.</li>
<li>If desired, you could make a set of rules work for more than one
namespace URI by providing constructors on the <code>RuleSet</code> to
@@ -987,7 +987,7 @@ accessed through calls to:
<p>
<strong>Note:</strong> all stack names beginning with
<code>org.apache.commons.digester</code>
are reserved for future use by the <code>Digester</code> component. It is also
recommended
-that users choose stack names perfixed by the name of their own domain to
avoid conflicts
+that users choose stack names prefixed by the name of their own domain to
avoid conflicts
with other <code>Rule</code> implementations.
</p>
diff --git a/java/org/apache/tomcat/util/modeler/modules/package.html
b/java/org/apache/tomcat/util/modeler/modules/package.html
index 402889a..e315bf6 100644
--- a/java/org/apache/tomcat/util/modeler/modules/package.html
+++ b/java/org/apache/tomcat/util/modeler/modules/package.html
@@ -20,7 +20,7 @@
</head>
<body>
<p>Implementation classes - should not be used directly. The API is not stable
-but eventually the code will be refactored as a collection of mbeans that will
be useable
+but eventually the code will be refactored as a collection of mbeans that will
be usable
( more or less ) independently.</p>
<p>The MbeanDescriptors* classes are used to extract metadata from different
sources. They
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index cb777f5..b0aacf5 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1758,7 +1758,7 @@ public class AprEndpoint extends AbstractEndpoint<Long>
implements SNICallBack {
* will be handled asynchronously inside the kernel. As a result,
* the poller will never be used.
*
- * @param data containing the reference to the data which should be
snet
+ * @param data containing the reference to the data which should be
sent
* @return true if all the data has been sent right away, and false
* otherwise
*/
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
index 486f9ea..3606acd 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
@@ -46,7 +46,7 @@ openssl.errMakeConf=Could not create OpenSSLConf context
openssl.errorSSLCtxInit=Error initializing SSL context
openssl.keyManagerMissing=No key manager found
openssl.makeConf=Creating OpenSSLConf context
-openssl.nonJsseCertficate=The certificate [{0}] or its private key [{1}] could
not be processed using a JSSE key manager and will be given directly to OpenSSL
+openssl.nonJsseCertificate=The certificate [{0}] or its private key [{1}]
could not be processed using a JSSE key manager and will be given directly to
OpenSSL
openssl.nonJsseChain=The certificate chain [{0}] was not specified or was not
valid and JSSE requires a valid certificate chain so attempting to use OpenSSL
directly
openssl.trustManagerMissing=No trust manager found
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index cc6d73c..1ecb0e0 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
@@ -46,7 +46,7 @@ openssl.errMakeConf=Impossible de créer le contexte de
OpenSSLConf
openssl.errorSSLCtxInit=Erreur d'initialisation du contexte SSL
openssl.keyManagerMissing=Aucun gestionnaire de clés trouvé
openssl.makeConf=Création du contexte de OpenSSLConf
-openssl.nonJsseCertficate=Le certificat [{0}] ou sa clé privée [{1}] n''a pas
pu être traité en utilisant un gestionnaire de clé de JSSE, et sera directement
passée à OpenSSL
+openssl.nonJsseCertificate=Le certificat [{0}] ou sa clé privée [{1}] n''a pas
pu être traité en utilisant un gestionnaire de clé de JSSE, et sera directement
passée à OpenSSL
openssl.nonJsseChain=La chaîne de certificat [{0}] n''a pas été spécifiée ou
est invalide et JSSE requiert une chaîne de certificats valide, donc OpenSSL
sera utilisé directement
openssl.trustManagerMissing=Gestionnaire de confiance non trouvé
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
index fa4e3c8..97a6ef3 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
@@ -46,7 +46,7 @@ openssl.errMakeConf=OpenSSLConfコンテキストを作成できませんでし
openssl.errorSSLCtxInit=SSL コンテキスト初期化中のエラー
openssl.keyManagerMissing=キーマネージャーが見つかりません。
openssl.makeConf=OpenSSLConfコンテキストの作成
-openssl.nonJsseCertficate=証明書 [{0}] またはその秘密鍵 [{1}] は JSSE
キーマネージャを用いて処理することが出来ませんでした。OpenSSL に直接渡されます
+openssl.nonJsseCertificate=証明書 [{0}] またはその秘密鍵 [{1}] は JSSE
キーマネージャを用いて処理することが出来ませんでした。OpenSSL に直接渡されます
openssl.nonJsseChain=証明書チェイン [{0}] が指定されていないか、または有効ではありません。JSSE
は有効な証明書チェインを必要とするため、OpenSSL の直接使用が試行されます
openssl.trustManagerMissing=トラストマネージャが見つかりません
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
index d70ac4b..53c8472 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
@@ -46,7 +46,7 @@ openssl.errMakeConf=OpenSSLConf 컨텍스트를 생성할 수 없었습니다.
openssl.errorSSLCtxInit=SSL 컨텍스트를 초기화 하는 중 오류 발생
openssl.keyManagerMissing=키 매니저를 찾을 수 없습니다.
openssl.makeConf=OpenSSLConf 컨텍스트를 생성합니다.
-openssl.nonJsseCertficate=인증서 [{0}] 또는 그것의 개인 키 [{1}]이(가) JSSE 키 매니저를 사용하여
처리되지 못하였으므로, OpenSSL에 직접 전달할 것입니다.
+openssl.nonJsseCertificate=인증서 [{0}] 또는 그것의 개인 키 [{1}]이(가) JSSE 키 매니저를 사용하여
처리되지 못하였으므로, OpenSSL에 직접 전달할 것입니다.
openssl.nonJsseChain=해당 인증서 체인 [{0}]이(가) 지정되지 않았거나 유효하지 않으며, JSSE는 유효한 인증서 체인을
요구하므로, OpenSSL을 직접 사용하려 시도합니다.
openssl.trustManagerMissing=Trust 매니저를 찾을 수 없습니다.
diff --git
a/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
index 14342d4..91b8354 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
@@ -46,7 +46,7 @@ openssl.errMakeConf=无法创建OpenSSLConf上下文
openssl.errorSSLCtxInit=初始化SSL上下文时出错
openssl.keyManagerMissing=key管理器未找到
openssl.makeConf=创建OpenSSLConf上下文
-openssl.nonJsseCertficate=无法使用JSSE密钥管理器处理证书{0}或其私钥{1}，该证书将直接提供给OpenSSL
+openssl.nonJsseCertificate=无法使用JSSE密钥管理器处理证书{0}或其私钥{1}，该证书将直接提供给OpenSSL
openssl.nonJsseChain=证书链[{0}]未指定或无效，JSSE需要有效的证书链，因此尝试直接使用OpenSSL
openssl.trustManagerMissing=没有找到.信任管理者
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
index 058ee71..e48acb4 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
@@ -437,7 +437,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
throw new SSLException(e);
}
- // If isOuboundDone is set, then the data from the network BIO
+ // If isOutboundDone is set, then the data from the network BIO
// was the close_notify message -- we are not required to wait
// for the receipt the peer's close_notify message -- shutdown.
if (isOutboundDone) {
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
index 0ab24c2..8336ecf 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
@@ -110,7 +110,7 @@ public class OpenSSLUtil extends SSLUtilBase {
// KeyStoreException or IOException if it doesn't understand the
// provided file.
if (certificate.getCertificateFile() != null) {
- String msg = sm.getString("openssl.nonJsseCertficate",
+ String msg = sm.getString("openssl.nonJsseCertificate",
certificate.getCertificateFile(),
certificate.getCertificateKeyFile());
if (log.isDebugEnabled()) {
log.info(msg, e);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
