GUACAMOLE-81: Merge sharing profile connection permission check changes.
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/83c744d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/83c744d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/83c744d2 Branch: refs/heads/master Commit: 83c744d27106a771236cbe0c91c623422432def5 Parents: 39a25db f32dbac Author: James Muehlner <[email protected]> Authored: Sat Aug 20 21:03:15 2016 -0700 Committer: James Muehlner <[email protected]> Committed: Sat Aug 20 21:03:15 2016 -0700 ---------------------------------------------------------------------- .../auth/jdbc/base/ChildObjectModel.java | 65 ++++++ .../auth/jdbc/base/GroupedObjectModel.java | 64 ------ .../jdbc/base/ModeledChildDirectoryObject.java | 75 +++++++ .../ModeledChildDirectoryObjectService.java | 209 +++++++++++++++++++ .../base/ModeledGroupedDirectoryObject.java | 75 ------- .../ModeledGroupedDirectoryObjectService.java | 194 ----------------- .../auth/jdbc/connection/ConnectionModel.java | 4 +- .../auth/jdbc/connection/ConnectionService.java | 13 +- .../auth/jdbc/connection/ModeledConnection.java | 4 +- .../connectiongroup/ConnectionGroupModel.java | 4 +- .../connectiongroup/ConnectionGroupService.java | 13 +- .../connectiongroup/ModeledConnectionGroup.java | 4 +- .../sharingprofile/ModeledSharingProfile.java | 8 +- .../sharingprofile/SharingProfileMapper.java | 4 +- .../sharingprofile/SharingProfileModel.java | 34 +-- .../sharingprofile/SharingProfileService.java | 17 +- .../sharingprofile/SharingProfileMapper.xml | 12 +- .../sharingprofile/SharingProfileMapper.xml | 12 +- 18 files changed, 412 insertions(+), 399 deletions(-) ----------------------------------------------------------------------
