This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.6.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 0301a1148ae733f585802832c1737c0f19da254a Merge: 29e4a00c6 9bc615036 Author: Mike Jumper <[email protected]> AuthorDate: Fri Aug 30 10:44:51 2024 -0700 GUACAMOLE-1006: Merge support for reading any property value as a Collection. .../guacamole/auth/json/ConfigurationService.java | 6 +- .../auth/ldap/AuthenticationProviderService.java | 2 +- .../auth/ldap/ConnectedLDAPConfiguration.java | 7 +- .../ldap/conf/EnvironmentLDAPConfiguration.java | 14 +- .../auth/ldap/conf/JacksonLDAPConfiguration.java | 7 +- .../auth/ldap/conf/LDAPConfiguration.java | 7 +- .../auth/ldap/conf/LDAPGuacamoleProperties.java | 12 +- .../auth/ldap/conf/StringListProperty.java | 62 ------ .../guacamole/auth/ldap/user/UserService.java | 2 +- .../quickconnect/conf/ConfigurationService.java | 15 +- .../auth/quickconnect/utility/QCParser.java | 7 +- .../auth/openid/conf/ConfigurationService.java | 10 +- .../auth/openid/token/TokenValidationService.java | 3 +- .../auth/ssl/SSLClientAuthenticationResource.java | 3 +- .../auth/ssl/conf/ConfigurationService.java | 11 +- .../environment/DelegatingEnvironment.java | 25 +++ .../apache/guacamole/environment/Environment.java | 219 +++++++++++++++++++-- .../guacamole/environment/LocalEnvironment.java | 46 +++++ .../properties/FileGuacamoleProperty.java | 25 +++ .../guacamole/properties/GuacamoleProperty.java | 50 ++++- .../properties/IntegerGuacamoleProperty.java | 24 +++ .../properties/LongGuacamoleProperty.java | 24 +++ .../properties/StringGuacamoleProperty.java | 17 ++ .../guacamole/properties/StringListProperty.java | 13 +- .../properties/TimeZoneGuacamoleProperty.java | 24 +++ .../guacamole/properties/URIGuacamoleProperty.java | 25 +++ 26 files changed, 517 insertions(+), 143 deletions(-)
