guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [1/3] incubator-guacamole-manual git commit: GUACAMOLE-154: Update documentation to point to 0.9.11-incubating where applicable.
Date Mon, 16 Jan 2017 05:32:14 GMT
Repository: incubator-guacamole-manual
Updated Branches:
  refs/heads/master b7dc148b5 -> 3ef53a014


GUACAMOLE-154: Update documentation to point to 0.9.11-incubating where applicable.


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/5804259d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/5804259d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/5804259d

Branch: refs/heads/master
Commit: 5804259dbed767a79c60f1d5adac56bba8b1dd09
Parents: b7dc148
Author: Michael Jumper <mjumper@apache.org>
Authored: Mon Jan 9 12:11:02 2017 -0800
Committer: Michael Jumper <mjumper@apache.org>
Committed: Mon Jan 9 15:01:59 2017 -0800

----------------------------------------------------------------------
 src/chapters/custom-auth.xml                    | 20 +++-------
 src/chapters/guacamole-ext.xml                  |  4 +-
 src/chapters/installing.xml                     | 14 +++----
 src/chapters/jdbc-auth.xml                      | 39 +++++++++++++++-----
 src/chapters/ldap-auth.xml                      |  4 +-
 src/chapters/noauth.xml                         |  4 +-
 src/gug.xml                                     |  4 +-
 tutorials/guacamole-auth-tutorial/pom.xml       | 12 +-----
 .../src/main/resources/guac-manifest.json       |  2 +-
 9 files changed, 53 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/src/chapters/custom-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/custom-auth.xml b/src/chapters/custom-auth.xml
index 644b883..13a60d6 100644
--- a/src/chapters/custom-auth.xml
+++ b/src/chapters/custom-auth.xml
@@ -58,7 +58,7 @@
     &lt;groupId>org.apache.guacamole&lt;/groupId>
     &lt;artifactId>guacamole-auth-tutorial&lt;/artifactId>
     &lt;packaging>jar&lt;/packaging>
-    &lt;version>0.9.10-incubating&lt;/version>
+    &lt;version>0.9.11-incubating&lt;/version>
     &lt;name>guacamole-auth-tutorial&lt;/name>
 
     &lt;properties>
@@ -84,19 +84,11 @@
 
     &lt;dependencies>
 
-        &lt;!-- Guacamole Java API -->
-        &lt;dependency>
-            &lt;groupId>org.apache.guacamole&lt;/groupId>
-            &lt;artifactId>guacamole-common&lt;/artifactId>
-            &lt;version>0.9.10-incubating&lt;/version>
-            &lt;scope>provided&lt;/scope>
-        &lt;/dependency>
-
         &lt;!-- Guacamole Extension API -->
         &lt;dependency>
             &lt;groupId>org.apache.guacamole&lt;/groupId>
             &lt;artifactId>guacamole-ext&lt;/artifactId>
-            &lt;version>0.9.10-incubating&lt;/version>
+            &lt;version>0.9.11-incubating&lt;/version>
             &lt;scope>provided&lt;/scope>
         &lt;/dependency>
 
@@ -180,7 +172,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
             <title>The required <filename>guac-manifest.json</filename></title>
             <programlisting>{
 
-    "guacamoleVersion" : "0.9.10-incubating",
+    "guacamoleVersion" : "0.9.11-incubating",
 
     "name"      : "Tutorial Authentication Extension",
     "namespace" : "guac-auth-tutorial",
@@ -204,7 +196,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
             <screen><prompt>$</prompt> mvn package
 <computeroutput>[INFO] Scanning for projects...
 [INFO] ------------------------------------------------------------------------
-[INFO] Building guacamole-auth-tutorial 0.9.10-incubating
+[INFO] Building guacamole-auth-tutorial 0.9.11-incubating
 [INFO] ------------------------------------------------------------------------
 ...
 [INFO] ------------------------------------------------------------------------
@@ -218,7 +210,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
         </informalexample>
         <para>Assuming you see the "<computeroutput>BUILD SUCCESS</computeroutput>"
message when you
             build the extension, there will be a new file,
-                <filename>target/guacamole-auth-tutorial-0.9.10-incubating.jar</filename>,
which can be
+                <filename>target/guacamole-auth-tutorial-0.9.11-incubating.jar</filename>,
which can be
             installed within Guacamole and tested. If you changed the name or version of
the project
             in the <filename>pom.xml</filename> file, the name of this new <filename>.jar</filename>
             file will be different, but it can still be found within
@@ -480,7 +472,7 @@ public Map&lt;String, GuacamoleConfiguration>
             user running Tomcat.</para>
         <para>To install your extension, ensure that the required properties have been
added to your
                 <filename>guacamole.properties</filename>, copy the
-                <filename>target/guacamole-auth-tutorial-0.9.10-incubating.jar</filename>
file into
+                <filename>target/guacamole-auth-tutorial-0.9.11-incubating.jar</filename>
file into
                 <filename>GUACAMOLE_HOME/extensions</filename> and restart Tomcat.
Guacamole will
             automatically load your extension, logging an informative message that it has
done
             so:</para>

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/src/chapters/guacamole-ext.xml
----------------------------------------------------------------------
diff --git a/src/chapters/guacamole-ext.xml b/src/chapters/guacamole-ext.xml
index 2697dbe..982b5c0 100644
--- a/src/chapters/guacamole-ext.xml
+++ b/src/chapters/guacamole-ext.xml
@@ -174,7 +174,7 @@
                     <filename>guac-manifest.json</filename> will look something
like this:</para>
             <informalexample>
                 <programlisting>{
-    "guacamoleVersion" : "0.9.10-incubating",
+    "guacamoleVersion" : "0.9.11-incubating",
     "name" : "My Extension",
     "namespace" : "my-extension"
 }</programlisting>
@@ -186,7 +186,7 @@
             <informalexample>
                 <programlisting>{
 
-    "guacamoleVersion" : "0.9.10-incubating",
+    "guacamoleVersion" : "0.9.11-incubating",
 
     "name"      : "My Extension",
     "namespace" : "my-extension",

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/src/chapters/installing.xml
----------------------------------------------------------------------
diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml
index 5bc076e..3fc2aab 100644
--- a/src/chapters/installing.xml
+++ b/src/chapters/installing.xml
@@ -551,8 +551,8 @@
                 of a <filename>.tar.gz</filename> archive which you can extract
from the command
                 line:</para>
             <informalexample>
-                <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-server-0.9.10-incubating.tar.gz</userinput>
-<prompt>$</prompt> <userinput>cd guacamole-server-0.9.10-incubating/</userinput>
+                <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-server-0.9.11-incubating.tar.gz</userinput>
+<prompt>$</prompt> <userinput>cd guacamole-server-0.9.11-incubating/</userinput>
 <prompt>$</prompt></screen>
             </informalexample>
             <para>If you want the absolute latest code, and don't care that the code
hasn't been as
@@ -604,7 +604,7 @@ checking whether build environment is sane... yes
 ...
 
 ------------------------------------------------
-guacamole-server version 0.9.10-incubating
+guacamole-server version 0.9.11-incubating
 ------------------------------------------------
 
    Library status:
@@ -780,8 +780,8 @@ make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'</com
                 <filename>.tar.gz</filename> archive which you can extract from
the command
             line:</para>
         <informalexample>
-            <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-client-0.9.10-incubating.tar.gz</userinput>
-<prompt>$</prompt> <userinput>cd guacamole-client-0.9.10-incubating/</userinput>
+            <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-client-0.9.11-incubating.tar.gz</userinput>
+<prompt>$</prompt> <userinput>cd guacamole-client-0.9.11-incubating/</userinput>
 <prompt>$</prompt></screen>
         </informalexample>
         <para>As with <package>guacamole-server</package>, if you want
the absolute latest code, and
@@ -875,7 +875,7 @@ Resolving deltas: 100% (3942/3942), done.</computeroutput>
             application from the name of the <filename>.war</filename> file,
you will likely want to
             rename this to simply <filename>guacamole.war</filename> while copying:</para>
         <informalexample>
-            <screen><prompt>#</prompt> <userinput>cp guacamole/target/guacamole-0.9.10-incubating.war
<replaceable>/var/lib/tomcat/webapps</replaceable>/guacamole.war</userinput>
+            <screen><prompt>#</prompt> <userinput>cp guacamole/target/guacamole-0.9.11-incubating.war
<replaceable>/var/lib/tomcat/webapps</replaceable>/guacamole.war</userinput>
 <prompt>#</prompt></screen>
         </informalexample>
         <para>Again, if you are using a different servlet container or if Tomcat is
installed to a
@@ -893,7 +893,7 @@ Resolving deltas: 100% (3942/3942), done.</computeroutput>
 Starting Tomcat... OK</computeroutput>
 <prompt>#</prompt> <userinput>/etc/init.d/guacd start</userinput>
 <computeroutput>Starting guacd: SUCCESS
-guacd[6229]: INFO:  Guacamole proxy daemon (guacd) version 0.9.10-incubating started</computeroutput>
+guacd[6229]: INFO:  Guacamole proxy daemon (guacd) version 0.9.11-incubating started</computeroutput>
 <prompt>#</prompt></screen>
         </informalexample>
         <important>

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/src/chapters/jdbc-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index 48130fe..00e4756 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -61,10 +61,10 @@
                 <term><filename>mysql/</filename></term>
                 <listitem>
                     <para>Contains the MySQL/MariaDB authentication extension,
-                            <filename>guacamole-auth-jdbc-mysql-0.9.10-incubating.jar</filename>,
+                            <filename>guacamole-auth-jdbc-mysql-0.9.11-incubating.jar</filename>,
                         along with a <filename>schema/</filename> directory containing
                         MySQL-specific SQL scripts required to set up the database. The
-                            <filename>guacamole-auth-jdbc-mysql-0.9.10-incubating.jar</filename>
+                            <filename>guacamole-auth-jdbc-mysql-0.9.11-incubating.jar</filename>
                         file will ultimately need to be placed within
                             <filename>GUACAMOLE_HOME/extensions</filename>, while
the MySQL JDBC
                         driver must be placed within <filename>GUACAMOLE_HOME/lib</filename>.</para>
@@ -81,10 +81,10 @@
                 <term><filename>postgresql/</filename></term>
                 <listitem>
                     <para>Contains the PostgreSQL authentication extension,
-                            <filename>guacamole-auth-jdbc-postgresql-0.9.10-incubating.jar</filename>,
+                            <filename>guacamole-auth-jdbc-postgresql-0.9.11-incubating.jar</filename>,
                         along with a <filename>schema/</filename> directory containing
                         PostgreSQL-specific SQL scripts required to set up the database.
The
-                            <filename>guacamole-auth-jdbc-postgresql-0.9.10-incubating.jar</filename>
+                            <filename>guacamole-auth-jdbc-postgresql-0.9.11-incubating.jar</filename>
                         file will ultimately need to be placed within
                             <filename>GUACAMOLE_HOME/extensions</filename>, while
the PostgreSQL
                         JDBC driver must be placed within
@@ -171,8 +171,9 @@ Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
                     script located within the <filename>upgrade/</filename> directory:</para>
                 <informalexample>
                     <screen><prompt>$</prompt> <userinput>ls schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.8.2.sql   upgrade-pre-0.9.6.sql  upgrade-pre-0.9.8.sql
-upgrade-pre-0.9.10.sql  upgrade-pre-0.9.7.sql  upgrade-pre-0.9.9.sql</computeroutput>
+<computeroutput>upgrade-pre-0.8.2.sql   upgrade-pre-0.9.6.sql  upgrade-pre-0.9.9.sql
+upgrade-pre-0.9.10.sql  upgrade-pre-0.9.7.sql
+upgrade-pre-0.9.11.sql  upgrade-pre-0.9.8.sq</computeroutput>
 <prompt>$</prompt> <userinput>mysql -u root -p <replaceable>guacamole_db</replaceable>
&lt; schema/upgrade/upgrade-pre-0.8.2.sql</userinput>
 <prompt>Enter password:</prompt> <userinput><replaceable>password</replaceable></userinput>
 <prompt>$</prompt></screen>
@@ -218,6 +219,14 @@ upgrade-pre-0.9.10.sql  upgrade-pre-0.9.7.sql  upgrade-pre-0.9.9.sql</computerou
 <prompt>Enter password:</prompt> <userinput><replaceable>password</replaceable></userinput>
 <prompt>$</prompt></screen>
                 </informalexample>
+                <para>If you are upgrading from a version of Guacamole before 0.9.11-incubating,
+                    schema changes which add support for password policies need to be
+                    applied:</para>
+                <informalexample>
+                    <screen><prompt>$</prompt> <userinput>mysql -u
root -p <replaceable>guacamole_db</replaceable> &lt; schema/upgrade/upgrade-pre-0.9.11.sql</userinput>
+<prompt>Enter password:</prompt> <userinput><replaceable>password</replaceable></userinput>
+<prompt>$</prompt></screen>
+                </informalexample>
             </important>
         </section>
         <section xml:id="jdbc-auth-postgresql">
@@ -263,8 +272,8 @@ Type "help" for help.
                     directory:</para>
                 <informalexample>
                     <screen><prompt>$</prompt> <userinput>ls schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.9.10.sql  upgrade-pre-0.9.8.sql
-upgrade-pre-0.9.7.sql   upgrade-pre-0.9.9.sql</computeroutput>
+<computeroutput>upgrade-pre-0.9.10.sql  upgrade-pre-0.9.7.sql  upgrade-pre-0.9.9.sql
+upgrade-pre-0.9.11.sql  upgrade-pre-0.9.8.sql</computeroutput>
 <prompt>$</prompt> <userinput>psql -d <replaceable>guacamole_db</replaceable>
-f schema/upgrade/upgrade-pre-0.9.7.sql</userinput>
 <computeroutput>ALTER TABLE
 ALTER TABLE</computeroutput>
@@ -328,6 +337,16 @@ ALTER TABLE
 CREATE INDEX</computeroutput>
 <prompt>$</prompt></screen>
                 </informalexample>
+                <para>If you are upgrading from a version of Guacamole before 0.9.11-incubating,
+                    schema changes which add support for password policies need to be
+                    applied:</para>
+                <informalexample>
+                    <screen><prompt>$</prompt> <userinput>psql -d
<replaceable>guacamole_db</replaceable> -f schema/upgrade/upgrade-pre-0.9.11.sql</userinput>
+<computeroutput>ALTER TABLE
+CREATE TABLE
+CREATE INDEX</computeroutput>
+<prompt>$</prompt></screen>
+                </informalexample>
             </important>
         </section>
     </section>
@@ -342,9 +361,9 @@ CREATE INDEX</computeroutput>
                     does not already exist.</para>
             </step>
             <step>
-                <para>Copy <filename>guacamole-auth-jdbc-mysql-0.9.10-incubating.jar</filename>
+                <para>Copy <filename>guacamole-auth-jdbc-mysql-0.9.11-incubating.jar</filename>
                     <emphasis>or</emphasis>
-                    <filename>guacamole-auth-jdbc-postgresql-0.9.10-incubating.jar</filename>
within
+                    <filename>guacamole-auth-jdbc-postgresql-0.9.11-incubating.jar</filename>
within
                         <filename>GUACAMOLE_HOME/extensions</filename>, depending
on whether you are
                     using MySQL/MariaDB or PostgreSQL.</para>
             </step>

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 60d5997..901704c 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -83,7 +83,7 @@
             containing:</para>
         <variablelist>
             <varlistentry>
-                <term><filename>guacamole-auth-ldap-0.9.10-incubating.jar</filename></term>
+                <term><filename>guacamole-auth-ldap-0.9.11-incubating.jar</filename></term>
                 <listitem>
                     <para>The Guacamole LDAP support extension itself, which must be
placed in
                             <filename>GUACAMOLE_HOME/extensions</filename>.</para>
@@ -211,7 +211,7 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
                     does not already exist.</para>
             </step>
             <step>
-                <para>Copy <filename>guacamole-auth-ldap-0.9.10-incubating.jar</filename>
within
+                <para>Copy <filename>guacamole-auth-ldap-0.9.11-incubating.jar</filename>
within
                         <filename>GUACAMOLE_HOME/extensions</filename>.</para>
             </step>
             <step>

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/src/chapters/noauth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/noauth.xml b/src/chapters/noauth.xml
index be82b27..32b5eaf 100644
--- a/src/chapters/noauth.xml
+++ b/src/chapters/noauth.xml
@@ -35,7 +35,7 @@
             packaged as a <filename>.tar.gz</filename> file containing:</para>
         <variablelist>
             <varlistentry>
-                <term><filename>guacamole-auth-noauth-0.9.10-incubating.jar</filename></term>
+                <term><filename>guacamole-auth-noauth-0.9.11-incubating.jar</filename></term>
                 <listitem>
                     <para>The NoAuth extension itself, which must be placed in
                             <filename>GUACAMOLE_HOME/extensions</filename>.</para>
@@ -61,7 +61,7 @@
                     does not already exist.</para>
             </step>
             <step>
-                <para>Copy <filename>guacamole-auth-noauth-0.9.10-incubating.jar</filename>
within
+                <para>Copy <filename>guacamole-auth-noauth-0.9.11-incubating.jar</filename>
within
                         <filename>GUACAMOLE_HOME/extensions</filename>.</para>
             </step>
             <step>

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/src/gug.xml
----------------------------------------------------------------------
diff --git a/src/gug.xml b/src/gug.xml
index 03b851e..222ece3 100644
--- a/src/gug.xml
+++ b/src/gug.xml
@@ -3,7 +3,7 @@
     xmlns:xi="http://www.w3.org/2001/XInclude">
     <info>
         <title>Guacamole Manual</title>
-        <edition>0.9.10-incubating</edition>
+        <edition>0.9.11-incubating</edition>
         <legalnotice>
             <para>Licensed to the Apache Software Foundation (ASF) under one or more
contributor
                 license agreements. See the <link xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -42,7 +42,7 @@
             application, etc.) to give a good starting point beyond simply looking at the
Guacamole
             codebase.</para>
         <para>This particular edition of the <citetitle>Guacamole Manual</citetitle>
covers
-            Guacamole version 0.9.10-incubating. New releases which create new features or
break
+            Guacamole version 0.9.11-incubating. New releases which create new features or
break
             compatibility will result in new editions of the user's guide, as will any necessary
             corrections. As the official documentation for the project, this book will always
be
             freely available in its entirety online.</para>

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/tutorials/guacamole-auth-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/pom.xml b/tutorials/guacamole-auth-tutorial/pom.xml
index be0c5e2..5bb0c4e 100644
--- a/tutorials/guacamole-auth-tutorial/pom.xml
+++ b/tutorials/guacamole-auth-tutorial/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-tutorial</artifactId>
     <packaging>jar</packaging>
-    <version>0.9.10-incubating</version>
+    <version>0.9.11-incubating</version>
     <name>guacamole-auth-tutorial</name>
 
     <properties>
@@ -33,19 +33,11 @@
 
     <dependencies>
 
-        <!-- Guacamole Java API -->
-        <dependency>
-            <groupId>org.apache.guacamole</groupId>
-            <artifactId>guacamole-common</artifactId>
-            <version>0.9.10-incubating</version>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- Guacamole Extension API -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>0.9.10-incubating</version>
+            <version>0.9.11-incubating</version>
             <scope>provided</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/5804259d/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 597688a..a2c2bdc 100644
--- a/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
+++ b/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
 {
 
-    "guacamoleVersion" : "0.9.10-incubating",
+    "guacamoleVersion" : "0.9.11-incubating",
 
     "name"      : "Tutorial Authentication Extension",
     "namespace" : "guac-auth-tutorial",


Mime
View raw message