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 f3c44383f05e4360124bbf27726b401f543bbb20
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 16:36:20 2019 +0100
Align with 9.0.x- spacing, l10n
---
.../apache/catalina/core/LocalStrings.properties | 6 ++++++
.../apache/catalina/core/LocalStrings_fr.properties | 6 ++++++
.../apache/catalina/core/LocalStrings_ja.properties | 6 ++++++
.../apache/catalina/core/LocalStrings_ko.properties | 6 ++++++
java/org/apache/catalina/core/StandardServer.java | 21 ++++++++-------------
5 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index d4042bc..9be2514 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -232,8 +232,14 @@ standardPipeline.valve.destroy=Error destroying Valve
standardPipeline.valve.start=Error starting Valve
standardPipeline.valve.stop=Error stopping Valve
+standardServer.accept.error=An IO exception occurred trying to accept on the
socket listening for the shutdown command
+standardServer.accept.readError=An IO exception occurred trying to read the
shutdown command
+standardServer.accept.security=A security error occurred trying to accept on
the socket listening for the shutdown command
standardServer.accept.timeout=The socket listening for the shutdown command
experienced an unexpected timeout [{0}] milliseconds after the call to
accept(). Is this an instance of bug 56684?
+standardServer.invalidShutdownCommand=Invalid shutdown command [{0}] received
standardServer.shutdownViaPort=A valid shutdown command was received via the
shutdown port. Stopping the Server instance.
+standardServer.storeConfig.contextError=Error storing context [{0}]
configuration
+standardServer.storeConfig.error=Error storing server configuration
standardServer.storeConfig.notAvailable=No StoreConfig implementation was
registered as an MBean named [{0}] so no configuration could be saved. A
suitable MBean is normally registered via the StoreConfigLifecycleListener.
standardService.connector.destroyFailed=Failed to destroy connector [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 472979c..835a849 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -231,8 +231,14 @@ standardPipeline.valve.destroy=Erreur lors de la
destruction de la valve
standardPipeline.valve.start=Erreur lors du démarrage de la valve
standardPipeline.valve.stop=Erreur lors de l'arrêt de la valve
+standardServer.accept.error=Une erreur d'IO s'est produite en essayant
d'accepter sur le socket qui attend la commande d'arrêt
+standardServer.accept.readError=Une erreur d'IO s'est produite lors de la
lecture de la commande d'arrêt
+standardServer.accept.security=Une erreur de sécurité s'est produite en
essayant d'accepter sur le socket qui attend la commande d'arrêt
standardServer.accept.timeout=Le socket qui écoute en attendant la commande
d''arrêt a rencontré un délai d''attente dépassé inattendu [{0}] millisecondes
après l''appel à accept()
+standardServer.invalidShutdownCommand=Une commande d''arrêt invalide [{0}] a
été reçue
standardServer.shutdownViaPort=Une commande d'arrêt valide a été reçue sur le
port d'arrêt, arrêt de l'instance du serveur
+standardServer.storeConfig.contextError=Erreur lors de l''enregistrement de la
configuration du contexte [{0}]
+standardServer.storeConfig.error=Erreur lors de l'enregistrement de la
configuration du serveur
standardServer.storeConfig.notAvailable=Aucune implémentation de StoreConfig
n''a été enregistrée comme un MBean nommé [{0}], et aucune configuration n''a
donc été enregistrée. Un MBean adéquat est normalement référencé via le
StoreConfigLifecycleListener
standardService.engine.startFailed=Impossible de démarrer l'Engine associé
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 89e0e3a..08186de 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -228,8 +228,14 @@ standardPipeline.valve.destroy=Valve を破棄できません。
standardPipeline.valve.start=Valve を開始できません。
standardPipeline.valve.stop=Valve を停止できません。
+standardServer.accept.error=シャットダウンコマンドを受信するソケットの accept で入出力例外が発生しました。
+standardServer.accept.readError=シャットダウンコマンドの読み取り時に入出力例外が発生しました。
+standardServer.accept.security=シャットダウンコマンドを受信するソケットの accept でセキュリティエラーを発生しました。
standardServer.accept.timeout=シャットダウンコマンドをリスンするソケットは、accept()の呼び出し後に予期しないタイムアウト[{0}]ミリ秒を経験しました。
これはバグ56684の一例ですか？
+standardServer.invalidShutdownCommand=不正なシャットダウンコマンド [{0}] を受信しました。
standardServer.shutdownViaPort=有効なシャットダウンコマンドがシャットダウンポート経由で受信されました。
サーバーインスタンスを停止します。
+standardServer.storeConfig.contextError=コンテキスト [{0}] の構成の格納時にエラーが発生しました。
+standardServer.storeConfig.error=サーバー構成を格納できません。
standardServer.storeConfig.notAvailable=StoreConfig実装は[{0}]という名前のMBeanとして登録されていないため、設定を保存することはできません。
適切なMBeanは通常StoreConfigLifecycleListenerを介して登録されます。
standardService.engine.startFailed=関連するEngineの起動に失敗しました
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 26efc08..c53a8b2 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -230,8 +230,14 @@ standardPipeline.valve.destroy=Valve를 소멸시키는 중 오류 발생
standardPipeline.valve.start=Valve를 시작시키는 중 오류 발생
standardPipeline.valve.stop=Valve를 중지시키는 중 오류 발생
+standardServer.accept.error=셧다운 명령을 위해 listen하고 있는 소켓에서, accept를 시도하는 중,
IOException이 발생했습니다.
+standardServer.accept.readError=셧다운 명령을 읽으려 시도하는 중 IOException이 발생했습니다.
+standardServer.accept.security=셧다운 명령을 위해 listen하고 있는 소켓에서, accept를 시도하는 중, 보안
오류가 발생했습니다.
standardServer.accept.timeout=셧다운 명령을 위해 listen하고 있는 소켓이, accept()를 호출 한 후,
예기치 않은 제한 시간 초과([{0}] 밀리초)를 발생시켰습니다. 버그 56684가 발생한 경우일까요?
+standardServer.invalidShutdownCommand=유효하지 않은 셧다운 명령 [{0}]을(를) 받았습니다.
standardServer.shutdownViaPort=셧다운 포트를 통해 유효한 셧다운 명령을 받았습니다. 서버 인스턴스를 중지시킵니다.
+standardServer.storeConfig.contextError=컨텍스트 [{0}]의 설정을 저장하는 중 오류 발생
+standardServer.storeConfig.error=서버 설정을 저장하는 중 오류 발생
standardServer.storeConfig.notAvailable=[{0}](이)라는 이름의 MBean으로서 StoreConfig 구현
객체가 등록되지 않았으므로, 어떤 설정도 저장될 수 없었습니다. 보통 StoreConfigLifecycleListener을 통하여 적절한
MBean이 등록됩니다.
standardService.engine.startFailed=연관된 엔진을 시작하지 못했습니다.
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index 82f4ff7..c4125b5 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -396,11 +396,11 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
@Override
public void await() {
// Negative values - don't wait on port - tomcat is embedded or we
just don't like ports
- if( port == -2 ) {
+ if (port == -2) {
// undocumented yet - for embedding apps that are around, alive.
return;
}
- if( port==-1 ) {
+ if (port==-1) {
try {
awaitThread = Thread.currentThread();
while(!stopAwait) {
@@ -454,15 +454,14 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
Long.valueOf(System.currentTimeMillis() -
acceptStartTime)), ste);
continue;
} catch (AccessControlException ace) {
- log.warn("StandardServer.accept security exception: "
- + ace.getMessage(), ace);
+
log.warn(sm.getString("standardServer.accept.security"), ace);
continue;
} catch (IOException e) {
if (stopAwait) {
// Wait was aborted with socket.close()
break;
}
- log.error("StandardServer.await: accept: ", e);
+ log.error(sm.getString("standardServer.accept.error"),
e);
break;
}
@@ -478,7 +477,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
try {
ch = stream.read();
} catch (IOException e) {
- log.warn("StandardServer.await: read: ", e);
+
log.warn(sm.getString("standardServer.accept.readError"), e);
ch = -1;
}
// Control character or EOF (-1) terminates loop
@@ -505,8 +504,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
log.info(sm.getString("standardServer.shutdownViaPort"));
break;
} else
- log.warn("StandardServer.await: Invalid command '"
- + command.toString() + "' received");
+
log.warn(sm.getString("standardServer.invalidShutdownCommand",
command.toString()));
}
} finally {
ServerSocket serverSocket = awaitSocket;
@@ -552,9 +550,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
*/
@Override
public Service[] findServices() {
-
return services;
-
}
/**
@@ -698,7 +694,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log.error(t);
+ log.error(sm.getString("standardServer.storeConfig.error"), t);
}
}
@@ -729,7 +725,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log.error(t);
+ log.error(sm.getString("standardServer.storeConfig.contextError",
context.getName()), t);
}
}
@@ -927,5 +923,4 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
protected final String getObjectNameKeyProperties() {
return "type=Server";
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
