This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit b256250720386198273122af551d4d17ce850276
Merge: 1ca9179 26a9246
Author: Virtually Nick <[email protected]>
AuthorDate: Wed Mar 2 16:27:00 2022 -0500

    GUACAMOLE-462: Merge add support for associating connection history with 
logs/recordings.

 .../ActivityRecordMapper.java}                     |  74 +++---
 .../auth/jdbc/base/ModeledActivityRecord.java      |  63 ++++-
 .../auth/jdbc/base/ModeledActivityRecordSet.java   |  37 ++-
 .../jdbc/connection/ConnectionRecordMapper.java    | 108 +-------
 .../auth/jdbc/connection/ConnectionRecordSet.java  |  22 +-
 .../auth/jdbc/connection/ConnectionService.java    |  86 +------
 .../jdbc/connection/ModeledConnectionRecord.java   |   7 +-
 .../tunnel/AbstractGuacamoleTunnelService.java     |  72 +++---
 .../auth/jdbc/tunnel/ActiveConnectionRecord.java   | 193 +++++++-------
 .../auth/jdbc/user/ModeledUserContext.java         |   2 +-
 .../guacamole/auth/jdbc/user/UserRecordMapper.java | 118 +--------
 .../guacamole/auth/jdbc/user/UserRecordSet.java    |  18 +-
 .../guacamole/auth/jdbc/user/UserService.java      |  79 +-----
 .../jdbc/connection/ConnectionRecordMapper.xml     |  51 ++--
 .../guacamole/auth/jdbc/user/UserRecordMapper.xml  |  44 +---
 .../jdbc/connection/ConnectionRecordMapper.xml     |  53 ++--
 .../guacamole/auth/jdbc/user/UserRecordMapper.xml  |  44 +---
 .../jdbc/connection/ConnectionRecordMapper.xml     |  49 ++--
 .../guacamole/auth/jdbc/user/UserRecordMapper.xml  |  44 +---
 .../guacamole-history-recording-storage/.gitignore |   3 +
 .../guacamole-history-recording-storage/.ratignore |   0
 .../guacamole-history-recording-storage/pom.xml    |  52 ++++
 .../src/main/assembly/dist.xml                     |  53 ++++
 .../history/HistoryAuthenticationProvider.java     |  89 +++++++
 .../history/connection/HistoryConnection.java      |  71 ++++++
 .../connection/HistoryConnectionRecord.java        | 284 +++++++++++++++++++++
 .../RecordedConnectionActivityRecordSet.java       | 125 +++++++++
 .../guacamole/history/user/HistoryUserContext.java | 122 +++++++++
 .../src/main/resources/guac-manifest.json          |  16 ++
 .../src/main/resources/translations/en.json        |  14 +
 extensions/pom.xml                                 |   1 +
 .../guacamole/net/auth/AbstractActivityLog.java    |  65 +++++
 .../org/apache/guacamole/net/auth/ActivityLog.java | 142 +++++++++++
 .../apache/guacamole/net/auth/ActivityRecord.java  |  53 +++-
 .../guacamole/net/auth/ActivityRecordSet.java      |  24 ++
 .../org/apache/guacamole/net/auth/Attributes.java  |  17 +-
 .../guacamole/net/auth/ConnectionRecord.java       |  14 +
 .../net/auth/DecoratingActivityRecordSet.java      | 165 ++++++++++++
 .../net/auth/DelegatingActivityRecord.java         | 104 ++++++++
 .../net/auth/DelegatingActivityRecordSet.java      |  88 +++++++
 .../net/auth/DelegatingConnectionRecord.java       |  81 ++++++
 .../apache/guacamole/net/auth/FileActivityLog.java |  74 ++++++
 .../{Attributes.java => ReadableAttributes.java}   |  20 +-
 .../frontend/src/app/rest/types/ActivityLog.js     |  89 +++++++
 .../src/app/rest/types/ConnectionHistoryEntry.js   |  34 +++
 .../guacamole/rest/history/APIActivityLog.java     |  74 ++++++
 .../guacamole/rest/history/APIActivityRecord.java  |  84 ++++++
 .../rest/history/ActivityLogResource.java          |  77 ++++++
 .../rest/history/ActivityRecordResource.java       | 107 ++++++++
 .../rest/history/ActivityRecordSetResource.java    |  84 +++++-
 50 files changed, 2604 insertions(+), 786 deletions(-)

Reply via email to