This is an automated email from the ASF dual-hosted git repository. vnick pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 4fec463 GUACAMOLE-1081: Merge support for parameter token modifiers. add 7d6e383 GUACAMOLE-728: Define EnumGuacamoleProperty for convenience and maintainability. add 7c44ee2 GUACAMOLE-728: Migrate existing enum-based GuacamoleProperty implementations to EnumGuacamoleProperty. add 2dd05d9 GUACAMOLE-728: Restore enum mapping of JRadius protocol names. Carry through refactor of RadiusAuthenticator configuration. add 678c772 GUACAMOLE-728: Merge Implement EnumGuacamoleProperty. new 2bbd039 Merge staging/1.2.0 changes back to master. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/guacamole/auth/mysql/MySQLDriver.java | 4 + .../guacamole/auth/mysql/MySQLDriverProperty.java | 52 --- .../auth/mysql/MySQLGuacamoleProperties.java | 5 +- .../guacamole/auth/sqlserver/SQLServerDriver.java | 6 + .../auth/sqlserver/SQLServerDriverProperty.java | 60 ---- .../sqlserver/SQLServerGuacamoleProperties.java | 5 +- .../auth/ldap/conf/DereferenceAliasesProperty.java | 62 ---- .../guacamole/auth/ldap/conf/EncryptionMethod.java | 5 + .../auth/ldap/conf/EncryptionMethodProperty.java | 58 ---- .../auth/ldap/conf/LDAPGuacamoleProperties.java | 21 +- .../auth/ldap/conf/MemberAttributeType.java | 12 +- .../ldap/conf/MemberAttributeTypeProperty.java | 56 ---- .../radius/RadiusAuthenticationProviderModule.java | 8 +- .../auth/radius/RadiusConnectionService.java | 78 ++--- .../auth/radius/conf/ConfigurationService.java | 2 +- .../radius/conf/RadiusAuthenticationProtocol.java | 125 +++---- .../conf/RadiusAuthenticationProtocolProperty.java | 54 --- .../radius/conf/RadiusGuacamoleProperties.java | 9 +- .../auth/totp/conf/ConfigurationService.java | 5 +- .../guacamole/auth/totp/conf/TOTPModeProperty.java | 62 ---- .../org/apache/guacamole/totp/TOTPGenerator.java | 4 + .../properties/EnumGuacamoleProperty.java | 254 ++++++++++++++ .../properties/EnumGuacamolePropertyTest.java | 372 +++++++++++++++++++++ 23 files changed, 780 insertions(+), 539 deletions(-) delete mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLDriverProperty.java delete mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerDriverProperty.java delete mode 100644 extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/DereferenceAliasesProperty.java delete mode 100644 extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/EncryptionMethodProperty.java delete mode 100644 extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/MemberAttributeTypeProperty.java delete mode 100644 extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/conf/RadiusAuthenticationProtocolProperty.java delete mode 100644 extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/conf/TOTPModeProperty.java create mode 100644 guacamole-ext/src/main/java/org/apache/guacamole/properties/EnumGuacamoleProperty.java create mode 100644 guacamole-ext/src/test/java/org/apache/guacamole/properties/EnumGuacamolePropertyTest.java