Merge 1.2.0 changes back to master.
diff --git a/src/chapters/adhoc-connections.xml b/src/chapters/adhoc-connections.xml
index 397e9b2..277b792 100644
--- a/src/chapters/adhoc-connections.xml
+++ b/src/chapters/adhoc-connections.xml
@@ -48,7 +48,7 @@
xlink:href="http://guacamole.apache.org/releases/"
>http://guacamole.apache.org/releases/</link>.</para>
<para>The quickconnect extension is packaged as a <filename>.tar.gz</filename> file containing
- only the extension itself, <filename>guacamole-auth-quickconnect-1.1.0.jar</filename>, which must
+ only the extension itself, <filename>guacamole-auth-quickconnect-1.2.0.jar</filename>, which must
ultimately be placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-quickconnect">
@@ -65,7 +65,7 @@
does not already exist.</para>
</step>
<step>
- <para>Place the <filename>guacamole-auth-quickconnect-1.1.0.jar</filename> file in
+ <para>Place the <filename>guacamole-auth-quickconnect-1.2.0.jar</filename> file in
the <filename>GUACAMOLE_HOME/extensions</filename> directory.</para>
</step>
</procedure>
diff --git a/src/chapters/cas-auth.xml b/src/chapters/cas-auth.xml
index c66d6bd..1331935 100644
--- a/src/chapters/cas-auth.xml
+++ b/src/chapters/cas-auth.xml
@@ -23,7 +23,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The CAS authentication extension is packaged as a <filename>.tar.gz</filename>
file containing only the extension itself,
- <filename>guacamole-auth-cas-1.1.0.jar</filename>, which must
+ <filename>guacamole-auth-cas-1.2.0.jar</filename>, which must
ultimately be placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-cas-auth">
@@ -40,7 +40,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-cas-1.1.0.jar</filename> within
+ <para>Copy <filename>guacamole-auth-cas-1.2.0.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index fbfeb90..65b106a 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -719,7 +719,7 @@
events:</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>guaclog <replaceable>/path/to/recording/NAME</replaceable></userinput><computeroutput>
-guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.1.0
+guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.2.0
guaclog: INFO: 1 input file(s) provided.
guaclog: INFO: Writing input events from "<replaceable>/path/to/recording/NAME</replaceable>" to "<replaceable annotations="">/path/to/recording/NAME</replaceable>.txt" ...
guaclog: INFO: All files interpreted successfully.</computeroutput>
@@ -1874,7 +1874,7 @@
can be used in situations where guacd does
not support passing the timezone parameter
during the handshake phase (guacd versions
- prior to 1.1.0).</para>
+ prior to 1.2.0).</para>
<para>Support for forwarding the client
timezone varies by RDP server implementation.
For example, with Windows, support for
@@ -2038,7 +2038,7 @@
events:</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>guaclog <replaceable>/path/to/recording/NAME</replaceable></userinput><computeroutput>
-guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.1.0
+guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.2.0
guaclog: INFO: 1 input file(s) provided.
guaclog: INFO: Writing input events from "<replaceable>/path/to/recording/NAME</replaceable>" to "<replaceable annotations="">/path/to/recording/NAME</replaceable>.txt" ...
guaclog: INFO: All files interpreted successfully.</computeroutput>
@@ -3720,7 +3720,7 @@
events:</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>guaclog <replaceable>/path/to/recording/NAME</replaceable></userinput><computeroutput>
-guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.1.0
+guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.2.0
guaclog: INFO: 1 input file(s) provided.
guaclog: INFO: Writing input events from "<replaceable>/path/to/recording/NAME</replaceable>" to "<replaceable annotations="">/path/to/recording/NAME</replaceable>.txt" ...
guaclog: INFO: All files interpreted successfully.</computeroutput>
@@ -4548,7 +4548,7 @@
events:</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>guaclog <replaceable>/path/to/recording/NAME</replaceable></userinput><computeroutput>
-guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.1.0
+guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.2.0
guaclog: INFO: 1 input file(s) provided.
guaclog: INFO: Writing input events from "<replaceable>/path/to/recording/NAME</replaceable>" to "<replaceable annotations="">/path/to/recording/NAME</replaceable>.txt" ...
guaclog: INFO: All files interpreted successfully.</computeroutput>
@@ -5291,7 +5291,7 @@
events:</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>guaclog <replaceable>/path/to/recording/NAME</replaceable></userinput><computeroutput>
-guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.1.0
+guaclog: INFO: Guacamole input log interpreter (guaclog) version 1.2.0
guaclog: INFO: 1 input file(s) provided.
guaclog: INFO: Writing input events from "<replaceable>/path/to/recording/NAME</replaceable>" to "<replaceable annotations="">/path/to/recording/NAME</replaceable>.txt" ...
guaclog: INFO: All files interpreted successfully.</computeroutput>
diff --git a/src/chapters/custom-auth.xml b/src/chapters/custom-auth.xml
index 28961eb..3b65c56 100644
--- a/src/chapters/custom-auth.xml
+++ b/src/chapters/custom-auth.xml
@@ -58,7 +58,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-tutorial</artifactId>
<packaging>jar</packaging>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<name>guacamole-auth-tutorial</name>
<properties>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
@@ -172,7 +172,7 @@
<title>The required <filename>guac-manifest.json</filename></title>
<programlisting>{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "Tutorial Authentication Extension",
"namespace" : "guac-auth-tutorial",
@@ -196,7 +196,7 @@
<screen><prompt>$</prompt> mvn package
<computeroutput>[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
-[INFO] Building guacamole-auth-tutorial 1.1.0
+[INFO] Building guacamole-auth-tutorial 1.2.0
[INFO] ------------------------------------------------------------------------
...
[INFO] ------------------------------------------------------------------------
@@ -210,7 +210,7 @@
</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-1.1.0.jar</filename>, which can be
+ <filename>target/guacamole-auth-tutorial-1.2.0.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
@@ -472,7 +472,7 @@
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-1.1.0.jar</filename> file into
+ <filename>target/guacamole-auth-tutorial-1.2.0.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>
diff --git a/src/chapters/duo-auth.xml b/src/chapters/duo-auth.xml
index d08cc3b..d92c469 100644
--- a/src/chapters/duo-auth.xml
+++ b/src/chapters/duo-auth.xml
@@ -55,7 +55,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The Duo authentication extension is packaged as a <filename>.tar.gz</filename> file
containing only the extension itself,
- <filename>guacamole-auth-duo-1.1.0.jar</filename>, which must ultimately
+ <filename>guacamole-auth-duo-1.2.0.jar</filename>, which must ultimately
be placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-duo-auth">
@@ -69,7 +69,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-duo-1.1.0.jar</filename> within
+ <para>Copy <filename>guacamole-auth-duo-1.2.0.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
diff --git a/src/chapters/event-listeners.xml b/src/chapters/event-listeners.xml
index 12dabf7..63706c3 100644
--- a/src/chapters/event-listeners.xml
+++ b/src/chapters/event-listeners.xml
@@ -52,7 +52,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-listener-tutorial</artifactId>
<packaging>jar</packaging>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<name>guacamole-listener-tutorial</name>
<properties>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
@@ -159,7 +159,7 @@
<title>The required <filename>guac-manifest.json</filename></title>
<programlisting>{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "Tutorial Listener Extension",
"namespace" : "guac-listener-tutorial",
@@ -179,7 +179,7 @@
<screen><prompt>$</prompt> mvn package
<computeroutput>[INFO] Scanning for projects...
[INFO] ---------------------------------------------------------------
-[INFO] Building guacamole-listener-tutorial 1.1.0
+[INFO] Building guacamole-listener-tutorial 1.2.0
[INFO] ---------------------------------------------------------------
...
[INFO] ---------------------------------------------------------------
@@ -193,7 +193,7 @@
</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-listener-tutorial-1.1.0.jar</filename>, which can be
+ <filename>target/guacamole-listener-tutorial-1.2.0.jar</filename>, which can be
installed within Guacamole (see <xref xmlns:xlink="http://www.w3.org/1999/xlink"
linkend="custom-listener-installing"/> at the end of this chapter). It should log
event notifications that occur during, for example, authentication attempts.
@@ -341,7 +341,7 @@
will be the <filename>.guacamole</filename> directory within the home directory of the
user running Tomcat.</para>
<para>To install your extension, copy the
- <filename>target/guacamole-listener-tutorial-1.1.0.jar</filename> file into
+ <filename>target/guacamole-listener-tutorial-1.2.0.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>
diff --git a/src/chapters/guacamole-ext.xml b/src/chapters/guacamole-ext.xml
index 6f041cd..799a16c 100644
--- a/src/chapters/guacamole-ext.xml
+++ b/src/chapters/guacamole-ext.xml
@@ -186,7 +186,7 @@
<filename>guac-manifest.json</filename> will look something like this:</para>
<informalexample>
<programlisting>{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "My Extension",
"namespace" : "my-extension"
}</programlisting>
@@ -198,7 +198,7 @@
<informalexample>
<programlisting>{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "My Extension",
"namespace" : "my-extension",
diff --git a/src/chapters/header-auth.xml b/src/chapters/header-auth.xml
index ab9c11d..16a5a36 100644
--- a/src/chapters/header-auth.xml
+++ b/src/chapters/header-auth.xml
@@ -29,7 +29,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The HTTP header authentication extension is packaged as a <filename>.tar.gz</filename>
file containing only the extension itself,
- <filename>guacamole-auth-header-1.1.0.jar</filename>, which must
+ <filename>guacamole-auth-header-1.2.0.jar</filename>, which must
ultimately be placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-header-auth">
@@ -46,7 +46,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-header-1.1.0.jar</filename> within
+ <para>Copy <filename>guacamole-auth-header-1.2.0.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml
index 8a0a41f..9518f48 100644
--- a/src/chapters/installing.xml
+++ b/src/chapters/installing.xml
@@ -615,8 +615,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-1.1.0.tar.gz</userinput>
-<prompt>$</prompt> <userinput>cd guacamole-server-1.1.0/</userinput>
+ <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-server-1.2.0.tar.gz</userinput>
+<prompt>$</prompt> <userinput>cd guacamole-server-1.2.0/</userinput>
<prompt>$</prompt></screen>
</informalexample>
<para>If you want the absolute latest code, and don't care that the code hasn't been as
@@ -668,7 +668,7 @@
...
------------------------------------------------
-guacamole-server version 1.1.0
+guacamole-server version 1.2.0
------------------------------------------------
Library status:
@@ -850,8 +850,8 @@
<filename>.tar.gz</filename> archive which you can extract from the command
line:</para>
<informalexample>
- <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-client-1.1.0.tar.gz</userinput>
-<prompt>$</prompt> <userinput>cd guacamole-client-1.1.0/</userinput>
+ <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-client-1.2.0.tar.gz</userinput>
+<prompt>$</prompt> <userinput>cd guacamole-client-1.2.0/</userinput>
<prompt>$</prompt></screen>
</informalexample>
<para>As with <package>guacamole-server</package>, if you want the absolute latest code, and
@@ -963,7 +963,7 @@
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-1.1.0.war <replaceable>/var/lib/tomcat/webapps</replaceable>/guacamole.war</userinput>
+ <screen><prompt>#</prompt> <userinput>cp guacamole/target/guacamole-1.2.0.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
@@ -981,7 +981,7 @@
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 1.1.0 started</computeroutput>
+guacd[6229]: INFO: Guacamole proxy daemon (guacd) version 1.2.0 started</computeroutput>
<prompt>#</prompt></screen>
</informalexample>
<important>
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index 0e5c2bb..d837254 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -62,10 +62,10 @@
<term><filename>mysql/</filename></term>
<listitem>
<para>Contains the MySQL/MariaDB authentication extension,
- <filename>guacamole-auth-jdbc-mysql-1.1.0.jar</filename>, along with a
+ <filename>guacamole-auth-jdbc-mysql-1.2.0.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-1.1.0.jar</filename> file will
+ <filename>guacamole-auth-jdbc-mysql-1.2.0.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>
@@ -82,10 +82,10 @@
<term><filename>postgresql/</filename></term>
<listitem>
<para>Contains the PostgreSQL authentication extension,
- <filename>guacamole-auth-jdbc-postgresql-1.1.0.jar</filename>, along
+ <filename>guacamole-auth-jdbc-postgresql-1.2.0.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-1.1.0.jar</filename> file will
+ <filename>guacamole-auth-jdbc-postgresql-1.2.0.jar</filename> file will
ultimately need to be placed within
<filename>GUACAMOLE_HOME/extensions</filename>, while the PostgreSQL
JDBC driver must be placed within
@@ -102,7 +102,7 @@
<term><filename>sqlserver/</filename></term>
<listitem>
<para>Contains the SQL Server authentication extension,
- <filename>guacamole-auth-jdbc-sqlserver-1.1.0.jar</filename>, along with
+ <filename>guacamole-auth-jdbc-sqlserver-1.2.0.jar</filename>, along with
a <filename>schema/</filename> directory contains SQL Server-specific
scripts requires to set up the database. The JAR extension file will need to
be placed within the <filename>GUACAMOLE_HOME/extensions</filename> folder,
@@ -355,11 +355,11 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-jdbc-mysql-1.1.0.jar</filename>
+ <para>Copy <filename>guacamole-auth-jdbc-mysql-1.2.0.jar</filename>
<emphasis>or</emphasis>
- <filename>guacamole-auth-jdbc-postgresql-1.1.0.jar</filename>
+ <filename>guacamole-auth-jdbc-postgresql-1.2.0.jar</filename>
<emphasis>or</emphasis>
- <filename>guacamole-auth-jdbc-sqlserver-1.1.0.jar</filename> within
+ <filename>guacamole-auth-jdbc-sqlserver-1.2.0.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>, depending on whether you are
using MySQL/MariaDB, PostgreSQL, or SQL Server.</para>
</step>
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 52ee98f..d7965df 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-1.1.0.jar</filename></term>
+ <term><filename>guacamole-auth-ldap-1.2.0.jar</filename></term>
<listitem>
<para>The Guacamole LDAP support extension itself, which must be placed in
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
@@ -214,7 +214,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-ldap-1.1.0.jar</filename> within
+ <para>Copy <filename>guacamole-auth-ldap-1.2.0.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
diff --git a/src/chapters/openid-auth.xml b/src/chapters/openid-auth.xml
index 78c43d2..dd98f86 100644
--- a/src/chapters/openid-auth.xml
+++ b/src/chapters/openid-auth.xml
@@ -31,7 +31,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The OpenID Connect authentication extension is packaged as a
<filename>.tar.gz</filename> file containing only the extension itself,
- <filename>guacamole-auth-openid-1.1.0.jar</filename>, which must ultimately be
+ <filename>guacamole-auth-openid-1.2.0.jar</filename>, which must ultimately be
placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-openid-auth">
@@ -48,7 +48,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-openid-1.1.0.jar</filename> within
+ <para>Copy <filename>guacamole-auth-openid-1.2.0.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
diff --git a/src/chapters/radius-auth.xml b/src/chapters/radius-auth.xml
index d48b9e5..e226493 100644
--- a/src/chapters/radius-auth.xml
+++ b/src/chapters/radius-auth.xml
@@ -29,7 +29,7 @@
<screen><prompt>$</prompt> <userinput>mvn clean package -Plgpl-extensions</userinput>
<computeroutput>[INFO] --- maven-assembly-plugin:2.5.3:single (make-source-archive) @ guacamole-client ---
[INFO] Reading assembly descriptor: project-assembly.xml
-[INFO] Building tar: /home/guac/guacamole-client/target/guacamole-client-1.1.0.tar.gz
+[INFO] Building tar: /home/guac/guacamole-client/target/guacamole-client-1.2.0.tar.gz
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
@@ -65,7 +65,7 @@
<para>After the build completes successfully, the extension will be in the
<filename>extensions/guacamole-auth-radius/target/</filename> directory, and will be
- called guacamole-auth-radius-1.1.0.jar. This extension file can be copied to
+ called guacamole-auth-radius-1.2.0.jar. This extension file can be copied to
the <filename>GUACAMOLE_HOME/extensions</filename> directory.
<emphasis>If you are unsure where <varname>GUACAMOLE_HOME</varname> is located on
your system, please consult <xref linkend="configuring-guacamole"/> before
@@ -86,7 +86,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-radius-1.1.0.jar</filename> into
+ <para>Copy <filename>guacamole-auth-radius-1.2.0.jar</filename> into
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
diff --git a/src/chapters/totp-auth.xml b/src/chapters/totp-auth.xml
index b5e923b..676f8ca 100644
--- a/src/chapters/totp-auth.xml
+++ b/src/chapters/totp-auth.xml
@@ -110,7 +110,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The TOTP authentication extension is packaged as a <filename>.tar.gz</filename> file
containing only the extension itself,
- <filename>guacamole-auth-totp-1.1.0.jar</filename>, which must ultimately be placed in
+ <filename>guacamole-auth-totp-1.2.0.jar</filename>, which must ultimately be placed in
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-totp-auth">
@@ -124,7 +124,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-totp-1.1.0.jar</filename> within
+ <para>Copy <filename>guacamole-auth-totp-1.2.0.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
diff --git a/src/chapters/yourown.xml b/src/chapters/yourown.xml
index 6b07048..daa41c6 100644
--- a/src/chapters/yourown.xml
+++ b/src/chapters/yourown.xml
@@ -112,7 +112,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-tutorial</artifactId>
<packaging>war</packaging>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<name>guacamole-tutorial</name>
<properties>
@@ -201,7 +201,7 @@
</informalexample>
<para>Assuming you see the "<computeroutput>BUILD SUCCESSFUL</computeroutput>" message
when you build the web application, there will be a new file,
- <filename>target/guacamole-tutorial-1.1.0.war</filename>, which
+ <filename>target/guacamole-tutorial-1.2.0.war</filename>, which
can be deployed to your servlet container 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>.war</filename> file will be different, but it can still be found
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
@@ -331,7 +331,7 @@
web application should build successfully, and the Guacamole JavaScript API should
be accessible in the <filename>guacamole-common-js/</filename> subdirectory of your
web application after it is deployed. A quick check that you can access
- <uri>/guacamole-tutorial-1.1.0/guacamole-common-js/all.min.js</uri>
+ <uri>/guacamole-tutorial-1.2.0/guacamole-common-js/all.min.js</uri>
is probably worth the effort.</para>
</section>
<section xml:id="simple-tunnel">
@@ -430,7 +430,7 @@
to the URL we wish to use when making HTTP requests to the servlet:
<uri>/tunnel</uri>. This URL is relative to the context root of the web
application. In the case of this web application, the final absolute URL will be
- <uri>/guacamole-tutorial-1.1.0/tunnel</uri>.</para>
+ <uri>/guacamole-tutorial-1.2.0/tunnel</uri>.</para>
</section>
<section xml:id="simple-client">
<title>Adding the client</title>
diff --git a/src/gug.xml b/src/gug.xml
index c0c930c..b6dad07 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>1.1.0</edition>
+ <edition>1.2.0</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 1.1.0. New releases which create new features or break
+ Guacamole version 1.2.0. 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>
diff --git a/tutorials/guacamole-auth-tutorial/pom.xml b/tutorials/guacamole-auth-tutorial/pom.xml
index 9dd5f00..1ee80c9 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>1.1.0</version>
+ <version>1.2.0</version>
<name>guacamole-auth-tutorial</name>
<properties>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
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 af7ca26..2e02cc4 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" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "Tutorial Authentication Extension",
"namespace" : "guac-auth-tutorial",
diff --git a/tutorials/guacamole-tutorial/pom.xml b/tutorials/guacamole-tutorial/pom.xml
index 02e13aa..fb3977c 100644
--- a/tutorials/guacamole-tutorial/pom.xml
+++ b/tutorials/guacamole-tutorial/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-tutorial</artifactId>
<packaging>war</packaging>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<name>guacamole-tutorial</name>
<properties>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
