Merge staging/1.2.0 changes back to master.

mconsoir · Jun 14, 2020 · 2bbd039 · 2bbd039
2 parents 4fec463 + 678c772
commit 2bbd039
Show file tree

Hide file tree

Showing 23 changed files with 780 additions and 539 deletions.
diff --git a/.../guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLDriver.java b/.../guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLDriver.java
@@ -19,6 +19,8 @@
 
 package org.apache.guacamole.auth.mysql;
 
+import org.apache.guacamole.properties.EnumGuacamoleProperty.PropertyValue;
+
 /**
  * The possible JDBC drivers to use when talking to a MySQL-compatible database
  * server.
@@ -28,10 +30,12 @@ public enum MySQLDriver {
     /**
      * MySQL driver.
      */
+    @PropertyValue("mysql")
     MYSQL,
 
     /**
      * MariaDB driver.
      */
+    @PropertyValue("mariadb")
     MARIADB;
 }
diff --git a/...le-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLDriverProperty.java b/...le-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLDriverProperty.java
diff --git a/...th-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java b/...th-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
@@ -20,6 +20,7 @@
 package org.apache.guacamole.auth.mysql;
 
 import org.apache.guacamole.properties.BooleanGuacamoleProperty;
+import org.apache.guacamole.properties.EnumGuacamoleProperty;
 import org.apache.guacamole.properties.IntegerGuacamoleProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
 
@@ -36,8 +37,8 @@ private MySQLGuacamoleProperties() {}
     /**
      * The JDBC driver that should be used to talk to MySQL-compatible servers.
      */
-    public static final MySQLDriverProperty MYSQL_DRIVER =
-            new MySQLDriverProperty() {
+    public static final EnumGuacamoleProperty<MySQLDriver> MYSQL_DRIVER =
+            new EnumGuacamoleProperty<MySQLDriver>(MySQLDriver.class) {
 
         @Override
         public String getName() { return "mysql-driver"; }

diff --git a/...uth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerDriver.java b/...uth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerDriver.java
@@ -19,6 +19,8 @@
 
 package org.apache.guacamole.auth.sqlserver;
 
+import org.apache.guacamole.properties.EnumGuacamoleProperty.PropertyValue;
+
 /**
  * The possible SQL Server drivers to use when using a TDS-compatible database.
  */
@@ -27,20 +29,24 @@ public enum SQLServerDriver {
     /**
      * The open source jTDS driver.
      */
+    @PropertyValue("jtds")
     JTDS,
 
     /**
      * The Progress DataDirect driver.
      */
+    @PropertyValue("datadirect")
     DATA_DIRECT,
 
     /**
      * The Microsoft Legacy SQL Server driver.
      */
+    @PropertyValue("microsoft")
     MICROSOFT_LEGACY,
 
     /**
      * The Microsoft 2005 SQL Server driver.
      */
+    @PropertyValue("microsoft2005")
     MICROSOFT_2005;
 }
diff --git a/...-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerDriverProperty.java b/...-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerDriverProperty.java
diff --git a/...erver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerGuacamoleProperties.java b/...erver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerGuacamoleProperties.java
@@ -20,6 +20,7 @@
 package org.apache.guacamole.auth.sqlserver;
 
 import org.apache.guacamole.properties.BooleanGuacamoleProperty;
+import org.apache.guacamole.properties.EnumGuacamoleProperty;
 import org.apache.guacamole.properties.IntegerGuacamoleProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
 
@@ -174,8 +175,8 @@ private SQLServerGuacamoleProperties() {}
     /**
      * Which TDS-compatible JDBC driver should be used for the connection.
      */
-    public static final SQLServerDriverProperty
-            SQLSERVER_DRIVER = new SQLServerDriverProperty() {
+    public static final EnumGuacamoleProperty<SQLServerDriver>
+            SQLSERVER_DRIVER = new EnumGuacamoleProperty<SQLServerDriver>(SQLServerDriver.class) {
 
         @Override
         public String getName() { return "sqlserver-driver"; }

diff --git a/...th-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/DereferenceAliasesProperty.java b/...th-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/DereferenceAliasesProperty.java
diff --git a/...acamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/EncryptionMethod.java b/...acamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/EncryptionMethod.java
@@ -19,6 +19,8 @@
 
 package org.apache.guacamole.auth.ldap.conf;
 
+import org.apache.guacamole.properties.EnumGuacamoleProperty.PropertyValue;
+
 /**
  * All possible encryption methods which may be used when connecting to an LDAP
  * server.
@@ -29,19 +31,22 @@ public enum EncryptionMethod {
      * No encryption will be used. All data will be sent to the LDAP server in
      * plaintext. Unencrypted LDAP connections use port 389 by default.
      */
+    @PropertyValue("none")
     NONE(389),
 
     /**
      * The connection to the LDAP server will be encrypted with SSL. LDAP over
      * SSL (LDAPS) will use port 636 by default.
      */
+    @PropertyValue("ssl")
     SSL(636),
 
     /**
      * The connection to the LDAP server will be encrypted using STARTTLS. TLS
      * connections are negotiated over the standard LDAP port of 389 - the same
      * port used for unencrypted traffic.
      */
+    @PropertyValue("starttls")
     STARTTLS(389);
 
     /**

diff --git a/...auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/EncryptionMethodProperty.java b/...auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/EncryptionMethodProperty.java