Bug 1202327 - Relax the 1h minimum Session timeout validation

Show GUI Session Timeout in minutes, changed minimum acceptable timeout to 1
minute

Author: Libor Zoubek

modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java

@@ -73,10 +73,10 @@
 public class UserSessionManager {
     private static final Messages MSG = CoreGUI.getMessages();
 
+    private static int SESSION_TIMEOUT_MINIMUM = 60 * 1000;
     // The length of CoreGUI inactivity (no call to refresh()) before a CoreGUI session timeout    
     // Initially: 1 hour
-    private static int SESSION_TIMEOUT_MINIMUM = 60 * 60 * 1000;
-    private static int sessionTimeout = SESSION_TIMEOUT_MINIMUM;
+    private static int sessionTimeout = SESSION_TIMEOUT_MINIMUM * 60;
 
     // After CoreGUI logout, the delay before the server-side logout. This is the period in which we allow in-flight
     // async requests to complete.

modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java

@@ -105,7 +105,7 @@ public void onSuccess(SystemSettings result) {
                 prop.setStringValue(convertMillisToMinutes(prop.getStringValue()));
 
                 prop = config.getSimple(SystemSetting.RHQ_SESSION_TIMEOUT.getInternalName());
-                prop.setStringValue(convertMillisToHours(prop.getStringValue()));
+                prop.setStringValue(convertMillisToMinutes(prop.getStringValue()));
 
                 prop = config.getSimple(SystemSetting.DATA_MAINTENANCE_PERIOD.getInternalName());
                 prop.setStringValue(convertMillisToHours(prop.getStringValue()));
@@ -204,10 +204,10 @@ private void save() {
                 // some of our properties actually need different values on the server than how they were
                 // visualized in the UI.
                 // -- some other numerical values need to be converted to milliseconds
-                if (SystemSetting.AGENT_MAX_QUIET_TIME_ALLOWED.getInternalName().equals(simple.getName())) {
-                    value = convertMinutesToMillis(value);
-                } else if (SystemSetting.DATA_MAINTENANCE_PERIOD.getInternalName().equals(simple.getName())
+                if (SystemSetting.AGENT_MAX_QUIET_TIME_ALLOWED.getInternalName().equals(simple.getName())
                     || SystemSetting.RHQ_SESSION_TIMEOUT.getInternalName().equals(simple.getName())) {
+                    value = convertMinutesToMillis(value);
+                } else if (SystemSetting.DATA_MAINTENANCE_PERIOD.getInternalName().equals(simple.getName())) {
                     value = convertHoursToMillis(value);
                 } else if (SystemSetting.AVAILABILITY_PURGE_PERIOD.getInternalName().equals(simple.getName())
                     || SystemSetting.ALERT_PURGE_PERIOD.getInternalName().equals(simple.getName())

modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties

@@ -1071,7 +1071,7 @@ view_admin_systemSettings_PartitionEventPurge_desc = How old partition events mu
 view_admin_systemSettings_PartitionEventPurge_name = Delete Partition Events Older Than
 view_admin_systemSettings_ResourceConfigHistoryPurge_desc = How old resource configuration history must be before being purged from the database. This is specified in days. Setting to 0 disables purge of resource configuration history, keeping it indefinitely.
 view_admin_systemSettings_ResourceConfigHistoryPurge_name = Delete Resource Configuration History Older Than
-view_admin_systemSettings_RHQSessionTimeout_desc = If this amount of time passes without any user interaction in the browser, the session is considered as expired and user is asked to log in again. This value is specified in hours.
+view_admin_systemSettings_RHQSessionTimeout_desc = If this amount of time passes without any user interaction in the browser, the session is considered as expired and user is asked to log in again. This value is specified in minutes.
 view_admin_systemSettings_RHQSessionTimeout_name = GUI Session Timeout
 view_admin_systemSettings_RemoteSshPasswordDefault_desc = The default SSH password to be used when logging into a remote machine for doing things like controlling or installing remote agents.
 view_admin_systemSettings_RemoteSshPasswordDefault_name = Default Remote SSH Password

modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties

@@ -1077,7 +1077,7 @@ view_admin_systemSettings_LDAPUrl_name = LDAP URL
 #view_admin_systemSettings_PartitionEventPurge_name = Delete Partition Events Older Than
 #view_admin_systemSettings_ResourceConfigHistoryPurge_desc = How old resource configuration history must be before being purged from the database. This is specified in days. Setting to 0 disables purge of resource configuration history, keeping it indefinitely.
 #view_admin_systemSettings_ResourceConfigHistoryPurge_name = Delete Resource Configuration History Older Than
-view_admin_systemSettings_RHQSessionTimeout_desc = Pokud uplyne tato doba a uživatel mezitím nezadal žádný příkaz ve webovém rozhraní RHQ, sezení tímto vyprší a uživatel je požádán o nové přihlášení. Tato doba je specifikována v hodinách.
+view_admin_systemSettings_RHQSessionTimeout_desc = Pokud uplyne tato doba a uživatel mezitím nezdal žádný příkaz ve webovém rozhraní RHQ, sezení tímto vyprší a uživatel je požádán o nové přihlášení. Tato doba je specifikována v minutách.
 view_admin_systemSettings_RHQSessionTimeout_name = Web UI doba sezení
 ##view_admin_systemSettings_RemoteSshPasswordDefault_desc = The default SSH password to be used when logging into a remote machine for doing things like controlling or installing remote agents.
 ##view_admin_systemSettings_RemoteSshPasswordDefault_name = Default Remote SSH Password

modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties

@@ -1056,7 +1056,7 @@ view_admin_systemSettings_LDAPUrl_name = LDAP URL
 <<<<<<< HEAD
 view_admin_systemSettings_OperationHistoryPurge_desc = Wie alt die Operationshistorie sein muss, ehe sie aus der Datenbank gel\u00F6scht wird. Dies wird in Tagen festgelegt. Die Einstellung auf 0 deaktiviert die Operationshistorie, so dass diese f\u00FCr unbegrezte Zeit behalten wird.
 view_admin_systemSettings_OperationHistoryPurge_name = Operationshistorie l\u00F6schen, wenn \u00E4lter als 
-view_admin_systemSettings_RHQSessionTimeout_desc = Wenn diese Zeit ohne jegliche Benutzerinteraktion im Browser vergeht, so wird die Session als abgelaufen angesehen und der Benutzer muss sich erneut anmelden. Dieser Wert wird in Stunden angegeben.
+view_admin_systemSettings_RHQSessionTimeout_desc = Wenn diese Zeit ohne jegliche Benutzerinteraktion im Browser vergeht, so wird die Session als abgelaufen angesehen und der Benutzer muss sich erneut anmelden. Dieser Wert wird in Minuten angegeben.
 view_admin_systemSettings_RHQSessionTimeout_name = GUI Session Timeout
 view_admin_systemSettings_RemoteSshPasswordDefault_desc = Das zu verwendende SSH-Passwort bei der Anmeldung bei einem Remote Rechner zur Steuerung oder zur Installation von Remote Agents.
 view_admin_systemSettings_RemoteSshPasswordDefault_name = Standard Remote SSH-Passwort

modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties

@@ -1055,7 +1055,7 @@ view_admin_systemSettings_LDAPUrl_desc = LDAP \u30B5\u30FC\u30D0\u30FC\u3078\u30
 view_admin_systemSettings_LDAPUrl_name = LDAP URL
 view_admin_systemSettings_OperationHistoryPurge_desc = \u64CD\u4F5C\u5C65\u6B74\u306E\u4FDD\u6301\u671F\u9593\u3002\u3053\u306E\u671F\u9593\u3092\u904E\u304E\u308B\u3068\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30D1\u30FC\u30B8\u3055\u308C\u307E\u3059\u3002\u65E5\u5358\u4F4D\u3067\u6307\u5B9A\u3055\u308C\u307E\u3059\u30020 \u3092\u8A2D\u5B9A\u3059\u308B\u3068\u64CD\u4F5C\u5C65\u6B74\u306E\u30D1\u30FC\u30B8\u304C\u7121\u52B9\u306B\u306A\u308A\u3001\u7121\u671F\u9650\u306B\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
 view_admin_systemSettings_OperationHistoryPurge_name = \u3053\u308C\u4EE5\u524D\u306E\u64CD\u4F5C\u5C65\u6B74\u306E\u524A\u9664
-view_admin_systemSettings_RHQSessionTimeout_desc = \u3053\u306E\u671F\u9593\u30D6\u30E9\u30A6\u30B6\u30FC\u3067\u30E6\u30FC\u30B6\u30FC\u306E\u3084\u308A\u3068\u308A\u304C\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u671F\u9650\u5207\u308C\u3068\u307F\u306A\u3055\u308C\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u518D\u5EA6\u30ED\u30B0\u30A4\u30F3\u3059\u308B\u3088\u3046\u8981\u6C42\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u5024\u306F\u6642\u5358\u4F4D\u3067\u6307\u5B9A\u3055\u308C\u307E\u3059\u3002
+view_admin_systemSettings_RHQSessionTimeout_desc = \u3053\u306E\u671F\u9593\u30D6\u30E9\u30A6\u30B6\u30FC\u3067\u30E6\u30FC\u30B6\u30FC\u306E\u3084\u308A\u3068\u308A\u304C\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u671F\u9650\u5207\u308C\u3068\u307F\u306A\u3055\u308C\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u518D\u5EA6\u30ED\u30B0\u30A4\u30F3\u3059\u308B\u3088\u3046\u8981\u6C42\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u5024\u306F\u5206\u5358\u4F4D\u3067\u6307\u5B9A\u3055\u308C\u307E\u3059\u3002
 view_admin_systemSettings_RHQSessionTimeout_name = GUI \u30BB\u30C3\u30B7\u30E7\u30F3\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
 view_admin_systemSettings_RemoteSshPasswordDefault_desc = \u30EA\u30E2\u30FC\u30C8\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306E\u5236\u5FA1\u3084\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306A\u3069\u3092\u884C\u3046\u305F\u3081\u306B\u30EA\u30E2\u30FC\u30C8\u30DE\u30B7\u30F3\u3078\u30ED\u30B0\u30A4\u30F3\u3059\u308B\u3068\u304D\u306B\u4F7F\u7528\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u306E SSH \u30D1\u30B9\u30EF\u30FC\u30C9\u3002
 view_admin_systemSettings_RemoteSshPasswordDefault_name = \u30C7\u30D5\u30A9\u30EB\u30C8\u30EA\u30E2\u30FC\u30C8 SSH \u30D1\u30B9\u30EF\u30FC\u30C9