You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/10/01 17:39:51 UTC
guacamole-client git commit: GUACAMOLE-220: Merge add database
support for user groups. [Forced Update!]
Repository: guacamole-client
Updated Branches:
refs/heads/staging/1.0.0 c8a68d37f -> 828313541 (forced update)
GUACAMOLE-220: Merge add database support for user groups.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/82831354
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/82831354
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/82831354
Branch: refs/heads/staging/1.0.0
Commit: 828313541b1903cc148f8d04b8bdcd4d5006dcd4
Parents: aa7cd9d 4d51962
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Oct 1 13:33:07 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Oct 1 13:38:55 2018 -0400
----------------------------------------------------------------------
.../modules/guacamole-auth-jdbc-base/pom.xml | 10 +-
.../jdbc/JDBCAuthenticationProviderModule.java | 26 +
.../guacamole/auth/jdbc/JDBCEnvironment.java | 15 +
.../ActiveConnectionPermissionService.java | 51 +-
.../guacamole/auth/jdbc/base/EntityMapper.java | 80 +++
.../guacamole/auth/jdbc/base/EntityModel.java | 113 ++++
.../guacamole/auth/jdbc/base/EntityService.java | 98 ++++
.../guacamole/auth/jdbc/base/EntityType.java | 38 ++
.../ModeledChildDirectoryObjectService.java | 7 +-
.../jdbc/base/ModeledDirectoryObjectMapper.java | 14 +-
.../base/ModeledDirectoryObjectService.java | 22 +-
.../auth/jdbc/base/ModeledPermissions.java | 271 ++++++++++
.../auth/jdbc/base/ObjectRelationMapper.java | 126 +++++
.../auth/jdbc/base/RelatedObjectSet.java | 211 ++++++++
.../auth/jdbc/connection/ConnectionMapper.java | 10 +-
.../jdbc/connection/ConnectionRecordMapper.java | 9 +-
.../auth/jdbc/connection/ConnectionService.java | 19 +-
.../connectiongroup/ConnectionGroupMapper.java | 10 +-
.../connectiongroup/ConnectionGroupService.java | 14 +-
.../permission/AbstractPermissionService.java | 59 +-
.../ConnectionGroupPermissionService.java | 11 +-
.../permission/ConnectionPermissionService.java | 11 +-
.../ModeledObjectPermissionService.java | 98 ++--
.../permission/ModeledPermissionService.java | 44 +-
.../jdbc/permission/ObjectPermissionMapper.java | 42 +-
.../permission/ObjectPermissionService.java | 49 +-
.../jdbc/permission/ObjectPermissionSet.java | 48 +-
.../auth/jdbc/permission/PermissionMapper.java | 20 +-
.../auth/jdbc/permission/PermissionModel.java | 50 +-
.../auth/jdbc/permission/PermissionService.java | 67 ++-
.../SharingProfilePermissionService.java | 11 +-
.../jdbc/permission/SystemPermissionMapper.java | 24 +-
.../permission/SystemPermissionService.java | 70 +--
.../jdbc/permission/SystemPermissionSet.java | 44 +-
.../permission/UserGroupPermissionMapper.java | 25 +
.../permission/UserGroupPermissionService.java | 67 +++
.../jdbc/permission/UserGroupPermissionSet.java | 42 ++
.../jdbc/permission/UserPermissionService.java | 11 +-
.../sharing/user/SharedAuthenticatedUser.java | 11 +-
.../sharingprofile/SharingProfileService.java | 10 +-
.../tunnel/AbstractGuacamoleTunnelService.java | 4 +-
.../jdbc/user/ModeledAuthenticatedUser.java | 9 +-
.../guacamole/auth/jdbc/user/ModeledUser.java | 114 +---
.../auth/jdbc/user/ModeledUserContext.java | 16 +-
.../auth/jdbc/user/RemoteAuthenticatedUser.java | 20 +-
.../guacamole/auth/jdbc/user/UserMapper.java | 2 +-
.../guacamole/auth/jdbc/user/UserModel.java | 6 +-
.../jdbc/user/UserParentUserGroupMapper.java | 28 +
.../auth/jdbc/user/UserParentUserGroupSet.java | 59 ++
.../auth/jdbc/user/UserRecordMapper.java | 9 +-
.../guacamole/auth/jdbc/user/UserService.java | 24 +-
.../auth/jdbc/usergroup/ModeledUserGroup.java | 206 +++++++
.../auth/jdbc/usergroup/UserGroupDirectory.java | 82 +++
.../auth/jdbc/usergroup/UserGroupMapper.java | 42 ++
.../UserGroupMemberUserGroupMapper.java | 28 +
.../usergroup/UserGroupMemberUserGroupSet.java | 57 ++
.../usergroup/UserGroupMemberUserMapper.java | 28 +
.../jdbc/usergroup/UserGroupMemberUserSet.java | 57 ++
.../auth/jdbc/usergroup/UserGroupModel.java | 68 +++
.../UserGroupParentUserGroupMapper.java | 28 +
.../usergroup/UserGroupParentUserGroupSet.java | 58 ++
.../auth/jdbc/usergroup/UserGroupService.java | 183 +++++++
.../src/main/resources/translations/en.json | 8 +
.../schema/001-create-schema.sql | 196 +++++--
.../schema/002-create-admin-user.sql | 26 +-
.../schema/upgrade/upgrade-pre-1.0.0.sql | 335 ++++++++++++
.../guacamole/auth/mysql/MySQLEnvironment.java | 55 +-
.../guacamole/auth/mysql/MySQLVersion.java | 153 ++++++
.../guacamole/auth/jdbc/base/EntityMapper.xml | 156 ++++++
.../auth/jdbc/connection/ConnectionMapper.xml | 30 +-
.../jdbc/connection/ConnectionRecordMapper.xml | 22 +-
.../connectiongroup/ConnectionGroupMapper.xml | 36 +-
.../ConnectionGroupPermissionMapper.xml | 44 +-
.../permission/ConnectionPermissionMapper.xml | 44 +-
.../SharingProfilePermissionMapper.xml | 46 +-
.../jdbc/permission/SystemPermissionMapper.xml | 40 +-
.../permission/UserGroupPermissionMapper.xml | 149 ++++++
.../jdbc/permission/UserPermissionMapper.xml | 85 +--
.../sharingprofile/SharingProfileMapper.xml | 18 +-
.../auth/jdbc/user/PasswordRecordMapper.xml | 3 +-
.../guacamole/auth/jdbc/user/UserMapper.xml | 82 ++-
.../jdbc/user/UserParentUserGroupMapper.xml | 96 ++++
.../auth/jdbc/user/UserRecordMapper.xml | 29 +-
.../auth/jdbc/usergroup/UserGroupMapper.xml | 229 ++++++++
.../UserGroupMemberUserGroupMapper.xml | 93 ++++
.../usergroup/UserGroupMemberUserMapper.xml | 93 ++++
.../UserGroupParentUserGroupMapper.xml | 96 ++++
.../schema/001-create-schema.sql | 233 ++++++--
.../schema/002-create-admin-user.sql | 27 +-
.../schema/upgrade/upgrade-pre-1.0.0.sql | 357 +++++++++++++
.../auth/postgresql/PostgreSQLEnvironment.java | 6 +
.../guacamole/auth/jdbc/base/EntityMapper.xml | 123 +++++
.../auth/jdbc/connection/ConnectionMapper.xml | 30 +-
.../jdbc/connection/ConnectionRecordMapper.xml | 22 +-
.../connectiongroup/ConnectionGroupMapper.xml | 36 +-
.../ConnectionGroupPermissionMapper.xml | 48 +-
.../permission/ConnectionPermissionMapper.xml | 48 +-
.../SharingProfilePermissionMapper.xml | 48 +-
.../jdbc/permission/SystemPermissionMapper.xml | 44 +-
.../permission/UserGroupPermissionMapper.xml | 156 ++++++
.../jdbc/permission/UserPermissionMapper.xml | 89 ++--
.../sharingprofile/SharingProfileMapper.xml | 18 +-
.../auth/jdbc/user/PasswordRecordMapper.xml | 3 +-
.../guacamole/auth/jdbc/user/UserMapper.xml | 82 ++-
.../jdbc/user/UserParentUserGroupMapper.xml | 96 ++++
.../auth/jdbc/user/UserRecordMapper.xml | 29 +-
.../auth/jdbc/usergroup/UserGroupMapper.xml | 229 ++++++++
.../UserGroupMemberUserGroupMapper.xml | 93 ++++
.../usergroup/UserGroupMemberUserMapper.xml | 93 ++++
.../UserGroupParentUserGroupMapper.xml | 96 ++++
.../schema/001-create-schema.sql | 303 ++++++++---
.../schema/002-create-admin-user.sql | 21 +-
.../schema/upgrade/upgrade-pre-1.0.0.sql | 532 +++++++++++++++++++
.../auth/sqlserver/SQLServerEnvironment.java | 8 +-
.../guacamole/auth/jdbc/base/EntityMapper.xml | 127 +++++
.../auth/jdbc/connection/ConnectionMapper.xml | 30 +-
.../jdbc/connection/ConnectionRecordMapper.xml | 22 +-
.../connectiongroup/ConnectionGroupMapper.xml | 36 +-
.../ConnectionGroupPermissionMapper.xml | 52 +-
.../permission/ConnectionPermissionMapper.xml | 44 +-
.../SharingProfilePermissionMapper.xml | 44 +-
.../jdbc/permission/SystemPermissionMapper.xml | 40 +-
.../permission/UserGroupPermissionMapper.xml | 153 ++++++
.../jdbc/permission/UserPermissionMapper.xml | 100 ++--
.../sharingprofile/SharingProfileMapper.xml | 18 +-
.../auth/jdbc/user/PasswordRecordMapper.xml | 3 +-
.../guacamole/auth/jdbc/user/UserMapper.xml | 84 ++-
.../jdbc/user/UserParentUserGroupMapper.xml | 96 ++++
.../auth/jdbc/user/UserRecordMapper.xml | 29 +-
.../auth/jdbc/usergroup/UserGroupMapper.xml | 229 ++++++++
.../UserGroupMemberUserGroupMapper.xml | 93 ++++
.../usergroup/UserGroupMemberUserMapper.xml | 93 ++++
.../UserGroupParentUserGroupMapper.xml | 96 ++++
133 files changed, 8377 insertions(+), 1132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/82831354/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
----------------------------------------------------------------------