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 71deb4b01041983e21d3efe0d7808d0a6f6f63f7 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Sep 27 16:13:33 2019 +0100 Align with 9.0.x - spacing, i18n --- .../apache/catalina/core/LocalStrings.properties | 6 ++++++ .../catalina/core/LocalStrings_fr.properties | 6 ++++++ .../catalina/core/LocalStrings_ja.properties | 6 ++++++ .../catalina/core/LocalStrings_ko.properties | 6 ++++++ .../org/apache/catalina/core/StandardPipeline.java | 22 ++++++++++------------ 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties index f0ed527..d4042bc 100644 --- a/java/org/apache/catalina/core/LocalStrings.properties +++ b/java/org/apache/catalina/core/LocalStrings.properties @@ -226,6 +226,12 @@ standardHost.problematicAppBase=Using an empty string for appBase on host [{0}] standardHostValue.customStatusFailed=Custom error page [{0}] could not be dispatched correctly +standardPipeline.basic.start=Error starting new basic Valve +standardPipeline.basic.stop=Error stopping old basic Valve +standardPipeline.valve.destroy=Error destroying Valve +standardPipeline.valve.start=Error starting Valve +standardPipeline.valve.stop=Error stopping Valve + 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.shutdownViaPort=A valid shutdown command was received via the shutdown port. Stopping the Server instance. 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. diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties index b530a22..472979c 100644 --- a/java/org/apache/catalina/core/LocalStrings_fr.properties +++ b/java/org/apache/catalina/core/LocalStrings_fr.properties @@ -225,6 +225,12 @@ standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de l'' standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}] n''a pu être redirigée correctement +standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de base +standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base +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.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.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.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 diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties b/java/org/apache/catalina/core/LocalStrings_ja.properties index 5488628..89e0e3a 100644 --- a/java/org/apache/catalina/core/LocalStrings_ja.properties +++ b/java/org/apache/catalina/core/LocalStrings_ja.properties @@ -222,6 +222,12 @@ standardHost.problematicAppBase=ホスト[{0}]のappBaseに空の文字列を使 standardHostValue.customStatusFailed=カスタムエラーページ[{0}]を正しくディスパッチできませんでした。 +standardPipeline.basic.start=新しい基本 Valve を開始できません。 +standardPipeline.basic.stop=古い基本 Valve を停止できません。 +standardPipeline.valve.destroy=Valve を破棄できません。 +standardPipeline.valve.start=Valve を開始できません。 +standardPipeline.valve.stop=Valve を停止できません。 + standardServer.accept.timeout=シャットダウンコマンドをリスンするソケットは、accept()の呼び出し後に予期しないタイムアウト[{0}]ミリ秒を経験しました。 これはバグ56684の一例ですか? standardServer.shutdownViaPort=有効なシャットダウンコマンドがシャットダウンポート経由で受信されました。 サーバーインスタンスを停止します。 standardServer.storeConfig.notAvailable=StoreConfig実装は[{0}]という名前のMBeanとして登録されていないため、設定を保存することはできません。 適切なMBeanは通常StoreConfigLifecycleListenerを介して登録されます。 diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties b/java/org/apache/catalina/core/LocalStrings_ko.properties index 3a4f915..26efc08 100644 --- a/java/org/apache/catalina/core/LocalStrings_ko.properties +++ b/java/org/apache/catalina/core/LocalStrings_ko.properties @@ -224,6 +224,12 @@ standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문 standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다. +standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생 +standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생 +standardPipeline.valve.destroy=Valve를 소멸시키는 중 오류 발생 +standardPipeline.valve.start=Valve를 시작시키는 중 오류 발생 +standardPipeline.valve.stop=Valve를 중지시키는 중 오류 발생 + standardServer.accept.timeout=셧다운 명령을 위해 listen하고 있는 소켓이, accept()를 호출 한 후, 예기치 않은 제한 시간 초과([{0}] 밀리초)를 발생시켰습니다. 버그 56684가 발생한 경우일까요? standardServer.shutdownViaPort=셧다운 포트를 통해 유효한 셧다운 명령을 받았습니다. 서버 인스턴스를 중지시킵니다. standardServer.storeConfig.notAvailable=[{0}](이)라는 이름의 MBean으로서 StoreConfig 구현 객체가 등록되지 않았으므로, 어떤 설정도 저장될 수 없었습니다. 보통 StoreConfigLifecycleListener을 통하여 적절한 MBean이 등록됩니다. diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java index c478426..9394b1c 100644 --- a/java/org/apache/catalina/core/StandardPipeline.java +++ b/java/org/apache/catalina/core/StandardPipeline.java @@ -14,12 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.core; - import java.util.ArrayList; +import java.util.List; import java.util.Set; import javax.management.ObjectName; @@ -36,7 +34,7 @@ import org.apache.catalina.util.LifecycleBase; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.ExceptionUtils; - +import org.apache.tomcat.util.res.StringManager; /** * Standard implementation of a processing <b>Pipeline</b> that will invoke @@ -50,11 +48,11 @@ import org.apache.tomcat.util.ExceptionUtils; * * @author Craig R. McClanahan */ - public class StandardPipeline extends LifecycleBase implements Pipeline, Contained { private static final Log log = LogFactory.getLog(StandardPipeline.class); + private static final StringManager sm = StringManager.getManager(Constants.Package); // ----------------------------------------------------------- Constructors @@ -268,7 +266,7 @@ public class StandardPipeline extends LifecycleBase try { ((Lifecycle) oldBasic).stop(); } catch (LifecycleException e) { - log.error("StandardPipeline.setBasic: stop", e); + log.error(sm.getString("standardPipeline.basic.stop"), e); } } if (oldBasic instanceof Contained) { @@ -290,7 +288,7 @@ public class StandardPipeline extends LifecycleBase try { ((Lifecycle) valve).start(); } catch (LifecycleException e) { - log.error("StandardPipeline.setBasic: start", e); + log.error(sm.getString("standardPipeline.basic.start"), e); return; } } @@ -342,7 +340,7 @@ public class StandardPipeline extends LifecycleBase try { ((Lifecycle) valve).start(); } catch (LifecycleException e) { - log.error("StandardPipeline.addValve: start: ", e); + log.error(sm.getString("standardPipeline.valve.start"), e); } } } @@ -375,7 +373,7 @@ public class StandardPipeline extends LifecycleBase @Override public Valve[] getValves() { - ArrayList<Valve> valveList = new ArrayList<>(); + List<Valve> valveList = new ArrayList<>(); Valve current = first; if (current == null) { current = basic; @@ -391,7 +389,7 @@ public class StandardPipeline extends LifecycleBase public ObjectName[] getValveObjectNames() { - ArrayList<ObjectName> valveList = new ArrayList<>(); + List<ObjectName> valveList = new ArrayList<>(); Valve current = first; if (current == null) { current = basic; @@ -444,13 +442,13 @@ public class StandardPipeline extends LifecycleBase try { ((Lifecycle) valve).stop(); } catch (LifecycleException e) { - log.error("StandardPipeline.removeValve: stop: ", e); + log.error(sm.getString("standardPipeline.valve.stop"), e); } } try { ((Lifecycle) valve).destroy(); } catch (LifecycleException e) { - log.error("StandardPipeline.removeValve: destroy: ", e); + log.error(sm.getString("standardPipeline.valve.destroy"), e); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org