tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r932912 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/manager/ webapps/docs/
Date Sun, 11 Apr 2010 14:25:21 GMT
Author: markt
Date: Sun Apr 11 14:25:21 2010
New Revision: 932912

URL: http://svn.apache.org/viewvc?rev=932912&view=rev
Log:
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.
The patch also provides separate templates for different variants of a message, printed by
that action. That is to allow proper translation of those messages, though I cannot provide
such translation by myself. (kkolinko)

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 14:25:21 2010
@@ -243,16 +243,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1: 
 
-* 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.
-  The patch also provides separate templates for different variants of a
-  message, printed by that action. That is to allow proper translation of
-  those messages, though I cannot provide such translation by myself.
-  http://svn.apache.org/viewvc?rev=931415&view=rev
-  +1: kkolinko, markt, kfujino
-  -1:
-
 * Use chunked encoding for http 1.1 requests with no content-length (regardless
   of keep-alive) so client can differentiate between complete and partial
   responses.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties Sun Apr
11 14:25:21 2010
@@ -98,7 +98,9 @@ managerServlet.saveFail=FAIL - Configura
 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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties Sun Apr
11 14:25:21 2010
@@ -80,7 +80,10 @@ managerServlet.resourcesType=OK - Auflis
 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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties Sun Apr
11 14:25:21 2010
@@ -86,7 +86,10 @@ managerServlet.saveFail = FAIL - Fallo a
 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}

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties Sun Apr
11 14:25:21 2010
@@ -88,7 +88,10 @@ managerServlet.saveFail=ECHEC - La sauve
 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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties Sun Apr
11 14:25:21 2010
@@ -79,7 +79,10 @@ managerServlet.saveFail=FAIL - \u8a2d\u5
 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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Apr 11 14:25:21
2010
@@ -1175,7 +1175,7 @@ public class ManagerServlet
                 int time = (int)((now-sessions[i].getLastAccessedTimeInternal())/1000);
                 if (idle >= 0 && time >= idle*60) {
                     sessions[i].expire();
-                    idle++;
+                    expired++;
                 }
                 time=time/60/histoInterval;
                 if (time < 0)
@@ -1199,11 +1199,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",

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=932912&r1=932911&r2=932912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 14:25:21 2010
@@ -68,6 +68,10 @@
         <bug>48790</bug>: Fix thread safety issue in the count of the maximum
         number of active session. (markt/kkolinko)
       </fix>
+      <fix>
+        <bug>49018</bug>: Fix processing of time argument in the Expire sessions

+        action in the Manager web application. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message