You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/10/23 02:46:57 UTC

[1/2] incubator-guacamole-client git commit: GUACAMOLE-416: Add translation entries for SQL Server module.

Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master b8abcd675 -> 528977422


GUACAMOLE-416: Add translation entries for SQL Server module.


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/cc8ea754
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/cc8ea754
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/cc8ea754

Branch: refs/heads/master
Commit: cc8ea75426b0fbdbc36a929e17ec20334506c085
Parents: b8abcd6
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Oct 13 13:13:12 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Oct 13 13:13:12 2017 -0400

----------------------------------------------------------------------
 .../src/main/resources/translations/en.json                  | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/cc8ea754/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
index c781c15..6e03340 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
@@ -63,6 +63,14 @@
         "NAME" : "Shared Connections (PostgreSQL)"
     },
 
+    "DATA_SOURCE_SQLSERVER" : {
+        "NAME" : "SQL Server"
+    },
+
+    "DATA_SOURCe_SQLSERVER_SHARED" : {
+        "NAME" : "Shared Connections (SQL Server)"
+    },
+
     "HOME" : {
         "INFO_SHARED_BY" : "Shared by {USERNAME}"
     },


[2/2] incubator-guacamole-client git commit: GUACAMOLE-416: Merge addition of missing translation strings for SQL Server auth.

Posted by jm...@apache.org.
GUACAMOLE-416: Merge addition of missing translation strings for SQL Server auth.


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/52897742
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/52897742
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/52897742

Branch: refs/heads/master
Commit: 528977422c7d4fa2258687547e6eea8b3967cd1b
Parents: a5ebc07 cc8ea75
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sun Oct 22 19:43:30 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sun Oct 22 19:43:30 2017 -0700

----------------------------------------------------------------------
 .dockerignore                                   |   1 -
 Dockerfile                                      |  37 +-
 .../auth/cas/CASAuthenticationProvider.java     |   5 +
 .../auth/duo/DuoAuthenticationProvider.java     |   5 +
 .../HTTPHeaderAuthenticationProvider.java       |   5 +
 .../jdbc/InjectedAuthenticationProvider.java    |   5 +
 .../jdbc/connection/ConnectionRecordSet.java    |  10 +-
 .../ConnectionRecordSortPredicate.java          |   8 +-
 .../auth/jdbc/connection/ModeledConnection.java |   6 +
 .../sharing/connection/SharedConnection.java    |   6 +
 .../auth/jdbc/sharing/user/SharedUser.java      |  19 +
 .../jdbc/sharing/user/SharedUserContext.java    |  21 +-
 .../tunnel/AbstractGuacamoleTunnelService.java  |   4 +-
 .../guacamole/auth/jdbc/user/ModeledUser.java   |  12 +
 .../auth/jdbc/user/ModeledUserContext.java      |  14 +
 .../auth/jdbc/user/RemoteAuthenticatedUser.java |   5 +
 .../src/main/resources/translations/en.json     |   8 +
 .../modules/guacamole-auth-jdbc-dist/pom.xml    |   7 +
 .../project-assembly.xml                        |  14 +
 .../jdbc/connection/ConnectionRecordMapper.xml  |   4 +-
 .../guacamole/auth/jdbc/user/UserMapper.xml     |   1 +
 .../jdbc/connection/ConnectionRecordMapper.xml  |   4 +-
 .../guacamole-auth-jdbc-sqlserver/.gitignore    |   2 +
 .../guacamole-auth-jdbc-sqlserver/pom.xml       | 128 +++++
 .../schema/001-create-schema.sql                | 467 +++++++++++++++++++
 .../schema/002-create-admin-user.sql            |  49 ++
 .../SQLServerAuthenticationProvider.java        |  50 ++
 .../SQLServerAuthenticationProviderModule.java  | 121 +++++
 .../auth/sqlserver/SQLServerDriver.java         |  46 ++
 .../auth/sqlserver/SQLServerDriverProperty.java |  60 +++
 .../auth/sqlserver/SQLServerEnvironment.java    | 254 ++++++++++
 .../sqlserver/SQLServerGuacamoleProperties.java | 185 ++++++++
 .../sqlserver/SQLServerInjectorProvider.java    |  49 ++
 .../auth/sqlserver/SQLServerPasswordPolicy.java | 194 ++++++++
 .../SQLServerSharedAuthenticationProvider.java  |  50 ++
 .../guacamole/auth/sqlserver/package-info.java  |  23 +
 .../src/main/resources/guac-manifest.json       |  28 ++
 .../auth/jdbc/connection/ConnectionMapper.xml   | 235 ++++++++++
 .../connection/ConnectionParameterMapper.xml    |  68 +++
 .../jdbc/connection/ConnectionRecordMapper.xml  | 212 +++++++++
 .../connectiongroup/ConnectionGroupMapper.xml   | 232 +++++++++
 .../ConnectionGroupPermissionMapper.xml         | 128 +++++
 .../permission/ConnectionPermissionMapper.xml   | 128 +++++
 .../SharingProfilePermissionMapper.xml          | 128 +++++
 .../jdbc/permission/SystemPermissionMapper.xml  |  99 ++++
 .../jdbc/permission/UserPermissionMapper.xml    | 135 ++++++
 .../sharingprofile/SharingProfileMapper.xml     | 126 +++++
 .../SharingProfileParameterMapper.xml           |  68 +++
 .../auth/jdbc/user/PasswordRecordMapper.xml     |  79 ++++
 .../guacamole/auth/jdbc/user/UserMapper.xml     | 216 +++++++++
 extensions/guacamole-auth-jdbc/pom.xml          |   1 +
 .../auth/ldap/LDAPAuthenticationProvider.java   |   5 +
 .../auth/ldap/connection/ConnectionService.java |   2 +-
 .../guacamole/auth/ldap/user/UserContext.java   |  21 +-
 extensions/guacamole-auth-openid/.gitignore     |   3 +
 extensions/guacamole-auth-openid/pom.xml        | 252 ++++++++++
 .../src/licenses/DISCLAIMER                     |   7 +
 .../guacamole-auth-openid/src/licenses/LICENSE  | 248 ++++++++++
 .../guacamole-auth-openid/src/licenses/NOTICE   |   5 +
 .../src/licenses/bundled/README                 |   4 +
 .../licenses/bundled/aopalliance-1.0/LICENSE    |   4 +
 .../src/licenses/bundled/guice-3.0/COPYING      | 202 ++++++++
 .../bundled/javax.inject-1/LICENSE-2.0.txt      | 202 ++++++++
 .../src/licenses/bundled/jose4j-0.5.5/LICENSE   | 202 ++++++++
 .../licenses/bundled/jose4j-0.5.5/NOTICE.txt    |  14 +
 .../src/main/assembly/dist.xml                  |  53 +++
 .../openid/AuthenticationProviderService.java   | 132 ++++++
 .../openid/OpenIDAuthenticationProvider.java    | 115 +++++
 .../OpenIDAuthenticationProviderModule.java     |  83 ++++
 .../auth/openid/conf/ConfigurationService.java  | 362 ++++++++++++++
 .../guacamole/auth/openid/form/TokenField.java  | 106 +++++
 .../auth/openid/token/NonceService.java         | 135 ++++++
 .../openid/token/TokenValidationService.java    | 140 ++++++
 .../auth/openid/user/AuthenticatedUser.java     |  71 +++
 .../src/main/resources/config/openidConfig.js   |  54 +++
 .../resources/controllers/openidController.js   |  30 ++
 .../src/main/resources/guac-manifest.json       |  28 ++
 .../src/main/resources/license.txt              |  18 +
 .../src/main/resources/openidModule.js          |  28 ++
 .../src/main/resources/styles/openid.css        |  35 ++
 .../resources/templates/openidTokenField.html   |   5 +
 .../src/main/resources/translations/en.json     |  12 +
 .../src/main/webapp/modules/Tunnel.js           |   2 +-
 guacamole-docker/bin/build-guacamole.sh         |   1 -
 .../net/auth/AbstractAuthenticatedUser.java     |   5 +
 .../guacamole/net/auth/ActivityRecord.java      |  78 ++++
 .../guacamole/net/auth/ActivityRecordSet.java   | 128 +++++
 .../guacamole/net/auth/AuthenticatedUser.java   |   7 +
 .../net/auth/AuthenticationProvider.java        |   7 +
 .../apache/guacamole/net/auth/Connection.java   |  13 +
 .../guacamole/net/auth/ConnectionRecord.java    |  48 +-
 .../guacamole/net/auth/ConnectionRecordSet.java | 106 +----
 .../org/apache/guacamole/net/auth/User.java     |  30 ++
 .../apache/guacamole/net/auth/UserContext.java  |  33 +-
 .../auth/simple/SimpleActivityRecordSet.java    |  62 +++
 .../simple/SimpleAuthenticationProvider.java    |   5 +
 .../net/auth/simple/SimpleConnection.java       |   6 +
 .../auth/simple/SimpleConnectionRecordSet.java  |  14 +-
 .../guacamole/net/auth/simple/SimpleUser.java   |  13 +
 .../net/auth/simple/SimpleUserContext.java      |  19 +-
 .../net/event/AuthenticationSuccessEvent.java   |   5 +
 .../guacamole/net/event/TunnelCloseEvent.java   |   4 +
 .../guacamole/net/event/TunnelConnectEvent.java |   4 +
 .../listener/AuthenticationFailureListener.java |  21 +-
 .../listener/AuthenticationSuccessListener.java |  25 +-
 .../guacamole/net/event/listener/Listener.java  |  51 ++
 .../net/event/listener/TunnelCloseListener.java |  31 +-
 .../event/listener/TunnelConnectListener.java   |  39 +-
 .../apache/guacamole/token/StandardTokens.java  |  28 ++
 .../GuacamoleServletContextListener.java        |  25 +-
 .../org/apache/guacamole/GuacamoleSession.java  |   7 +
 .../extension/AuthenticationProviderFacade.java |  61 +--
 .../apache/guacamole/extension/Extension.java   |  94 ++++
 .../guacamole/extension/ExtensionManifest.java  |  31 ++
 .../guacamole/extension/ExtensionModule.java    |  53 +++
 .../guacamole/extension/ListenerFactory.java    | 278 +++++++++++
 .../guacamole/extension/ProviderFactory.java    | 107 +++++
 .../guacamole/rest/RESTServiceModule.java       |   2 +
 .../rest/auth/AuthenticationService.java        |  65 ++-
 .../rest/connection/APIConnectionWrapper.java   |   6 +
 .../guacamole/rest/event/ListenerService.java   |  57 +++
 .../APIConnectionRecordSortPredicate.java       |  26 +-
 .../guacamole/rest/history/HistoryResource.java |   4 +-
 .../guacamole/rest/user/APIUserWrapper.java     |  14 +
 .../guacamole/tunnel/TunnelRequestService.java  |  66 ++-
 .../app/clipboard/services/clipboardService.js  | 149 ++++--
 .../webapp/app/clipboard/styles/clipboard.css   |   8 +-
 .../webapp/app/form/services/formService.js     |   9 +-
 .../app/index/controllers/indexController.js    |   4 +-
 .../directives/guacSettingsPreferences.js       |   3 +
 pom.xml                                         |   1 +
 131 files changed, 7825 insertions(+), 370 deletions(-)
----------------------------------------------------------------------