From do-not-reply at jboss.org Wed Oct 28 12:13:13 2009
Content-Type: multipart/mixed; boundary="===============4358655288483749636=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: hornetq-commits at lists.jboss.org
Subject: [hornetq-commits] JBoss hornetq SVN: r8157 -
 trunk/docs/user-manual/en.
Date: Wed, 28 Oct 2009 12:13:13 -0400
Message-ID: <200910281613.n9SGDDa7011080@svn01.web.mwc.hst.phx2.redhat.com>

--===============4358655288483749636==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jmesnil
Date: 2009-10-28 12:13:10 -0400 (Wed, 28 Oct 2009)
New Revision: 8157

Modified:
   trunk/docs/user-manual/en/clusters.xml
   trunk/docs/user-manual/en/configuration-index.xml
   trunk/docs/user-manual/en/ha.xml
Log:
documentation typo + missing config props

Modified: trunk/docs/user-manual/en/clusters.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/user-manual/en/clusters.xml	2009-10-28 13:59:28 UTC (rev 815=
6)
+++ trunk/docs/user-manual/en/clusters.xml	2009-10-28 16:13:10 UTC (rev 815=
7)
@@ -145,7 +145,7 @@
         </section>
         <section id=3D"clusters.discovery-groups">
             <title>Discovery Groups</title>
-            <para>While the broadcast group defines who connector informat=
ion is broadcast from a
+            <para>While the broadcast group defines how connector informat=
ion is broadcasted from a
                 server, a discovery group defines how connector informatio=
n is received from a
                 multicast address.</para>
             <para>A discovery group maintains a list of connector pairs - =
one for each broadcast by
@@ -161,7 +161,7 @@
                 </listitem>
                 <listitem>
                     <para>By messaging clients so they can discovery what =
servers in the cluster
-                        that they can connect to.</para>
+                        they can connect to.</para>
                 </listitem>
             </itemizedlist>
         </section>
@@ -582,7 +582,7 @@
                     balancing policy applied to that list of servers.</par=
a>
             </section>
         </section>
-        <section>
+        <section id=3D"clusters.static.servers">
             <title>Specifying List of Servers to form a Cluster</title>
             <para>Let's take a look at an example where each cluster conne=
ction is defined for a
                 symmetric cluster, but we're not using discovery for each =
node to discover its

Modified: trunk/docs/user-manual/en/configuration-index.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/user-manual/en/configuration-index.xml	2009-10-28 13:59:28 U=
TC (rev 8156)
+++ trunk/docs/user-manual/en/configuration-index.xml	2009-10-28 16:13:10 U=
TC (rev 8157)
@@ -838,6 +838,35 @@
                             <entry>false</entry>
                         </row>
                         <row>
+                            <entry><link linkend=3D"clusters.static.server=
s"
+                                    >connection-factory.connector-ref.conn=
ector-name (attribute)</link></entry>
+                            <entry>String</entry>
+                            <entry>Name of the connector to connect to the=
 live server</entry>
+                            <entry />
+                        </row>
+                        <row>
+                            <entry><link linkend=3D"clusters.static.server=
s"
+                                    >connection-factory.connector-ref.back=
up-connector-name (attribute)</link></entry>
+                            <entry>String</entry>
+                            <entry>Name of the connector to connect to the=
 backup server</entry>
+                            <entry />
+                        </row>
+                        <row>
+                            <entry><link linkend=3D"clusters-discovery.gro=
ups.clientside"
+                                    >connection-factory.discovery-group-re=
f.discovery-group-name (attribute)</link></entry>
+                            <entry>String</entry>
+                            <entry>Name of discovery group used by this co=
nnection factory</entry>
+                            <entry />
+                        </row>
+                        <row>
+                            <entry><link linkend=3D"clusters-discovery.gro=
ups.clientside"
+                                    >connection-factory.discovery-initial-=
wait-timeout</link></entry>
+                            <entry>Long</entry>
+                            <entry>the initial time to wait (in ms) for di=
scovery groups to wait for
+                                broadcasts</entry>
+                            <entry>2000</entry>
+                        </row>
+                        <row>
                             <entry><link linkend=3D"send-guarantees.nontra=
ns.acks"
                                     >connection-factory.block-on-acknowled=
ge</link></entry>
                             <entry>Boolean</entry>
@@ -911,14 +940,6 @@
                             <entry>1024 * 1024</entry>
                         </row>
                         <row>
-                            <entry><link linkend=3D"clusters-discovery.gro=
ups.clientside"
-                                    >connection-factory.discovery-initial-=
wait-timeout</link></entry>
-                            <entry>Long</entry>
-                            <entry>the initial time to wait (in ms) for di=
scovery groups to wait for
-                                broadcasts</entry>
-                            <entry>2000</entry>
-                        </row>
-                        <row>
                             <entry><link linkend=3D"using-jms.dupsokbatchs=
ize"
                                     >connection-factory.dups-ok-batch-size=
</link></entry>
                             <entry>Integer</entry>
@@ -927,7 +948,7 @@
                             <entry>1024 * 1024</entry>
                         </row>
                         <row>
-                            <entry><link linkend=3D"ha.client.automatic"
+                            <entry><link linkend=3D"ha.automatic.failover"
                                     >connection-factory.failover-on-server=
-shutdown</link></entry>
                             <entry>Boolean</entry>
                             <entry>whether or not to failover on server sh=
utdown</entry>

Modified: trunk/docs/user-manual/en/ha.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/user-manual/en/ha.xml	2009-10-28 13:59:28 UTC (rev 8156)
+++ trunk/docs/user-manual/en/ha.xml	2009-10-28 16:13:10 UTC (rev 8157)
@@ -119,6 +119,9 @@
                 <para>In order for live - backup pairs to operate properly=
 with a shared store, both servers
                    must have configured the location of journal directory =
to point
                         to the <emphasis>same shared location</emphasis> (=
as explained in <xref linkend=3D"configuring.message.journal" />)</para>
+               <para>If clients will use automatic failover with JMS, the =
live server will need to configure a connector
+                  to the backup server and reference it from its <literal>=
hornetq-jms.xml</literal> configuration as explained
+                  in <xref linkend=3D"ha.automatic.failover" />.</para>
              </section>
              <section>
                  <title>Synchronization of live-backup pairs</title>
@@ -139,7 +142,7 @@
          <listitem><para>application-level failover</para></listitem>
       </itemizedlist>
       =

-    <section id=3D"ha.client.automatic">
+    <section id=3D"ha.automatic.failover">
         <title>Automatic Client Failover</title>
         <para>HornetQ clients can be configured with knowledge of live and=
 backup servers, so that
             in event of connection failure of the client - live server con=
nection, the client will
@@ -152,8 +155,9 @@
         <para>HornetQ clients can be configured with the list of live-back=
up server pairs in a
             number of different ways. They can be configured explicitly or=
 probably the most common
             way of doing this is to use <emphasis>server discovery</emphas=
is> for the client to
-            automatically discover the list. For full details on how to co=
nfigure clients please see
-                <xref linkend=3D"clusters.server-discovery"/>.</para>
+            automatically discover the list. For full details on how to co=
nfigure server discovery, please see
+                <xref linkend=3D"clusters.server-discovery"/>. Alternative=
ly, the clients can  explicitely specifies pairs of
+                live-backup server as explained in <xref linkend=3D"cluste=
rs.static.servers" />.</para>
         <para>To enable automatic client failover, the client must be conf=
igured to allow non-zero reconnection attempts
            (as explained in <xref linkend=3D"client-reconnection" />).</pa=
ra>
         <para>Sometimes you want a client to failover onto a backup server=
 even if the live server


--===============4358655288483749636==--