This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 35df7ec Correct order
35df7ec is described below
commit 35df7eca9084d4530d42a3e005a509ec06cc4ec8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 27 12:50:45 2020 +0000
Correct order
---
java/javax/servlet/LocalStrings.properties | 6 +++---
java/org/apache/catalina/manager/LocalStrings.properties | 6 +++---
java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
java/org/apache/catalina/tribes/membership/LocalStrings.properties | 1 +
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +-
java/org/apache/coyote/ajp/LocalStrings.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/digester/LocalStrings.properties | 4 ++--
10 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/java/javax/servlet/LocalStrings.properties
b/java/javax/servlet/LocalStrings.properties
index f677ffb..cad5eb7 100644
--- a/java/javax/servlet/LocalStrings.properties
+++ b/java/javax/servlet/LocalStrings.properties
@@ -19,8 +19,8 @@ httpConstraintElement.invalidRolesDeny=Roles may not be
specified when using DEN
httpMethodConstraintElement.invalidMethod=Invalid HTTP method
-wrapper.nullRequest=Request cannot be null
-wrapper.nullResponse=Response cannot be null
-
value.false=false
value.true=true
+
+wrapper.nullRequest=Request cannot be null
+wrapper.nullResponse=Response cannot be null
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties
b/java/org/apache/catalina/manager/LocalStrings.properties
index afc1fec..e1ad20a 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -117,6 +117,9 @@ htmlManagerServlet.serverTitle=Server Information
htmlManagerServlet.serverVersion=Tomcat Version
htmlManagerServlet.title=Tomcat Web Application Manager
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}]
arguments on object name [{2}], which is a [{3}]
+jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+
managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
managerServlet.certsNotAvailable=Certificate information cannot be obtained
from this connector at runtime
managerServlet.copyError=Could not copy configuration file from path [{0}]
@@ -192,6 +195,3 @@ managerServlet.vminfo=OK - VM info
statusServlet.complete=Complete Server Status
statusServlet.title=Server Status
-
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}]
arguments on object name [{2}], which is a [{3}]
-jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties
b/java/org/apache/catalina/realm/LocalStrings.properties
index 4139377..0229e73 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -100,8 +100,8 @@ realmBase.authenticateSuccess=Username [{0}] successfully
authenticated
realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an
X509UsernameRetriever.
realmBase.createUsernameRetriever.newInstance=Cannot create object of type
[{0}].
-realmBase.delegatedCredentialFail=Unable to obtain delegated credential for
user [{0}]
realmBase.credentialNotDelegated=Credential for user [{0}] has not been
delegated though storing was requested
+realmBase.delegatedCredentialFail=Unable to obtain delegated credential for
user [{0}]
realmBase.digest=Error digesting user credentials
realmBase.forbidden=Access to the requested resource has been denied
realmBase.gotX509Username=Got user name from X509 certificate: [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 7119594..6237640 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -61,5 +61,6 @@ staticMembershipProvider.pingThread.failed=Unable to send
ping.
staticMembershipProvider.replyRequest.ignored=Message[{0}] is ignored.
staticMembershipProvider.startMembership.noReplies=Received 0 replies,
probably a timeout.
staticMembershipProvider.stopMembership.sendFailed=Unable to send stop
membership message.
+
staticMembershipService.noLocalMember=There is no localMember in static member
list.
staticMembershipService.stopFail=Unable to stop the static membership service,
level: [{0}]
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 7cfdf0a..abf8e60 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -261,7 +261,7 @@ public abstract class AbstractAjpProtocol<S> extends
AbstractProtocol<S> {
if (getSecretRequired()) {
String secret = getSecret();
if (secret == null || secret.length() == 0) {
- throw new
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
+ throw new
IllegalArgumentException(sm.getString("ajpprotocol.noSecret"));
}
}
super.start();
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties
b/java/org/apache/coyote/ajp/LocalStrings.properties
index 01de92a..ab377eb 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -28,6 +28,6 @@ ajpprocessor.request.prepare=Error preparing request
ajpprocessor.request.process=Error processing request
ajpprotocol.noSSL=SSL is not supported with AJP. The SSL host configuration
for [{0}] was ignored
-ajpprotocol.nosecret=The AJP Connector is configured with
secretRequired="true" but the secret attribute is either null or "". This
combination is not valid.
+ajpprotocol.noSecret=The AJP Connector is configured with
secretRequired="true" but the secret attribute is either null or "". This
combination is not valid.
ajpprotocol.noUpgrade=Upgrade is not supported with AJP. The UpgradeProtocol
configuration for [{0}] was ignored
ajpprotocol.noUpgradeHandler=Upgrade is not supported with AJP. The
HttpUpgradeHandler [{0}] can not be processed
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index 48633ec..5acecf3 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -30,4 +30,4 @@ ajpprocessor.request.process=Erreur de traitement de la
requête
ajpprotocol.noSSL=SSL n''est pas supporté par AJP, la configuration de l''hôte
SSL pour [{0}] a été ignorée
ajpprotocol.noUpgrade=L''upgrade n''est pas supporté par AJP. La
configuration UpgradeProtocol pour [{0}] a été ignorée
ajpprotocol.noUpgradeHandler=AJP ne supporte pas la mise à niveau (upgrade) de
HTTP/1.1, le HttpUpgradeHandler [{0}] ne peut pas être utilisé
-ajpprotocol.nosecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
+ajpprotocol.noSecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index 4fa663c..b896c47 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -30,4 +30,4 @@ ajpprocessor.request.process=요청 처리 중 오류 발생
ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
ajpprotocol.noUpgrade=AJP에서 프로토콜 업그레이드는 지원되지 않습니다. [{0}]을(를) 위한
UpgradeProtocol 설정은 무시됩니다.
ajpprotocol.noUpgradeHandler=AJP를 사용할 때, 업그레이드는 지원되지 않습니다. HttpUpgradeHandler
[{0}]은(는) 처리될 수 없습니다.
-ajpprotocol.nosecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index 534b430..c3a827a 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -20,4 +20,5 @@ ajpprocessor.certs.fail=):证书转换失败
ajpprocessor.header.error=头部信息解析失败
ajpprocessor.readtimeout=从Socket读取数据超时
+ajpprotocol.noSecret=AJP连接器配置secretRequired="true",但是属性secret确实空或者空字符串，这样的组合是无效的。
ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。
diff --git a/java/org/apache/tomcat/util/digester/LocalStrings.properties
b/java/org/apache/tomcat/util/digester/LocalStrings.properties
index dafddc1..74c6c78 100644
--- a/java/org/apache/tomcat/util/digester/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/digester/LocalStrings.properties
@@ -24,12 +24,12 @@ digester.error.finish=Finish event threw exception
digester.errorLocation=Error at line [{0}] column [{1}]: [{2}]
digester.failedToUpdateAttributes=Attribute [{0}] failed to update and remains
[{1}]
digester.failedToUpdateSystemProperty=System property [{0}] failed to update
and remains [{1}]
+digester.noLocator=No Locator
+digester.noRulesFound=No rules found matching [{0}]
digester.parseError=Parse error at line [{0}] column [{1}]
digester.parseErrorFatal=Parse fatal error at line [{0}] column [{1}]
digester.parseWarning=Parse warning at line [{0}] column [{1}]
digester.propertySourceLoadError=Error loading property source [{0}]
-digester.noLocator=No Locator
-digester.noRulesFound=No rules found matching [{0}]
rule.createError=Error creating object: [{0}]
rule.noClassName=No class name specified for [{0}] [{1}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
