Merge 0.9.14 changes back to master.

This commit is contained in:
Nick Couchman
2017-12-06 09:50:42 -05:00
32 changed files with 47 additions and 166 deletions

View File

@@ -24,10 +24,10 @@ the review process.
The Guacamole source is maintained in git repositories hosted on GitHub:
https://github.com/apache/incubator-guacamole-client
https://github.com/apache/incubator-guacamole-manual
https://github.com/apache/incubator-guacamole-server
https://github.com/apache/incubator-guacamole-website
https://github.com/apache/guacamole-client
https://github.com/apache/guacamole-manual
https://github.com/apache/guacamole-server
https://github.com/apache/guacamole-website
To make your changes, fork the applicable repositories and make commits
to a topic branch in your fork. Commits should be made in logical units

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

4
README
View File

@@ -9,11 +9,11 @@ technical users intending to compile parts of Apache Guacamole themselves.
Source archives and pre-built .war files are available from the downloads
section of the project website:
http://guacamole.incubator.apache.org/
http://guacamole.apache.org/
A full manual is available as well:
http://guacamole.incubator.apache.org/doc/gug/
http://guacamole.apache.org/doc/gug/
------------------------------------------------------------

View File

@@ -28,7 +28,7 @@
<packaging>war</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-example</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -28,7 +28,7 @@
<packaging>war</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-playback-example</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-auth-cas</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-auth-duo</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-auth-header</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -27,7 +27,7 @@
<artifactId>guacamole-auth-jdbc-base</artifactId>
<packaging>jar</packaging>
<name>guacamole-auth-jdbc-base</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -27,7 +27,7 @@
<artifactId>guacamole-auth-jdbc-dist</artifactId>
<packaging>jar</packaging>
<name>guacamole-auth-jdbc-dist</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -27,7 +27,7 @@
<artifactId>guacamole-auth-jdbc-mysql</artifactId>
<packaging>jar</packaging>
<name>guacamole-auth-jdbc-mysql</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -27,7 +27,7 @@
<artifactId>guacamole-auth-jdbc-postgresql</artifactId>
<packaging>jar</packaging>
<name>guacamole-auth-jdbc-postgresql</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -27,7 +27,7 @@
<artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
<packaging>jar</packaging>
<name>guacamole-auth-jdbc-sqlserver</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -28,7 +28,7 @@
<packaging>pom</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-auth-jdbc</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-auth-ldap</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-auth-noauth</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-auth-openid</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -28,7 +28,7 @@
<packaging>pom</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-common-js</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<description>
The base JavaScript API of the Guacamole project, providing JavaScript
@@ -47,25 +47,11 @@
<!-- Git repository -->
<scm>
<url>https://github.com/apache/incubator-guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
<url>https://github.com/apache/guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
</scm>
<!-- Developers -->
<developers>
<developer>
<id>mike.jumper</id>
<name>Michael Jumper</name>
<email>mike.jumper@guac-dev.org</email>
</developer>
<developer>
<id>james.muehlner</id>
<name>James Muehlner</name>
<email>james.muehlner@guac-dev.org</email>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-common</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<description>
The base Java API of the Guacamole project, providing Java support for
@@ -46,24 +46,10 @@
<!-- Git repository -->
<scm>
<url>https://github.com/apache/incubator-guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
<url>https://github.com/apache/guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
</scm>
<!-- Developers -->
<developers>
<developer>
<id>mike.jumper</id>
<name>Michael Jumper</name>
<email>mike.jumper@guac-dev.org</email>
</developer>
<developer>
<id>james.muehlner</id>
<name>James Muehlner</name>
<email>james.muehlner@guac-dev.org</email>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

View File

@@ -1,9 +1,9 @@
What is Apache Guacamole?
=========================
[Apache Guacamole](http://guacamole.incubator.apache.org/) is a clientless
remote desktop gateway. It supports standard protocols like VNC and RDP. We
call it clientless because no plugins or client software are required.
[Apache Guacamole](http://guacamole.apache.org/) is a clientless remote desktop
gateway. It supports standard protocols like VNC and RDP. We call it clientless
because no plugins or client software are required.
Thanks to HTML5, once Guacamole is installed on a server, all you need to
access your desktops is a web browser.
@@ -54,12 +54,12 @@ necessary SQL to do this is included in the Guacamole image.
To generate a SQL script which can be used to initialize a fresh PostgreSQL
database
[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql):
[as documented in the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql):
docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --postgres > initdb.sql
Alternatively, you can use the SQL scripts included with
[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
[guacamole-auth-jdbc](https://github.com/apache/guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
Once this script is generated, you must:
@@ -70,7 +70,7 @@ Once this script is generated, you must:
The process for doing this via the `psql` and `createdb` utilities included
with PostgreSQL is documented in
[the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql).
[the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql).
Deploying Guacamole with MySQL authentication
--------------------------------------------------
@@ -97,12 +97,12 @@ need to do so prior to using Guacamole. A convenience script for generating the
necessary SQL to do this is included in the Guacamole image.
To generate a SQL script which can be used to initialize a fresh MySQL database
[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql):
[as documented in the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql):
docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql
Alternatively, you can use the SQL scripts included with
[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema).
[guacamole-auth-jdbc](https://github.com/apache/guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema).
Once this script is generated, you must:
@@ -113,7 +113,7 @@ Once this script is generated, you must:
The process for doing this via the `mysql` utility included with MySQL is
documented in
[the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql).
[the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql).
Reporting issues
================

View File

@@ -22,11 +22,11 @@
## @fn build-guacamole.sh
##
## Builds Guacamole, saving "guacamole.war" and all applicable extension .jars
## using the incubator-guacamole-client source contained within the given
## directory. Extension files will be grouped by their associated type, with
## all MySQL files being placed within the "mysql/" subdirectory of the
## destination, all PostgreSQL files being placed within the "postgresql/"
## subdirectory of the destination, etc.
## using the guacamole-client source contained within the given directory.
## Extension files will be grouped by their associated type, with all MySQL
## files being placed within the "mysql/" subdirectory of the destination, all
## PostgreSQL files being placed within the "postgresql/" subdirectory of the
## destination, etc.
##
## @param BUILD_DIR
## The directory which currently contains the guacamole-client source and

View File

@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-ext</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<description>
The Java API for extending the main Guacamole web application. This
@@ -46,24 +46,10 @@
<!-- Git repository -->
<scm>
<url>https://github.com/apache/incubator-guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
<url>https://github.com/apache/guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
</scm>
<!-- Developers -->
<developers>
<developer>
<id>mike.jumper</id>
<name>Michael Jumper</name>
<email>mike.jumper@guac-dev.org</email>
</developer>
<developer>
<id>james.muehlner</id>
<name>James Muehlner</name>
<email>james.muehlner@guac-dev.org</email>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

View File

@@ -28,7 +28,7 @@
<packaging>war</packaging>
<version>0.9.13-incubating</version>
<name>guacamole</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<description>
The Guacamole web application, providing authentication and an HTML5
@@ -46,24 +46,10 @@
<!-- Git repository -->
<scm>
<url>https://github.com/apache/incubator-guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
<url>https://github.com/apache/guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
</scm>
<!-- Developers -->
<developers>
<developer>
<id>mike.jumper</id>
<name>Michael Jumper</name>
<email>mike.jumper@guac-dev.org</email>
</developer>
<developer>
<id>james.muehlner</id>
<name>James Muehlner</name>
<email>james.muehlner@guac-dev.org</email>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

View File

@@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.

View File

@@ -28,7 +28,7 @@
<packaging>pom</packaging>
<version>0.9.13-incubating</version>
<name>guacamole-client</name>
<url>http://guacamole.incubator.apache.org/</url>
<url>http://guacamole.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>