GUACAMOLE-394: Merge add support for recording user login/logout history to database auth.
diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index 3a0438e..26bddf3 100644
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-example</artifactId>
<packaging>war</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-example</name>
<url>http://guacamole.apache.org/</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>compile</scope>
</dependency>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
diff --git a/doc/guacamole-playback-example/pom.xml b/doc/guacamole-playback-example/pom.xml
index d567f7b..d925d92 100644
--- a/doc/guacamole-playback-example/pom.xml
+++ b/doc/guacamole-playback-example/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-playback-example</artifactId>
<packaging>war</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-playback-example</name>
<url>http://guacamole.apache.org/</url>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index 352dcb8..f87ae3f 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-cas</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-cas</name>
<url>http://guacamole.apache.org/</url>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
@@ -218,7 +218,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
index d241e38..6c2865f 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "CAS Authentication Extension",
"namespace" : "guac-cas",
diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml
index 2d49cea..dba5413 100644
--- a/extensions/guacamole-auth-duo/pom.xml
+++ b/extensions/guacamole-auth-duo/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-duo</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-duo</name>
<url>http://guacamole.apache.org/</url>
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
index f12896c..455aa5e 100644
--- a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "Duo TFA Authentication Backend",
"namespace" : "duo",
diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml
index 409a9a6..db944ce 100644
--- a/extensions/guacamole-auth-header/pom.xml
+++ b/extensions/guacamole-auth-header/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-header</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-header</name>
<url>http://guacamole.apache.org/</url>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
index ccc9d30..434e08e 100644
--- a/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "HTTP Header Authentication Extension",
"namespace" : "guac-header",
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
index 0bd3821..55bfa42 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<relativePath>../../</relativePath>
</parent>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
index 46c1259..a2ed0c3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<relativePath>../../</relativePath>
</parent>
@@ -99,21 +99,21 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-mysql</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
<!-- PostgreSQL Authentication Extension -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-postgresql</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
<!-- SQL Server Authentication Extension -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
</dependencies>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
index f332c24..466e57b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<relativePath>../../</relativePath>
</parent>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
</dependencies>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
index ebea496..8e172c3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "MySQL Authentication",
"namespace" : "guac-mysql",
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
index cac68f2..dbad026 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<relativePath>../../</relativePath>
</parent>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
</dependencies>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
index 4e18cb7..a2ff47b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "PostgreSQL Authentication",
"namespace" : "guac-postgresql",
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
index c1e7ec7..d10db14 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<relativePath>../../</relativePath>
</parent>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
</dependencies>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
index ee61ab5..852303d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "SQLServer Authentication",
"namespace" : "guac-sqlserver",
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index f9278d1..e436ea2 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<packaging>pom</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-jdbc</name>
<url>http://guacamole.apache.org/</url>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 782fd26..8f3655f 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-ldap</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-ldap</name>
<url>http://guacamole.apache.org/</url>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
index 6d3a9e3..639c2e1 100644
--- a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "LDAP Authentication",
"namespace" : "guac-ldap",
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 5060f53..c211b81 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-noauth</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-noauth</name>
<url>http://guacamole.apache.org/</url>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
index 8df24f6..e993864 100644
--- a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "Disabled Authentication (DEPRECATED)",
"namespace" : "guac-noauth",
diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml
index 251fbf0..ccac0a3 100644
--- a/extensions/guacamole-auth-openid/pom.xml
+++ b/extensions/guacamole-auth-openid/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-openid</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-openid</name>
<url>http://guacamole.apache.org/</url>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
index e71c140..aacca86 100644
--- a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "OpenID Authentication Extension",
"namespace" : "guac-openid",
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index c7ea73d..0eeb588 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<packaging>pom</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-common-js</name>
<url>http://guacamole.apache.org/</url>
diff --git a/guacamole-common-js/src/main/webapp/modules/Version.js b/guacamole-common-js/src/main/webapp/modules/Version.js
index c9f28b2..2ec8c20 100644
--- a/guacamole-common-js/src/main/webapp/modules/Version.js
+++ b/guacamole-common-js/src/main/webapp/modules/Version.js
@@ -27,4 +27,4 @@
*
* @type {String}
*/
-Guacamole.API_VERSION = "0.9.13-incubating";
+Guacamole.API_VERSION = "0.9.14";
diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index 00fdb45..beb5c9e 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-common</name>
<url>http://guacamole.apache.org/</url>
diff --git a/guacamole-docker/README.md b/guacamole-docker/README.md
index 21b9454..89ea1fa 100644
--- a/guacamole-docker/README.md
+++ b/guacamole-docker/README.md
@@ -58,8 +58,9 @@
docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --postgres > initdb.sql
-Alternatively, you can use the SQL scripts included with
-[guacamole-auth-jdbc](https://github.com/apache/guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
+Alternatively, you can use the SQL scripts included with the
+guacamole-auth-jdbc extension from
+[the corresponding release](http://guacamole.apache.org/releases/).
Once this script is generated, you must:
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index 44154a2..339abf8 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-ext</name>
<url>http://guacamole.apache.org/</url>
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>compile</scope>
</dependency>
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 712be72..9fa9fce 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId>
<packaging>war</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole</name>
<url>http://guacamole.apache.org/</url>
@@ -264,21 +264,21 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
</dependency>
<!-- Guacamole JavaScript API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
index a74c4c0..524ff57 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
@@ -60,7 +60,7 @@
private static final List<String> ALLOWED_GUACAMOLE_VERSIONS =
Collections.unmodifiableList(Arrays.asList(
"*",
- "0.9.13-incubating"
+ "0.9.14"
));
/**
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java
index 8e6a385..e402e67 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java
@@ -20,6 +20,7 @@
package org.apache.guacamole.rest.connection;
import java.util.Collection;
+import java.util.Date;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -75,7 +76,13 @@
* The count of currently active connections using this connection.
*/
private int activeConnections;
-
+
+ /**
+ * The date and time that this connection was last used, or null if this
+ * connection has never been used or this information is unavailable.
+ */
+ private Date lastActive;
+
/**
* Create an empty APIConnection.
*/
@@ -97,6 +104,7 @@
this.identifier = connection.getIdentifier();
this.parentIdentifier = connection.getParentIdentifier();
this.activeConnections = connection.getActiveConnections();
+ this.lastActive = connection.getLastActive();
// Set protocol from configuration
GuacamoleConfiguration configuration = connection.getConfiguration();
@@ -257,4 +265,27 @@
this.sharingProfiles = sharingProfiles;
}
+ /**
+ * Returns the date and time that this connection was last used, or null if
+ * this connection has never been used or this information is unavailable.
+ *
+ * @return
+ * The date and time that this connection was last used, or null if this
+ * connection has never been used or this information is unavailable.
+ */
+ public Date getLastActive() {
+ return lastActive;
+ }
+
+ /**
+ * Sets the date and time that this connection was last used.
+ *
+ * @param lastActive
+ * The date and time that this connection was last used, or null if this
+ * connection has never been used or this information is unavailable.
+ */
+ public void setLastActive(Date lastActive) {
+ this.lastActive = lastActive;
+ }
+
}
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIActivityRecord.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIActivityRecord.java
new file mode 100644
index 0000000..c1a0149
--- /dev/null
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIActivityRecord.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole.rest.history;
+
+import java.util.Date;
+import org.apache.guacamole.net.auth.ActivityRecord;
+
+/**
+ * A activity record which may be exposed through the REST endpoints.
+ */
+public class APIActivityRecord {
+
+ /**
+ * The date and time the activity began.
+ */
+ private final Date startDate;
+
+ /**
+ * The date and time the activity ended, or null if the activity is
+ * still in progress or if the end time is unknown.
+ */
+ private final Date endDate;
+
+ /**
+ * The hostname or IP address of the remote host that performed the
+ * activity associated with this record, if known.
+ */
+ private final String remoteHost;
+
+ /**
+ * The name of the user who performed or is performing the activity
+ * associated with this record.
+ */
+ private final String username;
+
+ /**
+ * Whether the activity is still in progress.
+ */
+ private final boolean active;
+
+ /**
+ * Creates a new APIActivityRecord, copying the data from the given activity
+ * record.
+ *
+ * @param record
+ * The record to copy data from.
+ */
+ public APIActivityRecord(ActivityRecord record) {
+ this.startDate = record.getStartDate();
+ this.endDate = record.getEndDate();
+ this.remoteHost = record.getRemoteHost();
+ this.username = record.getUsername();
+ this.active = record.isActive();
+ }
+
+ /**
+ * Returns the date and time the activity began.
+ *
+ * @return
+ * The date and time the activity began.
+ */
+ public Date getStartDate() {
+ return startDate;
+ }
+
+ /**
+ * Returns the date and time the activity ended, if applicable.
+ *
+ * @return
+ * The date and time the activity ended, or null if the activity is
+ * still in progress or if the end time is unknown.
+ */
+ public Date getEndDate() {
+ return endDate;
+ }
+
+ /**
+ * Returns the hostname or IP address of the remote host that performed the
+ * activity associated with this record, if known.
+ *
+ * @return
+ * The hostname or IP address of the remote host that performed the
+ * activity associated with this record, or null if the remote host is
+ * unknown.
+ */
+ public String getRemoteHost() {
+ return remoteHost;
+ }
+
+ /**
+ * Returns the name of the user who performed or is performing the activity
+ * associated with this record.
+ *
+ * @return
+ * The name of the user who performed or is performing the activity
+ * associated with this record.
+ */
+ public String getUsername() {
+ return username;
+ }
+
+ /**
+ * Returns whether the activity associated with this record is still in
+ * progress.
+ *
+ * @return
+ * true if the activity associated with this record is still in
+ * progress, false otherwise.
+ */
+ public boolean isActive() {
+ return active;
+ }
+
+}
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java
index 97c99a0..9d17fbf 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java
@@ -19,13 +19,12 @@
package org.apache.guacamole.rest.history;
-import java.util.Date;
import org.apache.guacamole.net.auth.ConnectionRecord;
/**
* A connection record which may be exposed through the REST endpoints.
*/
-public class APIConnectionRecord {
+public class APIConnectionRecord extends APIActivityRecord {
/**
* The identifier of the connection associated with this record.
@@ -48,32 +47,6 @@
private final String sharingProfileName;
/**
- * The date and time the connection began.
- */
- private final Date startDate;
-
- /**
- * The date and time the connection ended, or null if the connection is
- * still running or if the end time is unknown.
- */
- private final Date endDate;
-
- /**
- * The host from which the connection originated, if known.
- */
- private final String remoteHost;
-
- /**
- * The name of the user who used or is using the connection.
- */
- private final String username;
-
- /**
- * Whether the connection is currently active.
- */
- private final boolean active;
-
- /**
* Creates a new APIConnectionRecord, copying the data from the given
* record.
*
@@ -81,15 +54,11 @@
* The record to copy data from.
*/
public APIConnectionRecord(ConnectionRecord record) {
+ super(record);
this.connectionIdentifier = record.getConnectionIdentifier();
this.connectionName = record.getConnectionName();
this.sharingProfileIdentifier = record.getSharingProfileIdentifier();
this.sharingProfileName = record.getSharingProfileName();
- this.startDate = record.getStartDate();
- this.endDate = record.getEndDate();
- this.remoteHost = record.getRemoteHost();
- this.username = record.getUsername();
- this.active = record.isActive();
}
/**
@@ -139,58 +108,4 @@
return sharingProfileName;
}
- /**
- * Returns the date and time the connection began.
- *
- * @return
- * The date and time the connection began.
- */
- public Date getStartDate() {
- return startDate;
- }
-
- /**
- * Returns the date and time the connection ended, if applicable.
- *
- * @return
- * The date and time the connection ended, or null if the connection is
- * still running or if the end time is unknown.
- */
- public Date getEndDate() {
- return endDate;
- }
-
- /**
- * Returns the remote host from which this connection originated.
- *
- * @return
- * The remote host from which this connection originated.
- */
- public String getRemoteHost() {
- return remoteHost;
- }
-
- /**
- * Returns the name of the user who used or is using the connection at the
- * times given by this connection record.
- *
- * @return
- * The name of the user who used or is using the associated connection.
- */
- public String getUsername() {
- return username;
- }
-
- /**
- * Returns whether the connection associated with this record is still
- * active.
- *
- * @return
- * true if the connection associated with this record is still active,
- * false otherwise.
- */
- public boolean isActive() {
- return active;
- }
-
}
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/APISortPredicate.java
similarity index 92%
rename from guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java
rename to guacamole/src/main/java/org/apache/guacamole/rest/history/APISortPredicate.java
index d2281d0..c45ae9a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/APISortPredicate.java
@@ -25,10 +25,10 @@
import org.apache.guacamole.rest.APIException;
/**
- * A sort predicate which species the property to use when sorting connection
+ * A sort predicate which species the property to use when sorting activity
* records, along with the sort order.
*/
-public class APIConnectionRecordSortPredicate {
+public class APISortPredicate {
/**
* The prefix which will be included before the name of a sortable property
@@ -43,8 +43,8 @@
public enum SortableProperty {
/**
- * The date that the connection associated with the connection record
- * began (connected).
+ * The date that the activity associated with the activity record
+ * began.
*/
startDate(ActivityRecordSet.SortableProperty.START_DATE);
@@ -70,7 +70,7 @@
}
/**
- * The property to use when sorting ConnectionRecords.
+ * The property to use when sorting ActivityRecords.
*/
private ActivityRecordSet.SortableProperty property;
@@ -93,7 +93,7 @@
* @throws APIException
* If the provided sort predicate string is invalid.
*/
- public APIConnectionRecordSortPredicate(String value)
+ public APISortPredicate(String value)
throws APIException {
// Parse whether sort order is descending
@@ -124,7 +124,7 @@
* @return
* The ActivityRecordSet.SortableProperty which refers to the same
* property as the string originally provided when this
- * APIConnectionRecordSortPredicate was created.
+ * APISortPredicate was created.
*/
public ActivityRecordSet.SortableProperty getProperty() {
return property;
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java
index 53a8cdb..559ebd5 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryResource.java
@@ -28,6 +28,7 @@
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.ActivityRecord;
import org.apache.guacamole.net.auth.ActivityRecordSet;
import org.apache.guacamole.net.auth.ConnectionRecord;
import org.apache.guacamole.net.auth.UserContext;
@@ -88,7 +89,7 @@
@Path("connections")
public List<APIConnectionRecord> getConnectionHistory(
@QueryParam("contains") List<String> requiredContents,
- @QueryParam("order") List<APIConnectionRecordSortPredicate> sortPredicates)
+ @QueryParam("order") List<APISortPredicate> sortPredicates)
throws GuacamoleException {
// Retrieve overall connection history
@@ -101,7 +102,7 @@
}
// Sort according to specified ordering
- for (APIConnectionRecordSortPredicate predicate : sortPredicates)
+ for (APISortPredicate predicate : sortPredicates)
history = history.sort(predicate.getProperty(), predicate.isDescending());
// Limit to maximum result size
@@ -117,4 +118,59 @@
}
+ /**
+ * Retrieves the login history for all users, restricted by optional filter
+ * parameters.
+ *
+ * @param requiredContents
+ * The set of strings that each must occur somewhere within the
+ * returned user records, whether within the associated username or any
+ * associated date. If non-empty, any user record not matching each of
+ * the strings within the collection will be excluded from the results.
+ *
+ * @param sortPredicates
+ * A list of predicates to apply while sorting the resulting user
+ * records, describing the properties involved and the sort order for
+ * those properties.
+ *
+ * @return
+ * A list of user records, describing the start and end times of user
+ * sessions.
+ *
+ * @throws GuacamoleException
+ * If an error occurs while retrieving the user history.
+ */
+ @GET
+ @Path("users")
+ public List<APIActivityRecord> getUserHistory(
+ @QueryParam("contains") List<String> requiredContents,
+ @QueryParam("order") List<APISortPredicate> sortPredicates)
+ throws GuacamoleException {
+
+ // Retrieve overall user history
+ ActivityRecordSet<ActivityRecord> history = userContext.getUserHistory();
+
+ // Restrict to records which contain the specified strings
+ for (String required : requiredContents) {
+ if (!required.isEmpty())
+ history = history.contains(required);
+ }
+
+ // Sort according to specified ordering
+ for (APISortPredicate predicate : sortPredicates)
+ history = history.sort(predicate.getProperty(), predicate.isDescending());
+
+ // Limit to maximum result size
+ history = history.limit(MAXIMUM_HISTORY_SIZE);
+
+ // Convert record set to collection of API user records
+ List<APIActivityRecord> apiRecords = new ArrayList<APIActivityRecord>();
+ for (ActivityRecord record : history.asCollection())
+ apiRecords.add(new APIActivityRecord(record));
+
+ // Return the converted history
+ return apiRecords;
+
+ }
+
}
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java
index 96e2230..e71b5d2 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java
@@ -19,6 +19,7 @@
package org.apache.guacamole.rest.user;
+import java.util.Date;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -47,6 +48,12 @@
private Map<String, String> attributes;
/**
+ * The date and time that this user was last logged in, or null if this user
+ * has never logged in or this information is unavailable.
+ */
+ private Date lastActive;
+
+ /**
* Construct a new empty APIUser.
*/
public APIUser() {}
@@ -60,6 +67,7 @@
// Set user information
this.username = user.getIdentifier();
this.password = user.getPassword();
+ this.lastActive = user.getLastActive();
// Associate any attributes
this.attributes = user.getAttributes();
@@ -122,4 +130,27 @@
this.attributes = attributes;
}
+ /**
+ * Returns the date and time that this user was last logged in, or null if
+ * this user has never logged in or this information is unavailable.
+ *
+ * @return
+ * The date and time that this user was last logged in, or null if this
+ * user has never logged in or this information is unavailable.
+ */
+ public Date getLastActive() {
+ return lastActive;
+ }
+
+ /**
+ * Sets the date and time that this user was last logged in.
+ *
+ * @param lastActive
+ * The date and time that this user was last logged in, or null if this
+ * user has never logged in or this information is unavailable.
+ */
+ public void setLastActive(Date lastActive) {
+ this.lastActive = lastActive;
+ }
+
}
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
index 3f142ff..75a49db 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
@@ -21,8 +21,11 @@
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -30,6 +33,7 @@
import javax.ws.rs.core.MediaType;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.ActivityRecord;
import org.apache.guacamole.net.auth.AuthenticationProvider;
import org.apache.guacamole.net.auth.Credentials;
import org.apache.guacamole.net.auth.User;
@@ -38,6 +42,7 @@
import org.apache.guacamole.net.auth.credentials.GuacamoleCredentialsException;
import org.apache.guacamole.rest.directory.DirectoryObjectResource;
import org.apache.guacamole.rest.directory.DirectoryObjectTranslator;
+import org.apache.guacamole.rest.history.APIActivityRecord;
import org.apache.guacamole.rest.permission.PermissionSetResource;
/**
@@ -93,6 +98,31 @@
this.user = user;
}
+ /**
+ * Retrieves the login (session) history of a single user.
+ *
+ * @return
+ * A list of activity records, describing the start and end times of
+ * this user's sessions.
+ *
+ * @throws GuacamoleException
+ * If an error occurs while retrieving the user history.
+ */
+ @GET
+ @Path("history")
+ public List<APIActivityRecord> getUserHistory()
+ throws GuacamoleException {
+
+ // Retrieve the requested user's history
+ List<APIActivityRecord> apiRecords = new ArrayList<APIActivityRecord>();
+ for (ActivityRecord record : user.getHistory())
+ apiRecords.add(new APIActivityRecord(record));
+
+ // Return the converted history
+ return apiRecords;
+
+ }
+
@Override
public void updateObject(APIUser modifiedObject) throws GuacamoleException {
diff --git a/guacamole/src/main/webapp/app/rest/types/Connection.js b/guacamole/src/main/webapp/app/rest/types/Connection.js
index b4639b2..76ece9d 100644
--- a/guacamole/src/main/webapp/app/rest/types/Connection.js
+++ b/guacamole/src/main/webapp/app/rest/types/Connection.js
@@ -104,6 +104,15 @@
*/
this.sharingProfiles = template.sharingProfiles;
+ /**
+ * The time that this connection was last used, in milliseconds since
+ * 1970-01-01 00:00:00 UTC. If this information is unknown or
+ * unavailable, this will be null.
+ *
+ * @type Number
+ */
+ this.lastActive = template.lastActive;
+
};
return Connection;
diff --git a/guacamole/src/main/webapp/app/rest/types/User.js b/guacamole/src/main/webapp/app/rest/types/User.js
index 9edd1f2..f796147 100644
--- a/guacamole/src/main/webapp/app/rest/types/User.js
+++ b/guacamole/src/main/webapp/app/rest/types/User.js
@@ -54,6 +54,15 @@
this.password = template.password;
/**
+ * The time that this user was last logged in, in milliseconds since
+ * 1970-01-01 00:00:00 UTC. If this information is unknown or
+ * unavailable, this will be null.
+ *
+ * @type Number
+ */
+ this.lastActive = template.lastActive;
+
+ /**
* Arbitrary name/value pairs which further describe this user. The
* semantics and validity of these attributes are dictated by the
* extension which defines them.
diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
index cc134fa..1ac9fad 100644
--- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
+++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
@@ -36,9 +36,11 @@
// Required types
var ManageableUser = $injector.get('ManageableUser');
var PermissionSet = $injector.get('PermissionSet');
+ var SortOrder = $injector.get('SortOrder');
// Required services
var $location = $injector.get('$location');
+ var $translate = $injector.get('$translate');
var authenticationService = $injector.get('authenticationService');
var dataSourceService = $injector.get('dataSourceService');
var guacNotification = $injector.get('guacNotification');
@@ -98,10 +100,38 @@
* @type String[]
*/
$scope.filteredUserProperties = [
+ 'user.lastActive',
'user.username'
];
/**
+ * The date format for use for the last active date.
+ *
+ * @type String
+ */
+ $scope.dateFormat = null;
+
+ /**
+ * SortOrder instance which stores the sort order of the listed
+ * users.
+ *
+ * @type SortOrder
+ */
+ $scope.order = new SortOrder([
+ 'user.username',
+ '-user.lastActive'
+ ]);
+
+ // Get session date format
+ $translate('SETTINGS_USERS.FORMAT_DATE')
+ .then(function dateFormatReceived(retrievedDateFormat) {
+
+ // Store received date format
+ $scope.dateFormat = retrievedDateFormat;
+
+ });
+
+ /**
* Returns whether critical data has completed being loaded.
*
* @returns {Boolean}
@@ -110,7 +140,8 @@
*/
$scope.isLoaded = function isLoaded() {
- return $scope.manageableUsers !== null
+ return $scope.dateFormat !== null
+ && $scope.manageableUsers !== null
&& $scope.permissions !== null;
};
diff --git a/guacamole/src/main/webapp/app/settings/styles/user-list.css b/guacamole/src/main/webapp/app/settings/styles/user-list.css
new file mode 100644
index 0000000..6c0edd5
--- /dev/null
+++ b/guacamole/src/main/webapp/app/settings/styles/user-list.css
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.settings.users table.user-list {
+ width: 100%;
+}
+
+.settings.users table.user-list th.last-active,
+.settings.users table.user-list td.last-active {
+ white-space: nowrap;
+ width: 0;
+}
+
+.settings.users table.user-list th.username,
+.settings.users table.user-list td.username {
+ width: 100%;
+}
+
+.settings.users table.user-list tr.user td.username a[href] {
+ display: block;
+ padding: .5em 1em;
+}
+
+.settings.users table.user-list tr.user td.username {
+ padding: 0;
+}
diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html b/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html
index 41dac6c..67f6760 100644
--- a/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html
+++ b/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html
@@ -21,19 +21,32 @@
</div>
<!-- List of users this user has access to -->
- <div class="user-list">
- <div ng-repeat="manageableUser in manageableUserPage" class="user list-item">
- <a ng-href="#/manage/{{manageableUser.dataSource}}/users/{{manageableUser.user.username}}">
- <div class="caption">
- <div class="icon user"></div>
- <span class="name">{{manageableUser.user.username}}</span>
- </div>
- </a>
- </div>
- </div>
+ <table class="sorted user-list">
+ <thead>
+ <tr>
+ <th guac-sort-order="order" guac-sort-property="'user.username'" class="username">
+ {{'SETTINGS_USERS.TABLE_HEADER_USERNAME' | translate}}
+ </th>
+ <th guac-sort-order="order" guac-sort-property="'user.lastActive'" class="last-active">
+ {{'SETTINGS_USERS.TABLE_HEADER_LAST_ACTIVE' | translate}}
+ </th>
+ </tr>
+ </thead>
+ <tbody ng-class="{loading: !isLoaded()}">
+ <tr ng-repeat="manageableUser in manageableUserPage" class="user">
+ <td class="username">
+ <a ng-href="#/manage/{{manageableUser.dataSource}}/users/{{manageableUser.user.username}}">
+ <div class="icon user"></div>
+ <span class="name">{{manageableUser.user.username}}</span>
+ </a>
+ </td>
+ <td class="last-active">{{manageableUser.user.lastActive | date : dateFormat}}</td>
+ </tr>
+ </tbody>
+ </table>
<!-- Pager controls for user list -->
<guac-pager page="manageableUserPage" page-size="25"
- items="filteredManageableUsers | orderBy : 'user.username'"></guac-pager>
+ items="filteredManageableUsers | orderBy : order.predicate"></guac-pager>
</div>
\ No newline at end of file
diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json
index 9403402..90953e5 100644
--- a/guacamole/src/main/webapp/translations/de.json
+++ b/guacamole/src/main/webapp/translations/de.json
@@ -598,9 +598,13 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
"HELP_USERS" : "Klicke oder Tippe auf einen Benutzer um diesen zu verwalten. Abhänig von Ihrer Zugriffsebene können Benutzer hinzugefügt, gelöscht bzw. dessen Passwort geändert werden.",
- "SECTION_HEADER_USERS" : "Benutzer"
+ "SECTION_HEADER_USERS" : "Benutzer",
+
+ "TABLE_HEADER_USERNAME" : "Benutzername"
},
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 2b4fb5d..a64f64c 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -675,9 +675,14 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
"HELP_USERS" : "Click or tap on a user below to manage that user. Depending on your access level, users can be added and deleted, and their passwords can be changed.",
- "SECTION_HEADER_USERS" : "Users"
+ "SECTION_HEADER_USERS" : "Users",
+
+ "TABLE_HEADER_LAST_ACTIVE" : "Last active",
+ "TABLE_HEADER_USERNAME" : "Username"
},
diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json
index d59c384..8ebbd36 100644
--- a/guacamole/src/main/webapp/translations/fr.json
+++ b/guacamole/src/main/webapp/translations/fr.json
@@ -601,9 +601,13 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
"HELP_USERS" : "Cliquer ou appuyer sur un utilisateur en dessous pour le gérer. Selon vos permissions, les utilisateurs peuvent être ajoutés, supprimés, leur mot de passe changé.",
- "SECTION_HEADER_USERS" : "Utilisateur"
+ "SECTION_HEADER_USERS" : "Utilisateur",
+
+ "TABLE_HEADER_USERNAME" : "Identifiant"
},
diff --git a/guacamole/src/main/webapp/translations/it.json b/guacamole/src/main/webapp/translations/it.json
index e84e67f..5b3f641 100644
--- a/guacamole/src/main/webapp/translations/it.json
+++ b/guacamole/src/main/webapp/translations/it.json
@@ -543,9 +543,13 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
"HELP_USERS" : "Click or tap on a user below to manage that user. Depending on your access level, users can be added and deleted, and their passwords can be changed.",
- "SECTION_HEADER_USERS" : "Utenti"
+ "SECTION_HEADER_USERS" : "Utenti",
+
+ "TABLE_HEADER_USERNAME" : "Username"
},
diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json
index 7cc867b..69a789a 100644
--- a/guacamole/src/main/webapp/translations/nl.json
+++ b/guacamole/src/main/webapp/translations/nl.json
@@ -631,9 +631,13 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
"HELP_USERS" : "Klik of tik op een van de onderstaande gebruikers om die te beheren. Afhankelijk van uw toegangsniveau kunnen gebruikers worden toegevoegd, verwijderd en hun wachtwoorden gewijzigd.",
- "SECTION_HEADER_USERS" : "Gebruikers"
+ "SECTION_HEADER_USERS" : "Gebruikers",
+
+ "TABLE_HEADER_USERNAME" : "Gebruikersnaam"
},
diff --git a/guacamole/src/main/webapp/translations/no.json b/guacamole/src/main/webapp/translations/no.json
index 8b20b5d..30ea871 100644
--- a/guacamole/src/main/webapp/translations/no.json
+++ b/guacamole/src/main/webapp/translations/no.json
@@ -612,9 +612,13 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
"HELP_USERS" : "Klikk på en bruker under for å administrere den brukeren. Avhengig av din tilgang kan brukere legges til, slettes og passordet kan endres.",
- "SECTION_HEADER_USERS" : "Brukere"
+ "SECTION_HEADER_USERS" : "Brukere",
+
+ "TABLE_HEADER_USERNAME" : "Brukernavn"
},
diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json
index 0e47f60..4f04525 100644
--- a/guacamole/src/main/webapp/translations/ru.json
+++ b/guacamole/src/main/webapp/translations/ru.json
@@ -524,9 +524,13 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
"HELP_USERS" : "Нажмите на пользователя, чтобы управлять им. В зависимости от прав доступа возможно добавление и удаление пользователей, а также изменение паролей.",
- "SECTION_HEADER_USERS" : "Пользователи"
+ "SECTION_HEADER_USERS" : "Пользователи",
+
+ "TABLE_HEADER_USERNAME" : "Имя пользователя"
},
diff --git a/pom.xml b/pom.xml
index 954a318..fcd6503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId>
<packaging>pom</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-client</name>
<url>http://guacamole.apache.org/</url>
