You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/06/07 00:32:46 UTC
[26/28] incubator-guacamole-client git commit: GUACAMOLE-102: Split
out load balancing into a separate section/form.
GUACAMOLE-102: Split out load balancing into a separate section/form.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5532819a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5532819a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5532819a
Branch: refs/heads/master
Commit: 5532819abfcb1bbf6774f1275e0aa5685dcb7a96
Parents: 166c7cc
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Jun 6 09:10:49 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Jun 6 09:10:49 2017 -0400
----------------------------------------------------------------------
.../guacamole/auth/jdbc/connection/ModeledConnection.java | 9 ++++++++-
.../src/main/resources/translations/en.json | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5532819a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
----------------------------------------------------------------------
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 db8c815..3c85f37 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 ModeledChildDirectoryObject<ConnectionMod
*/
public static final Form CONCURRENCY_LIMITS = new Form("concurrency", Arrays.<Field>asList(
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.<Field>asList(
new NumericField(CONNECTION_WEIGHT)
));
@@ -137,6 +143,7 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
*/
public static final Collection<Form> ATTRIBUTES = Collections.unmodifiableCollection(Arrays.asList(
CONCURRENCY_LIMITS,
+ LOAD_BALANCING,
GUACD_PARAMETERS
));
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5532819a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
----------------------------------------------------------------------
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 93e95d5..0bc2db3 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:",