From 5532819abfcb1bbf6774f1275e0aa5685dcb7a96 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Tue, 6 Jun 2017 09:10:49 -0400 Subject: [PATCH] GUACAMOLE-102: Split out load balancing into a separate section/form. --- .../auth/jdbc/connection/ModeledConnection.java | 9 ++++++++- .../src/main/resources/translations/en.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java index db8c815cf..3c85f37c6 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java @@ -127,7 +127,13 @@ public class ModeledConnection extends ModeledChildDirectoryObjectasList( new NumericField(MAX_CONNECTIONS_NAME), - new NumericField(MAX_CONNECTIONS_PER_USER_NAME), + new NumericField(MAX_CONNECTIONS_PER_USER_NAME) + )); + + /** + * All attributes related to to load balancing in a logical form. + */ + public static final Form LOAD_BALANCING = new Form("load-balancing", Arrays.asList( new NumericField(CONNECTION_WEIGHT) )); @@ -137,6 +143,7 @@ public class ModeledConnection extends ModeledChildDirectoryObject ATTRIBUTES = Collections.unmodifiableCollection(Arrays.asList( CONCURRENCY_LIMITS, + LOAD_BALANCING, GUACD_PARAMETERS )); 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 93e95d58a..0bc2db375 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 @@ -20,7 +20,7 @@ "FIELD_HEADER_MAX_CONNECTIONS" : "Maximum number of connections:", "FIELD_HEADER_MAX_CONNECTIONS_PER_USER" : "Maximum number of connections per user:", - "FIELD_HEADER_WEIGHT" : "Connection weight for load balancing:", + "FIELD_HEADER_WEIGHT" : "Connection weight:", "FIELD_HEADER_GUACD_HOSTNAME" : "Hostname:", "FIELD_HEADER_GUACD_ENCRYPTION" : "Encryption:",