This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.1.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit f5aa986e63d371befee8111a5d9eff1ff98af95a Merge: 82ea1d6 9c26a76 Author: Mike Jumper <mjum...@apache.org> AuthorDate: Sun Jun 23 19:20:14 2019 -0700 GUACAMOLE-579: Merge support for retrieving user attributes CAS. .../auth/cas/AuthenticationProviderService.java | 16 +++--- .../auth/cas/CASAuthenticationProvider.java | 15 ++++++ .../auth/cas/ticket/TicketValidationService.java | 50 ++++++++++++------ ...nticatedUser.java => CASAuthenticatedUser.java} | 43 +++++++++++++++- extensions/guacamole-auth-ldap/pom.xml | 8 --- .../auth/ldap/AuthenticationProviderService.java | 13 +++-- .../guacamole/auth/ldap/LDAPConnectionService.java | 1 - .../guacamole/auth/ldap/ReferralAuthHandler.java | 9 ++-- .../apache/guacamole/auth/ldap/TokenNameTest.java | 53 ------------------- .../org/apache/guacamole/token}/TokenName.java | 60 ++++++++++++++-------- .../org/apache/guacamole/token/TokenNameTest.java | 55 ++++++++++++++++++++ 11 files changed, 209 insertions(+), 114 deletions(-)