You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/06/05 18:36:24 UTC
[1/5] incubator-guacamole-client git commit: GUACAMOLE-314: Update
extension API version sanity check to include the correct,
recently-bumped version number.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master bedd09fc1 -> 91920d0b2
GUACAMOLE-314: Update extension API version sanity check to include the correct, recently-bumped version number.
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/6c0957e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6c0957e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6c0957e7
Branch: refs/heads/master
Commit: 6c0957e7dedb47afe20b9ae2b5c5219c5cca3e75
Parents: 24708cf
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Jun 4 13:18:57 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Jun 4 13:18:57 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/guacamole/extension/ExtensionModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/6c0957e7/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
index 528f786..792066c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ b/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"
));
/**
[3/5] incubator-guacamole-client git commit: GUACAMOLE-314: Merge
extension API sanity check version number bump.
Posted by jm...@apache.org.
GUACAMOLE-314: Merge extension API sanity check version number bump.
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/193089fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/193089fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/193089fb
Branch: refs/heads/master
Commit: 193089fb66cf2d113c3766de12d4f38a5609498e
Parents: bedd09f 6c0957e
Author: James Muehlner <ja...@guac-dev.org>
Authored: Mon Jun 5 11:30:08 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Mon Jun 5 11:30:08 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/guacamole/extension/ExtensionModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/5] incubator-guacamole-client git commit: GUACAMOLE-189: Merge
addition of guacd override columns to schema creation scripts.
Posted by jm...@apache.org.
GUACAMOLE-189: Merge addition of guacd override columns to schema creation scripts.
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/80b681e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/80b681e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/80b681e1
Branch: refs/heads/master
Commit: 80b681e18d621006734c2444c4e895dc5275fa56
Parents: 193089f 8286b21
Author: James Muehlner <ja...@guac-dev.org>
Authored: Mon Jun 5 11:32:38 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Mon Jun 5 11:32:38 2017 -0700
----------------------------------------------------------------------
.../schema/001-create-schema.sql | 5 +++++
.../schema/001-create-schema.sql | 14 ++++++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
[2/5] incubator-guacamole-client git commit: GUACAMOLE-189: Define
guacd override columns for guacamole_connection table in main schema init
script.
Posted by jm...@apache.org.
GUACAMOLE-189: Define guacd override columns for guacamole_connection table in main schema init script.
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/8286b21b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8286b21b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8286b21b
Branch: refs/heads/master
Commit: 8286b21baad0f3a7a380b41299b547b73c11f74d
Parents: 24708cf
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Jun 4 16:06:16 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Jun 4 16:06:16 2017 -0700
----------------------------------------------------------------------
.../schema/001-create-schema.sql | 5 +++++
.../schema/001-create-schema.sql | 14 ++++++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
index 29bc47a..519d5ca 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
+++ b/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),
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
index f9b2351..e018617 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
@@ -50,6 +50,15 @@ CREATE TYPE guacamole_system_permission_type AS ENUM(
);
--
+-- 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
[5/5] incubator-guacamole-client git commit: Merge 0.9.13-incubating
changes back to master.
Posted by jm...@apache.org.
Merge 0.9.13-incubating changes back to master.
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/91920d0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/91920d0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/91920d0b
Branch: refs/heads/master
Commit: 91920d0b2d806de1a32908fa528b51ceb9068288
Parents: bedd09f 80b681e
Author: James Muehlner <ja...@guac-dev.org>
Authored: Mon Jun 5 11:35:48 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Mon Jun 5 11:35:48 2017 -0700
----------------------------------------------------------------------
.../schema/001-create-schema.sql | 5 +++++
.../schema/001-create-schema.sql | 14 ++++++++++++++
.../apache/guacamole/extension/ExtensionModule.java | 2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------