This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 9ad5d4801c2ce9510afdbd347067edcab86cafbc
Merge: 3854da3 1f8c240
Author: Michael Jumper <mjum...@apache.org>
AuthorDate: Fri Oct 30 11:30:11 2020 -0700
Merge 1.3.0 changes back to master.
.../auth/jdbc/base/ModeledActivityRecordSet.java | 4 +-
.../jdbc/connection/ConnectionRecordMapper.java | 19 +++-
.../auth/jdbc/connection/ConnectionRecordSet.java | 27 +++++-
.../auth/jdbc/connection/ConnectionService.java | 85 ++++++++++++------
.../auth/jdbc/connection/ModeledConnection.java | 16 +++-
.../jdbc/sharing/connection/SharedConnection.java | 8 --
.../auth/jdbc/sharing/user/SharedUser.java | 10 ---
.../guacamole/auth/jdbc/user/ModeledUser.java | 14 ++-
.../guacamole/auth/jdbc/user/UserRecordMapper.java | 23 +++--
.../guacamole/auth/jdbc/user/UserRecordSet.java | 27 +++++-
.../guacamole/auth/jdbc/user/UserService.java | 58 +++++++++---
.../jdbc/connection/ConnectionRecordMapper.xml | 100 ++++++++++++---------
.../guacamole/auth/jdbc/user/UserRecordMapper.xml | 86 ++++++++++--------
.../jdbc/connection/ConnectionRecordMapper.xml | 98 +++++++++++---------
.../guacamole/auth/jdbc/user/UserRecordMapper.xml | 85 ++++++++++--------
.../jdbc/connection/ConnectionRecordMapper.xml | 100 ++++++++++++---------
.../guacamole/auth/jdbc/user/UserRecordMapper.xml | 84 +++++++++--------
.../apache/guacamole/net/auth/AbstractUser.java | 14 +--
.../org/apache/guacamole/net/auth/Connection.java | 56 ++++++++++--
.../guacamole/net/auth/DelegatingConnection.java | 7 ++
.../apache/guacamole/net/auth/DelegatingUser.java | 7 ++
.../java/org/apache/guacamole/net/auth/User.java | 44 ++++++++-
.../net/auth/simple/SimpleActivityRecordSet.java | 26 +++++-
.../net/auth/simple/SimpleConnection.java | 9 +-
.../rest/connection/APIConnectionWrapper.java | 15 +---
.../rest/connection/ConnectionResource.java | 45 +++++++---
.../guacamole/rest/history/HistoryResource.java | 16 +++-
.../apache/guacamole/rest/user/APIUserWrapper.java | 8 --
.../apache/guacamole/rest/user/UserResource.java | 43 ++++++---
29 files changed, 746 insertions(+), 388 deletions(-)
