GUACAMOLE-189: Merge per-connection guacd functionality.
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/d9b888e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/d9b888e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/d9b888e9 Branch: refs/heads/master Commit: d9b888e99a69f1c99875a6924100615579ffb89f Parents: ea5c8c5 31b1b42 Author: James Muehlner <[email protected]> Authored: Wed May 10 20:38:05 2017 -0700 Committer: James Muehlner <[email protected]> Committed: Wed May 10 20:38:05 2017 -0700 ---------------------------------------------------------------------- .../auth/jdbc/connection/ConnectionModel.java | 92 ++++++++++++ .../auth/jdbc/connection/ModeledConnection.java | 141 ++++++++++++++++++- .../tunnel/AbstractGuacamoleTunnelService.java | 77 +++++----- .../src/main/resources/translations/en.json | 11 +- .../schema/upgrade/upgrade-pre-0.9.13.sql | 30 ++++ .../auth/jdbc/connection/ConnectionMapper.xml | 36 ++++- .../schema/upgrade/upgrade-pre-0.9.13.sql | 35 +++++ .../auth/jdbc/connection/ConnectionMapper.xml | 36 ++++- .../guacamole/environment/Environment.java | 16 +++ .../guacamole/environment/LocalEnvironment.java | 32 +++++ .../net/auth/GuacamoleProxyConfiguration.java | 132 +++++++++++++++++ .../net/auth/simple/SimpleConnection.java | 63 +++++---- 12 files changed, 618 insertions(+), 83 deletions(-) ----------------------------------------------------------------------
