summaryrefslogtreecommitdiff
path: root/qpid/java/broker
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2012-09-06 15:22:04 +0000
committerKeith Wall <kwall@apache.org>2012-09-06 15:22:04 +0000
commitb081663c3b7c2f6394d2a432188541c078576556 (patch)
treea4e2ac89e64e11151aa4e116bf42f7b60eb75f16 /qpid/java/broker
parent09feae6b99eb09648ed6849e62705438931296e6 (diff)
downloadqpid-python-b081663c3b7c2f6394d2a432188541c078576556.tar.gz
QPID-4255: Add "log out" functionality to web UI
* Added logout link to the Web Management UI (displayed once a user is logged in). * Added operation logging (open/close event) to report the fact that the user has logged in, logged out (or gone away i.e. web session timeout). * Allow Jetty web session timeout to be overridden from the config.xml Work of Robbie Gemmell <robbie@apache.org> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1381637 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java9
-rw-r--r--qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java13
2 files changed, 22 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index de34ed1fad..d70cec58e0 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -605,6 +605,14 @@ public class ServerConfiguration extends ConfigurationPlugin
return getBooleanValue("management.http.basic-auth", false);
}
+ /**
+ * @return value in seconds
+ */
+ public int getHTTPManagementSessionTimeout()
+ {
+ return getIntValue("management.http.session-timeout", 60 * 15);
+ }
+
public boolean getHTTPSManagementEnabled()
{
return getBooleanValue("management.https.enabled", false);
@@ -1064,4 +1072,5 @@ public class ServerConfiguration extends ConfigurationPlugin
}
+
}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index 5d4e0edcc9..00b0ad7e39 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
@@ -313,6 +313,19 @@ public class ServerConfigurationTest extends QpidTestCase
assertEquals(false, _serverConfig.getHTTPManagementEnabled());
}
+ public void testGetHTTPManagementSessionTimeout() throws ConfigurationException
+ {
+ // Check default
+ _serverConfig.initialise();
+ assertEquals(60 * 15, _serverConfig.getHTTPManagementSessionTimeout());
+
+ // Check value we set
+ _config.setProperty("management.http.session-timeout", 60);
+ _serverConfig = new ServerConfiguration(_config);
+ _serverConfig.initialise();
+ assertEquals(60, _serverConfig.getHTTPManagementSessionTimeout());
+ }
+
public void testGetHTTPManagementSaslAuthEnabled() throws ConfigurationException
{
// Check default