GUACAMOLE-394: Merge refactor extension API to define user history
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/81ffa5c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/81ffa5c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/81ffa5c8 Branch: refs/heads/master Commit: 81ffa5c8e16ee702bb9c2618bb3bf072a34a5c1d Parents: 9b5483e 3cd7f45 Author: Nick Couchman <[email protected]> Authored: Wed Sep 27 18:14:43 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Wed Sep 27 18:14:43 2017 -0400 ---------------------------------------------------------------------- .../jdbc/connection/ConnectionRecordSet.java | 10 +- .../ConnectionRecordSortPredicate.java | 8 +- .../auth/jdbc/connection/ModeledConnection.java | 6 + .../sharing/connection/SharedConnection.java | 6 + .../auth/jdbc/sharing/user/SharedUser.java | 19 +++ .../jdbc/sharing/user/SharedUserContext.java | 16 ++- .../guacamole/auth/jdbc/user/ModeledUser.java | 12 ++ .../auth/jdbc/user/ModeledUserContext.java | 9 ++ .../jdbc/connection/ConnectionRecordMapper.xml | 4 +- .../jdbc/connection/ConnectionRecordMapper.xml | 4 +- .../guacamole/auth/ldap/user/UserContext.java | 16 ++- .../guacamole/net/auth/ActivityRecord.java | 78 +++++++++++ .../guacamole/net/auth/ActivityRecordSet.java | 128 +++++++++++++++++++ .../apache/guacamole/net/auth/Connection.java | 13 ++ .../guacamole/net/auth/ConnectionRecord.java | 48 +------ .../guacamole/net/auth/ConnectionRecordSet.java | 106 +-------------- .../org/apache/guacamole/net/auth/User.java | 30 +++++ .../apache/guacamole/net/auth/UserContext.java | 26 +++- .../auth/simple/SimpleActivityRecordSet.java | 62 +++++++++ .../net/auth/simple/SimpleConnection.java | 6 + .../auth/simple/SimpleConnectionRecordSet.java | 14 +- .../guacamole/net/auth/simple/SimpleUser.java | 13 ++ .../net/auth/simple/SimpleUserContext.java | 14 +- .../rest/connection/APIConnectionWrapper.java | 6 + .../APIConnectionRecordSortPredicate.java | 26 ++-- .../guacamole/rest/history/HistoryResource.java | 4 +- .../guacamole/rest/user/APIUserWrapper.java | 14 ++ 27 files changed, 504 insertions(+), 194 deletions(-) ----------------------------------------------------------------------
