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 bfffb596f74c27f893ba93f3a7d31741ee8ccb06
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 29 14:12:17 2021 +0100
No functional change. Align 10.0.x, 9.0.x, 8.5.x.
---
java/org/apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/core/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/core/StandardEngine.java | 5 +++--
6 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index e4a9874..5bedad0 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -218,6 +218,7 @@ standardContextValve.acknowledgeException=Failed to
acknowledge request with a 1
standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from
system property
standardEngine.notHost=Child of an Engine must be a Host
standardEngine.notParent=Engine cannot have a parent Container
+standardEngine.start=Starting Servlet engine: [{0}]
standardHost.clientAbort=Remote Client Aborted Request, IOException: [{0}]
standardHost.invalidErrorReportValveClass=Couldn''t load specified error
report valve class: [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 71395c8..2a1e6ac 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=Impossible de
confirmer la requête av
standardEngine.jvmRouteFail=Impossible de fixer la jvmRoute de l'Engine à
partir d'une propriété système
standardEngine.notHost=Le fils d'un moteur (child of an Engine) doit être un
hôte
standardEngine.notParent=Un moteur (engine) ne peut avoir de conteneur parent
(container)
+standardEngine.start=Démarrage du moteur de Servlets : [{0}]
standardHost.clientAbort=Le client distant a abandonné la requête, IOException
: [{0}]
standardHost.invalidErrorReportValveClass=Impossible de charger la classe
valve de rapport d''erreur : [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 6ed2c6b..78c28b1 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=100 (Continue)
レスポンスでリ
standardEngine.jvmRouteFail=EngineのjvmRoute属性をシステムプロパティから設定できませんでした
standardEngine.notHost=Engineの子供はHostでなければいけません
standardEngine.notParent=エンジンは親のコンテナを持つことはできません
+standardEngine.start=サーブレットエンジンの起動：[{0}]
standardHost.clientAbort=リモートクライアントがリクエストを中止しました, IOException: [{0}]
standardHost.invalidErrorReportValveClass=指定されたErrorReportValveクラスをロードできません:
[{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 942f4b4..c8dacaf 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=요청에 대해, 100
(Continue) 응
standardEngine.jvmRouteFail=엔진의 jvmRoute 속성을 시스템 프로퍼티로부터 설정하지 못했습니다.
standardEngine.notHost=엔진의 자식은 반드시 호스트여야 합니다.
standardEngine.notParent=엔진은 부모 컨테이너를 가질 수 없습니다.
+standardEngine.start=서버 엔진을 시작합니다: [{0}]
standardHost.clientAbort=원격 클라이언트가 요청을 중단시켰습니다. IOException: [{0}]
standardHost.invalidErrorReportValveClass=지정된 오류 보고 Valve 클래스 [{0}]을(를) 로드할 수
없었습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index b9d3c66..8bde25e 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=以100（继续）响应确认请求
standardEngine.jvmRouteFail=无法从系统属性设置引擎的jvmRoute 属性
standardEngine.notHost=Engine的子节点必须是一个Host
standardEngine.notParent=引擎不能有父容器
+standardEngine.start=正在启动 Servlet 引擎：[{0}]
standardHost.clientAbort=远程客户端中止请求，IOException:[{0}]。
standardHost.invalidErrorReportValveClass=无法加载指定的错误报告阀类：[{0}]
diff --git a/java/org/apache/catalina/core/StandardEngine.java
b/java/org/apache/catalina/core/StandardEngine.java
index 6a6fbb5..f60c2e8 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -254,8 +254,9 @@ public class StandardEngine extends ContainerBase
implements Engine {
protected synchronized void startInternal() throws LifecycleException {
// Log our server identification information
- if(log.isInfoEnabled())
- log.info( "Starting Servlet Engine: " +
ServerInfo.getServerInfo());
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("standardEngine.start",
ServerInfo.getServerInfo()));
+ }
// Standard container startup
super.startInternal();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
