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 2016/11/01 02:10:30 UTC
[1/7] incubator-guacamole-manual git commit: GUACAMOLE-107: Update
README to reference Apache Guacamole site.
Repository: incubator-guacamole-manual
Updated Branches:
refs/heads/master 7d53ce224 -> 92cdb4255
GUACAMOLE-107: Update README to reference Apache Guacamole site.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/e540aabb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/e540aabb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/e540aabb
Branch: refs/heads/master
Commit: e540aabbcf5ae403ea4d383ae030fc0b36d752c8
Parents: 7d53ce2
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Oct 29 13:59:22 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Oct 29 13:59:22 2016 -0700
----------------------------------------------------------------------
README | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/e540aabb/README
----------------------------------------------------------------------
diff --git a/README b/README
index aff22ba..9d80b41 100644
--- a/README
+++ b/README
@@ -3,14 +3,14 @@
About this README
------------------------------------------------------------
-This README is intended to document the build process of the Guacamole manual
-for technical users who wish to contribute or who simply wish to build the
-manual themselves.
+This README is intended to document the build process of the Apache Guacamole
+manual for technical users who wish to contribute or who simply wish to build
+the manual themselves.
The latest version of the manual is provided on the Guacamole web site, and
snapshot copies of each release are included in the release archives:
- http://guac-dev.org/
+ http://guacamole.incubator.apache.org/
------------------------------------------------------------
@@ -89,5 +89,5 @@ processor called "xsltproc", applying the standard DocBook XSL stylesheets.
Please report any bugs encountered by opening a new issue in the JIRA system
hosted at:
- http://glyptodon.org/jira/
+ https://issues.apache.org/jira/browse/GUACAMOLE
[7/7] incubator-guacamole-manual git commit: GUACAMOLE-107: Merge
Apachification of Guacamole manual.
Posted by jm...@apache.org.
GUACAMOLE-107: Merge Apachification of Guacamole manual.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/92cdb425
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/92cdb425
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/92cdb425
Branch: refs/heads/master
Commit: 92cdb4255143b827ad62d0fc75511caef46fca0c
Parents: 7d53ce2 59721e4
Author: James Muehlner <ja...@guac-dev.org>
Authored: Mon Oct 31 19:08:59 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Mon Oct 31 19:08:59 2016 -0700
----------------------------------------------------------------------
README | 10 +--
src/appendices/faq.xml | 60 ++++++++++----
src/chapters/adding-protocol.xml | 2 +-
src/chapters/custom-auth.xml | 28 +++----
src/chapters/installing.xml | 32 +++----
src/chapters/jdbc-auth.xml | 5 +-
src/chapters/ldap-auth.xml | 5 +-
src/chapters/noauth.xml | 4 +-
src/chapters/using.xml | 2 +-
src/chapters/yourown.xml | 35 ++++----
src/gug.xml | 33 ++++----
.../instructions/server/drawing/transfer.xml | 24 ++++--
tutorials/guacamole-auth-tutorial/pom.xml | 8 +-
.../auth/TutorialAuthenticationProvider.java | 87 ++++++++++++++++++++
.../auth/TutorialGuacamoleProperties.java | 64 ++++++++++++++
.../auth/TutorialAuthenticationProvider.java | 87 --------------------
.../auth/TutorialGuacamoleProperties.java | 64 --------------
.../src/main/resources/guac-manifest.json | 2 +-
tutorials/guacamole-tutorial/pom.xml | 11 +--
.../example/TutorialGuacamoleTunnelServlet.java | 38 +++++++++
.../example/TutorialGuacamoleTunnelServlet.java | 38 ---------
.../src/main/webapp/WEB-INF/web.xml | 2 +-
tutorials/libguac-client-ball/configure.ac | 2 +-
23 files changed, 340 insertions(+), 303 deletions(-)
----------------------------------------------------------------------
[5/7] incubator-guacamole-manual git commit: GUACAMOLE-107: Update
old references to guac-dev.org to point to the new site and resources.
Posted by jm...@apache.org.
GUACAMOLE-107: Update old references to guac-dev.org to point to the new site and resources.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/fd3acd38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/fd3acd38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/fd3acd38
Branch: refs/heads/master
Commit: fd3acd38ecd6fcfda5e8616d91103d3b4bc647e3
Parents: bd527e7
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Oct 29 14:25:55 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Oct 29 14:25:55 2016 -0700
----------------------------------------------------------------------
src/appendices/faq.xml | 60 ++++++++++++++------
src/chapters/adding-protocol.xml | 2 +-
src/chapters/jdbc-auth.xml | 5 +-
src/chapters/ldap-auth.xml | 5 +-
src/chapters/noauth.xml | 4 +-
src/gug.xml | 17 ++----
.../instructions/server/drawing/transfer.xml | 24 +++++---
tutorials/libguac-client-ball/configure.ac | 2 +-
8 files changed, 75 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/src/appendices/faq.xml
----------------------------------------------------------------------
diff --git a/src/appendices/faq.xml b/src/appendices/faq.xml
index d36afc1..b69eb65 100644
--- a/src/appendices/faq.xml
+++ b/src/appendices/faq.xml
@@ -203,13 +203,15 @@
</question>
<answer>
- <para>The project hosts a bug tracking tool called Trac at
- http://guac-dev.org/trac/. All bugs should be reported there as new tickets.
- This is also where you would request a new feature. </para>
-
- <para>If the bug you found is security-related, we would prefer to be contacted
- personally via email, such that the bug can be fixed before becoming dangerously
- widely known. </para>
+ <para>The project tracks in-progress tasks and bugs via the JIRA instance hosted by
+ the Apache Software Foundation:</para>
+ <para><link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://issues.apache.org/jira/browse/GUACAMOLE/"
+ ><uri>https://issues.apache.org/jira/browse/GUACAMOLE/</uri></link></para>
+ <para>All bugs should be reported there as new issues. This is also where you would
+ request a new feature. If the bug you found is security-related, we would prefer
+ to be contacted personally via email, such that the bug can be fixed before
+ becoming dangerously widely known. </para>
</answer>
</qandaentry>
@@ -222,15 +224,41 @@
</question>
<answer>
- <para>The project hosts forums at http://sourceforge.net/projects/guacamole/forums.
- If you have a SourceForge username (or don't mind registering one), this is a
- good place to start. </para>
-
- <para>Otherwise, there are Guacamole-specific official IRC channels on freenode.net:
- #guacamole, #guacamole-dev, and #guacamole-help. </para>
-
- <para>If none of those options suffice, you can always email any of the project
- members directly. You will usually get a personal response, time permitting. </para>
+ <para>If you would like help with Apache Guacamole, or wish to help others, we
+ highly recommend sending an email to the one of the project\u2019s <link
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="http://guacamole.incubator.apache.org/support/#mailing-lists"
+ >mailing lists</link>. <emphasis>You will need to subscribe prior to sending
+ email to any list.</emphasis> All mailing lists are actively filtered for
+ spam, and any email not originating from a subscriber will bounce.</para>
+ <para>There are two primary mailing lists:</para>
+ <variablelist>
+ <varlistentry>
+ <term><link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="http://mail-archives.apache.org/mod_mbox/incubator-guacamole-user/"
+ ><email>user@guacamole.incubator.apache.org</email></link></term>
+ <listitem>
+ <para>The user list is intended for general questions and discussions
+ which do not necessarily pertain to development. This list replaces
+ the old <link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://sourceforge.net/p/guacamole/discussion/"
+ >SourceForge forums</link> used by Guacamole prior to its
+ acceptance into the Apache Incubator.</para>
+ <para><emphasis>If you're not sure which mailing list to use, the user
+ list is probably the correct choice.</emphasis></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/"
+ ><email>dev@guacamole.incubator.apache.org</email></link></term>
+ <listitem>
+ <para>The development list is for development-related discussion
+ involving people who are contributors to the Apache Guacamole
+ project (or who wish to become contributors).</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</answer>
</qandaentry>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/src/chapters/adding-protocol.xml
----------------------------------------------------------------------
diff --git a/src/chapters/adding-protocol.xml b/src/chapters/adding-protocol.xml
index cfe115d..3c92eef 100644
--- a/src/chapters/adding-protocol.xml
+++ b/src/chapters/adding-protocol.xml
@@ -205,7 +205,7 @@ AC_PROG_CC
AC_PROG_CC_C99
AC_PROG_LIBTOOL
-# Check for libguac (http://guac-dev.org/)
+# Check for libguac
AC_CHECK_LIB([guac], [guac_client_stream_png],,
AC_MSG_ERROR("libguac is required for communication via "
"the Guacamole protocol"))
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/src/chapters/jdbc-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index 05736b6..907d3b6 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -51,8 +51,9 @@
<filename>guacamole.war</filename>. The link for this and all other
officially-supported and compatible extensions for a particular version of Guacamole are
provided on the release notes for that version. You can find the release notes for
- current versions of Guacamole here: <link xlink:href="http://guac-dev.org/releases/"
- >http://guac-dev.org/releases/</link>.</para>
+ current versions of Guacamole here: <link
+ xlink:href="http://guacamole.incubator.apache.org/releases/"
+ >http://guacamole.incubator.apache.org/releases/</link>.</para>
<para>The database authentication extension is packaged as a <filename>.tar.gz</filename>
file containing:</para>
<variablelist>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 35c1415..8c5d379 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -76,8 +76,9 @@
<filename>guacamole.war</filename>. The link for this and all other
officially-supported and compatible extensions for a particular version of Guacamole are
provided on the release notes for that version. You can find the release notes for
- current versions of Guacamole here: <link xlink:href="http://guac-dev.org/releases/"
- >http://guac-dev.org/releases/</link>.</para>
+ current versions of Guacamole here: <link
+ xlink:href="http://guacamole.incubator.apache.org/releases/"
+ >http://guacamole.incubator.apache.org/releases/</link>.</para>
<para>The LDAP authentication extension is packaged as a <filename>.tar.gz</filename> file
containing:</para>
<variablelist>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/src/chapters/noauth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/noauth.xml b/src/chapters/noauth.xml
index e795258..be82b27 100644
--- a/src/chapters/noauth.xml
+++ b/src/chapters/noauth.xml
@@ -29,8 +29,8 @@
and all other officially-supported and compatible extensions for a particular version of
Guacamole are provided on the release notes for that version. You can find the release
notes for current versions of Guacamole here: <link
- xlink:href="http://guac-dev.org/releases/"
- >http://guac-dev.org/releases/</link>.</para>
+ xlink:href="http://guacamole.incubator.apache.org/releases/"
+ >http://guacamole.incubator.apache.org/releases/</link>.</para>
<para xmlns:xlink="http://www.w3.org/1999/xlink">The NoAuth authentication extension is
packaged as a <filename>.tar.gz</filename> file containing:</para>
<variablelist>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/src/gug.xml
----------------------------------------------------------------------
diff --git a/src/gug.xml b/src/gug.xml
index 3957d00..f798c67 100644
--- a/src/gug.xml
+++ b/src/gug.xml
@@ -4,13 +4,6 @@
<info>
<title>Guacamole Manual</title>
<edition>0.9.10-incubating</edition>
- <authorgroup>
- <author>
- <personname><firstname>Michael</firstname>
- <surname>Jumper</surname></personname>
- <email>mjumper@apache.org</email>
- </author>
- </authorgroup>
<legalnotice>
<para>Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the <filename>NOTICE</filename> file distributed with this
@@ -27,11 +20,11 @@
</info>
<preface xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="preface">
<title>Introduction</title>
- <para>This book is the official Guacamole manual, written by the upstream developers of the
- Guacamole project. It is also the official general documentation, and an online version
- at <link xlink:href="http://guac-dev.org/">http://guac-dev.org/</link>. It is a work in
- progress which will be continuously updated as Guacamole changes with each
- release.</para>
+ <para>This book is the official Apache Guacamole manual, written by the upstream developers
+ of the Guacamole project. It is also the official general documentation, and an online
+ version at <link xlink:href="http://guacamole.incubator.apache.org/"
+ >http://guacamole.incubator.apache.org/</link>. It is a work in progress which will
+ be continuously updated as Guacamole changes with each release.</para>
<para>We decided to maintain the documentation for Guacamole as a book, as there is an awful
lot that can be done with the Guacamole web application, and even more that can be done
with the API. This book is intended to explore the possibilities of Guacamole as an
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/src/references/instructions/server/drawing/transfer.xml
----------------------------------------------------------------------
diff --git a/src/references/instructions/server/drawing/transfer.xml b/src/references/instructions/server/drawing/transfer.xml
index 7648f79..735b32f 100644
--- a/src/references/instructions/server/drawing/transfer.xml
+++ b/src/references/instructions/server/drawing/transfer.xml
@@ -8,11 +8,15 @@
<indexterm>
<primary>transfer</primary>
</indexterm>
- <para>Transfers image data from the specified rectangle of the specified
- layer or buffer to a different location of another specified layer or
- buffer, using the specified transfer function. For a list of available
- functions, see
- [[http://guac-dev.org/trac/browser/libguac/include/protocol.h|guacamole/protocol.h.</para>
+ <para>Transfers image data from the specified rectangle of the specified layer or buffer to a
+ different location of another specified layer or buffer, using the specified transfer
+ function. </para>
+ <para>For a list of available functions, see the definition of
+ <classname>guac_transfer_function</classname> within the <link
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://github.com/apache/incubator-guacamole-server/blob/master/src/libguac/guacamole/protocol-types.h"
+ ><filename>guacamole/protocol-types.h</filename></link> header included with
+ libguac.</para>
<variablelist>
<varlistentry>
<term><parameter>srclayer</parameter></term>
@@ -51,9 +55,13 @@
<varlistentry>
<term><parameter>function</parameter></term>
<listitem>
- <para>The index of the transfer function to use. For a list of
- available functions, see
- [[http://guac-dev.org/trac/browser/libguac/include/protocol.h|guacamole/protocol.h.</para>
+ <para>The index of the transfer function to use.</para>
+ <para>For a list of available functions, see the definition of
+ <classname>guac_transfer_function</classname> within the <link
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://github.com/apache/incubator-guacamole-server/blob/master/src/libguac/guacamole/protocol-types.h"
+ ><filename>guacamole/protocol-types.h</filename></link> header included
+ with libguac.</para>
</listitem>
</varlistentry>
<varlistentry>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/fd3acd38/tutorials/libguac-client-ball/configure.ac
----------------------------------------------------------------------
diff --git a/tutorials/libguac-client-ball/configure.ac b/tutorials/libguac-client-ball/configure.ac
index 4516041..a0bc976 100644
--- a/tutorials/libguac-client-ball/configure.ac
+++ b/tutorials/libguac-client-ball/configure.ac
@@ -11,7 +11,7 @@ AC_PROG_CC
AC_PROG_CC_C99
AC_PROG_LIBTOOL
-# Check for libguac (http://guac-dev.org/)
+# Check for libguac
AC_CHECK_LIB([guac], [guac_client_stream_png],,
AC_MSG_ERROR("libguac is required for communication via "
"the Guacamole protocol"))
[6/7] incubator-guacamole-manual git commit: GUACAMOLE-107: Provide
links for Apache license and NOTICE file.
Posted by jm...@apache.org.
GUACAMOLE-107: Provide links for Apache license and NOTICE file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/59721e43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/59721e43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/59721e43
Branch: refs/heads/master
Commit: 59721e43533498a9bbffc700f66031a3ca60b1df
Parents: fd3acd3
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Oct 30 20:36:39 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Oct 30 20:36:39 2016 -0700
----------------------------------------------------------------------
src/gug.xml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/59721e43/src/gug.xml
----------------------------------------------------------------------
diff --git a/src/gug.xml b/src/gug.xml
index f798c67..03b851e 100644
--- a/src/gug.xml
+++ b/src/gug.xml
@@ -6,12 +6,16 @@
<edition>0.9.10-incubating</edition>
<legalnotice>
<para>Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the <filename>NOTICE</filename> file distributed with this
- work for additional information regarding copyright ownership. The ASF licenses this
- file to you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of the
- License at:</para>
- <para><uri>http://www.apache.org/licenses/LICENSE-2.0</uri></para>
+ license agreements. See the <link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://raw.githubusercontent.com/apache/incubator-guacamole-manual/master/NOTICE"
+ ><filename>NOTICE</filename></link> file distributed with this work for
+ additional information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use this file
+ except in compliance with the License. You may obtain a copy of the License
+ at:</para>
+ <para><link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="http://www.apache.org/licenses/LICENSE-2.0"
+ ><uri>http://www.apache.org/licenses/LICENSE-2.0</uri></link></para>
<para>Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
[3/7] incubator-guacamole-manual git commit: GUACAMOLE-107: Update
auth tutorial to reference org.apache.*.
Posted by jm...@apache.org.
GUACAMOLE-107: Update auth tutorial to reference org.apache.*.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/6866700c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/6866700c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/6866700c
Branch: refs/heads/master
Commit: 6866700cb449d15c0ae4a2999eeefbcd38c33ec0
Parents: e540aab
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Oct 29 13:44:03 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Oct 29 14:00:01 2016 -0700
----------------------------------------------------------------------
src/chapters/custom-auth.xml | 28 +++----
tutorials/guacamole-auth-tutorial/pom.xml | 8 +-
.../auth/TutorialAuthenticationProvider.java | 87 ++++++++++++++++++++
.../auth/TutorialGuacamoleProperties.java | 64 ++++++++++++++
.../auth/TutorialAuthenticationProvider.java | 87 --------------------
.../auth/TutorialGuacamoleProperties.java | 64 --------------
.../src/main/resources/guac-manifest.json | 2 +-
7 files changed, 170 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/6866700c/src/chapters/custom-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/custom-auth.xml b/src/chapters/custom-auth.xml
index 17694e6..644b883 100644
--- a/src/chapters/custom-auth.xml
+++ b/src/chapters/custom-auth.xml
@@ -55,12 +55,11 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-tutorial</artifactId>
<packaging>jar</packaging>
<version>0.9.10-incubating</version>
<name>guacamole-auth-tutorial</name>
- <url>http://guac-dev.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -73,6 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -86,7 +86,7 @@
<!-- Guacamole Java API -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.10-incubating</version>
<scope>provided</scope>
@@ -94,7 +94,7 @@
<!-- Guacamole Extension API -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.10-incubating</version>
<scope>provided</scope>
@@ -110,16 +110,16 @@
<para>Naturally, we need the actual authentication extension skeleton code. While you can
put this in whatever file and package you want, for the sake of this tutorial, we will
assume you are using
- <classname>org.glyptodon.guacamole.auth.TutorialAuthenticationProvider</classname>.</para>
+ <classname>org.apache.guacamole.auth.TutorialAuthenticationProvider</classname>.</para>
<example>
<title>A skeleton <classname>TutorialAuthenticationProvider</classname></title>
- <programlisting>package org.glyptodon.guacamole.auth;
+ <programlisting>package org.apache.guacamole.auth;
import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
/**
* Authentication provider implementation intended to demonstrate basic use
@@ -146,7 +146,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
}</programlisting>
</example>
<para>To conform with Maven, this skeleton file must be placed within
- <filename>src/main/java/org/glyptodon/guacamole/auth</filename> as
+ <filename>src/main/java/org/apache/guacamole/auth</filename> as
<filename>TutorialAuthenticationProvider.java</filename>.</para>
<para>Notice how simple the authentication provider is. The
<classname>SimpleAuthenticationProvider</classname> base class simplifies the
@@ -186,7 +186,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
"namespace" : "guac-auth-tutorial",
"authProviders" : [
- "org.glyptodon.guacamole.auth.TutorialAuthenticationProvider"
+ "org.apache.guacamole.auth.TutorialAuthenticationProvider"
]
}</programlisting>
@@ -271,9 +271,9 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
<example>
<title><filename>TutorialProperties.java</filename>, a class containing property
definitions</title>
- <programlisting>package org.glyptodon.guacamole.auth;
+ <programlisting>package org.apache.guacamole.auth;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
/**
* Utility class containing all properties used by the custom authentication
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/6866700c/tutorials/guacamole-auth-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/pom.xml b/tutorials/guacamole-auth-tutorial/pom.xml
index 028fbf8..be0c5e2 100644
--- a/tutorials/guacamole-auth-tutorial/pom.xml
+++ b/tutorials/guacamole-auth-tutorial/pom.xml
@@ -4,12 +4,11 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-tutorial</artifactId>
<packaging>jar</packaging>
<version>0.9.10-incubating</version>
<name>guacamole-auth-tutorial</name>
- <url>http://guac-dev.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,6 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -35,7 +35,7 @@
<!-- Guacamole Java API -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.10-incubating</version>
<scope>provided</scope>
@@ -43,7 +43,7 @@
<!-- Guacamole Extension API -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.10-incubating</version>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/6866700c/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialAuthenticationProvider.java b/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialAuthenticationProvider.java
new file mode 100644
index 0000000..50633c5
--- /dev/null
+++ b/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialAuthenticationProvider.java
@@ -0,0 +1,87 @@
+package org.apache.guacamole.auth;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+
+/**
+ * Authentication provider implementation intended to demonstrate basic use
+ * of Guacamole's extension API. The credentials and connection information for
+ * a single user are stored directly in guacamole.properties.
+ */
+public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider {
+
+ @Override
+ public String getIdentifier() {
+ return "tutorial";
+ }
+
+ @Override
+ public Map<String, GuacamoleConfiguration>
+ getAuthorizedConfigurations(Credentials credentials)
+ throws GuacamoleException {
+
+ // Get the Guacamole server environment
+ Environment environment = new LocalEnvironment();
+
+ // Get username from guacamole.properties
+ String username = environment.getRequiredProperty(
+ TutorialGuacamoleProperties.TUTORIAL_USER
+ );
+
+ // If wrong username, fail
+ if (!username.equals(credentials.getUsername()))
+ return null;
+
+ // Get password from guacamole.properties
+ String password = environment.getRequiredProperty(
+ TutorialGuacamoleProperties.TUTORIAL_PASSWORD
+ );
+
+ // If wrong password, fail
+ if (!password.equals(credentials.getPassword()))
+ return null;
+
+ // Successful login. Return configurations.
+ Map<String, GuacamoleConfiguration> configs =
+ new HashMap<String, GuacamoleConfiguration>();
+
+ // Create new configuration
+ GuacamoleConfiguration config = new GuacamoleConfiguration();
+
+ // Set protocol specified in properties
+ config.setProtocol(environment.getRequiredProperty(
+ TutorialGuacamoleProperties.TUTORIAL_PROTOCOL
+ ));
+
+ // Set all parameters, splitting at commas
+ for (String parameterValue : environment.getRequiredProperty(
+ TutorialGuacamoleProperties.TUTORIAL_PARAMETERS
+ ).split(",\\s*")) {
+
+ // Find the equals sign
+ int equals = parameterValue.indexOf('=');
+ if (equals == -1)
+ throw new GuacamoleServerException("Required equals sign missing");
+
+ // Get name and value from parameter string
+ String name = parameterValue.substring(0, equals);
+ String value = parameterValue.substring(equals+1);
+
+ // Set parameter as specified
+ config.setParameter(name, value);
+
+ }
+
+ configs.put("Tutorial Connection", config);
+ return configs;
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/6866700c/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialGuacamoleProperties.java
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialGuacamoleProperties.java b/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialGuacamoleProperties.java
new file mode 100644
index 0000000..ddf0a8c
--- /dev/null
+++ b/tutorials/guacamole-auth-tutorial/src/main/java/org/apache/guacamole/auth/TutorialGuacamoleProperties.java
@@ -0,0 +1,64 @@
+package org.apache.guacamole.auth;
+
+import org.apache.guacamole.properties.StringGuacamoleProperty;
+
+/**
+ * Utility class containing all properties used by the custom authentication
+ * tutorial. The properties defined here must be specified within
+ * guacamole.properties to configure the tutorial authentication provider.
+ */
+public class TutorialGuacamoleProperties {
+
+ /**
+ * This class should not be instantiated.
+ */
+ private TutorialGuacamoleProperties() {}
+
+ /**
+ * The only user to allow.
+ */
+ public static final StringGuacamoleProperty TUTORIAL_USER =
+ new StringGuacamoleProperty() {
+
+ @Override
+ public String getName() { return "tutorial-user"; }
+
+ };
+
+ /**
+ * The password required for the specified user.
+ */
+ public static final StringGuacamoleProperty TUTORIAL_PASSWORD =
+ new StringGuacamoleProperty() {
+
+ @Override
+ public String getName() { return "tutorial-password"; }
+
+ };
+
+
+ /**
+ * The protocol to use when connecting.
+ */
+ public static final StringGuacamoleProperty TUTORIAL_PROTOCOL =
+ new StringGuacamoleProperty() {
+
+ @Override
+ public String getName() { return "tutorial-protocol"; }
+
+ };
+
+
+ /**
+ * All parameters associated with the connection, as a comma-delimited
+ * list of name="value"
+ */
+ public static final StringGuacamoleProperty TUTORIAL_PARAMETERS =
+ new StringGuacamoleProperty() {
+
+ @Override
+ public String getName() { return "tutorial-parameters"; }
+
+ };
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/6866700c/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialAuthenticationProvider.java b/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialAuthenticationProvider.java
deleted file mode 100644
index 98131ef..0000000
--- a/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialAuthenticationProvider.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.glyptodon.guacamole.auth;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-
-/**
- * Authentication provider implementation intended to demonstrate basic use
- * of Guacamole's extension API. The credentials and connection information for
- * a single user are stored directly in guacamole.properties.
- */
-public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider {
-
- @Override
- public String getIdentifier() {
- return "tutorial";
- }
-
- @Override
- public Map<String, GuacamoleConfiguration>
- getAuthorizedConfigurations(Credentials credentials)
- throws GuacamoleException {
-
- // Get the Guacamole server environment
- Environment environment = new LocalEnvironment();
-
- // Get username from guacamole.properties
- String username = environment.getRequiredProperty(
- TutorialGuacamoleProperties.TUTORIAL_USER
- );
-
- // If wrong username, fail
- if (!username.equals(credentials.getUsername()))
- return null;
-
- // Get password from guacamole.properties
- String password = environment.getRequiredProperty(
- TutorialGuacamoleProperties.TUTORIAL_PASSWORD
- );
-
- // If wrong password, fail
- if (!password.equals(credentials.getPassword()))
- return null;
-
- // Successful login. Return configurations.
- Map<String, GuacamoleConfiguration> configs =
- new HashMap<String, GuacamoleConfiguration>();
-
- // Create new configuration
- GuacamoleConfiguration config = new GuacamoleConfiguration();
-
- // Set protocol specified in properties
- config.setProtocol(environment.getRequiredProperty(
- TutorialGuacamoleProperties.TUTORIAL_PROTOCOL
- ));
-
- // Set all parameters, splitting at commas
- for (String parameterValue : environment.getRequiredProperty(
- TutorialGuacamoleProperties.TUTORIAL_PARAMETERS
- ).split(",\\s*")) {
-
- // Find the equals sign
- int equals = parameterValue.indexOf('=');
- if (equals == -1)
- throw new GuacamoleServerException("Required equals sign missing");
-
- // Get name and value from parameter string
- String name = parameterValue.substring(0, equals);
- String value = parameterValue.substring(equals+1);
-
- // Set parameter as specified
- config.setParameter(name, value);
-
- }
-
- configs.put("Tutorial Connection", config);
- return configs;
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/6866700c/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialGuacamoleProperties.java
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialGuacamoleProperties.java b/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialGuacamoleProperties.java
deleted file mode 100644
index 75f0298..0000000
--- a/tutorials/guacamole-auth-tutorial/src/main/java/org/glyptodon/guacamole/auth/TutorialGuacamoleProperties.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.glyptodon.guacamole.auth;
-
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
-
-/**
- * Utility class containing all properties used by the custom authentication
- * tutorial. The properties defined here must be specified within
- * guacamole.properties to configure the tutorial authentication provider.
- */
-public class TutorialGuacamoleProperties {
-
- /**
- * This class should not be instantiated.
- */
- private TutorialGuacamoleProperties() {}
-
- /**
- * The only user to allow.
- */
- public static final StringGuacamoleProperty TUTORIAL_USER =
- new StringGuacamoleProperty() {
-
- @Override
- public String getName() { return "tutorial-user"; }
-
- };
-
- /**
- * The password required for the specified user.
- */
- public static final StringGuacamoleProperty TUTORIAL_PASSWORD =
- new StringGuacamoleProperty() {
-
- @Override
- public String getName() { return "tutorial-password"; }
-
- };
-
-
- /**
- * The protocol to use when connecting.
- */
- public static final StringGuacamoleProperty TUTORIAL_PROTOCOL =
- new StringGuacamoleProperty() {
-
- @Override
- public String getName() { return "tutorial-protocol"; }
-
- };
-
-
- /**
- * All parameters associated with the connection, as a comma-delimited
- * list of name="value"
- */
- public static final StringGuacamoleProperty TUTORIAL_PARAMETERS =
- new StringGuacamoleProperty() {
-
- @Override
- public String getName() { return "tutorial-parameters"; }
-
- };
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/6866700c/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json b/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
index d97efe7..597688a 100644
--- a/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
+++ b/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
@@ -6,7 +6,7 @@
"namespace" : "guac-auth-tutorial",
"authProviders" : [
- "org.glyptodon.guacamole.auth.TutorialAuthenticationProvider"
+ "org.apache.guacamole.auth.TutorialAuthenticationProvider"
]
}
[2/7] incubator-guacamole-manual git commit: GUACAMOLE-107: Update
webapp tutorial to reference org.apache.*.
Posted by jm...@apache.org.
GUACAMOLE-107: Update webapp tutorial to reference org.apache.*.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/71602c18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/71602c18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/71602c18
Branch: refs/heads/master
Commit: 71602c1890bc62ab368805a02a6da139fd942b30
Parents: 6866700
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Oct 29 13:56:48 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Oct 29 14:00:01 2016 -0700
----------------------------------------------------------------------
src/chapters/yourown.xml | 35 +++++++++---------
tutorials/guacamole-tutorial/pom.xml | 11 +++---
.../example/TutorialGuacamoleTunnelServlet.java | 38 ++++++++++++++++++++
.../example/TutorialGuacamoleTunnelServlet.java | 38 --------------------
.../src/main/webapp/WEB-INF/web.xml | 2 +-
5 files changed, 63 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/71602c18/src/chapters/yourown.xml
----------------------------------------------------------------------
diff --git a/src/chapters/yourown.xml b/src/chapters/yourown.xml
index afdee76..10b8b4b 100644
--- a/src/chapters/yourown.xml
+++ b/src/chapters/yourown.xml
@@ -109,12 +109,11 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-tutorial</artifactId>
<packaging>war</packaging>
<version>0.9.10-incubating</version>
<name>guacamole-tutorial</name>
- <url>http://guac-dev.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -236,6 +235,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -264,10 +264,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.6</version>
<configuration>
<overlays>
<overlay>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<type>zip</type>
</overlay>
@@ -301,7 +302,7 @@
<!-- Main Guacamole library -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.10-incubating</version>
<scope>compile</scope>
@@ -309,7 +310,7 @@
<!-- Guacamole JavaScript library -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>0.9.10-incubating</version>
<type>zip</type>
@@ -356,17 +357,17 @@
<para>Create a new file, <filename>TutorialGuacamoleTunnelServlet.java</filename>,
defining a basic implementation of a tunnel servlet class:</para>
<informalexample>
- <programlisting>package org.glyptodon.guacamole.net.example;
+ <programlisting>package org.apache.guacamole.net.example;
import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import org.glyptodon.guacamole.net.SimpleGuacamoleTunnel;
-import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.InetGuacamoleSocket;
+import org.apache.guacamole.net.SimpleGuacamoleTunnel;
+import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.servlet.GuacamoleHTTPTunnelServlet;
public class TutorialGuacamoleTunnelServlet
extends GuacamoleHTTPTunnelServlet {
@@ -396,8 +397,8 @@ public class TutorialGuacamoleTunnelServlet
}</programlisting>
</informalexample>
<para>Place this file in the
- <filename>src/main/java/org/glyptodon/guacamole/net/example</filename>
- subdirectory of the project. The initial part of this subdirectory,
+ <filename>src/main/java/org/apache/guacamole/net/example</filename> subdirectory
+ of the project. The initial part of this subdirectory,
<filename>src/main/java</filename>, is the path required by Maven, while the
rest is the directory required by Java based on the package associated with the
class.</para>
@@ -413,7 +414,7 @@ public class TutorialGuacamoleTunnelServlet
<description>Tunnel servlet.</description>
<servlet-name>Tunnel</servlet-name>
<servlet-class>
- org.glyptodon.guacamole.net.example.TutorialGuacamoleTunnelServlet
+ org.apache.guacamole.net.example.TutorialGuacamoleTunnelServlet
</servlet-class>
</servlet>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/71602c18/tutorials/guacamole-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-tutorial/pom.xml b/tutorials/guacamole-tutorial/pom.xml
index e6d8e79..0427ea1 100644
--- a/tutorials/guacamole-tutorial/pom.xml
+++ b/tutorials/guacamole-tutorial/pom.xml
@@ -4,12 +4,11 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-tutorial</artifactId>
<packaging>war</packaging>
<version>0.9.10-incubating</version>
<name>guacamole-tutorial</name>
- <url>http://guac-dev.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,6 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -32,10 +32,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.6</version>
<configuration>
<overlays>
<overlay>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<type>zip</type>
</overlay>
@@ -59,7 +60,7 @@
<!-- Main Guacamole library -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.10-incubating</version>
<scope>compile</scope>
@@ -67,7 +68,7 @@
<!-- Guacamole JavaScript library -->
<dependency>
- <groupId>org.glyptodon.guacamole</groupId>
+ <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>0.9.10-incubating</version>
<type>zip</type>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/71602c18/tutorials/guacamole-tutorial/src/main/java/org/apache/guacamole/net/example/TutorialGuacamoleTunnelServlet.java
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-tutorial/src/main/java/org/apache/guacamole/net/example/TutorialGuacamoleTunnelServlet.java b/tutorials/guacamole-tutorial/src/main/java/org/apache/guacamole/net/example/TutorialGuacamoleTunnelServlet.java
new file mode 100644
index 0000000..25d7aa8
--- /dev/null
+++ b/tutorials/guacamole-tutorial/src/main/java/org/apache/guacamole/net/example/TutorialGuacamoleTunnelServlet.java
@@ -0,0 +1,38 @@
+package org.apache.guacamole.net.example;
+
+import javax.servlet.http.HttpServletRequest;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.InetGuacamoleSocket;
+import org.apache.guacamole.net.SimpleGuacamoleTunnel;
+import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.servlet.GuacamoleHTTPTunnelServlet;
+
+public class TutorialGuacamoleTunnelServlet
+ extends GuacamoleHTTPTunnelServlet {
+
+ @Override
+ protected GuacamoleTunnel doConnect(HttpServletRequest request)
+ throws GuacamoleException {
+
+ // Create our configuration
+ GuacamoleConfiguration config = new GuacamoleConfiguration();
+ config.setProtocol("vnc");
+ config.setParameter("hostname", "localhost");
+ config.setParameter("port", "5901");
+ config.setParameter("password", "potato");
+
+ // Connect to guacd - everything is hard-coded here.
+ GuacamoleSocket socket = new ConfiguredGuacamoleSocket(
+ new InetGuacamoleSocket("localhost", 4822),
+ config
+ );
+
+ // Return a new tunnel which uses the connected socket
+ return new SimpleGuacamoleTunnel(socket);
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/71602c18/tutorials/guacamole-tutorial/src/main/java/org/glyptodon/guacamole/net/example/TutorialGuacamoleTunnelServlet.java
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-tutorial/src/main/java/org/glyptodon/guacamole/net/example/TutorialGuacamoleTunnelServlet.java b/tutorials/guacamole-tutorial/src/main/java/org/glyptodon/guacamole/net/example/TutorialGuacamoleTunnelServlet.java
deleted file mode 100644
index 1a2e958..0000000
--- a/tutorials/guacamole-tutorial/src/main/java/org/glyptodon/guacamole/net/example/TutorialGuacamoleTunnelServlet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.glyptodon.guacamole.net.example;
-
-import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import org.glyptodon.guacamole.net.SimpleGuacamoleTunnel;
-import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
-
-public class TutorialGuacamoleTunnelServlet
- extends GuacamoleHTTPTunnelServlet {
-
- @Override
- protected GuacamoleTunnel doConnect(HttpServletRequest request)
- throws GuacamoleException {
-
- // Create our configuration
- GuacamoleConfiguration config = new GuacamoleConfiguration();
- config.setProtocol("vnc");
- config.setParameter("hostname", "localhost");
- config.setParameter("port", "5901");
- config.setParameter("password", "potato");
-
- // Connect to guacd - everything is hard-coded here.
- GuacamoleSocket socket = new ConfiguredGuacamoleSocket(
- new InetGuacamoleSocket("localhost", 4822),
- config
- );
-
- // Return a new tunnel which uses the connected socket
- return new SimpleGuacamoleTunnel(socket);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/71602c18/tutorials/guacamole-tutorial/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-tutorial/src/main/webapp/WEB-INF/web.xml b/tutorials/guacamole-tutorial/src/main/webapp/WEB-INF/web.xml
index 064e95e..285ae75 100644
--- a/tutorials/guacamole-tutorial/src/main/webapp/WEB-INF/web.xml
+++ b/tutorials/guacamole-tutorial/src/main/webapp/WEB-INF/web.xml
@@ -16,7 +16,7 @@
<description>Tunnel servlet.</description>
<servlet-name>Tunnel</servlet-name>
<servlet-class>
- org.glyptodon.guacamole.net.example.TutorialGuacamoleTunnelServlet
+ org.apache.guacamole.net.example.TutorialGuacamoleTunnelServlet
</servlet-class>
</servlet>
[4/7] incubator-guacamole-manual git commit: GUACAMOLE-107: Point
references to GitHub repository at Apache mirror.
Posted by jm...@apache.org.
GUACAMOLE-107: Point references to GitHub repository at Apache mirror.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/bd527e75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/bd527e75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/bd527e75
Branch: refs/heads/master
Commit: bd527e756d3290ae1f612b7b26aa58996221b222
Parents: 71602c1
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Oct 29 14:04:31 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Oct 29 14:04:46 2016 -0700
----------------------------------------------------------------------
src/chapters/installing.xml | 32 ++++++++++++++++----------------
src/chapters/using.xml | 2 +-
2 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/bd527e75/src/chapters/installing.xml
----------------------------------------------------------------------
diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml
index e6c29b0..5bc076e 100644
--- a/src/chapters/installing.xml
+++ b/src/chapters/installing.xml
@@ -559,8 +559,8 @@
rigorously tested as the code in stable releases, you can also clone the Guacamole
team's git repository on GitHub:</para>
<informalexample>
- <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/glyptodon/guacamole-server.git</uri></userinput>
-<computeroutput>Cloning into 'guacamole-server'...
+ <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/apache/incubator-guacamole-server.git</uri></userinput>
+<computeroutput>Cloning into 'incubator-guacamole-server'...
remote: Counting objects: 6769, done.
remote: Compressing objects: 100% (2244/2244), done.
remote: Total 6769 (delta 3058), reused 6718 (delta 3008)
@@ -680,12 +680,12 @@ Type "make" to compile guacamole-server.
<informalexample>
<screen><prompt>$</prompt> <userinput>make</userinput>
<computeroutput>Making all in src/libguac
-make[1]: Entering directory `/home/zhz/guacamole/guacamole-server/src/libguac'
+make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server/src/libguac'
...
-make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server/src/protocols/vnc'
-make[1]: Entering directory `/home/zhz/guacamole/guacamole-server'
+make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server/src/protocols/vnc'
+make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server'
make[1]: Nothing to be done for `all-am'.
-make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server'</computeroutput>
+make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'</computeroutput>
<prompt>$</prompt></screen>
</informalexample>
<para>Quite a bit of output will scroll up the screen as all the components are
@@ -700,8 +700,8 @@ make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server'</computeroutpu
<informalexample>
<screen><prompt>#</prompt> <userinput>make install</userinput>
<computeroutput>Making install in src/libguac
-make[1]: Entering directory `/home/zhz/guacamole/guacamole-server/src/libguac'
-make[2]: Entering directory `/home/zhz/guacamole/guacamole-server/src/libguac'
+make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server/src/libguac'
+make[2]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server/src/libguac'
...
----------------------------------------------------------------------
Libraries have been installed in:
@@ -722,14 +722,14 @@ See any operating system documentation about shared libraries for
more information, such as the ld(1) and ld.so(8) manual pages.
----------------------------------------------------------------------
make[2]: Nothing to be done for `install-data-am'.
-make[2]: Leaving directory `/home/zhz/guacamole/guacamole-server/src/protocols/vnc'
-make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server/src/protocols/vnc'
-make[1]: Entering directory `/home/zhz/guacamole/guacamole-server'
-make[2]: Entering directory `/home/zhz/guacamole/guacamole-server'
+make[2]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server/src/protocols/vnc'
+make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server/src/protocols/vnc'
+make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server'
+make[2]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server'
make[2]: Nothing to be done for `install-exec-am'.
make[2]: Nothing to be done for `install-data-am'.
-make[2]: Leaving directory `/home/zhz/guacamole/guacamole-server'
-make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server'</computeroutput>
+make[2]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'
+make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'</computeroutput>
<prompt>#</prompt> <userinput>ldconfig</userinput>
<prompt>#</prompt> </screen>
</informalexample>
@@ -788,8 +788,8 @@ make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server'</computeroutpu
don't care that the code hasn't been as rigorously tested as the code in stable
releases, you can also clone the Guacamole team's git repository on GitHub:</para>
<informalexample>
- <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/glyptodon/guacamole-client.git</uri></userinput>
-<computeroutput>Cloning into 'guacamole-client'...
+ <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/apache/incubator-guacamole-client.git</uri></userinput>
+<computeroutput>Cloning into 'incubator-guacamole-client'...
remote: Counting objects: 12788, done.
remote: Compressing objects: 100% (4183/4183), done.
remote: Total 12788 (delta 3942), reused 12667 (delta 3822)
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/bd527e75/src/chapters/using.xml
----------------------------------------------------------------------
diff --git a/src/chapters/using.xml b/src/chapters/using.xml
index 1b946e4..92053e2 100644
--- a/src/chapters/using.xml
+++ b/src/chapters/using.xml
@@ -308,7 +308,7 @@
Guacamole's SSH support can be used with the <command>guacctl</command> utility. The
<command>guacctl</command> utility is a simple shell script <link
xmlns:xlink="http://www.w3.org/1999/xlink"
- xlink:href="https://raw.githubusercontent.com/glyptodon/guacamole-server/master/bin/guacctl"
+ xlink:href="https://raw.githubusercontent.com/apache/incubator-guacamole-server/master/bin/guacctl"
>included with Guacamole</link> which allows you to use and configure file
transfer directly from the command line within the SSH session:</para>
<informalexample>