From: kkolinko Date: Wed, 7 Apr 2010 03:24:08 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49018 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=19c5b0e4ed79b1d761d39d94817cdaaba2e94361;p=tomcat7.0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49018 Fix processing of time argument in the "Expire sessions" action in the Manager web application Also, provide separate templates for the "managerServlet.sessiontimeout" message, to allow it to be properly translated into other languages. I cannot provide the actual translations, though. The translated variants of the new messages are now a mix of English and translated text, which just mimics the old behaviour. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@931415 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties index 711797c5f..ae3f389f3 100644 --- a/java/org/apache/catalina/manager/LocalStrings.properties +++ b/java/org/apache/catalina/manager/LocalStrings.properties @@ -100,7 +100,9 @@ managerServlet.saveFail=FAIL - Configuration save failed: {0} managerServlet.saved=OK - Server configuration saved managerServlet.savedContext=OK - Context {0} configuration saved managerServlet.sessiondefaultmax=Default maximum session inactive interval {0} minutes -managerServlet.sessiontimeout={0} minutes:{1} sessions +managerServlet.sessiontimeout={0} minutes: {1} sessions +managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions +managerServlet.sessiontimeout.expired={0} minutes: {1} sessions were expired managerServlet.sessions=OK - Session information for application at context path {0} managerServlet.started=OK - Started application at context path {0} managerServlet.startFailed=FAIL - Application at context path {0} could not be started diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties b/java/org/apache/catalina/manager/LocalStrings_de.properties index 1963ba5eb..135a74ecc 100644 --- a/java/org/apache/catalina/manager/LocalStrings_de.properties +++ b/java/org/apache/catalina/manager/LocalStrings_de.properties @@ -79,7 +79,10 @@ managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ {0} managerServlet.rolesList=OK - Auflistung der Sicherheits-Rollen managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen: {0} managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal {0} Minuten Inaktivit\u00e4t +#TODO: Please review the following three messages. These are displayed when "Expire sessions" button is pressed in the Manager webapp: managerServlet.sessiontimeout={0} Minuten: {1} Sitzungen +managerServlet.sessiontimeout.unlimited=unlimited Minuten: {0} Sitzungen +managerServlet.sessiontimeout.expired={0} Minuten: expired {1} Sitzungen managerServlet.sessions=OK - Sitzungs-Informationen f\u00fcr Anwendung mit Kontext Pfad {0} managerServlet.started=OK - Anwendung mit Kontext Pfad {0} gestartet managerServlet.startFailed=FEHLER - Anwendung mit Kontext Pfad {0} konnte nicht gestartet werden diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties b/java/org/apache/catalina/manager/LocalStrings_es.properties index 0609cb7e5..98ded900e 100644 --- a/java/org/apache/catalina/manager/LocalStrings_es.properties +++ b/java/org/apache/catalina/manager/LocalStrings_es.properties @@ -86,7 +86,10 @@ managerServlet.saveFail = FAIL - Fallo al guardar la configuraci\u00F3n\: {0} managerServlet.saved = OK - Configuraci\u00F3n de Servidor guardada managerServlet.savedContext = OK - Configuraci\u00F3n de Contexto {0} guardada managerServlet.sessiondefaultmax = Intervalo m\u00E1ximo por defecto de sesi\u00F3n inactiva {0} minutos -managerServlet.sessiontimeout = {0} minutos\: {1} sesiones +#TODO: Please review the following three messages. These are displayed when "Expire sessions" button is pressed in the Manager webapp: +managerServlet.sessiontimeout={0} minutos: {1} sesiones +managerServlet.sessiontimeout.unlimited=unlimited minutos: {0} sesiones +managerServlet.sessiontimeout.expired={0} minutos: expired {1} sesiones managerServlet.sessions = OK - Informaci\u00F3n de sesi\u00F3n para aplicaci\u00F3n en trayectoria de contexto {0} managerServlet.started = OK - Arrancada aplicaci\u00F3n en trayectoria de contexto {0} managerServlet.startFailed = FALLO - No se pudo arrancar la aplicaci\u00F3n en trayectoria de contexto {0} diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties b/java/org/apache/catalina/manager/LocalStrings_fr.properties index 6481030c9..f4f86a186 100644 --- a/java/org/apache/catalina/manager/LocalStrings_fr.properties +++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties @@ -87,7 +87,10 @@ managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a \u00e9chou\u managerServlet.saved=OK - Configuration serveur sauvegard\u00e9e managerServlet.savedContext=OK - Configuration du contexte {0} sauvegard\u00e9e managerServlet.sessiondefaultmax=Interval par d\u00e9faut de maximum de session inactive {0} minutes -managerServlet.sessiontimeout={0} minutes:{1} sessions +#TODO: Please review the following three messages. These are displayed when "Expire sessions" button is pressed in the Manager webapp: +managerServlet.sessiontimeout={0} minutes: {1} sessions +managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions +managerServlet.sessiontimeout.expired={0} minutes: {1} sessions were expired managerServlet.sessions=OK - Information de session pour l''application au chemin de contexte {0} managerServlet.started=OK - Application d\u00e9marr\u00e9e pour le chemin de contexte {0} managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte {0} n''a pas pu \u00eatre d\u00e9marr\u00e9e diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties b/java/org/apache/catalina/manager/LocalStrings_ja.properties index 3e496f6fd..2be5183d0 100644 --- a/java/org/apache/catalina/manager/LocalStrings_ja.properties +++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties @@ -79,7 +79,10 @@ managerServlet.saveFail=FAIL - \u8a2d\u5b9a\u306e\u4fdd\u5b58\u306b\u5931\u6557\ managerServlet.saved=OK - \u30b5\u30fc\u30d0\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f managerServlet.savedContext=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {0} \u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f managerServlet.sessiondefaultmax=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u6700\u5927\u30bb\u30c3\u30b7\u30e7\u30f3\u505c\u6b62\u9593\u9694\u306f{0}\u5206\u3067\u3059 +#TODO: Please review the following three messages. These are displayed when "Expire sessions" button is pressed in the Manager webapp: managerServlet.sessiontimeout={0}\u5206: {1}\u30bb\u30c3\u30b7\u30e7\u30f3 +managerServlet.sessiontimeout.unlimited=unlimited \u5206: {0}\u30bb\u30c3\u30b7\u30e7\u30f3 +managerServlet.sessiontimeout.expired={0}\u5206: expired {1}\u30bb\u30c3\u30b7\u30e7\u30f3 managerServlet.sessions=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u60c5\u5831\u3067\u3059 managerServlet.started=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8d77\u52d5\u3057\u307e\u3057\u305f managerServlet.startFailed=FAIL - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093 diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java index 683d7baa1..66bb647eb 100644 --- a/java/org/apache/catalina/manager/ManagerServlet.java +++ b/java/org/apache/catalina/manager/ManagerServlet.java @@ -1146,7 +1146,7 @@ public class ManagerServlet int time = (int)((now-sessions[i].getThisAccessedTimeInternal())/1000); if (idle >= 0 && time >= idle*60) { sessions[i].expire(); - idle++; + expired++; } time=time/60/histoInterval; if (time < 0) @@ -1170,11 +1170,11 @@ public class ManagerServlet ">=" + maxCount*histoInterval, "" + timeout[maxCount-1])); if (notimeout > 0) - writer.println(sm.getString("managerServlet.sessiontimeout", - "unlimited","" + notimeout)); + writer.println(sm.getString("managerServlet.sessiontimeout.unlimited", + "" + notimeout)); if (idle >= 0) - writer.println(sm.getString("managerServlet.sessiontimeout", - "" + idle,"expired " + expired)); + writer.println(sm.getString("managerServlet.sessiontimeout.expired", + "" + idle,"" + expired)); } catch (Throwable t) { log("ManagerServlet.sessions[" + displayPath + "]", t); writer.println(sm.getString("managerServlet.exception",