Merge 0.9.13-incubating changes back to master.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql

@@ -57,6 +57,11 @@ CREATE TABLE `guacamole_connection` (
   `parent_id`           int(11),
   `protocol`            varchar(32)  NOT NULL,
   
+  -- Guacamole proxy (guacd) overrides
+  `proxy_port`              integer,
+  `proxy_hostname`          varchar(512),
+  `proxy_encryption_method` enum('NONE', 'SSL'),
+
   -- Concurrency limits
   `max_connections`          int(11),
   `max_connections_per_user` int(11),

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql

@@ -49,6 +49,15 @@ CREATE TYPE guacamole_system_permission_type AS ENUM(
     'ADMINISTER'
 );
 
+--
+-- Guacamole proxy (guacd) encryption methods
+--
+
+CREATE TYPE guacamole_proxy_encryption_method AS ENUM(
+    'NONE',
+    'SSL'
+);
+
 --
 -- Table of connection groups. Each connection group has a name.
 --
@@ -97,6 +106,11 @@ CREATE TABLE guacamole_connection (
   max_connections          integer,
   max_connections_per_user integer,
 
+  -- Guacamole proxy (guacd) overrides
+  proxy_port              integer,
+  proxy_hostname          varchar(512),
+  proxy_encryption_method guacamole_proxy_encryption_method,
+
   PRIMARY KEY (connection_id),
 
   CONSTRAINT connection_name_parent

guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java

@@ -59,7 +59,7 @@ public class ExtensionModule extends ServletModule {
     private static final List<String> ALLOWED_GUACAMOLE_VERSIONS =
         Collections.unmodifiableList(Arrays.asList(
             "*",
-            "0.9.12-incubating"
+            "0.9.13-incubating"
         ));
 
     /**