[jboss-cvs] JBoss Messaging SVN: r5167 - projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Oct 21 23:00:27 EDT 2008


Author: irooskov at redhat.com
Date: 2008-10-21 23:00:27 -0400 (Tue, 21 Oct 2008)
New Revision: 5167

Added:
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recovery_config.xml
Removed:
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recoveryconfig.xml
Modified:
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/JBoss_Messaging_User_Guide_CP03.xml
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/Revision_History.xml
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/bridge.xml
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/c_configuration.xml
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/configuration.xml
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/installation.xml
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/introduction.xml
   projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/runningexamples.xml
Log:
updated JBM Guide for EAP 4.3 CP03


Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/JBoss_Messaging_User_Guide_CP03.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/JBoss_Messaging_User_Guide_CP03.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/JBoss_Messaging_User_Guide_CP03.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -12,7 +12,8 @@
 	<xi:include href="runningexamples.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="c_configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="recoveryconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!--	<xi:include href="recoveryconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+	<xi:include href="recovery_config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="bridge.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Revision_History.xml"/>
 

Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/Revision_History.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/Revision_History.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/Revision_History.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -1,20 +1,26 @@
 <?xml version='1.0'?>
-<!DOCTYPE revhistory PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 
-<revhistory>
-	<revision>
-		<revnumber>1.0</revnumber>
-		<date></date>
-		<author>
-			<firstname></firstname>
-			<surname></surname>
-			<email></email>
-		</author>
-		<revdescription>
-			<simplelist>
-				<member></member>
-			</simplelist>
-		</revdescription>
-	</revision>
-</revhistory>
+<appendix id="appe-Publican-Revision_History">
+	<title>Revision History</title>
+	<simpara>
+		<revhistory>
+			<revision>
+				<revnumber>1.0</revnumber>
+				<date></date>
+				<author>
+					<firstname></firstname>
+					<surname></surname>
+					<email></email>
+				</author>
+				<revdescription>
+					<simplelist>
+						<member></member>
+					</simplelist>
+				</revdescription>
+			</revision>
+		</revhistory>
+	</simpara>
+</appendix>
+

Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/bridge.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/bridge.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/bridge.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -1,104 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter id="bridge">
-   <title>JBoss Messaging Message Bridge Configuration</title>
-   <section id="bridge.overview">
-      <title>Message bridge overview</title>
-      <para>JBoss Messaging includes a fully functional message bridge.</para>
-      <para>The function of the bridge is to consume messages from a source
-      queue or topic, and send them to a target queue or topic, typically on a
-      different server.</para>
-      <para>The source and target servers do not have to be in the same
-      cluster which makes bridging suitable for reliably sending messages from
-      one cluster to another, for instance across a WAN, and where the
-      connection may be unreliable.</para>
-      <para>A bridge is deployed inside a JBoss EAP instance. The instance can
-      be the same instance as either the source or target server. Or could be
-      on a third, separate JBoss EAP instance.</para>
-      <para>A bridge is deployed as an MBean inside JBoss EAP. Deployment is
-      trivial - just drop the MBean descriptor into the deploy directory of a
-      JBoss configuration which contains JBoss Messaging.</para>
-      <para>An example in docs/example/bridge demonstrates a simple bridge
-      being deployed in JBoss EAP, and moving messages from the source to the
-      target destination</para>
-      <para>The bridge can also be used to bridge messages from other non
-      JBoss Messaging JMS servers, as long as they are JMS 1.1
-      compliant.</para>
-      <para>The bridge has built in resilience to failure so if the source or
-      target server connetion is lost, e.g. due to network failure, the bridge
-      will retry connecting to the source and/or target until they come back
-      online. When it comes back online it will resume operation as
-      normal.</para>
-      <para>The bridge can be configured with an optional JMS selector, so it
-      will only consume messages matching that JMS selector</para>
-      <para>It can be configured to consume from a queue or a topic. When it
-      consumes from a topic it can be configured to consume using a non
-      durable or durable subscription</para>
-      <para>The bridge can be configured to bridge messages with one of three
-      levels of quality of service, they are:</para>
-      <para><itemizedlist>
-            <listitem>
-               <para>QOS_AT_MOST_ONCE</para>
-               <para>With this QoS mode messages will reach the destination
-               from the source at most once. The messages are consumed from
-               the source and acknowledged before sending to the destination.
-               Therefore there is a possibility that if failure occurs between
-               removing them from the source and them arriving at the
-               destination they could be lost. Hence delivery will occur at
-               most once. This mode is avilable for both persistent and non
-               persistent messages.</para>
-            </listitem>
-            <listitem>
-               <para>QOS_DUPLICATES_OK</para>
-               <para>With this QoS mode, the messages are consumed from the
-               source and then acknowledged after they have been successfully
-               sent to the destination. Therefore there is a possibility that
-               if failure occurs after sending to the destination but before
-               acknowledging them, they could be sent again when the system
-               recovers. I.e. the destination might receive duplicates after a
-               failure. This mode is available for both persistent and non
-               persistent messages.</para>
-            </listitem>
-            <listitem>
-               <para>QOS_ONCE_AND_ONLY_ONCE</para>
-               <para>This QoS mode ensures messages will reach the destination
-               from the source once and only once. (Sometimes this mode is
-               known as "exactly once"). If both the source and the
-               destination are on the same JBoss Messaging server instance
-               then this can be achieved by sending and acknowledging the
-               messages in the same local transaction. If the source and
-               destination are on different servers this is achieved by
-               enlisting the sending and consuming sessions in a JTA
-               transaction. The JTA transaction is controlled by JBoss
-               Transactions JTA implementation which is a fully recovering
-               transaction manager, thus providing a very high degree of
-               durability. If JTA is required then both supplied connection
-               factories need to be XAConnectionFactory implementations. This
-               mode is only available for persistent messages. This is likely
-               to be the slowest mode since it requires logging on both the
-               transaction manager and resource side for recovery. If you
-               require this level of QoS, please be sure to enable XA recovery
-               with JBoss Transactions.</para> <note>
-				<para>
-                      For a specific application it may possible to provide once and only once semantics without using the QOS_ONCE_AND_ONLY_ONCE QoS level. This can be done by using the QOS_DUPLICATES_OK mode and then checking for duplicates at the destination and discarding them. This may be possible to implement on the application level by maintaining a cache of received message ids on disk and comparing received messages to them. The cache would only be valid for a certain period of time so this approach is not as watertight as using QOS_ONCE_AND_ONLY_ONCE but may be a good choice depending on your specific application. </para>
-                  </note>
-            </listitem>
-         </itemizedlist></para>
-   </section>
-   <section id="bridge.deployment">
-      <title>Bridge deployment</title>
-      <para>A message bridge is easily deployed by dropping the MBean
-      descriptor in the deploy directory of your JBoss EAP installation which
-      contains JBoss Messaging</para>
-   </section>
-   <section id="bridge.configuration">
-      <title>Bridge configuration</title>
-      <para>In this section we describe how to configure the message
-      bridge</para>
-      <para>Here is an example of a message bridge configuration, with all the
-      attributes shown. Note that some are commented out for this
-      configuration, since it is not appropriate to specify them all at once.
-      Which ones are specified depends on the configuration you want.</para>
-      <programlisting>
+  <title>JBoss Messaging Message Bridge Configuration</title>
+
+  <section id="bridge.overview">
+    <title>Message bridge overview</title>
+
+    <para>JBoss Messaging includes a fully functional message bridge.</para>
+
+    <para>The function of the bridge is to consume messages from a source
+    queue or topic, and send them to a target queue or topic, typically on a
+    different server.</para>
+
+    <para>The source and target servers do not have to be in the same cluster
+    which makes bridging suitable for reliably sending messages from one
+    cluster to another, for instance across a WAN, and where the connection
+    may be unreliable.</para>
+
+    <para>A bridge is deployed inside a JBoss AS instance. The instance can be
+    the same instance as either the source or target server. Or could be on a
+    third, separate JBoss AS instance.</para>
+
+    <para>A bridge is deployed as an MBean inside JBoss AS. Deployment is
+    trivial - just drop the MBean descriptor into the deploy directory of a
+    JBoss configuration which contains JBoss Messaging.</para>
+
+    <para>An example in docs/example/bridge demonstrates a simple bridge being
+    deployed in JBoss AS, and moving messages from the source to the target
+    destination</para>
+
+    <para>The bridge can also be used to bridge messages from other non JBoss
+    Messaging JMS servers, as long as they are JMS 1.1 compliant.</para>
+
+    <para>The bridge has built in resilience to failure so if the source or
+    target server connetion is lost, e.g. due to network failure, the bridge
+    will retry connecting to the source and/or target until they come back
+    online. When it comes back online it will resume operation as
+    normal.</para>
+
+    <para>The bridge can be configured with an optional JMS selector, so it
+    will only consume messages matching that JMS selector</para>
+
+    <para>It can be configured to consume from a queue or a topic. When it
+    consumes from a topic it can be configured to consume using a non durable
+    or durable subscription</para>
+
+    <para>The bridge can be configured to bridge messages with one of three
+    levels of quality of service, they are:</para>
+
+    <itemizedlist>
+        <listitem>
+          <para>QOS_AT_MOST_ONCE</para>
+
+          <para>With this QoS mode messages will reach the destination from
+          the source at most once. The messages are consumed from the source
+          and acknowledged before sending to the destination. Therefore there
+          is a possibility that if failure occurs between removing them from
+          the source and them arriving at the destination they could be lost.
+          Hence delivery will occur at most once. This mode is avilable for
+          both persistent and non persistent messages.</para>
+        </listitem>
+
+        <listitem>
+          <para>QOS_DUPLICATES_OK</para>
+
+          <para>With this QoS mode, the messages are consumed from the source
+          and then acknowledged after they have been successfully sent to the
+          destination. Therefore there is a possibility that if failure occurs
+          after sending to the destination but before acknowledging them, they
+          could be sent again when the system recovers. I.e. the destination
+          might receive duplicates after a failure. This mode is available for
+          both persistent and non persistent messages.</para>
+        </listitem>
+
+        <listitem>
+          <para>QOS_ONCE_AND_ONLY_ONCE</para>
+
+          <para>This QoS mode ensures messages will reach the destination from
+          the source once and only once. (Sometimes this mode is known as
+          "exactly once"). If both the source and the destination are on the
+          same JBoss Messaging server instance then this can be achieved by
+          sending and acknowledging the messages in the same local
+          transaction. If the source and destination are on different servers
+          this is achieved by enlisting the sending and consuming sessions in
+          a JTA transaction. The JTA transaction is controlled by JBoss
+          Transactions JTA implementation which is a fully recovering
+          transaction manager, thus providing a very high degree of
+          durability. If JTA is required then both supplied connection
+          factories need to be XAConnectionFactory implementations. This mode
+          is only available for persistent messages. This is likely to be the
+          slowest mode since it requires logging on both the transaction
+          manager and resource side for recovery. If you require this level of
+          QoS, please be sure to enable XA recovery with JBoss Transactions.</para>
+          <note><para>
+               For a specific application it may possible to provide once and only once semantics without using the QOS_ONCE_AND_ONLY_ONCE QoS level. This can be done by using the QOS_DUPLICATES_OK mode and then checking for duplicates at the destination and discarding them. This may be possible to implement on the application level by maintaining a cache of received message ids on disk and comparing received messages to them. The cache would only be valid for a certain period of time so this approach is not as watertight as using QOS_ONCE_AND_ONLY_ONCE but may be a good choice depending on your specific application. </para>
+            </note>
+        </listitem>
+      </itemizedlist>
+  </section>
+
+  <section id="bridge.deployment">
+    <title>Bridge deployment</title>
+
+    <para>A message bridge is easily deployed by dropping the MBean descriptor
+    in the deploy directory of your JBoss AS installation which contains JBoss
+    Messaging</para>
+  </section>
+
+  <section id="bridge.configuration">
+    <title>Bridge configuration</title>
+
+    <para>In this section we describe how to configure the message
+    bridge</para>
+
+    <para>Here is an example of a message bridge configuration, with all the
+    attributes shown. Note that some are commented out for this configuration,
+    since it is not appropriate to specify them all at once. Which ones are
+    specified depends on the configuration you want.</para>
+
+    <programlisting>
    &lt;mbean code="org.jboss.jms.server.bridge.BridgeService"
           name="jboss.messaging:service=Bridge,name=TestBridge"
           xmbean-dd="xmdesc/Bridge-xmbean.xml"&gt;
@@ -175,165 +194,211 @@
       
     &lt;/mbean&gt;
       </programlisting>
-      <para>We will now discuss each attribute</para>
-      <section id="bridge.configuration.sourceproviderloader">
-         <title>SourceProviderLoader</title>
-         <para>This is the object name of the JMSProviderLoader MBean that the
-         bridge will use to lookup the source connection factory and source
-         destination.</para>
-         <para>By default JBoss EAP ships with one JMSProviderLoader, deployed
-         in the file <filename>jms-ds.xml</filename> - this is the default
-         local JMSProviderLoader. (This would be in
-         <filename>hajndi-jms-ds.xml</filename> in a clustered
-         configuration)</para>
-         <para>If your source destination is on different servers or even
-         correspond to a different, non JBoss JMS provider, then you can
-         deploy another JMSProviderLoader MBean instance which references the
-         remote JMS provider, and reference that from this attribute. The
-         bridge would then use that remote JMS provider to contact the source
-         destination</para>
-         <para>Note that if you are using a remote non JBoss Messaging source
-         or target and you wish once and only once delivery then that remote
-         JMS provider must provide a fully functional JMS XA resource
-         implementation that works remotely from the server - it is known that
-         some non JBoss JMS providers do not provide such a resource</para>
-      </section>
-      <section id="bridge.configuration.targetproviderloader">
-         <title>TargetProviderLoader</title>
-         <para>This is the object name of the JMSProviderLoader MBean that the
-         bridge will use to lookup the target connection factory and target
-         destination.</para>
-         <para>By default JBoss EAP ships with one JMSProviderLoader, deployed
-         in the file <filename>jms-ds.xml</filename> - this is the default
-         local JMSProviderLoader. JBoss EAP(This would be in
-         <filename>hajndi-jms-ds.xml</filename> in a clustered
-         configuration)</para>
-         <para>If your target destination is on a different server or even
-         correspond to a different, non JBoss JMS provider, then you can
-         deploy another JMSProviderLoader MBean instance which references the
-         remote JMS provider, and reference that from this attribute. The
-         bridge would then use that remote JMS provider to contact the target
-         destination</para>
-         <para>Note that if you are using a remote non JBoss Messaging source
-         or target and you wish once and only once delivery then that remote
-         JMS provider must provide a fully functional JMS XA resource
-         implementation that works remotely from the server - it is known that
-         some non JBoss JMS providers do not provide such a resource</para>
-      </section>
-      <section id="bridge.configuration.sourcedestinationlookup">
-         <title>SourceDestinationLookup</title>
-         <para>This is the full JNDI lookup for the source destination using
-         the SourceProviderLoader</para>
-         <para>An example would be /queue/mySourceQueue</para>
-      </section>
-      <section id="bridge.configuration.targetdestinationlookup">
-         <title>TargetDestinationLookup</title>
-         <para>This is the full JNDI lookup for the target destination using
-         the TargetProviderLoader</para>
-         <para>An example would be /topic/myTargetTopic</para>
-      </section>
-      <section id="bridge.configuration.sourceusername">
-         <title>SourceUsername</title>
-         <para>This optional attribute is for when you need to specify the
-         username for creating the source connection</para>
-      </section>
-      <section id="bridge.configuration.sourcepassword">
-         <title>SourcePassword</title>
-         <para>This optional attribute is for when you need to specify the
-         password for creating the source connection</para>
-      </section>
-      <section id="bridge.configuration.targetusername">
-         <title>TargetUsername</title>
-         <para>This optional attribute is for when you need to specify the
-         username for creating the target connection</para>
-      </section>
-      <section id="bridge.configuration.targetpassword">
-         <title>TargetPassword</title>
-         <para>This optional attribute is for when you need to specify the
-         password for creating the target connection</para>
-      </section>
-      <section id="bridge.configuration.qualityofservicemode">
-         <title>QualityOfServiceMode</title>
-         <para>This integer represents the desired quality of service
-         mode</para>
-         <para>Possible values are: <itemizedlist>
-               <listitem>
-			<para>
-                   QOS_AT_MOST_ONCE = 0 
-			</para>
-               </listitem>
-               <listitem>
-			<para>
-                   QOS_DUPLICATES_OK = 1 
-			</para>
-               </listitem>
-               <listitem>
-			<para>
-                   QOS_ONCE_AND_ONLY_ONCE = 2 
-			</para>
-               </listitem>
-            </itemizedlist></para>
-         <para>Please see <xref linkend="bridge.overview" /> for an
-         explanation of what these mean.</para>
-      </section>
-      <section id="bridge.configuration.selector">
-         <title>Selector</title>
-         <para>This optional attribute can contain a JMS selector expression
-         used for consuming messages from the source destination. Only
-         messages that match the selector expression will be bridged from the
-         source to the target destination</para>
-         <para>Please note it is always more performant to apply selectors on
-         source topic subscriptions to source queue consumers.</para>
-         <para>The selector expression must follow the JMS selector syntax
-         specified here: <ulink
-         url="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html"></ulink></para>
-      </section>
-      <section id="bridge.configuration.maxbatchsize">
-         <title>MaxBatchSize</title>
-         <para>This attribute specifies the maximum number of messages to
-         consume from the source destination before sending them in a batch to
-         the target destination. It's value must &gt;= 1</para>
-      </section>
-      <section id="bridge.configuration.maxbatchtime">
-         <title>MaxBatchTime</title>
-         <para>This attribute specifies the maximum number of milliseconds to
-         wait before sending a batch to target, even if the number of messages
-         consumed has not reached MaxBatchSize. It's value must can be -1 to
-         represent 'wait forever', or &gt;=1 to specify an actual time.</para>
-      </section>
-      <section id="bridge.configuration.subname">
-         <title>SubName</title>
-         <para>If the source destination represents a topic, and you want to
-         consume from the topic using a durable subscription then this
-         attribute represents the durable subscription name</para>
-      </section>
-      <section id="bridge.configuration.clientid">
-         <title>ClientID</title>
-         <para>If the source destination represents a topic, and you want to
-         consume from the topic using a durable subscription then this
-         attribute represents the the JMS client ID to use when
-         creating/looking up the durable subscription</para>
-      </section>
-      <section id="bridge.configuration.failureretryinterval">
-         <title>FailureRetryInterval</title>
-         <para>This represents the amount of time in ms to wait between trying
-         to recreate connections to the source or target servers when the
-         bridge has detected they have failed</para>
-      </section>
-      <section id="bridge.configuration.maxretries">
-         <title>MaxRetries</title>
-         <para>This represents the number of times to attempt to recreate
-         connections to the source or target servers when the bridge has
-         detected they have failed. The bridge will give up after trying this
-         number of times. -1 represents 'try forever'</para>
-      </section>
-      <section id="bridge.configuration.addmessageidinheader">
-         <title>AddMessageIDInHeader</title>
-         <para>If true, then the original message's message id will appended
-         in the message sent to the destination in the header
-         JBossMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST. If the message
-         is bridged more than once each message-id will be appended. This
-         enables a distributed request-response pattern to be used</para>
-      </section>
-   </section>
-</chapter>
+
+    <para>We will now discuss each attribute</para>
+
+    <section id="bridge.configuration.sourceproviderloader">
+      <title>SourceProviderLoader</title>
+
+      <para>This is the object name of the JMSProviderLoader MBean that the
+      bridge will use to lookup the source connection factory and source
+      destination.</para>
+
+      <para>By default JBoss AS ships with one JMSProviderLoader, deployed in
+      the file <filename>jms-ds.xml</filename> - this is the default local
+      JMSProviderLoader. (This would be in
+      <filename>hajndi-jms-ds.xml</filename> in a clustered
+      configuration)</para>
+
+      <para>If your source destination is on different servers or even
+      correspond to a different, non JBoss JMS provider, then you can deploy
+      another JMSProviderLoader MBean instance which references the remote JMS
+      provider, and reference that from this attribute. The bridge would then
+      use that remote JMS provider to contact the source destination</para>
+
+      <para>Note that if you are using a remote non JBoss Messaging source or
+      target and you wish once and only once delivery then that remote JMS
+      provider must provide a fully functional JMS XA resource implementation
+      that works remotely from the server - it is known that some non JBoss
+      JMS providers do not provide such a resource</para>
+    </section>
+
+    <section id="bridge.configuration.targetproviderloader">
+      <title>TargetProviderLoader</title>
+
+      <para>This is the object name of the JMSProviderLoader MBean that the
+      bridge will use to lookup the target connection factory and target
+      destination.</para>
+
+      <para>By default JBoss AS ships with one JMSProviderLoader, deployed in
+      the file <filename>jms-ds.xml</filename> - this is the default local
+      JMSProviderLoader. (This would be in
+      <filename>hajndi-jms-ds.xml</filename> in a clustered
+      configuration)</para>
+
+      <para>If your target destination is on a different server or even
+      correspond to a different, non JBoss JMS provider, then you can deploy
+      another JMSProviderLoader MBean instance which references the remote JMS
+      provider, and reference that from this attribute. The bridge would then
+      use that remote JMS provider to contact the target destination</para>
+
+      <para>Note that if you are using a remote non JBoss Messaging source or
+      target and you wish once and only once delivery then that remote JMS
+      provider must provide a fully functional JMS XA resource implementation
+      that works remotely from the server - it is known that some non JBoss
+      JMS providers do not provide such a resource</para>
+    </section>
+
+    <section id="bridge.configuration.sourcedestinationlookup">
+      <title>SourceDestinationLookup</title>
+
+      <para>This is the full JNDI lookup for the source destination using the
+      SourceProviderLoader</para>
+
+      <para>An example would be /queue/mySourceQueue</para>
+    </section>
+
+    <section id="bridge.configuration.targetdestinationlookup">
+      <title>TargetDestinationLookup</title>
+
+      <para>This is the full JNDI lookup for the target destination using the
+      TargetProviderLoader</para>
+
+      <para>An example would be /topic/myTargetTopic</para>
+    </section>
+
+    <section id="bridge.configuration.sourceusername">
+      <title>SourceUsername</title>
+
+      <para>This optional attribute is for when you need to specify the
+      username for creating the source connection</para>
+    </section>
+
+    <section id="bridge.configuration.sourcepassword">
+      <title>SourcePassword</title>
+
+      <para>This optional attribute is for when you need to specify the
+      password for creating the source connection</para>
+    </section>
+
+    <section id="bridge.configuration.targetusername">
+      <title>TargetUsername</title>
+
+      <para>This optional attribute is for when you need to specify the
+      username for creating the target connection</para>
+    </section>
+
+    <section id="bridge.configuration.targetpassword">
+      <title>TargetPassword</title>
+
+      <para>This optional attribute is for when you need to specify the
+      password for creating the target connection</para>
+    </section>
+
+    <section id="bridge.configuration.qualityofservicemode">
+      <title>QualityOfServiceMode</title>
+
+      <para>This integer represents the desired quality of service mode</para>
+
+      <para>Possible values are:</para> <itemizedlist>
+          <listitem>
+		  <para>
+             QOS_AT_MOST_ONCE = 0 
+     </para>
+          </listitem>
+
+          <listitem>
+		  <para>
+             QOS_DUPLICATES_OK = 1 
+     </para>
+          </listitem>
+
+          <listitem>
+		  <para>
+             QOS_ONCE_AND_ONLY_ONCE = 2 
+     </para>
+          </listitem>
+        </itemizedlist>
+
+      <para>Please see <xref linkend="bridge.overview" /> for an explanation
+      of what these mean.</para>
+    </section>
+
+    <section id="bridge.configuration.selector">
+      <title>Selector</title>
+
+      <para>This optional attribute can contain a JMS selector expression used
+      for consuming messages from the source destination. Only messages that
+      match the selector expression will be bridged from the source to the
+      target destination</para>
+
+      <para>Please note it is always more performant to apply selectors on
+      source topic subscriptions to source queue consumers.</para>
+
+      <para>The selector expression must follow the JMS selector syntax
+      specified here: <ulink
+      url="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html"></ulink></para>
+    </section>
+
+    <section id="bridge.configuration.maxbatchsize">
+      <title>MaxBatchSize</title>
+
+      <para>This attribute specifies the maximum number of messages to consume
+      from the source destination before sending them in a batch to the target
+      destination. It's value must &gt;= 1</para>
+    </section>
+
+    <section id="bridge.configuration.maxbatchtime">
+      <title>MaxBatchTime</title>
+
+      <para>This attribute specifies the maximum number of milliseconds to
+      wait before sending a batch to target, even if the number of messages
+      consumed has not reached MaxBatchSize. It's value must can be -1 to
+      represent 'wait forever', or &gt;=1 to specify an actual time.</para>
+    </section>
+
+    <section id="bridge.configuration.subname">
+      <title>SubName</title>
+
+      <para>If the source destination represents a topic, and you want to
+      consume from the topic using a durable subscription then this attribute
+      represents the durable subscription name</para>
+    </section>
+
+    <section id="bridge.configuration.clientid">
+      <title>ClientID</title>
+
+      <para>If the source destination represents a topic, and you want to
+      consume from the topic using a durable subscription then this attribute
+      represents the the JMS client ID to use when creating/looking up the
+      durable subscription</para>
+    </section>
+
+    <section id="bridge.configuration.failureretryinterval">
+      <title>FailureRetryInterval</title>
+
+      <para>This represents the amount of time in ms to wait between trying to
+      recreate connections to the source or target servers when the bridge has
+      detected they have failed</para>
+    </section>
+
+    <section id="bridge.configuration.maxretries">
+      <title>MaxRetries</title>
+
+      <para>This represents the number of times to attempt to recreate
+      connections to the source or target servers when the bridge has detected
+      they have failed. The bridge will give up after trying this number of
+      times. -1 represents 'try forever'</para>
+    </section>
+
+    <section id="bridge.configuration.addmessageidinheader">
+      <title>AddMessageIDInHeader</title>
+
+      <para>If true, then the original message's message id will appended in
+      the message sent to the destination in the header
+      JBossMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST. If the message is
+      bridged more than once each message-id will be appended. This enables a
+      distributed request-response pattern to be used</para>
+    </section>
+  </section>
+</chapter>
\ No newline at end of file

Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/c_configuration.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/c_configuration.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/c_configuration.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -1,97 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter id="c_configuration">
-   <title>JBoss Messaging Clustering Notes</title>
-  
-   <section id="c_conf.serverpeerid">
-	   <title>Unique server peer id</title>
-	   <para>JBoss Messaging clustering should work out of the box in most cases
-		 with no configuration changes. It is however crucial that every node is
-		 assigned a unique server id, as specified in the installation guide.</para>
-	   <para>Every node deployed must have a unique id, including those in a
-		 particular LAN cluster, and also those only linked by mesage
-		 bridges.</para>
-   </section>
-     
-   <section id="c_conf.clustereddests">   
-	<title>Clustered destinations</title>
-	<para>JBoss Messaging clusters JMS queues and topics transparently across
-		the cluster. Messages sent to a distributed queue or topic on one node are
-		consumable on other nodes. To designate that a particular destination is
-		clustered simply set the clustered attribute in the destination deployment
-		descriptor to true.</para>
-	<para>JBoss Messaging balances messages between nodes, catering for faster
-		or slower consumers to efficiently balance processing load across the
-		cluster.</para>
-	<para>If you do not want message redistribution between nodes, but still want to retain the other charactereristics
-	of clustered destinations. You can do this by not specifying the attribute ClusterPullConnectionFactoryName on the server peer
-        </para>
-   </section>
-   
-      <section id="c_conf.clustereddursubs">
-	   	<title>Clustered durable subs</title>
-	   	<para>JBoss Messaging durable subscriptions can also be clustered. This
-		   	means multiple subscribers can consume from the same durable subscription
-		   	from different nodes of the cluster. A durable subscription will be
-		   	clustered if it's topic is clustered</para>
-	      </section>
-      
-      <section id="c_conf.clusteredtempdest">
-	   	<title>Clustered temporary destinations</title>
-	   	<para>JBoss Messaging also supports clustered temporary topics and queues.
-		   	All temporary topics and queues will be clustered if the post office is
-		   	clustered</para>
-	      </section>
-   
-      <section id="c_conf.nonclusteredserver">  
-	   	<title>Non clustered servers</title>
-	   	<para>If you don't want your nodes to participate in a cluster, or only
-		   	have one non clustered server you can set the clustered attribute on the
-		   	postoffice to false</para>
-	      </section>
-      
-      
-      <section id="c_conf.orderingincluster">
-	   	<title>Message ordering in the cluster</title>
-	   	<para>If you wish to apply strict JMS ordering to messages, such that a
-		   	particular JMS consumer consumes messages in the same order as they were
-		   	produced by a particular producer, you can set the DefaultPreserveOrdering
-		   	attribute in the server peer to true. By default this is false. The
-		   	sideeffect of setting this to true is that messages cannot be distributed
-		   	as freely around the cluster</para>
-	      </section>
-   
-   	   
-      <section id="c_conf.idempotentops">	
-	   	<title>Idempotent operations</title>
-	   	<para>If the call to send a persistent message to a persistent destination
-		   	returns successfully with no exception, then you can be sure that the
-		   	message was persisted. However if the call doesn't return successfully e.g.
-		   	if an exception is thrown, then you *can't be sure the message wasn't
-		   	persisted*. Since the failure might have occurred after persisting the
-		   	message but before writing the response to the caller. This is a common
-		   	attribute of any RPC type call: You can't tell by the call not returning
-		   	that the call didn't actually succeed. Whether it's a web services call, an
-		   	HTTP get request, an ejb invocation the same applies. The trick is to code
-		   	your application so your operations are *idempotent*  i.e. they can be
-		   	repeated without getting the system into an inconsistent state. With a
-		   	message system you can do this on the application level, by checking for
-		   	duplicate messages, and discarding them if they arrive. Duplicate checking
-		   	is a very powerful technique that can remove the need for XA transactions
-		   	in many cases.</para>
-		<para>In the clustered case. JBM is by default configured to detect duplicate automatically messages by default</para>
-	      </section>
-      
-      
-      <section id="c_conf.clusteredcfs">
-	   	<title>Clustered connection factories</title>
-	   	<para>If the supportsLoadBalancing attribute of the connection factory is set to true then consecutive create connection attempts will round robin between available servers. The first node to try is chosen randomly</para>
-	   	<para>If the supportsFailover attribute of the connection factory is set to true then automatic failover is enabled.
-		   	This will automatically failover from one server to another, transparently to the user, in case of failure.</para>
-	           <para>If automatic failover is not required or you wish to do manual failover (JBoss MQ style) this can be set to false, and you can supply a standard JMS ExceptionListener on the connection which will be called in case of
-		   	connection failure. You would then need to manually close the connection, lookup a new connection factory from
-		   	HA JNDI and recreate the connection.</para>
-	   	
-   </section>
-   
-   
-</chapter>
+  <title>JBoss Messaging Clustering Notes</title>
+
+  <section id="c_conf.serverpeerid">
+    <title>Unique server peer id</title>
+
+    <para>JBoss Messaging clustering should work out of the box in most cases
+    with no configuration changes. It is however crucial that every node is
+    assigned a unique server id, as specified in the installation
+    guide.</para>
+
+    <para>Every node deployed must have a unique id, including those in a
+    particular LAN cluster, and also those only linked by mesage
+    bridges.</para>
+  </section>
+
+  <section id="c_conf.clustereddests">
+    <title>Clustered destinations</title>
+
+    <para>JBoss Messaging clusters JMS queues and topics transparently across
+    the cluster. Messages sent to a distributed queue or topic on one node are
+    consumable on other nodes. To designate that a particular destination is
+    clustered simply set the clustered attribute in the destination deployment
+    descriptor to true.</para>
+
+    <para>JBoss Messaging balances messages between nodes, catering for faster
+    or slower consumers to efficiently balance processing load across the
+    cluster.</para>
+
+    <para>If you do not want message redistribution between nodes, but still
+    want to retain the other charactereristics of clustered destinations. You
+    can do this by not specifying the attribute
+    ClusterPullConnectionFactoryName on the server peer</para>
+  </section>
+
+  <section id="c_conf.clustereddursubs">
+    <title>Clustered durable subs</title>
+
+    <para>JBoss Messaging durable subscriptions can also be clustered. This
+    means multiple subscribers can consume from the same durable subscription
+    from different nodes of the cluster. A durable subscription will be
+    clustered if it's topic is clustered</para>
+  </section>
+
+  <section id="c_conf.clusteredtempdest">
+    <title>Clustered temporary destinations</title>
+
+    <para>JBoss Messaging also supports clustered temporary topics and queues.
+    All temporary topics and queues will be clustered if the post office is
+    clustered</para>
+  </section>
+
+  <section id="c_conf.nonclusteredserver">
+    <title>Non clustered servers</title>
+
+    <para>If you don't want your nodes to participate in a cluster, or only
+    have one non clustered server you can set the clustered attribute on the
+    postoffice to false</para>
+  </section>
+
+  <section id="c_conf.orderingincluster">
+    <title>Message ordering in the cluster</title>
+
+    <para>If you wish to apply strict JMS ordering to messages, such that a
+    particular JMS consumer consumes messages in the same order as they were
+    produced by a particular producer, you can set the DefaultPreserveOrdering
+    attribute in the server peer to true. By default this is false. The
+    sideeffect of setting this to true is that messages cannot be distributed
+    as freely around the cluster</para>
+  </section>
+
+  <section id="c_conf.idempotentops">
+    <title>Idempotent operations</title>
+
+    <para>If the call to send a persistent message to a persistent destination
+    returns successfully with no exception, then you can be sure that the
+    message was persisted. However if the call doesn't return successfully
+    e.g. if an exception is thrown, then you *can't be sure the message wasn't
+    persisted*. Since the failure might have occurred after persisting the
+    message but before writing the response to the caller. This is a common
+    attribute of any RPC type call: You can't tell by the call not returning
+    that the call didn't actually succeed. Whether it's a web services call,
+    an HTTP get request, an ejb invocation the same applies. The trick is to
+    code your application so your operations are *idempotent* i.e. they can be
+    repeated without getting the system into an inconsistent state. With a
+    messaging system you can do this on the application level, by checking for
+    duplicate messages, and discarding them if they arrive. Duplicate checking
+    is a very powerful technique that can remove the need for XA transactions
+    in many cases.</para>
+
+    <para>In the clustered case. JBM is by default configured to detect
+    duplicate automatically messages by default</para>
+  </section>
+
+  <section id="c_conf.clusteredcfs">
+    <title>Clustered connection factories</title>
+
+    <para>If the supportsLoadBalancing attribute of the connection factory is
+    set to true then consecutive create connection attempts will round robin
+    between available servers. The first node to try is chosen randomly</para>
+
+    <para>If the supportsFailover attribute of the connection factory is set
+    to true then automatic failover is enabled. This will automatically
+    failover from one server to another, transparently to the user, in case of
+    failure.</para>
+
+    <para>If automatic failover is not required or you wish to do manual
+    failover (JBoss MQ style) this can be set to false, and you can supply a
+    standard JMS ExceptionListener on the connection which will be called in
+    case of connection failure. You would then need to manually close the
+    connection, lookup a new connection factory from HA JNDI and recreate the
+    connection.</para>
+  </section>
+</chapter>
\ No newline at end of file

Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/configuration.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/configuration.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/configuration.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -1,42 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<chapter id="configuration">
+  <title>Configuration</title>
 
-<chapter id="configuration">
-   <title>Configuration</title>
-   <para>The JMS API specifies how a messaging client interacts with a
-   messaging server. The exact definition and implementation of messaging
-   services, such as message destinations and connection factories, are
-   specific to JMS providers. JBoss Messaging has its own configuration files
-   to configure services. If you are migrating services from JBossMQ (or other
-   JMS provider) to JBoss Messaging, you will need to understand those
-   configuration files.</para>
-   <para>In this chapter, we discuss how to configure various services inside
-   JBoss Messaging, which work together to provide JMS API level services to
-   client applications.</para>
-   <para>The JBoss Messaging service configuration is spread among several
-   configuration files. Depending on the functionality provided by the
-   services it configures, the configuration data is distributed between
-   <filename>messaging-service.xml</filename>,
-   <filename>remoting-bisocket-service.xml</filename>,
-   <filename>xxx-persistence-service.xml</filename> (where xx is the name of
-   your databse) , <filename>connection-factories-service.xml</filename> and
-   <filename>destinations-service.xml</filename>.</para>
-   <para>The AOP client-side and server-side interceptor stacks are configured
-   in <filename>aop-messaging-client.xml</filename> and
-   <filename>aop-messaging-server.xml</filename>. Normally you will not want
-   to change them, but some of the interceptors can be removed to give a small
-   performance increase, if you don't need them. Be very careful you have
-   considered the security implications before removing the security
-   interceptor.</para>
-   <section id="conf.serverpeer">
-      <title>Configuring the ServerPeer</title>
-      <para>The Server Peer is the heart of the JBoss Messaging JMS facade.
-      The server's configuration, resides in
-      <filename>messaging-service.xml</filename> configuration file.</para>
-      <para>All JBoss Messaging services are rooted at the server peer</para>
-      <para>An example of a Server Peer configuration is presented below. Note
-      that not all values for the server peer's attributes are specified in
-      the example</para>
-      <programlisting>&lt;mbean code="org.jboss.jms.server.ServerPeer"
+  <para>The JMS API specifies how a messaging client interacts with a
+  messaging server. The exact definition and implementation of messaging
+  services, such as message destinations and connection factories, are
+  specific to JMS providers. JBoss Messaging has its own configuration files
+  to configure services. If you are migrating services from JBossMQ (or other
+  JMS provider) to JBoss Messaging, you will need to understand those
+  configuration files.</para>
+
+  <para>In this chapter, we discuss how to configure various services inside
+  JBoss Messaging, which work together to provide JMS API level services to
+  client applications.</para>
+
+  <para>The JBoss Messaging service configuration is spread among several
+  configuration files. Depending on the functionality provided by the services
+  it configures, the configuration data is distributed between
+  <filename>messaging-service.xml</filename>,
+  <filename>remoting-bisocket-service.xml</filename>,
+  <filename>xxx-persistence-service.xml</filename> (where xx is the name of
+  your databse) , <filename>connection-factories-service.xml</filename> and
+  <filename>destinations-service.xml</filename>.</para>
+
+  <para>The AOP client-side and server-side interceptor stacks are configured
+  in <filename>aop-messaging-client.xml</filename> and
+  <filename>aop-messaging-server.xml</filename>. Normally you will not want to
+  change them, but some of the interceptors can be removed to give a small
+  performance increase, if you don't need them. Be very careful you have
+  considered the security implications before removing the security
+  interceptor.</para>
+
+  <section id="conf.jb5.securityMetadataStore">
+    <title>JBoss5 Specific - Configuring the SecurityStore</title>
+
+    <para>Starting on JBossMessaging 1.4.1 the SecurityStore is a pluggable
+    object, and it has a default implementation on
+    messaging-service.xml.</para>
+
+    <programlisting>   &lt;!--  The SecurityStore mbean --&gt;
+   &lt;mbean code="org.jboss.jms.server.security.SecurityMetadataStore"
+             name="jboss.messaging:service=SecurityStore"&gt;
+             
+        &lt;!-- The default security configuration to apply to destinations - this can be overridden on a per destination basis
+        --&gt;
+        &lt;attribute name="DefaultSecurityConfig"&gt;
+             &lt;security&gt;
+                  &lt;role name="guest" read="true" write="true" create="true"/&gt;
+             &lt;/security&gt;
+        &lt;/attribute&gt;
+        
+        &lt;!-- The JAAS security domain to use for JBoss Messaging --&gt;
+        &lt;attribute name="SecurityDomain"&gt;java:/jaas/messaging&lt;/attribute&gt;
+        
+        &lt;!--
+        This attribute defines what's the SuckerPassword used on this SecurityStore
+        --&gt;
+        &lt;attribute name="SuckerPassword"&gt;CHANGE ME!!&lt;/attribute&gt;  
+   &lt;/mbean&gt;    </programlisting>
+
+    <section id="conf.securityMetadataStore.attributes">
+      <title>SecurityStore Attributes</title>
+
+      <formalpara>
+        <title>DefaultSecurityConfig</title>
+
+        <para>Default security configuration is used when the security
+        configuration for a specific queue or topic has not been overridden in
+        the destination's deployment descriptor. It has exactly the same
+        syntax and semantics as in JBossMQ.</para>
+	</formalpara>
+	
+        <para>The <literal>DefaultSecurityConfig</literal> attribute element
+        should contain one <literal>&lt;security&gt;</literal> element. The
+        <literal>&lt;security&gt;</literal> element can contain multiple
+        <literal>&lt;role&gt;</literal> elements. Each
+        <literal>&lt;role&gt;</literal> element defines the default access for
+        that particular role.</para>
+
+        <para>If the <literal>read</literal> attribute is
+        <literal>true</literal> then that role will be able to read (create
+        consumers, receive messaages or browse) destinations by
+        default.</para>
+
+        <para>If the <literal>write</literal> attribute is
+        <literal>true</literal> then that role will be able to write (create
+        producers or send messages) to destinations by default.</para>
+
+        <para>If the <literal>create</literal> attribute is
+        <literal>true</literal> then that role will be able to create durable
+        subscriptions on topics by default.</para>
+
+      <formalpara>
+        <title>SecurityDomain</title>
+
+        <para>The JAAS security domain to be used by this server peer</para>
+	</formalpara>
+
+	<formalpara>
+        <title>SuckerPassword</title>
+
+        <para>This defines how the SecurityStore will authenticate the sucker
+        user (JBM.SUCKER)</para>
+	</formalpara>
+  </section>
+</section>
+<!--
+  <section id="conf.jb4.security">
+    <title>JBoss4/EAP4.3 Specific - Configuring the SecurityStore</title>
+  </section> -->
+
+  <section id="conf.serverpeer">
+    <title>Configuring the ServerPeer</title>
+
+    <para>The Server Peer is the heart of the JBoss Messaging JMS facade. The
+    server's configuration, resides in
+    <filename>messaging-service.xml</filename> configuration file.</para>
+
+    <para>All JBoss Messaging services are rooted at the server peer</para>
+
+    <para>An example of a Server Peer configuration is presented below. Note
+    that not all values for the server peer's attributes are specified in the
+    example</para>
+
+    <programlisting>     &lt;!-- ServerPeer MBean configuration
+          ============================== --&gt;
+     &lt;mbean code="org.jboss.jms.server.ServerPeer"
       name="jboss.messaging:service=ServerPeer"
       xmbean-dd="xmdesc/ServerPeer-xmbean.xml"&gt;
 
@@ -52,20 +141,8 @@
       
       &lt;attribute name="DefaultTopicJNDIContext"&gt;/topic&lt;/attribute&gt;
 
-	     &lt;attribute name="PostOffice"&gt;jboss.messaging:service=PostOffice&lt;/attribute&gt;
+	  &lt;attribute name="PostOffice"&gt;jboss.messaging:service=PostOffice&lt;/attribute&gt;
 	  
-	     &lt;!-- The JAAS security domain to use for JBoss Messaging --&gt;
-	  
-      &lt;attribute name="SecurityDomain"&gt;java:/jaas/messaging&lt;/attribute&gt;
-      
-      &lt;!-- The default security configuration to apply to destinations - this can be overridden on a per destination basis --&gt;
-      
-      &lt;attribute name="DefaultSecurityConfig"&gt;
-        &lt;security&gt;
-            &lt;role name="guest" read="true" write="true" create="true"/&gt;
-        &lt;/security&gt;
-      &lt;/attribute&gt;
-      
       &lt;!-- The default Dead Letter Queue (DLQ) to use for destinations.
            This can be overridden on a per destinatin basis --&gt;
       
@@ -115,8 +192,9 @@
       
       &lt;attribute name="RecoverDeliveriesTimeout"&gt;300000&lt;/attribute&gt;
       
-      &lt;attribute name="EnableMessageCounters"&gt;false&lt;/attribute&gt;           
+      &lt;attribute name="EnableMessageCounters"&gt;false&lt;/attribute&gt;
       
+      
       &lt;!-- The password used by the message sucker connections to create connections.
            THIS SHOULD ALWAYS BE CHANGED AT INSTALL TIME TO SECURE SYSTEM
       &lt;attribute name="SuckerPassword"&gt;&lt;/attribute&gt;
@@ -127,386 +205,480 @@
       &lt;depends optional-attribute-name="JMSUserManager"&gt;jboss.messaging:service=JMSUserManager&lt;/depends&gt;
       
       &lt;depends&gt;jboss.messaging:service=Connector,transport=bisocket&lt;/depends&gt;
-
+      &lt;depends optional-attribute-name="SecurityStore" proxy-type="org.jboss.jms.server.SecurityStore"&gt;jboss.messaging:service=SecurityStore&lt;/depends&gt;
+          
    &lt;/mbean&gt;
-      </programlisting>
-      <section id="conf.serverpeer.attributes">
-         <title>ServerPeer attributes</title>
-         <para>We now discuss the MBean attributes of the ServerPeer
-         MBean.</para>
-         <formalpara>
-            <title>ServerPeerID</title>
-            <para>The unique id of the server peer. Every node you deploy MUST
-            have a unique id. This applies whether the different nodes form a
-            cluster, or are only linked via a message bridge. The id must be a
-            valid integer.</para>
-         </formalpara>
-	 <formalpara>
-            <title>DefaultQueueJNDIContext</title>
-            <para>The default JNDI context to use when binding queues.
-            Defaults to /queue.</para>
-	</formalpara>
-	<formalpara>
-            <title>DefaultTopicJNDIContext</title>
-            <para>The default JNDI context to use when binding topics.wa
-            Defaults to /topic.</para>
-	</formalpara>
-	<formalpara>
-            <title>PostOffice</title>
-            <para>This is the post office that the ServerPeer uses. You will
-            not normally need to change this attribute. The post office is
-            responsible for routing messages to queues and maintaining the
-            mapping between addresses and queues.</para>
-	</formalpara>
-	<formalpara>
-            <title>SecurityDomain</title>
-            <para>The JAAS security domain to be used by this server
-            peer</para>
-	</formalpara>
-	<formalpara>
-            <title>DefaultSecurityConfig</title>
-            <para>Default security configuration is used when the security
-            configuration for a specific queue or topic has not been
-            overridden in the destination's deployment descriptor. It has
-            exactly the same syntax and semantics as in JBossMQ.</para>
-	</formalpara>
-            <para>The <literal>DefaultSecurityConfig</literal> attribute
-            element should contain one <literal>&lt;security&gt;</literal>
-            element. The <literal>&lt;security&gt;</literal> element can
-            contain multiple <literal>&lt;role&gt;</literal> elements. Each
-            <literal>&lt;role&gt;</literal> element defines the default access
-            for that particular role.</para>
-            <para>If the <literal>read</literal> attribute is
-            <literal>true</literal> then that role will be able to read
-            (create consumers, receive messaages or browse) destinations by
-            default.</para>
-            <para>If the <literal>write</literal> attribute is
-            <literal>true</literal> then that role will be able to write
-            (create producers or send messages) to destinations by
-            default.</para>
-            <para>If the <literal>create</literal> attribute is
-            <literal>true</literal> then that role will be able to create
-            durable subscriptions on topics by default.</para>
-    	<formalpara>
-            <title>DefaultDLQ</title>
-            <para>This is the name of the default DLQ (Dead Letter Queue) the
-            server peer will use for destinations. The DLQ can be overridden
-            on a per destination basis - see the destination MBean
-            configuration for more details. A DLQ is a special destination
-            where messages are sent when the server has attempted to deliver
-            them unsuccessfully more than a certain number of times. If the
-            DLQ is not specified at all then the message will be removed after
-            the maximum number of delivery attempts. The maximum number of
-            delivery attempts can be specified using the attribute
-            DefaultMaxDeliveryAttempts for a global default or individually on
-            a per destination basis.</para>
-	</formalpara>
-	<formalpara>
-            <title>DefaultMaxDeliveryAttempts</title>
-            <para>The default for the maximum number of times delivery of a
-            message will be attempted before sending the message to the DLQ,
-            if configured.</para>
-	</formalpara>
-            <para>The default value is <literal>10</literal>.</para>
-            <para>This value can also be overridden on a per destination
-            basis.</para>
-   	<formalpara>
-            <title>DefaultExpiryQueue</title>
-            <para>This is the name of the default expiry queue the server peer
-            will use for destinations. The expiry can be overridden on a per
-            destination basis - see the destination MBean configuration for
-            more details. An expiry queue is a special destination where
-            messages are sent when they have expired. Message expiry is
-            determined by the value of Message::getJMSExpiration() If the
-            expiry queue is not specified at all then the message will be
-            removed after it is expired.</para>
-	</formalpara>
-	<formalpara>
-            <title>DefaultRedeliveryDelay</title>
-            <para>When redelivering a message after failure of previous
-            delivery it is often beneficial to introduce a delay perform
-            redelivery in order to prevent thrashing of delivery-failure,
-	    delivery-failure etc</para></formalpara>
-            <para>The default value is <literal>0</literal> which means there
-            will be no delay.</para>
-            <para>Change this if your application could benefit with a delay
-            before redelivery. This value can also be overridden on a per
-            destination basis.</para>
-	<formalpara>
-            <title>MessageCounterSamplePeriod</title>
-            <para>Periodically the server will query each queue to gets its
-            statistics. This is the period.</para>
-	</formalpara>
-            <para>The default value is <literal>10000</literal>
-            milliseconds.</para>
-   	<formalpara>
-            <title>FailoverStartTimeout</title>
-            <para>The maximum number of milliseconds the client will wait for
-            failover to start on the server side when a problem is
-            detected.</para>
-	</formalpara>
-            <para>The default value is <literal>60000</literal> (one
-            minute).</para>
+</programlisting>
 
-	<formalpara>
-            <title>FailoverCompleteTimeout</title>
-            <para>The maximum number of milliseconds the client will wait for
-            failover to complete on the server side after it has
-	    started.</para>	</formalpara>
-            <para>The default value is <literal>300000</literal> (five
-            minutes).</para>
-	<formalpara>
-            <title>DefaultMessageCounterHistoryDayLimit</title>
-            <para>JBoss Messaging provides a message counter history which
-            shows the number of messages arriving on each queue of a certain
-            number of days. This attribute represents the maximum number of
-            days for which to store message counter history. It can be
-            overridden on a per destination basis.</para>
-	</formalpara>
-	<formalpara>
-            <title>ClusterPullConnectionFactory</title>
-            <para>The name of the connection factory to use for pulling
-		    messages between nodes. </para>	</formalpara>
-            <para>If you wish to turn off message sucking between queues altogether, but retain failover, then you can ommit this attribute
-            altogether</para>
-	<formalpara>
-            <title>DefaultPreserveOrdering</title>
-            <para>If true, then strict JMS ordering is preserved in the
-            cluster. See the cluster configurations section for more details.
-            Default is false.</para>
-	</formalpara>
-	<formalpara>
-            <title>RecoverDeliveriesTimeout</title>
-            <para>When failover occurs, already delivered messages will be
-            kept aside, waiting for clients to reconnect. In the case that
-            clients never reconnect (e.g. the client is dead) then eventually
-            these messages will timeout and be added back to the queue. The
-            value is in ms. The default is 5 mins.</para>
-	</formalpara>
-	<formalpara>
-            <title>EnableMessageCounters</title>		 
-	    <para>Set this to true to enable message counters when the server starts</para>
-   	 </formalpara>	 
-	 
-    	<formalpara>
-            <title>SuckerPassword</title>
-            <para>JBoss Messaging internally makes connections between nodes
-            in order to redistribute messages between clustered destinations.
-            These connections are made with the user name of a special
-            reserved user. The password used by that user is specified by this
-            parameter. </para>
-	</formalpara>
+<section id="conf.serverpeer.attributes">
+      <title>ServerPeer attributes</title>
+
+      <para>We now discuss the MBean attributes of the ServerPeer
+      MBean.</para>
+
+<formalpara>
+        <title>ServerPeerID</title>
+
+        <para>The unique id of the server peer. Every node you deploy MUST
+        have a unique id. This applies whether the different nodes form a
+        cluster, or are only linked via a message bridge. The id must be a
+        valid integer.</para>
+</formalpara>
+
+<formalpara>
+        <title>DefaultQueueJNDIContext</title>
+
+        <para>The default JNDI context to use when binding queues. Defaults to
+        /queue.</para>
+</formalpara>
+
+<formalpara>
+        <title>DefaultTopicJNDIContext</title>
+
+        <para>The default JNDI context to use when binding topics.wa Defaults
+        to /topic.</para>
+</formalpara>
+
+<formalpara>
+        <title>PostOffice</title>
+
+        <para>This is the post office that the ServerPeer uses. You will not
+        normally need to change this attribute. The post office is responsible
+        for routing messages to queues and maintaining the mapping between
+        addresses and queues.</para>
+</formalpara>
+
+<formalpara>
+        <title>DefaultDLQ</title>
+
+        <para>This is the name of the default DLQ (Dead Letter Queue) the
+        server peer will use for destinations. The DLQ can be overridden on a
+        per destination basis - see the destination MBean configuration for
+        more details. A DLQ is a special destination where messages are sent
+        when the server has attempted to deliver them unsuccessfully more than
+        a certain number of times. If the DLQ is not specified at all then the
+        message will be removed after the maximum number of delivery attempts.
+        The maximum number of delivery attempts can be specified using the
+        attribute DefaultMaxDeliveryAttempts for a global default or
+        individually on a per destination basis.</para>
+</formalpara>
+<important>
+	<para>
+		Message-Driven Bean (MDB) and JBoss Messaging (JBM) both have individual DLQ logic. You will want to be careful which one is processing your undelivered messages as a situation may occur where a process is expecting MDB DLQ logic to be used however in reality JBM DLQ logic has been given precedence and thus an error may occur. 
+	</para>
+</important>
+
+<formalpara>
+        <title>DefaultMaxDeliveryAttempts</title>
+
+        <para>The default for the maximum number of times delivery of a
+        message will be attempted before sending the message to the DLQ, if
+        configured.</para>
+</formalpara>
+        <para>The default value is <literal>10</literal>.</para>
+
+        <para>This value can also be overridden on a per destination
+        basis.</para>
+
+<formalpara>
+        <title>DefaultExpiryQueue</title>
+
+        <para>This is the name of the default expiry queue the server peer
+        will use for destinations. The expiry can be overridden on a per
+        destination basis - see the destination MBean configuration for more
+        details. An expiry queue is a special destination where messages are
+        sent when they have expired. Message expiry is determined by the value
+        of Message::getJMSExpiration() If the expiry queue is not specified at
+        all then the message will be removed after it is expired.</para>
+</formalpara>
+<formalpara>
+        <title>DefaultRedeliveryDelay</title>
+
+        <para>When redelivering a message after failure of previous delivery
+        it is often beneficial to introduce a delay perform redelivery in
+        order to prevent thrashing of delivery-failure, delivery-failure
+        etc</para>
+</formalpara>
+
+        <para>The default value is <literal>0</literal> which means there will
+        be no delay.</para>
+
+        <para>Change this if your application could benefit with a delay
+        before redelivery. This value can also be overridden on a per
+        destination basis.</para>
+
+<formalpara>
+        <title>MessageCounterSamplePeriod</title>
+
+        <para>Periodically the server will query each queue to gets its
+        statistics. This is the period.</para>
+</formalpara>
+        <para>The default value is <literal>10000</literal>
+        milliseconds.</para>
+
+<formalpara>
+        <title>FailoverStartTimeout</title>
+
+        <para>The maximum number of milliseconds the client will wait for
+        failover to start on the server side when a problem is
+        detected.</para>
+</formalpara>
+        <para>The default value is <literal>60000</literal> (one
+        minute).</para>
+
+<formalpara>
+        <title>FailoverCompleteTimeout</title>
+
+        <para>The maximum number of milliseconds the client will wait for
+        failover to complete on the server side after it has started.</para>
+</formalpara>
+        <para>The default value is <literal>300000</literal> (five
+        minutes).</para>
+
+
+<formalpara>
+        <title>DefaultMessageCounterHistoryDayLimit</title>
+
+        <para>JBoss Messaging provides a message counter history which shows
+        the number of messages arriving on each queue of a certain number of
+        days. This attribute represents the maxiumum number of days for which
+        to store message counter history. It can be overridden on a per
+        destination basis.</para>
+</formalpara>
+
+<formalpara>
+        <title>ClusterPullConnectionFactory</title>
+
+        <para>The name of the connection factory to use for pulling messages
+        between nodes.</para>
+</formalpara>
+
+        <para>If you wish to turn off message sucking between queues
+        altogether, but retain failover, then you can ommit this attribute
+        altogether</para>
+
+<formalpara>
+        <title>DefaultPreserveOrdering</title>
+
+        <para>If true, then strict JMS ordering is preserved in the cluster.
+        See the cluster configurations section for more details. Default is
+        false.</para>
+</formalpara>
+
+<formalpara>
+        <title>RecoverDeliveriesTimeout</title>
+
+        <para>When failover occurs, already delivered messages will be kept
+        aside, waiting for clients to reconnect. In the case that clients
+        never reconnect (e.g. the client is dead) then eventually these
+        messages will timeout and be added back to the queue. The value is in
+        ms. The default is 5 mins.</para>
+</formalpara>
+
+<formalpara>
+        <title>EnableMessageCounters</title>
+
+        <para>Set this to true to enable message counters when the server
+        starts</para>
+</formalpara>
+
+<formalpara>
+        <title>SuckerPassword</title>
+
+        <para>JBoss Messaging internally makes connections between nodes in
+        order to redistribute messages between clustered destinations. These
+        connections are made with the user name of a special reserved user. On
+        this parameter you define the password used as these connections are
+        made. After JBossMessaging 1.4.1.GA you will need to define the Sucker
+        Password on the ServerPeer and on the SecurityMetadataStore.</para>
+</formalpara>
 <warning>
-<para>
-                   This must be specified at install time, or the default password will be used. Any one who then knows the default password will be able to gain access to any destinations on the server. This value MUST be changed at install time. 
-</para>
-               </warning>
-	       <formalpara>
-            <title>StrictTCK</title>
-            <para>Set to true if you want strict JMS TCK semantiocs</para>
-   	 </formalpara>
-	 <formalpara>
-            <title>Destinations</title>
-            <para>Returns a list of the destinations (queues and topics)
-            currently deployed.</para>
+	<para>
+             This must be specified at install time, or the default password will be used. Any one who then knows the default password will be able to gain access to any destinations on the server. This value MUST be changed at install time. </para>
+          </warning>
+
+	  <formalpara>
+        <title>StrictTCK</title>
+
+        <para>Set to true if you want strict JMS TCK semantiocs</para>
 </formalpara>
+
 <formalpara>
-            <title>MessageCounters</title>
-            <para>JBoss Messaging provides a message counter for each
-            queue.</para>
+        <title>Destinations</title>
+
+        <para>Returns a list of the destinations (queues and topics) currently
+        deployed.</para>
 </formalpara>
+
 <formalpara>
-            <title>MessageCountersStatistics</title>
-            <para>JBoss Messaging provides statistics for each message counter
-            for each queue.</para>
+        <title>MessageCounters</title>
+
+        <para>JBoss Messaging provides a message counter for each
+        queue.</para>
 </formalpara>
+
 <formalpara>
-            <title>SupportsFailover</title>
-            <para>Set to false to prevent server side failover occurring in a
-            cluster when a node crashes.</para>
+        <title>MessageCountersStatistics</title>
+
+        <para>JBoss Messaging provides statistics for each message counter for
+        each queue.</para>
 </formalpara>
+
 <formalpara>
-            <title>PersistenceManager</title>
-            <para>This is the persistence manager that the ServerPeer uses.
-            You will not normally need to change this attribute.</para>
+        <title>SupportsFailover</title>
+
+        <para>Set to false to prevent server side failover occurring in a
+        cluster when a node crashes.</para>
 </formalpara>
+
 <formalpara>
-            <title>JMSUserManager</title>
-            <para>This is the JMS user manager that the ServerPeer uses. You
-            will not normally need to change this attribute.</para>
+        <title>PersistenceManager</title>
+
+        <para>This is the persistence manager that the ServerPeer uses. You
+        will not normally need to change this attribute.</para>
 </formalpara>
+
+<formalpara>
+        <title>JMSUserManager</title>
+
+        <para>This is the JMS user manager that the ServerPeer uses. You will
+        not normally need to change this attribute.</para>
+</formalpara>
+
+<formalpara>
+        <title>SecurityStore</title>
+
+        <para>This is the pluggable SecurityStore. If you redefine this
+        SecurityStore, notice it will need to authenticate the MessageSucker
+        user ("JBM.SUCKER") with all the special permissions required by
+        clustering.</para>
+</formalpara>
 </section>
-         <section id="conf.serverpeer.operations">
-            <title>We now discuss the MBean operations of the ServerPeer
-            MBean.</title>
-    <formalpara>
-               <title>DeployQueue</title>
-               <para>This operation lets you programmatically deploy a
-		       queue.</para></formalpara>
-               <para>There are two overloaded versions of this
-               operation</para>
-               <para>If the queue already exists but is undeployed it is
-               deployed. Otherwise it is created and deployed.</para>
-               <para>The <literal>name</literal> parameter represents the name
-               of the destination to deploy.</para>
-               <para>The <literal>jndiName</literal> parameter (optional)
-               represents the full jndi name where to bind the destination. If
-               this is not specified then the destination will be bound in
-               &lt;DefaultQueueJNDIContext&gt;/&lt;name&gt;.</para>
-               <para>The first version of this operation deploys the
-               destination with the default paging parameters. The second
-               overloaded version deploys the destination with the specified
-               paging parameters. See the section on configuring destinations
-               for a discussion of what the paging parameters mean.</para>
+      <section id="conf.serverpeer.operations">
+        <title>We now discuss the MBean operations of the ServerPeer
+        MBean.</title>
+
        <formalpara>
-               <title>UndeployQueue</title>
-               <para>This operation lets you programmatically undeploy a
-		       queue.</para></formalpara>
-               <para>The queue is undeployed but is NOT removed from
-               persistent storage.</para>
-               <para>This operation returns <literal>true</literal> if the
-               queue was successfull undeployed, otherwise it returns
-               <literal>false</literal>.</para>
-       <formalpara>
-               <title>DestroyQueue</title>
-               <para>This operation lets you programmatically destroy a
-		       queue.</para></formalpara>
-               <para>The queue is undeployed and then all its data is
-               destroyed from the database.</para>
-               <warning>
-			<para>
-                   Be careful when using this method since it will delete all data for the queue. 
-			</para>
-               </warning>
-               <para>This operation returns <literal>true</literal> if the
-               queue was successfully destroyed, otherwise it returns
-               <literal>false</literal>.</para>
-       <formalpara>
-               <title>DeployTopic</title>
-               <para>This operation lets you programmatically deploy a
-		       topic.</para></formalpara>
-               <para>There are two overloaded versions of this
-               operation.</para>
-               <para>If the topic already exists but is undeployed it is
-               deployed. Otherwise it is created and deployed.</para>
-               <para>The <literal>name</literal> parameter represents the name
-               of the destination to deploy.</para>
-               <para>The <literal>jndiName</literal> parameter (optional)
-               represents the full jndi name where to bind the destination. If
-               this is not specified then the destination will be bound in
-               &lt;DefaultTopicJNDIContext&gt;/&lt;name&gt;.</para>
-               <para>The first version of this operation deploys the
-               destination with the default paging parameters. The second
-               overloaded version deploys the destination with the specified
-               paging parameters. See the section on configuring destinations
-               for a discussion of what the paging parameters mean.</para>
-       <formalpara>
-               <title>UndeployTopic</title>
-               <para>This operation lets you programmatically undeploy a
-		       topic.</para></formalpara>
-               <para>The queue is undeployed but is NOT removed from
-               persistent storage.</para>
-               <para>This operation returns <literal>true</literal> if the
-               topic was successfully undeployed, otherwise it returns
-               <literal>false</literal>.</para>
-       <formalpara>
-               <title>DestroyTopic</title>
-               <para>This operation lets you programmatically destroy a
-		       topic.</para></formalpara>
-               <para>The topic is undeployed and then all its data is
-               destroyed from the database.</para>
-               <warning>
-			<para>
-                   Be careful when using this method since it will delete all data for the topic. 
-			</para>
-               </warning>
-               <para>This operation returns <literal>true</literal> if the
-               topic was successfully destroyed, otherwise it returns
-               <literal>false</literal>.</para>
-       <formalpara>
-               <title>ListMessageCountersHTML</title>
-               <para>This operation returns message counters in an easy to
-               display HTML format.</para>
+          <title>DeployQueue</title>
+
+          <para>This operation lets you programmatically deploy a
+          queue.</para>
 </formalpara>
-<formalpara>
-               <title>ResetAllMesageCounters</title>
-               <para>This operation resets all message counters to
-               zero.</para>
+          <para>There are two overloaded versions of this operation</para>
+
+          <para>If the queue already exists but is undeployed it is deployed.
+          Otherwise it is created and deployed.</para>
+
+          <para>The <literal>name</literal> parameter represents the name of
+          the destination to deploy.</para>
+
+          <para>The <literal>jndiName</literal> parameter (optional)
+          represents the full jndi name where to bind the destination. If this
+          is not specified then the destination will be bound in
+          &lt;DefaultQueueJNDIContext&gt;/&lt;name&gt;.</para>
+
+          <para>The first version of this operation deploys the destination
+          with the default paging parameters. The second overloaded version
+          deploys the destination with the specified paging parameters. See
+          the section on configuring destinations for a discussion of what the
+          paging parameters mean.</para>
+
+  <formalpara>
+          <title>UndeployQueue</title>
+
+          <para>This operation lets you programmatically undeploy a
+          queue.</para>
 </formalpara>
+          <para>The queue is undeployed but is NOT removed from persistent
+          storage.</para>
+
+          <para>This operation returns <literal>true</literal> if the queue
+          was successfull undeployed. otherwise it returns
+          <literal>false</literal>.</para>
+
+  <formalpara>
+          <title>DestroyQueue</title>
+
+          <para>This operation lets you programmatically destroy a
+          queue.</para>
+</formalpara>
+          <para>The queue is undeployed and then all its data is destroyed
+          from the database.</para>
+
+          <warning>
+		  <para>
+             Be careful when using this method since it will delete all data for the queue. </para>
+          </warning>
+
+          <para>This operation returns <literal>true</literal> if the queue
+          was successfully destroyed. otherwise it returns
+          <literal>false</literal>.</para>
+
+  <formalpara>
+          <title>DeployTopic</title>
+
+          <para>This operation lets you programmatically deploy a
+          topic.</para>
+</formalpara>
+          <para>There are two overloaded versions of this operation.</para>
+
+          <para>If the topic already exists but is undeployed it is deployed.
+          Otherwise it is created and deployed.</para>
+
+          <para>The <literal>name</literal> parameter represents the name of
+          the destination to deploy.</para>
+
+          <para>The <literal>jndiName</literal> parameter (optional)
+          represents the full jndi name where to bind the destination. If this
+          is not specified then the destination will be bound in
+          &lt;DefaultTopicJNDIContext&gt;/&lt;name&gt;.</para>
+
+          <para>The first version of this operation deploys the destination
+          with the default paging parameters. The second overloaded version
+          deploys the destination with the specified paging parameters. See
+          the section on configuring destinations for a discussion of what the
+          paging parameters mean.</para>
+
+  <formalpara>
+          <title>UndeployTopic</title>
+
+          <para>This operation lets you programmatically undeploy a
+          topic.</para>
+</formalpara>
+          <para>The queue is undeployed but is NOT removed from persistent
+          storage.</para>
+
+          <para>This operation returns <literal>true</literal> if the topic
+          was successfully undeployed. otherwise it returns
+          <literal>false</literal>.</para>
+
+  <formalpara>
+          <title>DestroyTopic</title>
+
+          <para>This operation lets you programmatically destroy a
+          topic.</para>
+</formalpara>
+          <para>The topic is undeployed and then all its data is destroyed
+          from the database.</para>
+
+          <warning>
+		  <para>
+             Be careful when using this method since it will delete all data for the topic. </para>
+          </warning>
+
+          <para>This operation returns <literal>true</literal> if the topic
+          was successfully destroyed. otherwise it returns
+          <literal>false</literal>.</para>
+
+  <formalpara>
+          <title>ListMessageCountersHTML</title>
+
+          <para>This operation returns message counters in an easy to display
+          HTML format.</para>
+</formalpara>
+
 <formalpara>
-               <title>ResetAllMesageCounters</title>
-               <para>This operation resets all message counter histories to
-               zero.</para>
+          <title>ResetAllMesageCounters</title>
+
+          <para>This operation resets all message counters to zero.</para>
+  </formalpara>
+
+  <formalpara>
+          <title>ResetAllMesageCounters</title>
+
+          <para>This operation resets all message counter histories to
+          zero.</para>
 </formalpara>
+
 <formalpara>
-               <title>EnableMessageCounters</title>
-               <para>This operation enables all message counters for all
-               destinations. Message counters are disabled by default.</para>
+          <title>EnableMessageCounters</title>
+
+          <para>This operation enables all message counters for all
+          destinations. Message counters are disabled by default.</para>
 </formalpara>
+
 <formalpara>
-               <title>DisableMessageCounters</title>
-               <para>This operation disables all message counters for all
-               destinations. Message counters are disabled by default.</para>
+          <title>DisableMessageCounters</title>
+
+          <para>This operation disables all message counters for all
+          destinations. Message counters are disabled by default.</para>
 </formalpara>
+
 <formalpara>
-               <title>RetrievePreparedTransactions</title>
-               <para>Retrieves a list of the Xids for all transactions
-               currently in a prepared state on the node.</para>
+          <title>RetrievePreparedTransactions</title>
+
+          <para>Retrieves a list of the Xids for all transactions currently in
+          a prepared state on the node.</para>
 </formalpara>
+
 <formalpara>
-               <title>ShowPreparedTransactions</title>
-               <para>Retrieves a list of the Xids for all transactions
-               currently in a prepared state on the node in an easy to display
-               HTML format.</para>
+          <title>ShowPreparedTransactions</title>
+
+          <para>Retrieves a list of the Xids for all transactions currently in
+          a prepared state on the node in an easy to display HTML
+          format.</para>
 </formalpara>
-      </section>
-   </section>
-   <section id="conf.changingds">
-      <title>Changing the Database</title>
-      <para>Several JBoss Messaging services interact with persistent storage.
-      They include: The Persistence Manager, The PostOffice and the JMS User
-      Manager. The Persistence Manager is used to handle the message-related
-      persistence. The Post Office handles binding related persistence. The
-      JMS User manager handles user related persistence The configuration for
-      all these MBeans is handled in the
-      <filename>xxx-persistence-service.xml</filename> file.</para>
-      <para>If the database you want to switch to is one of MySQL, Oracle,
-      PostgreSQL, MS SQL Sever or Sybase, persistence configuration files are
-      already available in the <filename>examples/config</filename> directory
-      of the release bundle.</para>
-      <para>In order to enable support for one of these databases, just
-      replace the default <filename>hsqldb-persistence-service.xml</filename>
-      configuration file with the database-specific configuration file and
-      restart the server.</para>
-      <para>Also, be aware that by default, the Messaging services relying on
-      a datastore are referencing <literal>"java:/DefaultDS"</literal> for the
-      datasource. If you are deploying a datasource with a different JNDI
-      name, you need to update all the <literal>DataSource</literal> attribute
-      in the persistence configuration file. Example data source
-      configurations for each of the popular databases are available in the
-      distribution.</para>
-   </section>
-   <section id="conf.postoffice">
-      <title>Configuring the Post office</title>
-      <para>It is the job of the post office to route messages to their
-      destination(s).</para>
-      <para>The post office maintains the mappings between addresses to which
-      messages can be sent and their final queues.</para>
-      <para>For example when sending a message with an address that represents
-      a JMS queue name, the post office will route this to a single queue -
-      the JMS queue. When sending a message with an address that repesents a
-      JMS topic name, the post office will route this to a set of queues - one
-      for each JMS subscription.</para>
-      <para>The post office also handles the persistence for the mapping of
-      addresses.</para>
-      <para>JBoss Messaging post-offices are also cluster aware. In a cluster
-      they will automatically route and pull messages between them in order to
-      provide fully distributed JMS queues and topics.</para>
-      <para>The post office configuration is found in the
-      xxx-persistence-service.xml file (where xxx is the name of your
-      database).</para>
-      <para>Here is an example of a post office configuration:</para>
-      <programlisting>
+    </section>
+ </section>
+
+  <section id="conf.changingds">
+    <title>Changing the Database</title>
+
+    <para>Several JBoss Messaging services interact with persistent storage.
+    They include: The Persistence Manager, The PostOffice and the JMS User
+    Manager. The Persistence Manager is used to handle the message-related
+    persistence. The Post Office handles binding related persistence. The JMS
+    User manager handles user related persistence The configuration for all
+    these MBeans is handled in the
+    <filename>xxx-persistence-service.xml</filename> file.</para>
+
+    <para>If the database you want to switch to is one of MySQL, Oracle,
+    PostgreSQL, MS SQL Sever or Sybase, persistence configuration files are
+    already available in the <filename>examples/config</filename> directory of
+    the release bundle.</para>
+
+    <para>In order to enable support for one of these databases, just replace
+    the default <filename>hsqldb-persistence-service.xml</filename>
+    configuration file with the database-specific configuration file and
+    restart the server.</para>
+
+    <para>Also, be aware that by default, the Messaging services relying on a
+    datastore are referencing <literal>"java:/DefaultDS"</literal> for the
+    datasource. If you are deploying a datasource with a different JNDI name,
+    you need to update all the <literal>DataSource</literal> attribute in the
+    persistence configuration file. Example data source configurations for
+    each of the popular databases are available in the distribution.</para>
+  </section>
+
+  <section id="conf.postoffice">
+    <title>Configuring the Post office</title>
+
+    <para>It is the job of the post office to route messages to their
+    destination(s).</para>
+
+    <para>The post office maintains the mappings between addresses to which
+    messages can be sent and their final queues.</para>
+
+    <para>For example when sending a message with an address that represents a
+    JMS queue name, the post office will route this to a single queue - the
+    JMS queue. When sending a message with an address that repesents a JMS
+    topic name, the post office will route this to a set of queues - one for
+    each JMS subscription.</para>
+
+    <para>The post office also handles the persistence for the mapping of
+    addresses.</para>
+
+    <para>JBoss Messaging post-offices are also cluster aware. In a cluster
+    they will automatically route and pull messages between them in order to
+    provide fully distributed JMS queues and topics.</para>
+
+    <para>The post office configuration is found in the
+    xxx-persistence-service.xml file (where xxx is the name of your
+    database).</para>
+
+    <para>Here is an example of a post office configuration:</para>
+
+    <programlisting>
    &lt;mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
       name="jboss.messaging:service=PostOffice"
       xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml"&gt;
@@ -529,6 +701,7 @@
                         
       &lt;attribute name="CreateTablesOnStartup"&gt;true&lt;/attribute&gt;
       
+      
       &lt;!-- If true then we will automatically detect and reject duplicate messages sent during failover --&gt;
       
       &lt;attribute name="DetectDuplicates"&gt;true&lt;/attribute&gt;
@@ -536,7 +709,8 @@
       &lt;!-- The size of the id cache to use when detecting duplicate messages --&gt;
       
       &lt;attribute name="IDCacheSize"&gt;500&lt;/attribute&gt;
-                  
+      
+      
       &lt;attribute name="SqlProperties"&gt;&lt;![CDATA[
 CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(255), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, CLUSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME)) ENGINE = INNODB
 INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
@@ -566,8 +740,8 @@
       &lt;!-- Set this to true if you want failover of connections to occur when a node is shut down --&gt;
       
       &lt;attribute name="FailoverOnNodeLeave"&gt;false&lt;/attribute&gt;
-            
       
+      
       &lt;!-- JGroups stack configuration for the data channel - used for sending data across the cluster --&gt; 
                    
       &lt;!-- By default we use the TCP stack for data --&gt;                  
@@ -664,172 +838,225 @@
       
    &lt;/mbean&gt;
       </programlisting>
-      <section id="conf.postoffice.attributes">
-         <title>The post office has the following attributes</title>
-         <formalpara>
-            <title>DataSource</title>
-            <para>The datasource the postoffice should use for persisting its
-            mapping data.</para>
+
+    <section id="conf.postoffice.attributes">
+      <title>The post office has the following attributes</title>
+
+      <formalpara>
+        <title>DataSource</title>
+
+        <para>The datasource the postoffice should use for persisting its
+        mapping data.</para>
 </formalpara>
+
 <formalpara>
-            <title>SQLProperties</title>
-            <para>This is where the DDL and DML for the particular database is
-            specified. If a particular DDL or DML statement is not overridden,
-            the default Hypersonic configuration will be used for that
-            statement.</para>
+        <title>SQLProperties</title>
+
+        <para>This is where the DDL and DML for the particular database is
+        specified. If a particular DDL or DML statement is not overridden, the
+        default Hypersonic configuration will be used for that
+        statement.</para>
 </formalpara>
+
 <formalpara>
-            <title>CreateTablesOnStartup</title>
-            <para>Set this to <literal>true</literal> if you wish the post
-            office to attempt to create the tables (and indexes) when it
-            starts. If the tables (or indexes) already exist a
-            <literal>SQLException</literal> will be thrown by the JDBC driver
-            and ignored by the Persistence Manager, allowing it to
-	    continue.</para></formalpara>
-            <para>By default the value of
-            <literal>CreateTablesOnStartup</literal> attribute is set to
-            <literal>true</literal></para>
-    <formalpara>
-            <title>DetectDuplicates</title>
-	    <para>Set this to <literal>true</literal> if you wish the post office detect duplicate messages
-			 that may sent when a send is retried on a different node after server failure.
-		 </para>	</formalpara>	 
-            <para>By default the value of <literal>DetectDuplicates</literal>
-	          attribute is set to <literal>true</literal></para>
-	  <formalpara>
-	    <title>IDCacheSize</title>
-	
-	    <para>If duplicate detection is enabled. (See <literal>DetectDuplicates</literal>), then the server will rememeber the last
-		<literal>n</literal> message ids
-		sent, to prevent duplicate messages sent after failover has occurred. The value of <literal>n</literal> is determined by this attribute.
-	</para></formalpara>
-	
-	    <para>By default the value of <literal>IDCacheSize</literal>
-		attribute is set to <literal>500</literal></para>	 
-	<formalpara>
-            <title>PostOfficeName</title>
-            <para>The name of the post office.</para>
-    </formalpara>
-    <formalpara>
-            <title>NodeIDView</title>
-            <para>This returns set containing the node ids of all the nodes in
-            the cluster.</para>
+        <title>CreateTablesOnStartup</title>
+
+        <para>Set this to <literal>true</literal> if you wish the post office
+        to attempt to create the tables (and indexes) when it starts. If the
+        tables (or indexes) already exist a <literal>SQLException</literal>
+        will be thrown by the JDBC driver and ignored by the Persistence
+        Manager, allowing it to continue.</para>
 </formalpara>
+        <para>By default the value of <literal>CreateTablesOnStartup</literal>
+        attribute is set to <literal>true</literal></para>
+
 <formalpara>
-            <title>GroupName</title>
-            <para>All post offices in the cluster with the same group name
-            will form a cluster together. Make sure the group name matches
-            with all the nodes in the cluster you want to form a cluster
-            with.</para>
+        <title>DetectDuplicates</title>
+
+        <para>Set this to <literal>true</literal> if you wish the post office
+        detect duplicate messages that may sent when a send is retried on a
+        different node after server failure.</para>
 </formalpara>
+        <para>By default the value of <literal>DetectDuplicates</literal>
+        attribute is set to <literal>true</literal></para>
+
 <formalpara>
-            <title>Clustered</title>
-            <para>If true the post office will take part in a cluster to form
-            distributed queues and topics. If false then it will not
-            participate in the cluster. If false, then all the cluster related
-            attributes will be ignored.</para>
+        <title>IDCacheSize</title>
+
+        <para>If duplicate detection is enabled. (See
+        <literal>DetectDuplicates</literal>), then the server will rememeber
+        the last <literal>n</literal> message ids sent, to prevent duplicate
+        messages sent after failover has occurred. The value of
+        <literal>n</literal> is determined by this attribute.</para>
 </formalpara>
+        <para>By default the value of <literal>IDCacheSize</literal> attribute
+        is set to <literal>500</literal></para>
+
 <formalpara>
-            <title>StateTimeout</title>
-            <para>The maximum time to wait when waiting for the group state to
-		    arrive when a node joins a pre-existing cluster.</para></formalpara>
-            <para>The default value is <literal>5000</literal>
-            milliseconds.</para>
-    <formalpara>
-            <title>CastTimeout</title>
-            <para>The maximum time to wait for a reply casting message
-		    synchronously.</para></formalpara>
-            <para>The default value is <literal>5000</literal>
-            milliseconds.</para>
-    <formalpara>
-            <title>FailoverOnNodeLeave</title>		 
-	    <para>If this attribute is <literal>true</literal> then if a server node is shut down cleanly, then this will cause any
-		    connections on the shutting down node to failover onto another node.</para></formalpara>		 
-	     <para>The default value for this is attribute is <literal>false</literal></para>				  
-	     <formalpara>
-            <title>MaxConcurrentReplications</title>
-            <para>The maximum number of concurrent replication requests to
-            make before blocking for replies to come back. This prevents us
-            overwhelming JGroups. This is rarely a good reason to change
-	    this.</para></formalpara>
-            <para>The default value is <literal>50</literal></para>
-	    <formalpara>
-            <title>ControlChannelConfig</title>
-            <para>JBoss Messaging uses JGroups for all group management. This
-            contains the JGroups stack configuration for the control
-	    channel.</para></formalpara>
-            <para>The control channel is used for sending request/receiving
-            responses from other nodes in the cluster</para>
-            <para>The details of the JGroups configuration won't be discussed
-            here since it is standard JGroups configuration. Detailed
-            information on JGroups can be found in JGroups release
-            documentation or on-line at <ulink
-            url="http://www.jgroups.org">http://www.jgroups.org</ulink> or
-            <ulink
-            url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups">http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups</ulink>.</para>
+        <title>PostOfficeName</title>
 
-    <formalpara>
-            <title>DataChannelConfig</title>
-            <para>JBoss Messaging uses JGroups for all group management. This
-            contains the JGroups stack configuration for the data
-	    channel.</para></formalpara>
-            <para>The data channel is used for sending sending/receiving
-            messages from other nodes in the cluster and for replicating
-            session data.</para>
-            <para>The details of the JGroups configuration won't be discussed
-            here since it is standard JGroups configuration. Detailed
-            information on JGroups can be found in JGroups release
-            documentation or on-line at <ulink
-            url="http://www.jgroups.org">http://www.jgroups.org</ulink> or
-            <ulink
-            url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups">http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups</ulink>.</para>
-      </section>
-   </section>
-   <section id="conf.persistencemanager">
-      <title>Configuring the Persistence Manager</title>
-      <para>It is the job of the persistence manager to manage all message
-      related persistence.</para>
-      <para>JBoss Messaging ships with a JDBC Persistence Manager used for
-      handling persistence of message data in a relational database accessed
-      via JDBC. The Persistence Manager implementation is pluggable (the
-      Persistence Manager is a Messaging server plug-in), this making possible
-      to provide other implementations for persisting message data in non
-      relational stores, file stores etc.</para>
-      <para>The configuration of "persistent" services is grouped in a
-      <filename>xxx-persistence-service.xml</filename> file, where xxx
-      corresponds to the database name. By default, Messaging ships with a
-      <filename>hsqldb-persistence-service.xml</filename>, which configures
-      the Messaging server to use the in-VM Hypersonic database instance that
-      comes by default with any EAP instance.</para>
-      <warning>
-	      <para>The default persistence manager works out of the box with Hypersonic. However, it must be stressed that Hypersonic should not be used in a production environment, mainly due to its limited support for transaction isolation, and its propensity to behave erratically under high load.</para>
-         <para>The <ulink
-         url="http://wiki.jboss.org/wiki/Wiki.jsp?page=ConfigJBossMQDB">Critique
-         of Hypersonic</ulink> wiki page outlines some of the well-known
-         issues occuring when using this database.</para>
-      </warning>
-      <para>JBoss Messaging also ships with pre-made Persistence Manager
-      configurations for MySQL, Oracle, PostgreSQL, Sybase and MS SQL Server.
-      The example <filename>mysql-persistence-service.xml</filename>,
-       <filename>ndb-persistence-service.xml</filename>,
-      <filename>oracle-persistence-service.xml</filename>,
-      <filename>postgres-persistence-service.xml</filename> and
-      <filename>sybase-persistence-service.xml</filename> and
-      <filename>mssql-persistence-service.xml</filename> configuration files
-      are available in the <filename>examples/config</filename> directory of
-      the release bundle.</para>
-      <para>Users are encouraged to contribute their own configuration files
-      where we will thoroughly test them before certifying them for suppported
-      use with JBoss Messaging. The JDBC Persistence Manager has been designed
-      to use standard SQL for the DML so writing a JDBC Persistence Manager
-      configuration for another database is usually only a fairly simple
-      matter of changing DDL in the configuration which is likely to be
-      different for different databases.</para>
-      <para>JBoss Messaging also ships with a Null Persistence Manager config - this can be used when you don't want any persistence at all.
-      </para>
-      <para>The default Hypersonic persistence configuration file is listed
-      below:</para>
-      <programlisting>
+        <para>The name of the post office.</para>
+</formalpara>
+
+<formalpara>
+        <title>NodeIDView</title>
+
+        <para>This returns set containing the node ids of all the nodes in the
+        cluster.</para>
+</formalpara>
+
+<formalpara>
+        <title>GroupName</title>
+
+        <para>All post offices in the cluster with the same group name will
+        form a cluster together. Make sure the group name matches with all the
+        nodes in the cluster you want to form a cluster with.</para>
+</formalpara>
+
+<formalpara>
+        <title>Clustered</title>
+
+        <para>If true the post office will take part in a cluster to form
+        distributed queues and topics. If false then it will not participate
+        in the cluster. If false, then all the cluster related attributes will
+        be ignored.</para>
+</formalpara>
+
+<formalpara>
+        <title>StateTimeout</title>
+
+        <para>The maximum time to wait when waiting for the group state to
+        arrive when a node joins a pre-existing cluster.</para>
+</formalpara>
+
+        <para>The default value is <literal>5000</literal>
+        milliseconds.</para>
+
+<formalpara>
+        <title>CastTimeout</title>
+
+        <para>The maximum time to wait for a reply casting message
+        synchronously.</para>
+</formalpara>
+        <para>The default value is <literal>5000</literal>
+        milliseconds.</para>
+
+
+<formalpara>
+        <title>FailoverOnNodeLeave</title>
+
+        <para>If this attribute is <literal>true</literal> then if a server
+        node is shut down cleanly, then this will cause any connections on the
+        shutting down node to failover onto another node.</para>
+</formalpara>
+        <para>The default value for this is attribute is
+        <literal>false</literal></para>
+
+<formalpara>
+        <title>MaxConcurrentReplications</title>
+
+        <para>The maximum number of concurrent replication requests to make
+        before blocking for replies to come back. This prevents us
+        overwhelming JGroups. This is rarely a good reason to change
+        this.</para>
+</formalpara>
+        <para>The default value is <literal>50</literal></para>
+
+	<formalpara>
+        <title>ControlChannelConfig</title>
+
+        <para>JBoss Messaging uses JGroups for all group management. This
+        contains the JGroups stack configuration for the control
+        channel.</para>
+</formalpara>
+        <para>The control channel is used for sending request/receiving
+        responses from other nodes in the cluster</para>
+
+        <para>The details of the JGroups configuration won't be discussed here
+        since it is standard JGroups configuration. Detailed information on
+        JGroups can be found in JGroups release documentation or on-line at
+        <ulink url="http://www.jgroups.org">http://www.jgroups.org</ulink> or
+        <ulink
+        url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups">http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups</ulink>.</para>
+
+<formalpara>
+        <title>DataChannelConfig</title>
+
+        <para>JBoss Messaging uses JGroups for all group management. This
+        contains the JGroups stack configuration for the data channel.</para>
+</formalpara>
+        <para>The data channel is used for sending sending/receiving messages
+        from other nodes in the cluster and for replicating session
+        data.</para>
+
+        <para>The details of the JGroups configuration won't be discussed here
+        since it is standard JGroups configuration. Detailed information on
+        JGroups can be found in JGroups release documentation or on-line at
+        <ulink url="http://www.jgroups.org">http://www.jgroups.org</ulink> or
+        <ulink
+        url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups">http://wiki.jboss.org/wiki/Wiki.jsp?page=JGroups</ulink>.</para>
+    </section>
+  </section>
+
+  <section id="conf.persistencemanager">
+    <title>Configuring the Persistence Manager</title>
+
+    <para>It is the job of the persistence manager to manage all message
+    related persistence.</para>
+
+    <para>JBoss Messaging ships with a JDBC Persistence Manager used for
+    handling persistence of message data in a relational database accessed via
+    JDBC. The Persistence Manager implementation is pluggable (the Persistence
+    Manager is a Messaging server plug-in), this making possible to provide
+    other implementations for persisting message data in non relational
+    stores, file stores etc.</para>
+
+    <para>The configuration of "persistent" services is grouped in a
+    <filename>xxx-persistence-service.xml</filename> file, where xxx
+    corresponds to the database name. By default, Messaging ships with a
+    <filename>hsqldb-persistence-service.xml</filename>, which configures the
+    Messaging server to use the in-VM Hypersonic database instance that comes
+    by default with any JBossAS instance.</para>
+
+    <warning>
+      <para>The default Persistence Manager configuration is works out of the
+      box with Hypersonic, however it must be stressed that Hypersonic should
+      not be used in a production environment mainly due to its limited
+      support for transaction isolation and its propensity to behave
+      erratically under high load.</para>
+
+      <para>The <ulink
+      url="http://wiki.jboss.org/wiki/Wiki.jsp?page=ConfigJBossMQDB">Critique
+      of Hypersonic</ulink> wiki page outlines some of the well-known issues
+      occuring when using this database.</para>
+    </warning>
+
+    <para>JBoss Messaging also ships with pre-made Persistence Manager
+    configurations for MySQL, Oracle, PostgreSQL, Sybase and MS SQL Server.
+    The example <filename>mysql-persistence-service.xml</filename>,
+    <filename>ndb-persistence-service.xml</filename>,
+    <filename>oracle-persistence-service.xml</filename>,
+    <filename>postgres-persistence-service.xml</filename> and
+    <filename>sybase-persistence-service.xml</filename> and
+    <filename>mssql-persistence-service.xml</filename> configuration files are
+    available in the <filename>examples/config</filename> directory of the
+    release bundle.</para>
+    
+    <para>Users are encouraged to contribute their own configuration files
+    where we will thoroughly test them before certifying them for suppported
+    use with JBoss Messaging. The JDBC Persistence Manager has been designed
+    to use standard SQL for the DML so writing a JDBC Persistence Manager
+    configuration for another database is usually only a fairly simple matter
+    of changing DDL in the configuration which is likely to be different for
+    different databases.</para>
+
+    <para>JBoss Messaging also ships with a Null Persistence Manager config -
+    this can be used when you don't want any persistence at all.</para>
+
+    <para>The default Hypersonic persistence configuration file is listed
+    below:</para>
+
+    <programlisting>
 	 &lt;mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml"&gt;
@@ -902,101 +1129,139 @@
       &lt;!-- The maximum number of parameters to include in a prepared statement --&gt;
                   
       &lt;attribute name="MaxParams"&gt;500&lt;/attribute&gt;
+
+      &lt;attribute name="UseNDBFailoverStrategy"&gt;true&lt;/attribute&gt;
          
-      &lt;attribute name="UseNDBFailoverStrategy"&gt;true&lt;/attribute&gt;
-
    &lt;/mbean&gt;
 	  
 	   </programlisting>
-      <section id="conf.persistencemanager.attributes">
-         <title>We now discuss the MBean attributes of the PersistenceManager
-         MBean</title>
- <formalpara>
-            <title>CreateTablesOnStartup</title>
-            <para>Set this to <literal>true</literal> if you wish the
-            Persistence Manager to attempt to create the tables (and indexes)
-            when it starts. If the tables (or indexes) already exist a
-            <literal>SQLException</literal> will be thrown by the JDBC driver
-            and ignored by the Persistence Manager, allowing it to
-	    continue.</para></formalpara>
-            <para>By default the value of
-            <literal>CreateTablesOnStartup</literal> attribute is set to
-            <literal>true</literal></para>
-         <formalpara>
-            <title>UsingBatchUpdates</title>
-            <para>Set this to <literal>true</literal> if the database supports
-            JDBC batch updates. The JDBC Persistence Manager will then group
-	    multiple database updates in batches to aid performance.</para></formalpara>
-            <para>By default the value of <literal>UsingBatchUpdates</literal>
-            attribute is set to <literal>false</literal></para>
-    <formalpara>
-            <title>UsingBinaryStream</title>
-            <para>Set this to <literal>true</literal> if you want messages to
-            be store and read using a JDBC binary stream rather than using
-            getBytes(), setBytes(). Some database has limits on the maximum
-            number of bytes that can be get/set using
-	    getBytes()/setBytes().</para></formalpara>
-            <para>By default the value of <literal>UsingBinaryStream</literal>
-            attribute is set to <literal>true</literal></para>
-    <formalpara>
-            <title>UsingTrailingByte</title>
-            <para>Certain version of Sybase are known to truncate blobs if
-            they have trailing zeros. To prevent this if this attribute is set
-            to <literal>true</literal> then a trailing non zero byte will be
-            added and removed to each blob before and after persistence to
-            prevent the database from truncating it. Currently this is only
-	    known to be necessary for Sybase.</para></formalpara>
-            <para>By default the value of <literal>UsingTrailingByte</literal>
-            attribute is set to <literal>false</literal></para>
-    <formalpara>
-            <title>SupportsBlobOnSelect</title>
-            <para>Oracle (and possibly other databases) is known to not allow
-            BLOBs to be inserted using a INSERT INTO ... SELECT FROM
-            statement, and requires a two stage conditional insert of
-            messages. If this value is false then such a two stage insert will
-	    be used.</para></formalpara>
-            <para>By default the value of
-            <literal>SupportsBlobOnSelect</literal> attribute is set to
-            <literal>true</literal></para>
-    <formalpara>
-            <title>SQLProperties</title>
-            <para>This is where the DDL and DML for the particular database is
-            specified. If a particular DDL or DML statement is not overridden,
-            the default Hypersonic configuration will be used for that
-            statement.</para>
+	   
+	   <section id="conf.persistencemanager.sybasemssqlnotes">
+		   <title>Important notes for Sybase and Microsoft SQL Server users</title>
+		   <para>When a database is created in Sybase the maximum size of text and image datatypes is set to the default page size of 2 KB. Any longer message payload is truncated without any information or warning. The database parameters have to be updated to set the @@TEXTSIZE parameter to a higher value. The truncation behaviour may also be observed in MSSQL Server if @@TEXTSIZE is changed from its default value to a smaller one. Further information: <ulink url="http://jira.jboss.com/jira/browse/SOA-554"/>.
+		   </para>
+		   <para>Sybase database may fail to insert a row if the total size of the row exceeds the page size allocated for the database. A command line option passed to the dataserver command used to start the database can be used to change the page size.       
+				   Further information: <ulink url="http://jira.jboss.com/jira/browse/SOA-553"/></para>
+		   <para>Microsoft SQL Server does not automatically de-allocate the hard-drive space occupied by data in a database when that data is deleted. If used as a data-store for services that temporarily store many records, such as a messaging service, the disk space used will grow to be much greater than the amount of data actually being stored.	
+				   Your database administrator should implement database maintenance plans to ensure that unused space is reclaimed. Please refer to your Microsoft SQL Server documentation for the DBCC commands ShrinkDatabase and UpdateUsage for guidance.
+				   <ulink url="https://jira.jboss.org/jira/browse/SOA-629"/></para>
+		   
+    </section>	   
+
+    <section id="conf.persistencemanager.attributes">
+      <title>We now discuss the MBean attributes of the PersistenceManager
+      MBean</title>
+
+<formalpara>
+        <title>CreateTablesOnStartup</title>
+
+        <para>Set this to <literal>true</literal> if you wish the Persistence
+        Manager to attempt to create the tables (and indexes) when it starts.
+        If the tables (or indexes) already exist a
+        <literal>SQLException</literal> will be thrown by the JDBC driver and
+        ignored by the Persistence Manager, allowing it to continue.</para>
 </formalpara>
+        <para>By default the value of <literal>CreateTablesOnStartup</literal>
+        attribute is set to <literal>true</literal></para>
+
 <formalpara>
-            <title>MaxParams</title>
-            <para>When loading messages the persistence manager will generate
-            prepared statements with many parameters. This value tells the
-            persistence manager what the absolute maximum number of parameters
-	    are allowable per prepared statement.</para></formalpara>
-            <para>By default the value of <literal>MaxParams</literal>
-            attribute is set to <literal>100</literal></para>
+        <title>UsingBatchUpdates</title>
 
-    <formalpara>
-         <title>UseNDBFailoverStrategy</title>
-          <para>When running in a clustered database environment it is possible that some databases,
-             MySQL for instance, can fail during the commit of a database transaction. This can happen
-             if the database node dies whilst committing meaning that the final state of the transaction is
-             unknown. If this attribute is set to true and the above happens then the SQL statement will be
-             re-executed, however if there is a further error an assumption is made that this is because the
-             previous transaction committed successfully and the error is ignored.
-     </para></formalpara>
+        <para>Set this to <literal>true</literal> if the database supports
+        JDBC batch updates. The JDBC Persistence Manager will then group
+        multiple database updates in batches to aid performance.</para>
+</formalpara>
+        <para>By default the value of <literal>UsingBatchUpdates</literal>
+        attribute is set to <literal>false</literal></para>
 
-          <para>By default the value of <literal>UseNDBFailoverStrategy</literal> attribute
-          is set to <literal>false</literal></para>
-      </section>
-      <!-- end conf.persistencemanager.attributes -->
-   </section>
-   <!-- end conf.persistencemanager -->
-   <section id="conf.jmsusermanager">
-      <title>Configuring the JMS user manager</title>
-      <para>The JMS user manager handles the mapping of pre-configured client
-      IDs to users and also managers the user and role tables which may or may
-      not be used depending on which login module you have configured</para>
-      <para>Here is an example JMSUserManager configuration</para>
-      <programlisting>
+<formalpara>
+        <title>UsingBinaryStream</title>
+
+        <para>Set this to <literal>true</literal> if you want messages to be
+        store and read using a JDBC binary stream rather than using
+        getBytes(), setBytes(). Some database has limits on the maximum number
+        of bytes that can be get/set using getBytes()/setBytes().</para>
+</formalpara>
+        <para>By default the value of <literal>UsingBinaryStream</literal>
+        attribute is set to <literal>true</literal></para>
+
+<formalpara>
+        <title>UsingTrailingByte</title>
+
+        <para>Certain version of Sybase are known to truncate blobs if they
+        have trailing zeros. To prevent this if this attribute is set to
+        <literal>true</literal> then a trailing non zero byte will be added
+        and removed to each blob before and after persistence to prevent the
+        database from truncating it. Currently this is only known to be
+        necessary for Sybase.</para>
+</formalpara>
+        <para>By default the value of <literal>UsingTrailingByte</literal>
+        attribute is set to <literal>false</literal></para>
+
+<formalpara>
+        <title>SupportsBlobOnSelect</title>
+
+        <para>Oracle (and possibly other databases) is known to not allow
+        BLOBs to be inserted using a INSERT INTO ... SELECT FROM statement,
+        and requires a two stage conditional insert of messages. If this value
+        is false then such a two stage insert will be used.</para>
+</formalpara>
+        <para>By default the value of <literal>SupportsBlobOnSelect</literal>
+        attribute is set to <literal>true</literal></para>
+
+<formalpara>
+        <title>SQLProperties</title>
+
+        <para>This is where the DDL and DML for the particular database is
+        specified. If a particular DDL or DML statement is not overridden, the
+        default Hypersonic configuration will be used for that
+        statement.</para>
+</formalpara>
+
+<formalpara>
+        <title>MaxParams</title>
+
+        <para>When loading messages the persistence manager will generate
+        prepared statements with many parameters. This value tells the
+        persistence manager what the absolute maximum number of parameters are
+        allowable per prepared statement.</para>
+</formalpara>
+        <para>By default the value of <literal>MaxParams</literal> attribute
+        is set to <literal>100</literal></para>
+
+
+<formalpara>
+        <title>UseNDBFailoverStrategy</title>
+
+        <para>When running in a clustered database environment it is possible
+        that some databases, MySQL for instance, can fail during the commit of
+        a database transaction. This can happen if the database node dies
+        whilst committing meaning that the final state of the transaction is
+        unknown. If this attribute is set to true and the above happens then
+        the SQL statement will be re-executed, however if there is a further
+        error an assumption is made that this is because the previous
+        transaction committed successfully and the error is ignored.</para>
+</formalpara>
+        <para>By default the value of
+        <literal>UseNDBFailoverStrategy</literal> attribute is set to
+        <literal>false</literal></para>
+    </section>
+
+    <!-- end conf.persistencemanager.attributes -->
+  </section>
+
+  <!-- end conf.persistencemanager -->
+
+  <section id="conf.jmsusermanager">
+    <title>Configuring the JMS user manager</title>
+
+    <para>The JMS user manager handles the mapping of pre-configured client
+    IDs to users and also managers the user and role tables which may or may
+    not be used depending on which login module you have configured</para>
+
+    <para>Here is an example JMSUserManager configuration</para>
+
+    <programlisting>
    &lt;mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
       name="jboss.messaging:service=JMSUserManager"
       xmbean-dd="xmdesc/JMSUserManager-xmbean.xml"&gt;
@@ -1018,52 +1283,65 @@
                VALUES ('dilbert','dogbert','dilbert-id')
       ]]&gt;&lt;/attribute&gt;
    &lt;/mbean&gt;
-           </programlisting>
-      <section id="conf.jmsusermanager.attributes">
-         <title>We now discuss the MBean attributes of the JMSUserManager
-         MBean</title>
- <formalpara>
-            <title>CreateTablesOnStartup</title>
-            <para>Set this to <literal>true</literal> if you wish the JMS user
-            manager to attempt to create the tables (and indexes) when it
-            starts. If the tables (or indexes) already exist a
-            <literal>SQLException</literal> will be thrown by the JDBC driver
-            and ignored by the Persistence Manager, allowing it to
-	    continue.</para></formalpara>
-            <para>By default the value of
-            <literal>CreateTablesOnStartup</literal> attribute is set to
-            <literal>true</literal></para>
-    <formalpara>
-            <title>UsingBatchUpdates</title>
-            <para>Set this to <literal>true</literal> if the database supports
-            JDBC batch updates. The JDBC Persistence Manager will then group
-	    multiple database updates in batches to aid performance.</para></formalpara>
-            <para>By default the value of <literal>UsingBatchUpdates</literal>
-            attribute is set to <literal>false</literal></para>
-    <formalpara>
-            <title>SQLProperties</title>
-            <para>This is where the DDL and DML for the particular database is
-            specified. If a particular DDL or DML statement is not overridden,
-            the default Hypersonic configuration will be used for that
-	    statement.</para></formalpara>
-            <para>Default user and role data can also be specified here. Any
-            data to be inserted must be specified with property names starting
-            with <literal>POPULATE.TABLES</literal> as in the above
-            example.</para>
-      </section>
-      <!-- end conf.jmsusermanager.attributes -->
-   </section>
-   <!-- end.conf.jmsusermanager -->
-   <section id="conf.destination">
-      <title>Configuring Destinations</title>
-      <section id="conf.destinations.preconf">
-         <title>Pre-configured destinations</title>
-         <para>JBoss Messaging ships with a default set of pre-configured
-         destinations that will be deployed during the server start up. The
-         file that contains configuration for these destinations is
-         <filename>destinations-service.xml</filename>. A section of this file
-         is listed below:</para>
-         <programlisting>
+</programlisting>
+
+    <section id="conf.jmsusermanager.attributes">
+      <title>We now discuss the MBean attributes of the JMSUserManager
+      MBean</title>
+
+<formalpara>
+        <title>CreateTablesOnStartup</title>
+
+        <para>Set this to <literal>true</literal> if you wish the JMS user
+        manager to attempt to create the tables (and indexes) when it starts.
+        If the tables (or indexes) already exist a
+        <literal>SQLException</literal> will be thrown by the JDBC driver and
+        ignored by the Persistence Manager, allowing it to continue.</para>
+</formalpara>
+        <para>By default the value of <literal>CreateTablesOnStartup</literal>
+        attribute is set to <literal>true</literal></para>
+
+<formalpara>
+        <title>UsingBatchUpdates</title>
+
+        <para>Set this to <literal>true</literal> if the database supports
+        JDBC batch updates. The JDBC Persistence Manager will then group
+        multiple database updates in batches to aid performance.</para>
+</formalpara>
+        <para>By default the value of <literal>UsingBatchUpdates</literal>
+        attribute is set to <literal>false</literal></para>
+
+<formalpara>
+        <title>SQLProperties</title>
+
+        <para>This is where the DDL and DML for the particular database is
+        specified. If a particular DDL or DML statement is not overridden, the
+        default Hypersonic configuration will be used for that
+        statement.</para>
+</formalpara>
+        <para>Default user and role data can also be specified here. Any data
+        to be inserted must be specified with property names starting with
+        <literal>POPULATE.TABLES</literal> as in the above example.</para>
+    </section>
+
+    <!-- end conf.jmsusermanager.attributes -->
+  </section>
+
+  <!-- end.conf.jmsusermanager -->
+
+  <section id="conf.destination">
+    <title>Configuring Destinations</title>
+
+    <section id="conf.preconf.destinations">
+      <title>Pre-configured destinations</title>
+
+      <para>JBoss Messaging ships with a default set of pre-configured
+      destinations that will be deployed during the server start up. The file
+      that contains configuration for these destinations is
+      <filename>destinations-service.xml</filename>. A section of this file is
+      listed below:</para>
+
+      <programlisting>
    &lt;!--
       The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
    --&gt;
@@ -1209,137 +1487,173 @@
    &lt;/mbean&gt;
 ....
               </programlisting>
-      </section>
+    </section>
+</section>
+    <!-- end conf.preconf.destinations -->
 
-      <!-- end conf.preconf.destinations -->
-      <section id="conf.destination.queue">
-         <title>Configuring queues</title>
-	 <para>This section will discuss the configuration of queues.</para>
-         <section id="conf.destination.queue.attributes">
-            <title>Queue MBean attributes</title>
-	    <para>We now discuss the attributes of the Queue MBean</para>
-	    <formalpara>
-               <title>Name</title>
-               <para>The name of the queue</para>
-       </formalpara>
-       <formalpara>
-               <title>JNDIName</title>
-               <para>The JNDI name where the queue is bound</para>
-       </formalpara>
-       <formalpara>
-               <title>DLQ</title>
-               <para>The DLQ used for this queue. Overrides any value set on
-               the ServerPeer config</para>
+    <section id="conf.destination.queue">
+      <title>Configuring queues</title>
+
+      <section id="conf.destination.queue.attributes">
+        <title>We now discuss the attributes of the Queue MBean</title>
+
+	<formalpara>
+          <title>Name</title>
+
+          <para>The name of the queue</para>
+  </formalpara>
+
+  <formalpara>
+          <title>JNDIName</title>
+
+          <para>The JNDI name where the queue is bound</para>
+  </formalpara>
+
+  <formalpara>
+          <title>DLQ</title>
+
+          <para>The DLQ used for this queue. Overrides any value set on the
+          ServerPeer config</para>
 </formalpara>
+
 <formalpara>
-               <title>ExpiryQueue</title>
-               <para>The Expiry queue used for this queue. Overrides any value
-               set on the ServerPeer config</para>
+          <title>ExpiryQueue</title>
+
+          <para>The Expiry queue used for this queue. Overrides any value set
+          on the ServerPeer config</para>
 </formalpara>
+
 <formalpara>
-               <title>RedeliveryDelay</title>
-               <para>The redelivery delay to be used for this queue. Overrides
-               any value set on the ServerPeer config</para>
+          <title>RedeliveryDelay</title>
+
+          <para>The redelivery delay to be used for this queue. Overrides any
+          value set on the ServerPeer config</para>
 </formalpara>
+
 <formalpara>
-               <title>MaxDeliveryAttempts</title>
-               <para>The maximum number of times delivery of a message will be
-               attempted before sending the message to the DLQ, if configured.
-               If set to -1 (the default), the value from the ServerPeer
-               config is used. Any other setting overrides the value set on
-               the ServerPeer config.</para>
+          <title>MaxDeliveryAttempts</title>
+
+          <para>The maximum number of times delivery of a message will be
+          attempted before sending the message to the DLQ, if configured. If
+          set to -1 (the default), the value from the ServerPeer config is
+          used. Any other setting overrides the value set on the ServerPeer
+          config.</para>
 </formalpara>
+
 <formalpara>
-               <title>Destination Security Configuration</title>
-               <para><literal>SecurityConfig</literal> - allows you to
-               determine which roles are allowed to read, write and create on
-               the destination. It has exactly the same syntax and semantics
-	       as the security configuration in JBossMQ destinations.</para></formalpara>
-               <para>The <literal>SecurityConfig</literal> element should
-               contain one <literal>&lt;security&gt;</literal> element. The
-               <literal>&lt;security&gt;</literal> element can contain
-               multiple <literal>&lt;role&gt;</literal> elements. Each
-               <literal>&lt;role&gt;</literal> element defines the access for
-               that particular role.</para>
-               <para>If the <literal>read</literal> attribute is
-               <literal>true</literal> then that role will be able to read
-               (create consumers, receive messaages or browse) this
-               destination.</para>
-               <para>If the <literal>write</literal> attribute is
-               <literal>true</literal> then that role will be able to write
-               (create producers or send messages) to this destination.</para>
-               <para>If the <literal>create</literal> attribute is
-               <literal>true</literal> then that role will be able to create
-               durable subscriptions on this destination.</para>
-               <para>Note that the security configuration for a destination is
-               optional. If a <literal>SecurityConfig</literal> element is not
-               specifed then the default security configuration from the
-               Server Peer will be used.</para>
+          <title>Destination Security Configuration</title>
 
-       <formalpara>
-               <title>Destination paging parameters</title>
-               <para>'Pageable Channels' are a sophisticated new feature
-		       available in JBoss Messaging.</para></formalpara>
-               <para>If your application needs to support very large queues or
-               subscriptions containing potentially millions of messages, then
-               it's not possible to store them all in memory at once.</para>
-               <para>JBoss Messaging solves this problem but letting you
-               specify the maximum number of messages that can be stored in
-               memory at any one time, on a queue-by-queue, or topic-by-topic
-               basis. JBoss Messaging then pages messages to and from storage
-               transparently in blocks, allowing queues and subscriptions to
-               grow to very large sizes without any performance degradation as
-               channel size increases.</para>
-               <para>This has been tested with in excess of 10 million 2K
-               messages on very basic hardware and has the potential to scale
-               to much larger number of messages.</para>
-               <para>The individual parameters are:</para>
-               <para><literal>FullSize</literal> - this is the maximum number
-               of messages held by the queue or topic subscriptions in memory
-               at any one time. The actual queue or subscription can hold many
-               more messages than this but these are paged to and from storage
-               as necessary as messages are added or consumed.</para>
-               <para><literal>PageSize</literal> - When loading messages from
-               the queue or subscrition this is the maximum number of messages
-               to pre-load in one operation.</para>
-               <para><literal>DownCacheSize</literal> - When paging messages
-               to storage from the queue they first go into a "Down Cache"
-               before being written to storage. This enables the write to
-               occur as a single operation thus aiding performance. This
-               setting determines the max number of messages that the Down
-               Cache will hold before they are flushed to storage.</para>
-               <para>If no values for <literal>FullSize</literal>,
-               <literal>PageSize</literal>, or
-               <literal>DownCacheSize</literal> are specified they will
-               default to values 75000, 2000, 2000 respectively.</para>
-               <para>If you want to specify the paging parameters used for
-               temporary queues then you need to specify them on the
-               appropriate connection factory. See connection factory
-               configuration for details.</para>
+          <para><literal>SecurityConfig</literal> - allows you to determine
+          which roles are allowed to read, write and create on the
+          destination. It has exactly the same syntax and semantics as the
+          security configuration in JBossMQ destinations.</para>
+</formalpara>
+          <para>The <literal>SecurityConfig</literal> element should contain
+          one <literal>&lt;security&gt;</literal> element. The
+          <literal>&lt;security&gt;</literal> element can contain multiple
+          <literal>&lt;role&gt;</literal> elements. Each
+          <literal>&lt;role&gt;</literal> element defines the access for that
+          particular role.</para>
 
-       <formalpara>
-               <title>CreatedProgrammatically</title>
-               <para>Returns <literal>true</literal> if the queue was created
-               programmatically</para>
+          <para>If the <literal>read</literal> attribute is
+          <literal>true</literal> then that role will be able to read (create
+          consumers, receive messaages or browse) this destination.</para>
+
+          <para>If the <literal>write</literal> attribute is
+          <literal>true</literal> then that role will be able to write (create
+          producers or send messages) to this destination.</para>
+
+          <para>If the <literal>create</literal> attribute is
+          <literal>true</literal> then that role will be able to create
+          durable subscriptions on this destination.</para>
+
+          <para>Note that the security configuration for a destination is
+          optional. If a <literal>SecurityConfig</literal> element is not
+          specifed then the default security configuration from the Server
+          Peer will be used.</para>
+
+  <formalpara>
+          <title>Destination paging parameters</title>
+
+          <para>'Pageable Channels' are a sophisticated new feature available
+          in JBoss Messaging.</para>
 </formalpara>
+          <para>If your application needs to support very large queues or
+          subscriptions containing potentially millions of messages, then it's
+          not possible to store them all in memory at once.</para>
+
+          <para>JBoss Messaging solves this problem but letting you specify
+          the maximum number of messages that can be stored in memory at any
+          one time, on a queue-by-queue, or topic-by-topic basis. JBoss
+          Messaging then pages messages to and from storage transparently in
+          blocks, allowing queues and subscriptions to grow to very large
+          sizes without any performance degradation as channel size
+          increases.</para>
+
+          <para>This has been tested with in excess of 10 million 2K messages
+          on very basic hardware and has the potential to scale to much larger
+          number of messages.</para>
+
+          <para>The individual parameters are:</para>
+
+          <para><literal>FullSize</literal> - this is the maximum number of
+          messages held by the queue or topic subscriptions in memory at any
+          one time. The actual queue or subscription can hold many more
+          messages than this but these are paged to and from storage as
+          necessary as messages are added or consumed.</para>
+
+          <para><literal>PageSize</literal> - When loading messages from the
+          queue or subscrition this is the maximum number of messages to
+          pre-load in one operation.</para>
+
+          <para><literal>DownCacheSize</literal> - When paging messages to
+          storage from the queue they first go into a "Down Cache" before
+          being written to storage. This enables the write to occur as a
+          single operation thus aiding performance. This setting determines
+          the max number of messages that the Down Cache will hold before they
+          are flushed to storage.</para>
+
+          <para>If no values for <literal>FullSize</literal>,
+          <literal>PageSize</literal>, or <literal>DownCacheSize</literal> are
+          specified they will default to values 75000, 2000, 2000
+          respectively.</para>
+
+          <para>If you want to specify the paging parameters used for
+          temporary queues then you need to specify them on the appropriate
+          connection factory. See connection factory configuration for
+          details.</para>
+
+  <formalpara>
+          <title>CreatedProgrammatically</title>
+
+          <para>Returns <literal>true</literal> if the queue was created
+          programmatically</para>
+</formalpara>
+
 <formalpara>
-               <title>MessageCount</title>
-               <para>Returns the total number of messages in the queue =
-               number not being delivered + number being delivered + number
-               being scheduled</para>
+          <title>MessageCount</title>
+
+          <para>Returns the total number of messages in the queue = number not
+          being delivered + number being delivered + number being
+          scheduled</para>
 </formalpara>
+
 <formalpara>
-               <title>ScheduledMessageCount</title>
-               <para>Returns the number of scheduled messages in the queue.
-               This is the number of messages scheduled to be delivered at a
-	       later date.</para></formalpara>
-               <para>Scheduled delivery is a feature of JBoss Messaging where
-               you can send a message and specify the earliest time at which
-               it will be delivered. E.g. you can send a message now, but the
-               message won't actually be delivered until 2 hours time.</para>
-               <para>To do this, you just need to set the following header in
-               the message before sending:</para>
-               <programlisting>
+          <title>ScheduledMessageCount</title>
+
+          <para>Returns the number of scheduled messages in the queue. This is
+          the number of messages scheduled to be delivered at a later
+          date.</para>
+</formalpara>
+          <para>Scheduled delivery is a feature of JBoss Messaging where you
+          can send a message and specify the earliest time at which it will be
+          delivered. E.g. you can send a message now, but the message won't
+          actually be delivered until 2 hours time.</para>
+
+          <para>To do this, you just need to set the following header in the
+          message before sending:</para>
+
+          <programlisting>
               
               long now = System.currentTimeMillis();
          
@@ -1353,355 +1667,456 @@
                  </programlisting>
 
 		 <formalpara>
-               <title>MaxSize</title>
-               <para>A maximum size (in number of messages) can be specified
-               for a queue. Any messages that arrive beyond this point will be
-               dropped. The default is <literal>-1</literal> which is
-               unbounded.</para>
+          <title>MaxSize</title>
+
+          <para>A maximum size (in number of messages) can be specified for a
+          queue. Any messages that arrive beyond this point will be dropped.
+          The default is <literal>-1</literal> which is unbounded.</para>
 </formalpara>
+
 <formalpara>
-               <title>Clustered</title>
-               <para>Clustered destinations must have this set to
-               <literal>true</literal>.</para>
+          <title>Clustered</title>
+
+          <para>Clustered destinations must have this set to
+          <literal>true</literal>.</para>
 </formalpara>
+
 <formalpara>
-               <title>MessageCounter</title>
-               <para>Each queue maintains a message counter.</para>
-       </formalpara>
-       <formalpara>
-               <title>MessageCounterStatistics</title>
-               <para>The statistics for the message counter</para>
-       </formalpara>
-       <formalpara>
-               <title>MessageCounterHistoryDayLimit</title>
-               <para>The maximum number of days to hold message counter
-               history for. Overrides any value set on the ServerPeer.</para>
+          <title>MessageCounter</title>
+
+          <para>Each queue maintains a message counter.</para>
+  </formalpara>
+
+  <formalpara>
+          <title>MessageCounterStatistics</title>
+
+          <para>The statistics for the message counter</para>
+  </formalpara>
+
+  <formalpara>
+          <title>MessageCounterHistoryDayLimit</title>
+
+          <para>The maximum number of days to hold message counter history
+          for. Overrides any value set on the ServerPeer.</para>
 </formalpara>
+
 <formalpara>
-               <title>ConsumerCount</title>
-               <para>The number of consumers currently consuming from the
-               queue.</para>
+          <title>ConsumerCount</title>
+
+          <para>The number of consumers currently consuming from the
+          queue.</para>
 </formalpara>
-</section>
-         <section id="conf.destination.queue.operations"> 
-            <title>Queue Operations</title>
-	    <para>We now discuss the MBean operations of the Queue
-            MBean</para> 
-    <formalpara>
-               <title>RemoveAllMessages</title>
-	       <para>Remove (and delete) all messages from the queue.</para></formalpara> 
-       <warning>
-		<para>
-                      Use this with caution. It will permanently delete all messages from the queue 
-			</para>
-                  </warning>
-		  <formalpara>
-               <title>ListAllMessages</title>
-	       <para>List all messages currently in the queue</para>
-       </formalpara>
-               <para>There are two overloaded versions of this operation: One
-               takes a JMS selector as an argument, the other does not. By
-               using the selector you can retrieve a subset of the messages in
-               the queue that match the criteria</para>
-       <formalpara>
-               <title>ListDurableMessages</title>
-               <para>As listAllMessages but only lists the durable
-		       messages</para>
-       </formalpara>
-               <para>There are two overloaded versions of this operation: One
-               takes a JMS selector as an argument, the other does not. By
-               using the selector you can retrieve a subset of the messages in
-               the queue that match the criteria</para>
+      </section>
 
-       <formalpara>
-               <title>ListNonDurableMessages</title>
-               <para>As listAllMessages but only lists the non durable
-		       messages</para>
-       </formalpara>
-               <para>There are two overloaded versions of this operation: One
-               takes a JMS selector as an argument, the other does not. By
-               using the selector you can retrieve a subset of the messages in
-               the queue that match the criteria</para>
+      <section id="conf.destination.queue.operations">
+        <title>We now discuss the MBean operations of the Queue MBean</title>
 
-       <formalpara>
-               <title>ResetMessageCounter</title>
-               <para>Resets the message counter to zero.</para>
-       </formalpara>
-       <formalpara>
-               <title>ResetMessageCounterHistory</title>
-               <para>Resets the message counter history.</para>
-       </formalpara>
-       <formalpara>
-               <title>ListMessageCounterAsHTML</title>
-               <para>Lists the message counter in an easy to display HTML
-               format</para>
+	<formalpara>
+          <title>RemoveAllMessages</title>
+
+          <para>Remove (and delete) all messages from the queue.</para>
+  </formalpara><warning>
+		  <para>
+               Use this with caution. It will permanently delete all messages from the queue. </para>
+            </warning>
+	    <formalpara>
+          <title>ListAllMessages</title>
+
+          <para>List all messages currently in the queue</para>
+  </formalpara>
+          <para>There are two overloaded versions of this operation: One takes
+          a JMS selector as an argument, the other does not. By using the
+          selector you can retrieve a subset of the messages in the queue that
+          match the criteria</para>
+
+  <formalpara>
+          <title>ListDurableMessages</title>
+
+          <para>As listAllMessages but only lists the durable messages</para>
+  </formalpara>
+          <para>There are two overloaded versions of this operation: One takes
+          a JMS selector as an argument, the other does not. By using the
+          selector you can retrieve a subset of the messages in the queue that
+          match the criteria</para>
+
+  <formalpara>
+          <title>ListNonDurableMessages</title>
+
+          <para>As listAllMessages but only lists the non durable
+          messages</para>
 </formalpara>
+          <para>There are two overloaded versions of this operation: One takes
+          a JMS selector as an argument, the other does not. By using the
+          selector you can retrieve a subset of the messages in the queue that
+          match the criteria</para>
+
+  <formalpara>
+          <title>ResetMessageCounter</title>
+
+          <para>Resets the message counter to zero.</para>
+  </formalpara>
+
+  <formalpara>
+          <title>ResetMessageCounterHistory</title>
+
+          <para>Resets the message counter history.</para>
+  </formalpara>
+
+  <formalpara>
+          <title>ListMessageCounterAsHTML</title>
+
+          <para>Lists the message counter in an easy to display HTML
+          format</para>
+</formalpara>
+
 <formalpara>
-               <title>ListMessageCounterHistoryAsHTML</title>
-               <para>Lists the message counter history in an easy to display
-               HTML format</para>
-</formalpara> 
-</section>
-</section>
+          <title>ListMessageCounterHistoryAsHTML</title>
+
+          <para>Lists the message counter history in an easy to display HTML
+          format</para>
+</formalpara>
       </section>
-      <section id="conf.destination.topics">
-         <title>Configuring topics</title>
-	 <para>This section will explain the configuration of topics</para>
-         <section id="conf.destination.topic.attributes">
-            <title>We now discuss the MBean attributes of the Topic
-            MBean</title>
-    <formalpara>
-               <title>Name</title>
-               <para>The name of the topic</para>
-       </formalpara>
-       <formalpara>
-               <title>JNDIName</title>
-               <para>The JNDI name where the topic is bound</para>
-       </formalpara>
-       <formalpara>
-               <title>DLQ</title>
-               <para>The DLQ used for this topic. Overrides any value set on
-               the ServerPeer config</para>
+    </section>
+
+    <section id="conf.destination.topics">
+      <title>Configuring topics</title>
+
+      <section id="conf.destination.topic.attributes">
+        <title>We now discuss the MBean attributes of the Topic MBean</title>
+
+	<formalpara>
+          <title>Name</title>
+
+          <para>The name of the topic</para>
+  </formalpara>
+
+  <formalpara>
+          <title>JNDIName</title>
+
+          <para>The JNDI name where the topic is bound</para>
+  </formalpara>
+
+  <formalpara>
+          <title>DLQ</title>
+
+          <para>The DLQ used for this topic. Overrides any value set on the
+          ServerPeer config</para>
 </formalpara>
+
 <formalpara>
-               <title>ExpiryQueue</title>
-               <para>The Expiry queue used for this topic. Overrides any value
-               set on the ServerPeer config</para>
+          <title>ExpiryQueue</title>
+
+          <para>The Expiry queue used for this topic. Overrides any value set
+          on the ServerPeer config</para>
 </formalpara>
+
 <formalpara>
-               <title>RedeliveryDelay</title>
-               <para>The redelivery delay to be used for this topic. Overrides
-               any value set on the ServerPeer config</para>
+          <title>RedeliveryDelay</title>
+
+          <para>The redelivery delay to be used for this topic. Overrides any
+          value set on the ServerPeer config</para>
 </formalpara>
+
 <formalpara>
-               <title>MaxDeliveryAttempts</title>
-               <para>The maximum number of times delivery of a message will be
-               attempted before sending the message to the DLQ, if configured.
-               If set to -1 (the default), the value from the ServerPeer
-               config is used. Any other setting overrides the value set on
-               the ServerPeer config.</para>
+          <title>MaxDeliveryAttempts</title>
+
+          <para>The maximum number of times delivery of a message will be
+          attempted before sending the message to the DLQ, if configured. If
+          set to -1 (the default), the value from the ServerPeer config is
+          used. Any other setting overrides the value set on the ServerPeer
+          config.</para>
 </formalpara>
+
 <formalpara>
-               <title>Destination Security Configuration</title>
-               <para><literal>SecurityConfig</literal> - allows you to
-               determine which roles are allowed to read, write and create on
-               the destination. It has exactly the same syntax and semantics
-	       as the security configuration in JBossMQ destinations.</para></formalpara>
-               <para>The <literal>SecurityConfig</literal> element should
-               contain one <literal>&lt;security&gt;</literal> element. The
-               <literal>&lt;security&gt;</literal> element can contain
-               multiple <literal>&lt;role&gt;</literal> elements. Each
-               <literal>&lt;role&gt;</literal> element defines the access for
-               that particular role.</para>
-               <para>If the <literal>read</literal> attribute is
-               <literal>true</literal> then that role will be able to read
-               (create consumers, receive messaages or browse) this
-               destination.</para>
-               <para>If the <literal>write</literal> attribute is
-               <literal>true</literal> then that role will be able to write
-               (create producers or send messages) to this destination.</para>
-               <para>If the <literal>create</literal> attribute is
-               <literal>true</literal> then that role will be able to create
-               durable subscriptions on this destination.</para>
-               <para>Note that the security configuration for a destination is
-               optional. If a <literal>SecurityConfig</literal> element is not
-               specifed then the default security configuration from the
-               Server Peer will be used.</para>
+          <title>Destination Security Configuration</title>
 
-       <formalpara>
-               <title>Destination paging parameters</title>
-               <para>'Pageable Channels' are a sophisticated new feature
-		       available in JBoss Messaging.</para></formalpara>
-               <para>If your application needs to support very large queues or
-               subscriptions containing potentially millions of messages, then
-               it's not possible to store them all in memory at once.</para>
-               <para>JBoss Messaging solves this problem but letting you
-               specify the maximum number of messages that can be stored in
-               memory at any one time, on a queue-by-queue, or topic-by-topic
-               basis. JBoss Messaging then pages messages to and from storage
-               transparently in blocks, allowing queues and subscriptions to
-               grow to very large sizes without any performance degradation as
-               channel size increases.</para>
-               <para>This has been tested with in excess of 10 million 2K
-               messages on very basic hardware and has the potential to scale
-               to much larger number of messages.</para>
-               <para>The individual parameters are:</para>
-               <para><literal>FullSize</literal> - this is the maximum number
-               of messages held by the queue or topic subscriptions in memory
-               at any one time. The actual queue or subscription can hold many
-               more messages than this but these are paged to and from storage
-               as necessary as messages are added or consumed.</para>
-               <para><literal>PageSize</literal> - When loading messages from
-               the queue or subscrition this is the maximum number of messages
-               to pre-load in one operation.</para>
-               <para><literal>DownCacheSize</literal> - When paging messages
-               to storage from the queue they first go into a "Down Cache"
-               before being written to storage. This enables the write to
-               occur as a single operation thus aiding performance. This
-               setting determines the max number of messages that the Down
-               Cache will hold before they are flushed to storage.</para>
-               <para>If no values for <literal>FullSize</literal>,
-               <literal>PageSize</literal>, or
-               <literal>DownCacheSize</literal> are specified they will
-               default to values 75000, 2000, 2000 respectively.</para>
-               <para>If you want to specify the paging parameters used for
-               temporary queues then you need to specify them on the
-               appropriate connection factory. See connection factory
-               configuration for details.</para>
+          <para><literal>SecurityConfig</literal> - allows you to determine
+          which roles are allowed to read, write and create on the
+          destination. It has exactly the same syntax and semantics as the
+          security configuration in JBossMQ destinations.</para>
+</formalpara>
+          <para>The <literal>SecurityConfig</literal> element should contain
+          one <literal>&lt;security&gt;</literal> element. The
+          <literal>&lt;security&gt;</literal> element can contain multiple
+          <literal>&lt;role&gt;</literal> elements. Each
+          <literal>&lt;role&gt;</literal> element defines the access for that
+          particular role.</para>
 
-       <formalpara>
-               <title>CreatedProgrammatically</title>
-               <para>Returns <literal>true</literal> if the topic was created
-               programmatically</para>
+          <para>If the <literal>read</literal> attribute is
+          <literal>true</literal> then that role will be able to read (create
+          consumers, receive messaages or browse) this destination.</para>
+
+          <para>If the <literal>write</literal> attribute is
+          <literal>true</literal> then that role will be able to write (create
+          producers or send messages) to this destination.</para>
+
+          <para>If the <literal>create</literal> attribute is
+          <literal>true</literal> then that role will be able to create
+          durable subscriptions on this destination.</para>
+
+          <para>Note that the security configuration for a destination is
+          optional. If a <literal>SecurityConfig</literal> element is not
+          specifed then the default security configuration from the Server
+          Peer will be used.</para>
+
+  <formalpara>
+          <title>Destination paging parameters</title>
+
+          <para>'Pageable Channels' are a sophisticated new feature available
+          in JBoss Messaging.</para>
 </formalpara>
-<formalpara>
-               <title>MaxSize</title>
-               <para>A maximum size (in number of messages) can be specified
-               for a topic subscription. Any messages that arrive beyond this
-               point will be dropped. The default is <literal>-1</literal>
-               which is unbounded.</para>
+          <para>If your application needs to support very large queues or
+          subscriptions containing potentially millions of messages, then it's
+          not possible to store them all in memory at once.</para>
+
+          <para>JBoss Messaging solves this problem but letting you specify
+          the maximum number of messages that can be stored in memory at any
+          one time, on a queue-by-queue, or topic-by-topic basis. JBoss
+          Messaging then pages messages to and from storage transparently in
+          blocks, allowing queues and subscriptions to grow to very large
+          sizes without any performance degradation as channel size
+          increases.</para>
+
+          <para>This has been tested with in excess of 10 million 2K messages
+          on very basic hardware and has the potential to scale to much larger
+          number of messages.</para>
+
+          <para>The individual parameters are:</para>
+
+          <para><literal>FullSize</literal> - this is the maximum number of
+          messages held by the queue or topic subscriptions in memory at any
+          one time. The actual queue or subscription can hold many more
+          messages than this but these are paged to and from storage as
+          necessary as messages are added or consumed.</para>
+
+          <para><literal>PageSize</literal> - When loading messages from the
+          queue or subscrition this is the maximum number of messages to
+          pre-load in one operation.</para>
+
+          <para><literal>DownCacheSize</literal> - When paging messages to
+          storage from the queue they first go into a "Down Cache" before
+          being written to storage. This enables the write to occur as a
+          single operation thus aiding performance. This setting determines
+          the max number of messages that the Down Cache will hold before they
+          are flushed to storage.</para>
+
+          <para>If no values for <literal>FullSize</literal>,
+          <literal>PageSize</literal>, or <literal>DownCacheSize</literal> are
+          specified they will default to values 75000, 2000, 2000
+          respectively.</para>
+
+          <para>If you want to specify the paging parameters used for
+          temporary queues then you need to specify them on the appropriate
+          connection factory. See connection factory configuration for
+          details.</para>
+
+  <formalpara>
+          <title>CreatedProgrammatically</title>
+
+          <para>Returns <literal>true</literal> if the topic was created
+          programmatically</para>
 </formalpara>
+
 <formalpara>
-               <title>Clustered</title>
-               <para>Clustered destinations must have this set to
-               <literal>true</literal></para>
+          <title>MaxSize</title>
+
+          <para>A maximum size (in number of messages) can be specified for a
+          topic subscription. Any messages that arrive beyond this point will
+          be dropped. The default is <literal>-1</literal> which is
+          unbounded.</para>
 </formalpara>
+
 <formalpara>
-               <title>MessageCounterHistoryDayLimit</title>
-               <para>The maximum number of days to hold message counter
-               history for. Overrides any value set on the ServerPeer.</para>
+          <title>Clustered</title>
+
+          <para>Clustered destinations must have this set to
+          <literal>true</literal></para>
 </formalpara>
+
 <formalpara>
-               <title>MessageCounters</title>
-               <para>Return a list of the message counters for the
-               subscriptions of this topic.</para>
+          <title>MessageCounterHistoryDayLimit</title>
+
+          <para>The maximum number of days to hold message counter history
+          for. Overrides any value set on the ServerPeer.</para>
 </formalpara>
+
 <formalpara>
-               <title>AllMessageCount</title>
-               <para>Return the total number of messages in all subscriptions
-               of this topic.</para>
+          <title>MessageCounters</title>
+
+          <para>Return a list of the message counters for the subscriptions of
+          this topic.</para>
 </formalpara>
+
 <formalpara>
-               <title>DurableMessageCount</title>
-               <para>Return the total number of durable messages in all
-               subscriptions of this topic.</para>
+          <title>AllMessageCount</title>
+
+          <para>Return the total number of messages in all subscriptions of
+          this topic.</para>
 </formalpara>
+
 <formalpara>
-               <title>NonDurableMessageCount</title>
-               <para>Return the total number of non durable messages in all
-               subscriptions of this topic.</para>
+          <title>DurableMessageCount</title>
+
+          <para>Return the total number of durable messages in all
+          subscriptions of this topic.</para>
 </formalpara>
+
 <formalpara>
-               <title>AllSubscriptionsCount</title>
-               <para>The count of all subscriptions on this topic</para>
-       </formalpara>
-       <formalpara>
-               <title>DurableSubscriptionsCount</title>
-               <para>The count of all durable subscriptions on this
-               topic</para>
+          <title>NonDurableMessageCount</title>
+
+          <para>Return the total number of non durable messages in all
+          subscriptions of this topic.</para>
 </formalpara>
+
 <formalpara>
-               <title>NonDurableSubscriptionsCount</title>
-               <para>The count of all non durable subscriptions on this
-               topic</para>
+          <title>AllSubscriptionsCount</title>
+
+          <para>The count of all subscriptions on this topic</para>
+  </formalpara>
+
+  <formalpara>
+          <title>DurableSubscriptionsCount</title>
+
+          <para>The count of all durable subscriptions on this topic</para>
+  </formalpara>
+
+  <formalpara>
+          <title>NonDurableSubscriptionsCount</title>
+
+          <para>The count of all non durable subscriptions on this
+          topic</para>
 </formalpara>
-         </section>
-         <section id="conf.destination.topic.operations">
-            <title>We now discuss the MBean operations of the Topic
-            MBean</title>
-    <formalpara>
-               <title>RemoveAllMessages</title>
-               <para>Remove (and delete) all messages from the subscriptions
-		       of this topic.</para></formalpara> <warning><para>
-                      Use this with caution. It will permanently delete all messages from the topic. </para>
-                  </warning>
-		  <formalpara>
-               <title>ListAllSubscriptions</title>
-               <para>List all subscriptions of this topic</para>
-       </formalpara>
-       <formalpara>
-               <title>ListDurableSubscriptions</title>
-               <para>List all durable subscriptions of this topic</para>
-       </formalpara>
-       <formalpara>
-               <title>ListNonDurableSubscriptions</title>
-               <para>List all non durable subscriptions of this topic</para>
-       </formalpara>
-       <formalpara>
-               <title>ListAllSubscriptionsAsHTML</title>
-               <para>List all subscriptions of this topic in an easy to
-               display HTML format</para>
+      </section>
+
+      <section id="conf.destination.topic.operations">
+        <title>We now discuss the MBean operations of the Topic MBean</title>
+
+	<formalpara>
+          <title>RemoveAllMessages</title>
+
+          <para>Remove (and delete) all messages from the subscriptions of
+		  this topic.</para></formalpara> <warning><para>
+               Use this with caution. It will permanently delete all messages from the topic. </para> 
+            </warning>
+
+	    <formalpara>
+          <title>ListAllSubscriptions</title>
+
+          <para>List all subscriptions of this topic</para>
+  </formalpara>
+
+  <formalpara>
+          <title>ListDurableSubscriptions</title>
+
+          <para>List all durable subscriptions of this topic</para>
+  </formalpara>
+
+  <formalpara>
+          <title>ListNonDurableSubscriptions</title>
+
+          <para>List all non durable subscriptions of this topic</para>
+  </formalpara>
+
+  <formalpara>
+          <title>ListAllSubscriptionsAsHTML</title>
+
+          <para>List all subscriptions of this topic in an easy to display
+          HTML format</para>
 </formalpara>
+
 <formalpara>
-               <title>ListDurableSubscriptionsAsHTML</title>
-               <para>List all durable subscriptions of this topic in an easy
-               to display HTML format</para>
+          <title>ListDurableSubscriptionsAsHTML</title>
+
+          <para>List all durable subscriptions of this topic in an easy to
+          display HTML format</para>
 </formalpara>
+
 <formalpara>
-               <title>ListNonDurableSubscriptionsAsHTML</title>
-               <para>List all non durable subscriptions of this topic in an
-               easy to display HTML format</para>
+          <title>ListNonDurableSubscriptionsAsHTML</title>
+
+          <para>List all non durable subscriptions of this topic in an easy to
+          display HTML format</para>
 </formalpara>
+
 <formalpara>
-               <title>ListAllMessages</title>
-	       <para>Lists all messages for the specified subscription.</para></formalpara>
-               <para>There are two overloaded versions of this operation. One
-               that takes a selector and one that does not. By specifyingthe
-               selector you can limit the messages returned.</para>
+          <title>ListAllMessages</title>
 
+          <para>Lists all messages for the specified subscription.</para>
+  </formalpara>
+          <para>There are two overloaded versions of this operation. One that
+          takes a selector and one that does not. By specifyingthe selector
+          you can limit the messages returned.</para>
+
+
 <formalpara>
-               <title>ListNonDurableMessages</title>
-               <para>Lists all non durable messages for the specified
-		       subscription.</para></formalpara>
-               <para>There are two overloaded versions of this operation. One
-               that takes a selector and one that does not. By specifyingthe
-               selector you can limit the messages returned.</para>
+          <title>ListNonDurableMessages</title>
 
-       <formalpara>
-               <title>ListDurableMessages</title>
-               <para>Lists all durable messages for the specified
-		       subscription.</para></formalpara>
-               <para>There are two overloaded versions of this operation. One
-               that takes a selector and one that does not. By specifyingthe
-               selector you can limit the messages returned.</para>
-         </section>
+          <para>Lists all non durable messages for the specified
+          subscription.</para>
+</formalpara>
+          <para>There are two overloaded versions of this operation. One that
+          takes a selector and one that does not. By specifyingthe selector
+          you can limit the messages returned.</para>
+
+
+<formalpara>
+          <title>ListDurableMessages</title>
+
+          <para>Lists all durable messages for the specified
+          subscription.</para>
+</formalpara>
+          <para>There are two overloaded versions of this operation. One that
+          takes a selector and one that does not. By specifyingthe selector
+          you can limit the messages returned.</para>
+
       </section>
-   <!-- end of conf destination -->
-   <section id="conf.connectionfactory">
-      <title>Configuring Connection Factories</title>
-      <para>With the default configuration JBoss Messaging binds two
-      connection factories in JNDI at start-up.</para>
-      <para>The first connection factory is the default non-clustered
-      connection factory and is bound into the following JNDI contexts:
-      <literal>/ConnectionFactory, /XAConnectionFactory,
-      java:/ConnectionFactory, java:/XAConnectionFactory</literal>. This
-      connection factory is provided to maintain compatibility with
-      applications originally written against JBoss MQ which has no automatic
-      failover or load balancing. This connection factory should be used if
-      you do not require client side automatic failover or load
-      balancing.</para>
-      <para>The second connection factory is the default clustered connection
-      factory and is bound into the following JNDI contexts
-      <literal>/ClusteredConnectionFactory, /ClusteredXAConnectionFactory,
-      java:/ClusteredConnectionFactory,
-      java:/ClusteredXAConnectionFactory</literal>.</para>
-      <para>You may want to configure additional connection factories, for
-      instance if you want to provide a default client id for a connection
-      factory, or if you want to bind it in different places in JNDI, if you
-      want different connection factories to use different transports, or if
-      you want to selective enable or disable load-balancing and/or automatic
-      failover for a particular connection factory. Deploying a new connection
-      factory is equivalent with adding a new ConnectionFactory MBean
-      configuration to
-      <filename>connection-factories-service.xml</filename>.</para>
-      <para>It is also possible to create an entirely new service deployment
-      descriptor <filename>xxx-service.xml</filename> altogether and deploy it
-      in <filename>$JBOSS_HOME/server/messaging/deploy</filename>.</para>
-      <para>Connection factories can support automatic failover and/or
-      load-balancing by setting the corresponding attributes</para>
-      <para>An example connection factory configuration is presented
-      below:</para>
-      <programlisting>
+    </section>
+<!--  </section> -->
+
+  <!-- end of conf destination -->
+
+  <section id="conf.connectionfactory">
+    <title>Configuring Connection Factories</title>
+
+    <para>With the default configuration JBoss Messaging binds two connection
+    factories in JNDI at start-up.</para>
+
+    <para>The first connection factory is the default non-clustered connection
+    factory and is bound into the following JNDI contexts:
+    <literal>/ConnectionFactory, /XAConnectionFactory,
+    java:/ConnectionFactory, java:/XAConnectionFactory</literal>. This
+    connection factory is provided to maintain compatibility with applications
+    originally written against JBoss MQ which has no automatic failover or
+    load balancing. This connection factory should be used if you do not
+    require client side automatic failover or load balancing.</para>
+
+    <para>The second connection factory is the default clustered connection
+    factory and is bound into the following JNDI contexts
+    <literal>/ClusteredConnectionFactory, /ClusteredXAConnectionFactory,
+    java:/ClusteredConnectionFactory,
+    java:/ClusteredXAConnectionFactory</literal>.</para>
+
+    <para>You may want to configure additional connection factories, for
+    instance if you want to provide a default client id for a connection
+    factory, or if you want to bind it in different places in JNDI, if you
+    want different connection factories to use different transports, or if you
+    want to selective enable or disable load-balancing and/or automatic
+    failover for a particular connection factory. Deploying a new connection
+    factory is equivalent with adding a new ConnectionFactory MBean
+    configuration to
+    <filename>connection-factories-service.xml</filename>.</para>
+
+    <para>It is also possible to create an entirely new service deployment
+    descriptor <filename>xxx-service.xml</filename> altogether and deploy it
+    in <filename>$JBOSS_HOME/server/messaging/deploy</filename>.</para>
+
+    <para>Connection factories can support automatic failover and/or
+    load-balancing by setting the corresponding attributes</para>
+
+    <para>An example connection factory configuration is presented
+    below:</para>
+
+    <programlisting>
 &lt;mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
       name="jboss.messaging.connectionfactory:service=MyConnectionFactory"
       xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml"&gt;
@@ -1733,6 +2148,8 @@
       &lt;attribute name="SlowConsumers"&gt;false&lt;/attribute&gt;
       
       &lt;attribute name="StrictTck"&gt;true&lt;/attribute&gt;
+      
+      &lt;attribute name="SendAcksAsync"&gt;false&lt;/attribute&gt;
 
       &lt;attribute name="DefaultTempQueueFullSize"&gt;50000&lt;/attribute&gt;
       
@@ -1745,173 +2162,224 @@
    
 
              </programlisting>
-      <para>The above example would create a connection factory with
-      pre-configured client ID <literal>myClientID</literal> and bind the
-      connection factory in two places in the JNDI tree:
-      <literal>/MyConnectionFactory</literal> and
-      <literal>/factories/cf</literal>. The connection factory overrides the
-      default values for PreFetchSize, DefaultTempQueueFullSize,
-      DefaultTempQueuePageSize, DefaultTempQueueDownCacheSize and
-      DupsOKBatchSize, SupportsFailover, SupportsLoadBalancing and
-      LoadBalancingFactory. The connection factory will use the default
-      remoting connector. To use a different remoting connector with the
-      connection factory change the <literal>Connector</literal> attribute to
-      specify the service name of the connector you wish to use.</para>
-      <section id="conf.connectionfactory.attributes">
-         <title>We now discuss the MBean attributes of the ConnectionFactory
-         MBean</title>
- <formalpara>
-            <title>ClientID</title>
-            <para>Connection factories can be pre-configured with a client id.
-            Any connections created using this connection factory will obtain
-            this client id</para>
+
+    <para>The above example would create a connection factory with
+    pre-configured client ID <literal>myClientID</literal> and bind the
+    connection factory in two places in the JNDI tree:
+    <literal>/MyConnectionFactory</literal> and
+    <literal>/factories/cf</literal>. The connection factory overrides the
+    default values for PreFetchSize, DefaultTempQueueFullSize,
+    DefaultTempQueuePageSize, DefaultTempQueueDownCacheSize and
+    DupsOKBatchSize, SupportsFailover, SupportsLoadBalancing and
+    LoadBalancingFactory. The connection factory will use the default remoting
+    connector. To use a different remoting connector with the connection
+    factory change the <literal>Connector</literal> attribute to specify the
+    service name of the connector you wish to use.</para>
+
+    <section id="conf.connectionfactory.attributes">
+      <title>We now discuss the MBean attributes of the ConnectionFactory
+      MBean</title>
+
+<formalpara>
+        <title>ClientID</title>
+
+        <para>Connection factories can be pre-configured with a client id. Any
+        connections created using this connection factory will obtain this
+        client id</para>
 </formalpara>
+
 <formalpara>
-            <title>JNDIBindings</title>
-            <para>The list of the JNDI bindings for this connection
-            factory</para>
+        <title>JNDIBindings</title>
+
+        <para>The list of the JNDI bindings for this connection factory</para>
 </formalpara>
+
 <formalpara>
-            <title>PrefetchSize</title>
-	    <para>This parameter specifies the window size in numbers of messages, for consumer flow control.
-		    The window size determines the number of messages a server can send to a consumer without blocking.
-        Each consumer maintains a buffer of messages from which it consumes. Please note that TCP also implements its own flow control, so if you set this to too large a number, then the TCP window size may be hit before the prefetchSize, which can cause writes to block.</para>
+        <title>PrefetchSize</title>
+
+        <para>This parameter specifies the window size in numbers of messages,
+        for consumer flow control. The window size determines the number of
+        messages a server can send to a consumer without blocking. Each
+        consumer maintains a buffer of messages from which it consumes. Please
+        note that TCP also implements its own flow control, so if you set this
+        to too large a number, then the TCP window size may be hit before the
+        prefetchSize, which can cause writes to block.</para>
 </formalpara>
+
 <formalpara>
-            <title>SlowConsumers</title>
-	    <para>If you have very slow consumers, then you probably want to make
-		    sure they don't buffer any messages. Since this can prevent them from
-        being consumed by faster consumers. Setting this to true is equivalent to setting PrefetchSize to 1</para>
+        <title>SlowConsumers</title>
+
+        <para>If you have very slow consumers, then you probably want to make
+        sure they don't buffer any messages. Since this can prevent them from
+        being consumed by faster consumers. Setting this to true is equivalent
+        to setting PrefetchSize to 1</para>
 </formalpara>
+
 <formalpara>
-            <title>StrictTck</title>
-            <para>Set this to true if you want strict JMS behaviour as
-            required by the TCK.</para>
+        <title>StrictTck</title>
+
+        <para>Set this to true if you want strict JMS behaviour as required by
+        the TCK.</para>
 </formalpara>
+
 <formalpara>
-            <title>Temporary queue paging parameters</title>
-            <para>DefaultTempQueueFullSize, DefaultTempQueuePageSize,
-            DefaultTempQueueDownCacheSize are optional attributes that
-            determine the default paging parameters to be used for any
-            temporary destinations scoped to connections created using this
-            connection factory. See the section on paging channels for more
-            information on what these values mean. They will default to values
-            of 200000, 2000 and 2000 respectively if ommitted.</para>
+        <title>SendAcksAsync</title>
+
+        <para>Set this to true if you want acknowledgements to be sent
+        asynchronously. This can speed up performance especially if you are
+        using auto_acknowledge mode</para>
 </formalpara>
+
 <formalpara>
-            <title>DupsOKBatchSize</title>
-            <para>When using a session with acknowledge mode of
-            DUPS_OK_ACKNOWLEDGE this setting determines how many
-            acknowledgments it will buffer locally before sending. The default
-            value is <literal>2000</literal></para>
+        <title>Temporary queue paging parameters</title>
+
+        <para>DefaultTempQueueFullSize, DefaultTempQueuePageSize,
+        DefaultTempQueueDownCacheSize are optional attributes that determine
+        the default paging parameters to be used for any temporary
+        destinations scoped to connections created using this connection
+        factory. See the section on paging channels for more information on
+        what these values mean. They will default to values of 200000, 2000
+        and 2000 respectively if ommitted.</para>
 </formalpara>
+
 <formalpara>
-            <title>SupportsLoadBalancing</title>
-            <para>When using a connection factory with a clustered JBoss
-            Messaging installation you can choose whether to enable client
-            side connection load-balancing. This is determined by setting the
-	    attribute supportsLoadBalancing on the connection factory.</para></formalpara>
-            <para>If load balancing is enabled on a connection factory then
-            any connections created with that connection factory will be
-            load-balanced across the nodes of the cluster. Once a connection
-            is created on a particular node, it stays on that node.</para>
-            <para>The exact policy that determines how connections are load
-            balanced is determined by the LoadBalancingFactory
-            attribute</para>
-            <para>The default value is <literal>false</literal></para>
+        <title>DupsOKBatchSize</title>
 
-	    <formalpara>
-            <title>SupportsFailover</title>
-            <para>When using a connection factory with a clustered JBoss
-            Messaging installation you can choose whether to enable client
-            side automatic failover. This is determined by setting the
-	    attribute supportsFailover on the connection factory.</para></formalpara>
-            <para>If automatic failover is enabled on a connection factory,
-            then if a connection problem is detected with the connection then
-            JBoss Messaging will automatically and transparently failover to
-            another node in the cluster.</para>
-            <para>The failover is transparent meaning the user can carry on
-            using the sessions, consumers, producers and connection objects as
-            before.</para>
-            <para>If automatic failover is not required, then this attribute
-            can be set to false. With automatic failover disabled it is up to
-            the user code to catch connection exceptions in synchronous JMS
-            operations and install a JMS ExceptionListener to catch exceptions
-            asynchronously. When a connection is caught, the client side code
-            should lookup a new connection factory using HAJNDI and recreate
-            the connection using that.</para>
-            <para>The default value is <literal>false</literal></para>
+        <para>When using a session with acknowledge mode of
+        DUPS_OK_ACKNOWLEDGE this setting determines how many acknowledgments
+        it will buffer locally before sending. The default value is
+        <literal>2000</literal></para>
+</formalpara>
 
-	    <formalpara>
-            <title>DisableRemotingChecks</title>
-            <para>By default, when deploying a connection factory, JBoss
-            Messaging checks that the corresponding JBoss Remoting Connector
-            has "sensible" values. JBoss Messaging is very sensitive to the
-            values and for many of them there's rarely a good reason to change
-	    them. To disable such sanity checking set this to false.</para></formalpara> <warning><para>
-                   There is rarely a good reason to disable checking. Only do so if you are absolutely sure in what you are doing </para>
-               </warning>
-            <para>The default value is <literal>false</literal></para>
+<formalpara>
+        <title>SupportsLoadBalancing</title>
 
-	    <formalpara>
-            <title>LoadBalancingFactory</title>
-            <para>If you are using a connection factory with client side load
-            balancing then you can specify how the load balancing is
-            implemented by overriding this attribute. The value must
-            correspond to the name of a class which implements the interface
-	    org.jboss.jms.client.plugin.LoadBalancingFactory</para></formalpara>
-            <para>The default value is
-            org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory, which
-            load balances connections across the cluster in a round-robin
-            fashion</para>
+        <para>When using a connection factory with a clustered JBoss Messaging
+        installation you can choose whether to enable client side connection
+        load-balancing. This is determined by setting the attribute
+        supportsLoadBalancing on the connection factory.</para>
+</formalpara>
+        <para>If load balancing is enabled on a connection factory then any
+        connections created with that connection factory will be load-balanced
+        across the nodes of the cluster. Once a connection is created on a
+        particular node, it stays on that node.</para>
 
-    <formalpara>
-            <title>Connector</title>
-            <para>This specifies which remoting connector this connection
-            factory uses. Different connection factories can use different
-	    connectors.</para></formalpara>
-            <para>For instance you could deploy one connection factory that
-            creates connections that use the HTTP transport to communicate to
-            the server and another that creates connections that use the
-            bisocket transport to communicate.</para>
+        <para>The exact policy that determines how connections are load
+        balanced is determined by the LoadBalancingFactory attribute</para>
 
-      </section>
-      <!-- End conf.connectionfactory.attributes -->
-   </section>
-   <!-- End conf.connectionfactory -->
-   <section id="conf.connector">
-      <title>Configuring the remoting connector</title>
-      <para>JBoss Messaging uses JBoss Remoting for all client to server
-      communication. For full details of what JBoss Remoting is capable of and
-      how it is configured please consult the JBoss Remoting
-      documentation.</para>
-      <para>The default configuration includes a single remoting connector
-      which is used by the single default connection factory. Each connection
-      factory can be configured to use its own connector.</para>
-      <para>The default connector is configured to use the remoting bisocket
-      transport. The bisocket transport is a TCP socket based transport which
-      only listens and accepts connections on the server side. I.e.
-      connections are always initiated from the client side. This means it
-      works well in typical firewall scenarios where only inbound connections
-      are allowed on the server. Or where onlu outbound connections are
-      allowed from the client.</para>
-      <para>The bisocket transport can be configured to use SSL where a higher
-      level of security is required.</para>
-      <para>The other supported transport is the HTTP transport. This uses the
-      HTTP protocol to communicate between client and server. Data is received
-      on the client by the client periodically polling the server for
-      messages. This transport is well suited to situations where there is a
-      firewall between client and server which only allows incoming HTTP
-      traffic on the server. Please note this transport will not be as
-      performant as the bisocket transport due to the nature of polling and
-      the HTTP protocl. Also please note it is not designed for high load
-      situations.</para>
-      <para>No other remoting transports are currently supported by JBoss
-      Messaging</para>
-      <para>You can look at remoting configuration under:</para>
-      <para>&lt;JBoss&gt;/server/&lt;YourMessagingServer&gt;/deploy/jboss-messaging.sar/remoting-bisocket-service.xml</para>
-      <para>Here is an example bisocket remoting configuration:
-      <programlisting>
+        <para>The default value is <literal>false</literal></para>
+
+	<formalpara>
+        <title>SupportsFailover</title>
+
+        <para>When using a connection factory with a clustered JBoss Messaging
+        installation you can choose whether to enable client side automatic
+        failover. This is determined by setting the attribute supportsFailover
+        on the connection factory.</para>
+</formalpara>
+        <para>If automatic failover is enabled on a connection factory, then
+        if a connection problem is detected with the connection then JBoss
+        Messaging will automatically and transparently failover to another
+        node in the cluster.</para>
+
+        <para>The failover is transparent meaning the user can carry on using
+        the sessions, consumers, producers and connection objects as
+        before.</para>
+
+        <para>If automatic failover is not required, then this attribute can
+        be set to false. With automatic failover disabled it is up to the user
+        code to catch connection exceptions in synchronous JMS operations and
+        install a JMS ExceptionListener to catch exceptions asynchronously.
+        When a connection is caught, the client side code should lookup a new
+        connection factory using HAJNDI and recreate the connection using
+        that.</para>
+
+        <para>The default value is <literal>false</literal></para>
+
+	<formalpara>
+        <title>DisableRemotingChecks</title>
+
+        <para>By default, when deploying a connection factory, JBoss Messaging
+        checks that the corresponding JBoss Remoting Connector has "sensible"
+        values. JBoss Messaging is very sensitive to the values and for many
+        of them there's rarely a good reason to change them. To disable such
+	sanity checking set this to false.</para></formalpara> <warning><para>
+             There is rarely a good reason to disable checking. Only do so if you are absolutely sure in what you are doing. </para>
+          </warning>
+
+        <para>The default value is <literal>false</literal></para>
+
+	<formalpara>
+        <title>LoadBalancingFactory</title>
+
+        <para>If you are using a connection factory with client side load
+        balancing then you can specify how the load balancing is implemented
+        by overriding this attribute. The value must correspond to the name of
+        a class which implements the interface
+        org.jboss.jms.client.plugin.LoadBalancingFactory</para>
+</formalpara>
+        <para>The default value is
+        org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory, which load
+        balances connetions across the cluster in a round-robin fashion</para>
+
+<formalpara>
+        <title>Connector</title>
+
+        <para>This specifies which remoting connector this connection factory
+        uses. Different connection factories can use different
+        connectors.</para>
+</formalpara>
+        <para>For instance you could deploy one connection factory that
+        creates connections that use the HTTP transport to communicate to the
+        server and another that creates connections that use the bisocket
+        transport to communicate.</para>
+    </section>
+
+    <!-- End conf.connectionfactory.attributes -->
+  </section>
+
+  <!-- End conf.connectionfactory -->
+
+  <section id="conf.connector">
+    <title>Configuring the remoting connector</title>
+
+    <para>JBoss Messaging uses JBoss Remoting for all client to server
+    communication. For full details of what JBoss Remoting is capable of and
+    how it is configured please consult the JBoss Remoting
+    documentation.</para>
+
+    <para>The default configuration includes a single remoting connector which
+    is used by the single default connection factory. Each connection factory
+    can be configured to use its own connector.</para>
+
+    <para>The default connector is configured to use the remoting bisocket
+    transport. The bisocket transport is a TCP socket based transport which
+    only listens and accepts connections on the server side. I.e. connections
+    are always initiated from the client side. This means it works well in
+    typical firewall scenarios where only inbound connections are allowed on
+    the server. Or where onlu outbound connections are allowed from the
+    client.</para>
+
+    <para>The bisocket transport can be configured to use SSL where a higher
+    level of security is required.</para>
+
+    <para>The other supported transport is the HTTP transport. This uses the
+    HTTP protocol to communicate between client and server. Data is received
+    on the client by the client periodically polling the server for messages.
+    This transport is well suited to situations where there is a firewall
+    between client and server which only allows incoming HTTP traffic on the
+    server. Please note this transport will not be as performant as the
+    bisocket transport due to the nature of polling and the HTTP protocl. Also
+    please note it is not designed for high load situations.</para>
+
+    <para>No other remoting transports are currently supported by JBoss
+    Messaging</para>
+
+    <para>You can look at remoting configuration under:</para>
+
+    <para>&lt;JBoss&gt;/server/&lt;YourMessagingServer&gt;/deploy/jboss-messaging.sar/remoting-bisocket-service.xml</para>
+
+    <para>Here is an example bisocket remoting configuration: <programlisting>
          &lt;config&gt;
             &lt;invoker transport="bisocket"&gt;
             
@@ -1953,66 +2421,75 @@
             &lt;/handlers&gt;
          &lt;/config&gt;
       </programlisting></para>
-      <para>Please note that some of the attributes should not be changed
-      unless you know exactly what you are doing. We will discuss the
-      attributes that you may have a good reason to change:</para>
-      <para><itemizedlist>
-            <listitem>
-		    <para>
-                clientLeasePeriod - Clients periodically send heartbeats to the server to tell the server they are still alive. If the server does not receive a heartbeat after a certain time it will close down the connection and remove all resources on the server corresponding to the client's session. The clientLeasePeriod determines the period of heartbeats. The server will (by default) close a client if it does not receive a heartbeat in 2 * clientLeasePeriod ms. The actual factor gets automatically resized according to system load. The value is in milliseconds. The defaut value is 10000 ms. 
-	</para>
-            </listitem>
-            <listitem>
-            <para>
-                numberOfRetries - This effectively corresponds to the number of seconds JBoss Remoting will block on the client connection pool waiting for a connection to become free. If you have a very large number of sessions concurrently accessing the server from a client and you are experiencing issues due to not being able to obtain connections from the pool, you may want to consider increasing this value. 
-	</para>
-            </listitem>
-            <listitem>
-		    <para>
-                clientMaxPoolSize - JBoss Remoting maintains a client side pool of TCP connections on which to service requests. If you have a very large number of sessions concurrently accessing the server from a client and you are experiencing issues due to not being able to obtain connections from the pool in a timely manner, you may want to consider increasing this value. 
-	</para>
-            </listitem>
-            <listitem>
-		    <para>
-                secondaryBindPort - The bisocket transport uses control connections to pass control messages between server and client. If you want to work behind a firewall you may want to specify a particular value for this according to your firewall configuration. This is the address the secondary ServerSocket binds to 
-	</para>
-            </listitem>
-            <listitem>
-		    <para>
-                secondaryConnectPort - This is the port the client uses to connect. You may want to specify this to allow clients to work with NAT routers. 
-	</para>
-            </listitem>
-            <listitem>
-		    <para>
-                maxPoolSize - This is the number of threads used on the server side to service requests. 
-	</para>
-            </listitem>
-         </itemizedlist></para>
-      <para>By default JBoss Messaging binds to ${jboss.bind.address} which
-      can be defined by: ./run.sh -c &lt;yourconfig&gt; -b yourIP.</para>
-      <para>You can change remoting-bisocket-service.xml if you want for
-      example use a different communication port.</para>
-      <warning>
-<para>
-          There is rarely a good reason to change values in the the bisocket or sslbisocket connector configuration apart from clientLeasePeriod, clientMaxPoolSize, maxRetries, numberOfRetries, secondaryBindPort or secondaryConnectPort. Changing them can cause JBoss Messaging to stop functioning correctly. 
+
+    <para>Please note that some of the attributes should not be changed unless
+    you know exactly what you are doing. We will discuss the attributes that
+    you may have a good reason to change:</para>
+
+    <itemizedlist>
+        <listitem>
+		<para>
+			clientLeasePeriod - Clients periodically send heartbeats to the server to tell the server they are still alive. If the server does not receive a heartbeat after a certain time it will close down the connection and remove all resources on the server corresponding to the client's session. The clientLeasePeriod determines the period of heartbeats. The server will (by default) close a client if it does not receive a heartbeat in 2 * clientLeasePeriod ms. The actual factor gets automatically resized according to system load. The value is in milliseconds. The defaut value is 10000 ms. </para>
+        </listitem>
+
+        <listitem>
+		<para>
+			numberOfRetries - This effectively corresponds to the number of seconds JBoss Remoting will block on the client connection pool waiting for a connection to become free. If you have a very large number of sessions concurrently accessing the server from a client and you are experiencing issues due to not being able to obtain connections from the pool, you may want to consider increasing this value. </para>
+        </listitem>
+
+        <listitem>
+		<para>
+			clientMaxPoolSize - JBoss Remoting maintains a client side pool of TCP connections on which to service requests. If you have a very large number of sessions concurrently accessing the server from a client and you are experiencing issues due to not being able to obtain connections from the pool in a timely manner, you may want to consider increasing this value. </para>
+        </listitem>
+
+        <listitem>
+		<para>
+			secondaryBindPort - The bisocket transport uses control connections to pass control messages between server and client. If you want to work behind a firewall you may want to specify a particular value for this according to your firewall configuration. This is the address the secondary ServerSocket binds to. </para> 
+        </listitem>
+
+        <listitem>
+		<para>
+			secondaryConnectPort - This is the port the client uses to connect. You may want to specify this to allow clients to work with NAT routers. </para>
+        </listitem>
+
+        <listitem>
+		<para>
+			maxPoolSize - This is the number of threads used on the server side to service requests. </para>
+        </listitem>
+      </itemizedlist>
+
+    <para>By default JBoss Messaging binds to ${jboss.bind.address} which can
+    be defined by: ./run.sh -c &lt;yourconfig&gt; -b yourIP.</para>
+
+    <para>You can change remoting-bisocket-service.xml if you want for example
+    use a different communication port.</para>
+
+    <warning>
+	    <para>
+       There is rarely a good reason to change values in the the bisocket or sslbisocket connector configuration apart from clientLeasePeriod, clientMaxPoolSize, maxRetries, numberOfRetries, secondaryBindPort or secondaryConnectPort. Changing them can cause JBoss Messaging to stop functioning correctly. 
 </para>
-      </warning>
-   </section>
-   <!-- end conf.connector -->
-   <section id="conf.servicebindingmanager">
-      <title>ServiceBindingManager</title>
-      <para>If you are using the JBoss EAP ServiceBindingManager to provide
-      different servers with different port ranges, then you must make sure
-      that the JBoss Messaging remoting configuration specified in the JBoss
-      Messaging section of the ServiceBindingManager xml file exactly matches
-      that in remoting-bisocket-service.xml.</para>
-      <para>If you are using a newer version of JBM in an older version of
-      JBAS then the example bindings in the AS distribution may well be out of
-      date. It is therefore imperative that the relevant sections are
-      overwritten with the remoting configuration from the JBM
-      distribution.</para>
-      <para>See the chapter on installation for a description of how to set-up
-      the service binding manager for JBoss Messaging</para>
-   </section>
-   <!-- End conf.callback -->
+    </warning>
+  </section>
+
+  <!-- end conf.connector -->
+
+  <section id="conf.servicebindingmanager">
+    <title>ServiceBindingManager</title>
+
+    <para>If you are using the JBoss AS ServiceBindingManager to provide
+    different servers with different port ranges, then you must make sure that
+    the JBoss Messaging remoting configuration specified in the JBoss
+    Messaging section of the ServiceBindingManager xml file exactly matches
+    that in remoting-bisocket-service.xml.</para>
+
+    <para>If you are using a newer version of JBM in an older version of JBAS
+    then the example bindings in the AS distribution may well be out of date.
+    It is therefore imperative that the relevant sections are overwritten with
+    the remoting configuration from the JBM distribution.</para>
+
+    <para>See the chapter on installation for a description of how to set-up
+    the service binding manager for JBoss Messaging</para>
+  </section>
+
+  <!-- End conf.callback -->
 </chapter>
\ No newline at end of file

Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/installation.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/installation.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/installation.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -1,157 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter id="installation">
-   <title>JBoss Messaging Installation</title>
-   <para>This section describes procedures on how to install JBoss Messaging
-   into JBoss AS. At the end of this procedure, you will create a JBoss
-   Messaging configuration that will start a clustered or non-clustered
-   messaging server.</para>
-   <para>By default, JBoss AS 4 ships with JBossMQ as default JMS provider. In
-   order to use the JBoss AS instance with JBoss Messaging, you need to
-   perform the installation procedure described below.</para>
-   <para><note>
-          A JBossMQ and a JBoss Messaging instance cannot coexist, at least not unless special precautions are taken. Do not simply attempt to copy the Messaging release artifact 
-         <filename>jboss-messaging.sar</filename>
-          over to the JBoss instance w 
-         <filename>deploy</filename>
-          directory. Follow one of the alternate installation procedures outlined below instead. 
-      </note></para>
-   <para><note>
-          We only recommend and support installing JBoss Messaging in JBoss AS 4.2 or later. You should avoid using JBoss Messaging on any version of JBoss AS prior to JBoss 4.2.0.GA, such as 4.0.5.GA and 4.0.4.GA. 
-      </note><note>
-          JBoss Messaging is built against the JBoss AS 4.2 libraries which are built using Java 5. Therefore JBoss Messaging only runs with Java 5 or later. 
-      </note></para>
-   <section id="install">
-      <title>Installing JBoss Messaging on JBoss AS 4.2</title>
-      <para>In this section we present two different methods of installing
-      JBoss Messaging in JBoss AS 4.2</para>
+  <title>JBoss Messaging Installation</title>
+
+  <para>This section describes procedures on how to install JBoss Messaging
+  into JBoss Application Server community edition 4.2. At the end of this
+  procedure, you will create a JBoss Messaging configuration that will start a
+  clustered or non-clustered messaging server.</para>
+
+  <para>Please note that JBoss EAP 4.3 or later comes with JBoss Messaging
+  pre-installed as default JMS provider so if you are using that, there is no need to manually
+  install JBoss Messaging</para>
+
+  <para>By default, JBoss AS 4.2 ships with JBossMQ as default JMS provider.
+  In order to use the JBoss AS instance with JBoss Messaging, you need to
+  perform the installation procedure described below.</para>
+
+  <para><note>
+       A JBossMQ and a JBoss Messaging instance cannot coexist, at least not unless special precautions are taken. Do not simply attempt to copy the Messaging release artifact 
+
+      <filename>jboss-messaging.sar</filename>
+
+       over to the JBoss instance w 
+
+      <filename>deploy</filename>
+
+       directory. Follow one of the alternate installation procedures outlined below instead. 
+    </note></para>
+
+  <para><note>
+       We only recommend and support installing JBoss Messaging in JBoss AS 4.2 or later. You should avoid using JBoss Messaging on any version of JBoss AS prior to JBoss 4.2.0.GA, such as 4.0.5.GA and 4.0.4.GA. 
+    </note><note>
+       JBoss Messaging is built against the JBoss AS 4.2 libraries which are built using Java 5. Therefore JBoss Messaging only runs with Java 5 or later. 
+    </note></para>
+
+  <section id="install">
+    <title>Installing JBoss Messaging on JBoss AS 4.2</title>
+
+    <para>In this section we present two different methods of installing JBoss
+    Messaging in JBoss AS 4.2</para>
+
+    <itemizedlist>
+      <listitem>
+         If you have a completely clean JBoss AS 4.2.0 installation then you can do an 
+
+        <xref linkend="install.automated">automatic install</xref>
+
+         . 
+      </listitem>
+
+      <listitem>
+         If you have a JBoss 4.2.0 that you have changed in some way from a clean JBoss AS 4.2.0 installation then you will need to do a 
+
+        <xref linkend="install.manual">manual install</xref>
+
+         . 
+      </listitem>
+    </itemizedlist>
+
+    <section id="install.automated">
+      <title>Automated Installation</title>
+
+      <para><note>
+           This procedure should only be performed from a clean JBoss AS 4.2 installation. If you have modifed the JBoss AS 4.2 installation at all since installation then you will need to perform a manual clustered JBoss Messaging installation 
+        </note></para>
+
       <itemizedlist>
-         <listitem>
-             If you have a completely clean JBoss AS 4.2.0 installation then you can do an 
-            <xref linkend="install.automated">automatic install</xref>
-             . 
-         </listitem>
-         <listitem>
-             If you have a JBoss 4.2.0 that you have changed in some way from a clean JBoss AS 4.2.0 installation then you will need to do a 
-            <xref linkend="install.manual">manual install</xref>
-             . 
-         </listitem>
-      </itemizedlist>
-      <section id="install.automated">
-         <title>Automated Installation</title>
-         <para><note>
-                This procedure should only be performed from a clean JBoss AS 4.2 installation. If you have modifed the JBoss AS 4.2 installation at all since installation then you will need to perform a manual clustered JBoss Messaging installation 
-            </note></para>
-         <itemizedlist>
-            <listitem>
-               <para>Set up the <literal>JBOSS_HOME</literal> environment
-               variable to point to the JBoss 4.2 installation you want to use
-               JBoss Messaging with.</para>
-               <para>Run the installation script, available in the
-               <filename>util</filename> directory of the release bundle as
-               follows:</para>
-               <para>If you want to create a simple non clustered installion
-               based on the default configuration:</para>
-               <programlisting>
+        <listitem>
+          <para>Set up the <literal>JBOSS_HOME</literal> environment variable
+          to point to the JBoss 4.2 installation you want to use JBoss
+          Messaging with.</para>
+
+          <para>Run the installation script, available in the
+          <filename>util</filename> directory of the release bundle as
+          follows:</para>
+
+          <para>If you want to create a simple non clustered installion based
+          on the default configuration:</para>
+
+          <programlisting>
          cd util
          ant -f release-admin.xml
          </programlisting>
-               <para>If you want to create a clustered installation based on
-               the all configuration or change the configuration name:</para>
-               <programlisting>
+
+          <para>If you want to create a clustered installation based on the
+          all configuration or change the configuration name:</para>
+
+          <programlisting>
  cd util
  ant -f release-admin.xml -Dmessaging.config.source=all -Dmessaging.config.name=messaging-node0
          </programlisting>
-               <para>In the above you would substitute
-               <literal>messaging-node0</literal> with whatever is the name
-               you want to give the configuration. If you want several cluster
-               nodes on the same machine, e.g. for development purposes then a
-               good convention is to name them <literal>messaging-node0,
-               messaging-node1</literal> to match
-               <literal>messaging-node&lt;ServerPeerID&gt;</literal></para>
-               <para>The messaging.config.source variable determines which
-               JBoss AS configuration (e.g. default or all) to base the
-               installation on</para>
-               <para>The installation script will create a
-               <filename>$JBOSS_HOME/server/messaging-node0</filename>
-               configuration. (If you have chosen
-               <literal>messaging-node0</literal>)</para>
+
+          <para>In the above you would substitute
+          <literal>messaging-node0</literal> with whatever is the name you
+          want to give the configuration. If you want several cluster nodes on
+          the same machine, e.g. for development purposes then a good
+          convention is to name them <literal>messaging-node0,
+          messaging-node1</literal> to match
+          <literal>messaging-node&lt;ServerPeerID&gt;</literal></para>
+
+          <para>The messaging.config.source variable determines which JBoss AS
+          configuration (e.g. default or all) to base the installation
+          on</para>
+
+          <para>The installation script will create a
+          <filename>$JBOSS_HOME/server/messaging-node0</filename>
+          configuration. (If you have chosen
+          <literal>messaging-node0</literal>)</para>
+        </listitem>
+
+        <para>For the rest of the procedure we assume JBOSS_CONFIG refers to
+        your new messaging configuration (e.g. messaging-node0 or
+        messaging)</para>
+
+        <para>You don't actually have to create an environment variable
+        <literal>JBOSS_CONFIG</literal>, this is just used in the installation
+        instructions to describe the steps</para>
+
+        <listitem>
+          <para>
+            <warning>For a clustered installation it is mandatory that a
+            shared database is available to all nodes in the cluster. The
+            default JBoss AS uses HSQLDB for its database which is a local
+            shared database. Therefore in order to use clustering you must
+            replace this with a different shared database. If the database is
+            not replaced then clustering will not work.</warning>
+          </para>
+
+          <itemizedlist>
+            <listitem>
+              <para>Replace
+              <literal>$JBOSS_CONFIG/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml</literal>
+              by the <literal>databasename&gt;-persistence-service</literal>
+              from
+              <literal>&lt;downloadPackage&gt;/examples/config.</literal>. For
+              instance <literal>mysql-persistence-service.xml</literal></para>.
+              <para>If you are installing in a clustered configuration
+      make sure to set the <literal>Clustered</literal> attribute to <literal>true</literal></para>
             </listitem>
-            <para>For the rest of the procedure we assume JBOSS_CONFIG refers
-            to your new messaging configuration (e.g. messaging-node0 or
-            messaging)</para>
-            <para>You don't actually have to create an environment variable
-            <literal>JBOSS_CONFIG</literal>, this is just used in the
-            installation instructions to describe the steps</para>
+
+            <listitem><para>Configure a JCA datasource using an example from
+            <literal>$JBOSS_HOME/docs/examples/jca</literal></para> and
+            copying to <literal>$JBOSS_CONFIG/deploy</literal> <para>JBoss
+            Messaging uses <literal>DefaultDS</literal> by default so you
+            should configure your datasource to bind to that</para></listitem>
+
             <listitem>
-               <para>
-                  <warning>For a clustered installation it is mandatory that a
-                  shared database is available to all nodes in the cluster.
-                  The default JBoss AS uses HSQLDB for its database which is a
-                  local shared database. Therefore in order to use clustering
-                  you must replace this with a different shared database. If
-                  the database is not replaced then clustering will not
-                  work.</warning>
-               </para>
-               <itemizedlist>
-                  <listitem>
-                     <para>Replace
-                     <literal>$JBOSS_CONFIG/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml</literal>
-                     by the
-                     <literal>databasename&gt;-persistence-service</literal>
-                     from
-                     <literal>&lt;downloadPackage&gt;/examples/config.</literal>.
-                     For instance
-                     <literal>mysql-persistence-service.xml</literal></para>
-                  </listitem>
-                  <listitem><para>Configure a JCA datasource using an example
-                  from <literal>$JBOSS_HOME/docs/examples/jca</literal></para>
-                  and copying to <literal>$JBOSS_CONFIG/deploy</literal>
-                  <para>JBoss Messaging uses <literal>DefaultDS</literal> by
-                  default so you should configure your datasource to bind to
-                  that</para></listitem>
-                  <listitem>
-                     <para>Remove hsqldb-ds.xml from
-                     <literal>$JBOSS_CONFIG/deploy</literal></para>
-                  </listitem>
-                  <listitem>
-                     <para>Copy your database driver to
-                     <literal>$JBOSS_CONFIG/lib</literal></para>
-                     <para>Your database driver can probably be downloaded
-                     from your database provider's web site</para>
-                  </listitem>
-               </itemizedlist>
+              <para>Remove hsqldb-ds.xml from
+              <literal>$JBOSS_CONFIG/deploy</literal></para>
             </listitem>
+
             <listitem>
-               <para>Ensure the <literal>ServerPeerID</literal> MBean
-               attribute value in messaging-service.xml is unique for each
-               node. The <literal>ServerPeerID</literal> value must be a valid
-               integer. Every node MUST have a unique id, including those just
-               connected by message bridges.</para>
-               <para>
-                  <warning>Each node must have a unique
-                  <literal>ServerPeerID</literal> irrespective of whether you
-                  are using clustering.</warning>
-               </para>
+              <para>Copy your database driver to
+              <literal>$JBOSS_CONFIG/lib</literal></para>
+
+              <para>Your database driver can probably be downloaded from your
+              database provider's web site</para>
             </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Ensure the <literal>ServerPeerID</literal> MBean attribute
+          value in messaging-service.xml is unique for each node. The
+          <literal>ServerPeerID</literal> value must be a valid integer. Every
+          node MUST have a unique id, including those just connected by
+          message bridges.</para>
+
+          <para>
+            <warning>Each node must have a unique
+            <literal>ServerPeerID</literal> irrespective of whether you are
+            using clustering.</warning>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>If you want to run multiple JBoss Messaging nodes on the same
+          box using the same IP address, e.g. for development purposes, then
+          you can use the ServiceBindingManager to do this as follows:</para>
+
+          <itemizedlist>
             <listitem>
-               <para>If you want to run multiple JBoss Messaging nodes on the
-               same box using the same IP address, e.g. for development
-               purposes, then you can use the ServiceBindingManager to do this
-               as follows:</para>
-               <itemizedlist>
-                  <listitem>
-                     <para>Uncomment binding manager service from
-                     $JBOSS_CONFIG/conf/jboss-service.xml</para>
-                  </listitem>
-                  <listitem>
-                     <para>Specify the desired port rage (e.g. ports-01,
-                     ports-02... etc)</para>
-                  </listitem>
-                  <listitem>
-                     <para>Look at
-                     $JBOSS_HOME/docs/examples/binding-manager/sample-bindings.xml.
-                     Here is an example:</para>
-                     <programlisting>
+              <para>Uncomment binding manager service from
+              $JBOSS_CONFIG/conf/jboss-service.xml</para>
+            </listitem>
+
+            <listitem>
+              <para>Specify the desired port rage (e.g. ports-01, ports-02...
+              etc)</para>
+            </listitem>
+
+            <listitem>
+              <para>Look at
+              $JBOSS_HOME/docs/examples/binding-manager/sample-bindings.xml.
+              Here is an example:</para>
+
+              <programlisting>
       &lt;service-config name="jboss.messaging:service=Connector,transport=bisocket"
                       delegateClass="org.jboss.services.binding.AttributeMappingDelegate"&gt;
          &lt;delegate-config&gt;
@@ -165,6 +208,7 @@
                &lt;attribute name="unmarshaller" isParam="true"&gt;org.jboss.jms.wireformat.JMSWireFormat&lt;/attribute&gt;
                &lt;attribute name="dataType" isParam="true"&gt;jms&lt;/attribute&gt;
                &lt;attribute name="socket.check_connection" isParam="true"&gt;false&lt;/attribute&gt;
+               &lt;attribute name="timeout" isParam="true"&gt;0&lt;/attribute&gt;
                &lt;attribute name="serverBindAddress"&gt;${jboss.bind.address}&lt;/attribute&gt;
                &lt;attribute name="serverBindPort"&gt;4657&lt;/attribute&gt;
                &lt;attribute name="clientSocketClass" isParam="true"&gt;org.jboss.jms.client.remoting.ClientSocketWrapper&lt;/attribute&gt;
@@ -177,8 +221,6 @@
                &lt;!-- Periodicity of client pings. Server window by default is twice this figure --&gt;                               
                &lt;attribute name="clientLeasePeriod" isParam="true"&gt;10000&lt;/attribute&gt;
 
-	       &lt;attribute name="timeout" isParam="true"&gt;0&lt;/attribute&gt;
-	       
                &lt;!-- Number of seconds to wait for a connection in the client pool to become free --&gt;
                &lt;attribute name="numberOfRetries" isParam="true"&gt;10&lt;/attribute&gt;
 
@@ -203,71 +245,90 @@
       &lt;/service-config&gt;
               
               </programlisting>
-                     <warning>You must ensure that the config (like above) is
-                     identical to that in
-                     <literal>remoting-bisocket-service.xml</literal> With the
-                     exception of the actual serverBindPort which clearly must
-                     be different for each ports range. Please note that the
-                     default JBoss Messaging service binding manager bindings
-                     in <literal>sample-bindings.xml</literal> shipped with
-                     JBAS 4.2.0 may be out of date and you will need to copy
-                     the config from <literal>remoting-bisocket-service.xml.
-                     DO NOT just copy and paste from the above example - copy
-                     it from the JBoss Messaging
-                     distribution.</literal></warning>
-                     <para>You should ensure that each node is configured to
-                     use a different ports range.</para>
-                  </listitem>
-               </itemizedlist>
+
+              <warning>You must ensure that the config (like above) is
+              identical to that in
+              <literal>remoting-bisocket-service.xml</literal> With the
+              exception of the actual serverBindPort which clearly must be
+              different for each ports range. Please note that the default
+              JBoss Messaging service binding manager bindings in
+              <literal>sample-bindings.xml</literal> shipped with JBAS 4.2.0
+              may be out of date and you will need to copy the config from
+              <literal>remoting-bisocket-service.xml. DO NOT just copy and
+              paste from the above example - copy it from the JBoss Messaging
+              distribution.</literal></warning>
+
+              <para>You should ensure that each node is configured to use a
+              different ports range.</para>
             </listitem>
-            <listitem>
-               <para>There are few extra steps at <xref
-               linkend="install.extra-steps" /></para>
-            </listitem>
-            <listitem>That's it</listitem>
-         </itemizedlist>
-      </section>
-      <section id="install.manual">
-         <title>Manual Installation</title>
-         <para><note>
-                This installation procedure should be performed if you are installing into a JBoss AS configuration that you have changed in some way from the default JBoss AS distribution. If you are just using the standard, untouched JBoss AS 4.2 distribution you can use the automated procedure above 
-            </note></para>
-         <para>For this procedure we assume you already have your custom
-         configuration located at
-         <literal>JBOSS_CONFIG=$JBOSS_HOME/server/&lt;myconfiguration&gt;</literal>,
-         and that it contains a JBoss MQ installation.</para>
-         <para>You don't actually have to create an environment variable
-         <literal>JBOSS_CONFIG</literal>, this is just used in the
-         installation instructions to describe the steps</para>
-         <itemizedlist>
-            <listitem>
-               <para>Move
-               <literal>$JBOSS_CONFIG/deploy/jms/hajndi-jms-ds.xml</literal>
-               and <literal>$JBOSS_CONFIG/deploy/jms/jms-ra.rar</literal> to
-               <literal>$JBOSS_CONFIG/deploy</literal></para>
-            </listitem>
-            <listitem>
-                
-               <para>Remove the old JBoss MQ by removing the directory
-               <literal>$JBOSS_CONFIG/deploy/jms.</literal></para>
-                . 
-               <para>Remove the old JBoss MQ jar file:
-               <literal>$JBOSS_CONFIG/lib/jbossmq.jar</literal></para>
-                
-               <para>Make sure you don't have any JBossMQ files under
-               <literal>$JBOSS_CONFIG/deploy-hasingleton</literal>. For that
-               just remove
-               <literal>$JBOSS_CONFIG/deploy-hasingleton/jms</literal></para>
-                
-            </listitem>
-            <listitem>
-                
-               <para>Add a security policy called "messaging" on
-               $JBOSS_CONFIG/config/login-config.xml. You could use this as an
-               example, or create one according to JBoss Security
-               Documentation:</para>
-                
-               <programlisting>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>There are few extra steps at <xref
+          linkend="install.extra-steps" /></para>
+        </listitem>
+
+        <listitem>That's it</listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="install.manual">
+      <title>Manual Installation</title>
+
+      <para><note>
+           This installation procedure should be performed if you are installing into a JBoss AS configuration that you have changed in some way from the default JBoss AS distribution. If you are just using the standard, untouched JBoss AS 4.2 distribution you can use the automated procedure above 
+        </note></para>
+
+      <para>For this procedure we assume you already have your custom
+      configuration located at
+      <literal>JBOSS_CONFIG=$JBOSS_HOME/server/&lt;myconfiguration&gt;</literal>,
+      and that it contains a JBoss MQ installation.</para>
+
+      <para>You don't actually have to create an environment variable
+      <literal>JBOSS_CONFIG</literal>, this is just used in the installation
+      instructions to describe the steps</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Move
+          <literal>$JBOSS_CONFIG/deploy/jms/hajndi-jms-ds.xml</literal> and
+          <literal>$JBOSS_CONFIG/deploy/jms/jms-ra.rar</literal> to
+          <literal>$JBOSS_CONFIG/deploy</literal></para>
+        </listitem>
+
+        <listitem>
+           
+
+          <para>Remove the old JBoss MQ by removing the directory
+          <literal>$JBOSS_CONFIG/deploy/jms.</literal></para>
+
+           . 
+
+          <para>Remove the old JBoss MQ jar file:
+          <literal>$JBOSS_CONFIG/lib/jbossmq.jar</literal></para>
+
+           
+
+          <para>Make sure you don't have any JBossMQ files under
+          <literal>$JBOSS_CONFIG/deploy-hasingleton</literal>. For that just
+          remove
+          <literal>$JBOSS_CONFIG/deploy-hasingleton/jms</literal></para>
+
+           
+        </listitem>
+
+        <listitem>
+           
+
+          <para>Add a security policy called "messaging" on
+          $JBOSS_CONFIG/config/login-config.xml. You could use this as an
+          example, or create one according to JBoss Security
+          Documentation:</para>
+
+           
+
+          <programlisting>
 &lt;application-policy name = "messaging"&gt;
 &lt;authentication&gt;
 &lt;login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule" flag = "required" &gt;
@@ -278,30 +339,38 @@
 &lt;/authentication&gt;
 &lt;/application-policy&gt;
           </programlisting>
-                
-               <para>In case you are using the above policy you should also
-               create files <literal>messaging-users.properties</literal> and
-               <literal>messaging-roles.properties</literal> in the
-               <literal>$JBOSS_CONFIG/config/props/</literal> directory</para>
-                . 
-               <para>
-                  <note>You can find an example
-                  <literal>messaging-users.properties</literal> and
-                  <literal>messaging-roles.properties</literal> in the JBoss
-                  Messaging distribution in the
-                  <literal>&lt;downloadPackage&gt;src/etc/server/default/config</literal>
-                  directory.</note>
-               </para>
-                
-               <programlisting>
+
+           
+
+          <para>In case you are using the above policy you should also create
+          files <literal>messaging-users.properties</literal> and
+          <literal>messaging-roles.properties</literal> in the
+          <literal>$JBOSS_CONFIG/config/props/</literal> directory</para>
+
+           . 
+
+          <para>
+            <note>You can find an example
+            <literal>messaging-users.properties</literal> and
+            <literal>messaging-roles.properties</literal> in the JBoss
+            Messaging distribution in the
+            <literal>&lt;downloadPackage&gt;src/etc/server/default/config</literal>
+            directory.</note>
+          </para>
+
+           
+
+          <programlisting>
 # messaging-roles.properties
 # Add roles as you like
 # user=role1,role2,...
 #
 guest=guest
           </programlisting>
-                
-               <programlisting>
+
+           
+
+          <programlisting>
 # messaging-users.properties
 
 # Add users as you like
@@ -309,93 +378,118 @@
 #
 guest=guest
           </programlisting>
-                
+
+           
+        </listitem>
+
+        <listitem>
+          <para>Unzip jboss-messaging.sar from your download package into the
+          directory
+          <literal>JBOSS_CONFIG/deploy/jboss-messaging.sar</literal></para>
+
+          <para>JBoss Messaging should be deployed unzipped (exploded) so you
+          have easy access to its config files which are stored there.</para>
+        </listitem>
+
+        <listitem>
+          <para>Copy jboss-messaging.jar from your download package into the
+          directory <literal>JBOSS_CONFIG/lib</literal></para>
+
+          <para>jboss-messaging.jar needs to go in the lib directory so it is
+          accessible to other services e.g. the JBoss Transactions Recovery
+          Manager</para>
+        </listitem>
+
+        <listitem>
+          <para><warning>
+               For a clustered installation it is mandatory that a shared database is available to all nodes in the cluster. The default JBoss AS uses HSQLDB for its database which is a local shared database. Therefore in order to use clustering you must replace this with a different shared database. If the database is not replaced then clustering will not work. 
+            </warning></para>
+
+          <itemizedlist>
+            <listitem>
+              <para>Replace
+              <literal>$JBOSS_CONFIG/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml</literal>
+              by the <literal>databasename&gt;-persistence-service</literal>
+              from
+              <literal>&lt;downloadPackage&gt;/examples/config.</literal>. For
+              instance <literal>mysql-persistence-service.xml</literal></para>
+      
+      <para>If you are installing in a clustered configuration
+      make sure to set the <literal>Clustered</literal> attribute to <literal>true</literal></para>
             </listitem>
+
             <listitem>
-               <para>Unzip jboss-messaging.sar from your download package into
-               the directory
-               <literal>JBOSS_CONFIG/deploy/jboss-messaging.sar</literal></para>
-               <para>JBoss Messaging should be deployed unzipped (exploded) so
-               you have easy access to its config files which are stored
-               there.</para>
+               
+
+              <para>Configure a JCA datasource using an example from
+              <literal>$JBOSS_HOME/docs/examples/jca</literal></para>
+
+               and copying to 
+
+              <literal>$JBOSS_CONFIG/deploy</literal>
+
+               
+
+              <para>JBoss Messaging uses <literal>DefaultDS</literal> by
+              default so you should configure your datasource to bind to
+              that</para>
+
+               
             </listitem>
+
             <listitem>
-               <para>Copy jboss-messaging.jar from your download package into
-               the directory <literal>JBOSS_CONFIG/lib</literal></para>
-               <para>jboss-messaging.jar needs to go in the lib directory so
-               it is accessible to other services e.g. the JBoss Transactions
-               Recovery Manager</para>
+              <para>Remove hsqldb-ds.xml from
+              <literal>$JBOSS_CONFIG/deploy</literal></para>
             </listitem>
+
             <listitem>
-               <para><warning>
-                      For a clustered installation it is mandatory that a shared database is available to all nodes in the cluster. The default JBoss AS uses HSQLDB for its database which is a local shared database. Therefore in order to use clustering you must replace this with a different shared database. If the database is not replaced then clustering will not work. 
-                  </warning></para>
-               <itemizedlist>
-                  <listitem>
-                     <para>Replace
-                     <literal>$JBOSS_CONFIG/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml</literal>
-                     by the
-                     <literal>databasename&gt;-persistence-service</literal>
-                     from
-                     <literal>&lt;downloadPackage&gt;/examples/config.</literal>.
-                     For instance
-                     <literal>mysql-persistence-service.xml</literal></para>
-                  </listitem>
-                  <listitem>
-                      
-                     <para>Configure a JCA datasource using an example from
-                     <literal>$JBOSS_HOME/docs/examples/jca</literal></para>
-                      and copying to 
-                     <literal>$JBOSS_CONFIG/deploy</literal>
-                      
-                     <para>JBoss Messaging uses <literal>DefaultDS</literal>
-                     by default so you should configure your datasource to
-                     bind to that</para>
-                      
-                  </listitem>
-                  <listitem>
-                     <para>Remove hsqldb-ds.xml from
-                     <literal>$JBOSS_CONFIG/deploy</literal></para>
-                  </listitem>
-                  <listitem>
-                     <para>Copy your database driver to
-                     <literal>$JBOSS_CONFIG/lib</literal></para>
-                     <para>Your database driver can probably be downloaded
-                     from your database provider's web site</para>
-                  </listitem>
-               </itemizedlist>
+              <para>Copy your database driver to
+              <literal>$JBOSS_CONFIG/lib</literal></para>
+
+              <para>Your database driver can probably be downloaded from your
+              database provider's web site</para>
             </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Ensure the <literal>ServerPeerID</literal> MBean attribute
+          value in messaging-service.xml is unique for each node on the
+          cluster. The <literal>ServerPeerID</literal> value must be a valid
+          integer.</para>
+
+          <para><warning>
+               Each node must have a unique 
+
+              <literal>ServerPeerID</literal>
+
+               irrespective of whether you are using clustering. 
+            </warning></para>
+        </listitem>
+
+        <listitem>
+          <para>If you want to run multiple JBoss Messaging nodes on the same
+          box using the same IP address, e.g. for development purposes, then
+          you can use the ServiceBindingManager to do this as follows:</para>
+
+          <itemizedlist>
             <listitem>
-               <para>Ensure the <literal>ServerPeerID</literal> MBean
-               attribute value in messaging-service.xml is unique for each
-               node on the cluster. The <literal>ServerPeerID</literal> value
-               must be a valid integer.</para>
-               <para><warning>
-                      Each node must have a unique 
-                     <literal>ServerPeerID</literal>
-                      irrespective of whether you are using clustering.
-                  </warning></para>
+              <para>Uncomment binding manager service from
+              $JBOSS_CONFIG/conf/jboss-service.xml</para>
             </listitem>
+
             <listitem>
-               <para>If you want to run multiple JBoss Messaging nodes on the
-               same box using the same IP address, e.g. for development
-               purposes, then you can use the ServiceBindingManager to do this
-               as follows:</para>
-               <itemizedlist>
-                  <listitem>
-                     <para>Uncomment binding manager service from
-                     $JBOSS_CONFIG/conf/jboss-service.xml</para>
-                  </listitem>
-                  <listitem>
-                     <para>Specify the desired port rage (e.g. ports-01,
-                     ports-02... etc)</para>
-                  </listitem>
-                  <listitem>
-                     <para>Look at
-                     $JBOSS_HOME/docs/examples/binding-manager/sample-bindings.xml.
-                     On each port range, JBoss Remoting configuration should
-                     look like:</para>
-                     <programlisting>
+              <para>Specify the desired port rage (e.g. ports-01, ports-02...
+              etc)</para>
+            </listitem>
+
+            <listitem>
+              <para>Look at
+              $JBOSS_HOME/docs/examples/binding-manager/sample-bindings.xml.
+              On each port range, JBoss Remoting configuration should look
+              like:</para>
+
+              <programlisting>
       &lt;service-config name="jboss.messaging:service=Connector,transport=bisocket"
                       delegateClass="org.jboss.services.binding.AttributeMappingDelegate"&gt;
          &lt;delegate-config&gt;
@@ -408,7 +502,8 @@
                &lt;attribute name="marshaller" isParam="true"&gt;org.jboss.jms.wireformat.JMSWireFormat&lt;/attribute&gt;
                &lt;attribute name="unmarshaller" isParam="true"&gt;org.jboss.jms.wireformat.JMSWireFormat&lt;/attribute&gt;
                &lt;attribute name="dataType" isParam="true"&gt;jms&lt;/attribute&gt;
-               &lt;attribute name="socket.check_connection" isParam="true"&gt;false&lt;/attribute&gt;              
+               &lt;attribute name="socket.check_connection" isParam="true"&gt;false&lt;/attribute&gt;
+               &lt;attribute name="timeout" isParam="true"&gt;0&lt;/attribute&gt;
                &lt;attribute name="serverBindAddress"&gt;${jboss.bind.address}&lt;/attribute&gt;
                &lt;attribute name="serverBindPort"&gt;4657&lt;/attribute&gt;
                &lt;attribute name="clientSocketClass" isParam="true"&gt;org.jboss.jms.client.remoting.ClientSocketWrapper&lt;/attribute&gt;
@@ -424,8 +519,6 @@
                &lt;!-- Number of seconds to wait for a connection in the client pool to become free --&gt;
                &lt;attribute name="numberOfRetries" isParam="true"&gt;10&lt;/attribute&gt;
 
-	       &lt;attribute name="timeout" isParam="true"&gt;0&lt;/attribute&gt;
-	       
                &lt;!-- Max Number of connections in client pool. This should be significantly higher than
                     the max number of sessions/consumers you expect --&gt;
                &lt;attribute name="JBM_clientMaxPoolSize" isParam="true"&gt;200&lt;/attribute&gt;
@@ -447,92 +540,117 @@
       &lt;/service-config&gt;
               
               </programlisting>
-                     <warning>
-                        You must ensure that the config (like above) is identical to that in 
-                        <literal>remoting-bisocket-service.xml</literal>
-                         With the exception of the actual serverBindPort which clearly must be different for each ports range. Please note that the default JBoss Messaging service binding manager bindings in 
-                        <literal>sample-bindings.xml</literal>
-                         shipped with JBAS 4.2.0 may be out of date and you will need to copy the config from 
-                        <literal>remoting-bisocket-service.xml. DO NOT just
-                        copy and paste from the above example - copy it from
-                        the JBoss Messaging distribution.</literal>
-                        
-                        <literal />
-                        
-                        <literal />
-                        
-                        <literal />
-                        
-                     </warning>
-                     <para>You should ensure that each node is configured to
-                     use a different ports range.</para>
-                  </listitem>
-               </itemizedlist>
+
+              <warning>
+                 You must ensure that the config (like above) is identical to that in 
+
+                <literal>remoting-bisocket-service.xml</literal>
+
+                 With the exception of the actual serverBindPort which clearly must be different for each ports range. Please note that the default JBoss Messaging service binding manager bindings in 
+
+                <literal>sample-bindings.xml</literal>
+
+                 shipped with JBAS 4.2.0 may be out of date and you will need to copy the config from 
+
+                <literal>remoting-bisocket-service.xml. DO NOT just copy and
+                paste from the above example - copy it from the JBoss
+                Messaging distribution.</literal>
+
+                 
+
+                <literal />
+
+                 
+
+                <literal />
+
+                 
+
+                <literal />
+
+                 
+              </warning>
+
+              <para>You should ensure that each node is configured to use a
+              different ports range.</para>
             </listitem>
-            <listitem>
-               <para>There are few extra steps at <xref
-               linkend="install.extra-steps" /></para>
-            </listitem>
-            <listitem>
-                That's it 
-            </listitem>
-         </itemizedlist>
-      </section>
-      <section id="install.extra-steps">
-         <title>Extra steps to complete your installation</title>
-         <itemizedlist>
-            <listitem>
-               <para>
-                  <warning>SECURITY RISK! To avoid a security risk, you MUST
-                  specify the value of the attribute SuckerPassword in the
-                  Server Peer config (messaging-service.xml). If you do not
-                  specify a value, the default value will be used. Any person
-                  that knows the default value will be able to access to all
-                  destinations on the server. The password chosen should only
-                  be exposed to administrators</warning>
-               </para>
-            </listitem>
-            <listitem>
-               <para>
-                  <note>JBoss Messaging 1.4.0 requires a patched version of
-                  jboss-remoting.jar. This version is available on JBoss EAP 4.3, so if you're using a different version of JBoss you should download the patched version which can be found <ulink
-                  url="http://repository.jboss.com/jboss/remoting/2.2.2.SP8-brew/ ">here</ulink>The
-                  version is JBoss Remoting 2.2.2.SP8-brew. Please download it
-                  and copy it into the <literal>$JBOSS_HOME/server/&lt;your
-                  server name&gt;/lib directory</literal> of any server
-                  profiles that use JBoss Messaging 1.4.0. If you are using
-                  JBoss Messaging from a standalone client also make sure this
-                  jar is on your classpath *before*
-                  jbossall-client.jar.</note>
-               </para>
-            </listitem>
-            <para>You should also make these changes on any configuration you
-            choose, to remove all references to the old JBossMQ:</para>
-            <listitem>
-               <para>Edit <literal>$JBOSS_CONFIG/deploy/jms-ds.xml</literal>
-               and replace jboss.mq by jboss.messaging on every
-               occurrence</para>
-               <para>If you are in a clustered installation, then do the above
-               with the file
-               <literal>$JBOSS_CONFIG/deploy/hajndi-jms-ds.xml</literal></para>
-            </listitem>
-            <listitem>
-               <para>Edit
-               <literal>$JBOSS_CONFIG/conf/standardjboss.xml</literal> and set
-               <literal>CreateJBossMQDestination</literal> to false on every
-               occurrence</para>
-               <para>Make sure it looks like this:</para>
-               <para>
-                  <literal>&lt;CreateJBossMQDestination&gt;false&lt;/CreateJBossMQDestination&gt;</literal>
-               </para>
-               <para>Those Proxies will try to create a Destination on JBossMQ
-               if they can't find it on JNDI, what would cause some errors
-               related to JBoss MQ.</para>
-            </listitem>
-            <listitem>
-               <para>Edit $JBOSS_CONFIG/conf/jboss-service.xml and remove the
-               reference to JBoss MQ on JSR-77 Management Bean:</para>
-               <programlisting>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>There are few extra steps at <xref
+          linkend="install.extra-steps" /></para>
+        </listitem>
+
+        <listitem>
+           That's it 
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="install.extra-steps">
+      <title>Extra steps to complete your installation</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>
+            <warning>SECURITY RISK! To avoid a security risk, you MUST specify
+            the value of the attribute SuckerPassword in the Server Peer
+            config (messaging-service.xml). If you do not specify a value, the
+            default value will be used. Any person that knows the default
+            value will be able to access to all destinations on the server.
+            The password chosen should only be exposed to
+            administrators</warning>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <note>JBoss Messaging 1.4.0 and 1.4.1 requires a patched version
+            of jboss-remoting.jar. This version is available can be downloaded from here <ulink
+            url="http://repository.jboss.com/jboss/remoting/2.2.2.SP10-brew/ ">here</ulink>The
+            version is JBoss Remoting 2.2.2.SP10-brew. Please download it and
+            copy it into the <literal>$JBOSS_HOME/server/&lt;your server
+            name&gt;/lib directory</literal> of any server profiles that use
+            JBoss Messaging. If you are using JBoss Messaging
+            from a standalone client also make sure this jar is on your
+            classpath *before* jbossall-client.jar.</note>
+          </para>
+        </listitem>
+
+        <para>You should also make these changes on any configuration you
+        choose, to remove all references to the old JBossMQ:</para>
+
+        <listitem>
+          <para>Edit <literal>$JBOSS_CONFIG/deploy/jms-ds.xml</literal> and
+          replace jboss.mq by jboss.messaging on every occurrence</para>
+
+          <para>If you are in a clustered installation, then do the above with
+          the file
+          <literal>$JBOSS_CONFIG/deploy/hajndi-jms-ds.xml</literal></para>
+        </listitem>
+
+        <listitem>
+          <para>Edit <literal>$JBOSS_CONFIG/conf/standardjboss.xml</literal>
+          and set <literal>CreateJBossMQDestination</literal> to false on
+          every occurrence</para>
+
+          <para>Make sure it looks like this:</para>
+
+          <para>
+            <literal>&lt;CreateJBossMQDestination&gt;false&lt;/CreateJBossMQDestination&gt;</literal>
+          </para>
+
+          <para>Those Proxies will try to create a Destination on JBossMQ if
+          they can't find it on JNDI, what would cause some errors related to
+          JBoss MQ.</para>
+        </listitem>
+
+        <listitem>
+          <para>Edit $JBOSS_CONFIG/conf/jboss-service.xml and remove the
+          reference to JBoss MQ on JSR-77 Management Bean:</para>
+
+          <programlisting>
  &lt;!-- ==================================================================== --&gt;
  &lt;!-- JSR-77 Single JBoss Server Management Domain                         --&gt;
  &lt;!-- ==================================================================== --&gt;
@@ -541,12 +659,13 @@
   ... Remove this line ...
  &lt;attribute name="JMSService"&gt;jboss.mq:service=DestinationManager&lt;/attribute&gt;
              </programlisting>
-            </listitem>
-            <listitem>
-               <para>Change
-               <literal>$JBOSS_CONFIG/conf/login-config.xml</literal> and
-               remove jboss-mq security policies</para>
-               <programlisting>
+        </listitem>
+
+        <listitem>
+          <para>Change <literal>$JBOSS_CONFIG/conf/login-config.xml</literal>
+          and remove jboss-mq security policies</para>
+
+          <programlisting>
 ### Remove these lines:
 
 &lt;!-- Security domain for JBossMQ --&gt;
@@ -577,25 +696,31 @@
 --&gt;
              
             </programlisting>
-            </listitem>
-         </itemizedlist>
-      </section>
-   </section>
-   <section id="startingtheservice">
-      <title>Starting the Server</title>
-      <para>To run the server, execute the <filename>run.bat</filename> or
-      <filename>run.sh</filename> script as appropriate for your operating
-      system, in the <filename>$JBOSS_HOME/bin</filename> directory.</para>
-      <programlisting>
+        </listitem>
+      </itemizedlist>
+    </section>
+  </section>
+
+  <section id="startingtheservice">
+    <title>Starting the Server</title>
+
+    <para>To run the server, execute the <filename>run.bat</filename> or
+    <filename>run.sh</filename> script as appropriate for your operating
+    system, in the <filename>$JBOSS_HOME/bin</filename> directory.</para>
+
+    <programlisting>
 cd $JBOSS_HOME/bin
 ./run.sh -c &lt;config name&gt;
    </programlisting>
-      <para>Where config_name is the name of the JBoss AS configuration where
-      you have installed messaging. (The default is 'messaging')</para>
-      <para>A successful JBoss Messaging deployment generates logging output
-      similar to for a non clustered installation (for a clustered
-      installation you will also see extra cluster related output)</para>
-      <programlisting>
+
+    <para>Where config_name is the name of the JBoss AS configuration where
+    you have installed messaging. (The default is 'messaging')</para>
+
+    <para>A successful JBoss Messaging deployment generates logging output
+    similar to for a non clustered installation (for a clustered installation
+    you will also see extra cluster related output)</para>
+
+    <programlisting>
 ....
 13:19:14,914 WARN  [JDBCPersistenceManager] 
 
@@ -670,48 +795,65 @@
 e=200705111440)] Started in 19s:359ms
 
    </programlisting>
-      <note>
-          The warning message 
-         <literal>"DataSource connection transaction isolation should be
-         READ_COMMITTED, but it is currently NONE"</literal>
-          is there to remind you that by default JBossAS ships with Hypersonic, an in-memory Java-based database engine, which is apropriate for demo purposes, but not for heavy load production environments. The 
-         <ulink
-         url="http://wiki.jboss.org/wiki/Wiki.jsp?page=ConfigJBossMQDB">Critique
-         of Hypersonic</ulink>
-          wiki page outlines some of the well-known issues occuring when using this database. 
-      </note>
-      <warning>
-          Before using Messaging in production, you 
-         <emphasis>must</emphasis>
-          configure the Messaging instance to use an enterprise-class database backend such as Oracle, Sybase, PostgreSQL, MS SQL or MySQL, otherwise you risk losing your data. See 
-         <xref linkend="conf.changingds" />
-          for details about replacing Hypersonic. 
-      </warning>
-   </section>
-   <section id="inst.validation">
-      <title>Installation Validation</title>
-      <para>The release bundle contains a series of examples that should run
-      "out of the box" and could be used to validate a new installation. Such
-      an example sends a persistent JMS message to a queue called
-      <literal>queue/testQueue</literal>.</para>
-      <para>To run the example and validate the installation, open an new
-      command line window and set the <literal>JBOSS_HOME</literal>
-      environment variable to point to the JBoss AS 4.x installation you've
-      just installed Messaging on. Navigate to the folder where you extracted
-      the release bundle and drill down to
-      <filename>/examples/queue</filename>. Apache Ant must pe present in your
-      path in order to be able to run the example.</para>
-      <para>Make sure you start the JBoss server before trying to run the
-      tests</para>
-      <programlisting>
 
+    <note>
+       The warning message 
+
+      <literal>"DataSource connection transaction isolation should be
+      READ_COMMITTED, but it is currently NONE"</literal>
+
+       is there to remind you that by default JBossAS ships with Hypersonic, an in-memory Java-based database engine, which is apropriate for demo purposes, but not for heavy load production environments. The 
+
+      <ulink
+      url="http://wiki.jboss.org/wiki/Wiki.jsp?page=ConfigJBossMQDB">Critique
+      of Hypersonic</ulink>
+
+       wiki page outlines some of the well-known issues occuring when using this database. 
+    </note>
+
+    <warning>
+       Before using Messaging in production, you 
+
+      <emphasis>must</emphasis>
+
+       configure the Messaging instance to use an enterprise-class database backend such as Oracle, Sybase, PostgreSQL, MS SQL or MySQL, otherwise you risk losing your data. See 
+
+      <xref linkend="conf.changingds" />
+
+       for details about replacing Hypersonic. 
+    </warning>
+  </section>
+
+  <section id="inst.validation">
+    <title>Installation Validation</title>
+
+    <para>The release bundle contains a series of examples that should run
+    "out of the box" and could be used to validate a new installation. Such an
+    example sends a persistent JMS message to a queue called
+    <literal>queue/testQueue</literal>.</para>
+
+    <para>To run the example and validate the installation, open an new
+    command line window and set the <literal>JBOSS_HOME</literal> environment
+    variable to point to the JBoss AS 4.x installation you've just installed
+    Messaging on. Navigate to the folder where you extracted the release
+    bundle and drill down to <filename>/examples/queue</filename>. Apache Ant
+    must pe present in your path in order to be able to run the
+    example.</para>
+
+    <para>Make sure you start the JBoss server before trying to run the
+    tests</para>
+
+    <programlisting>
+
 setenv JBOSS_HOME=&lt;your_JBoss_installation&gt;
 cd .../examples/queue
 $ant
 
    </programlisting>
-      <para>A successfull execution log output looks similar to:</para>
-      <programlisting>
+
+    <para>A successfull execution log output looks similar to:</para>
+
+    <programlisting>
 [tim at Vigor14 queue]$ ant
 Buildfile: build.xml
 
@@ -751,100 +893,147 @@
 [tim at Vigor14 queue]$
 
 </programlisting>
-      <para>It is recommended to run <literal>all</literal> validation
-      examples available in the <filename>example</filename> directory
-      (<filename>queue</filename>, <filename>topic</filename>,
-      <filename>mdb</filename>, <filename>stateless</filename>, etc.). In
-      <xref linkend="examples" />, we will have a look at each of those
-      examples.</para>
-   </section>
-   <section id="inst.remoteclient">
-      <title>Accessing JBoss Messaging from a remote client</title>
-      <para>In order to access JBoss Messaging from a client outside the JBoss
-      app server, you will need to ensure the following jar files are on the
-      client classpath:</para>
+
+    <para>It is recommended to run <literal>all</literal> validation examples
+    available in the <filename>example</filename> directory
+    (<filename>queue</filename>, <filename>topic</filename>,
+    <filename>mdb</filename>, <filename>stateless</filename>, etc.). In <xref
+    linkend="examples" />, we will have a look at each of those
+    examples.</para>
+  </section>
+
+  <section id="inst.remoteclient">
+    <title>Accessing JBoss Messaging from a remote client</title>
+
+    <para>In order to access JBoss Messaging from a client outside the JBoss
+    app server, you will need to ensure the following jar files are on the
+    client classpath:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><note>
+             JBoss Messaging 1.4.0 requires a patched version of jboss-remoting.jar. The version is JBoss Remoting 2.2.2.SP10-brew. This version is available on JBoss EAP 4.3, so if you're using a different version you should download it. The patched jar can be found 
+
+            <ulink
+            url="http://repository.jboss.com/jboss/remoting/2.2.2.SP10-brew/lib/">here</ulink>
+
+             . Please download it and make sure this jar is on your classpath *before* jbossall-client.jar. 
+          </note></para>
+      </listitem>
+
+      <listitem>
+        <para>jboss-messaging-client.jar - This is available in the messaging
+        distribution</para>
+      </listitem>
+
+      <listitem>
+        <para>jbossall-client.jar - This is available in your
+        $JBOSS_HOME/client directory</para>
+      </listitem>
+
+      <listitem>
+        <para>$JBOSS_HOME/server/&lt;SERVER_NAME&gt;/deploy/jboss-aop.deployer/jboss-aop.jar</para>
+
+        <para>JBoss AOP 1.5.5.GA_CP03</para>
+
+	<para><ulink  url="http://repository.jboss.com/jboss/aop/1.5.5.GA_CP03-brew/lib/">http://repository.jboss.com/jboss/aop/1.5.5.GA_CP03-brew/lib/</ulink></para>
+
+        <para>(For AOP, sometimes you have to use a specific JAR according to
+        your JVM of choice. Use the most convenient for you)</para>
+      </listitem>
+
+      <listitem>
+        <para>$JBOSS_HOME/server/&lt;SERVER_NAME&gt;/lib/javassist.jar</para>
+
+        <para>Javassist 3.8.0.GA-brew</para>
+
+        <para><ulink
+		    url="http://repository.jboss.com/javassist/3.8.0.GA-brew/lib/">http://repository.jboss.com/javassist/3.8.0.GA-brew/lib/</ulink></para>
+      </listitem>
+
+      <listitem>
+        <para>$JBOSS_HOME/server/&lt;SERVER_NAME&gt;/lib/trove.jar</para>
+
+        <para>trove 1.0.2-brew</para>
+
+        <para><ulink
+        url="http://repository.jboss.com/trove/1.0.2-brew/lib/">http://repository.jboss.com/trove/1.0.2-brew/lib/</ulink></para>
+      </listitem>
+
+      <listitem>
+        <para>log4j</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="inst.mqmessagemigration">
+    <title>Migrating Messages from JBoss MQ to JBoss Messaging</title>
+
+    <para>This configuration will allow you to migrate your systems using
+    JBossMQ to JBM(JBoss Messaging). Many Enterprise systems are complex and
+    have multiple applications and can't be migrated from JBossMQ to JBM all
+    at one time.</para>
+
+    <para>Made up Use Case: For instance, your business is selling items, some
+    you make directly and some you farm out to other distributors. Your
+    ordering system is JBossMQ based. Customers place orders that are then
+    queued up to be processed(via JBossMQ). You also use MQ to queue up the
+    orders that you need to produce and you also queue up the orders that will
+    go to your other distributors. You use MDB's in three separate places in
+    your operation. You want to do a staged migration from JBossMQ to JBM.
+    That requires that JBossMQ and JBM work together. This is exactly what the
+    JBM bridge was meant to do. It's meant to take messages from one
+    queue/topic and transfer them to another queue/topic. This helps with the
+    migration by allowing you to pull messages from your JBossMQ queues
+    automatically and push them into your JBM Queues. You can also do the
+    opposite, you can push messages from your JBM system to your JBossMQ
+    system. In our example, we want to replace the ordering side(producer)
+    with JBM. We push messages into the JBM Order queue, but we set the bridge
+    up to send all of those messages to the JBossMQ Order queue. The rest of
+    your processing happens as normal. Lets say you want to leave your
+    ordering system intact, but you want to have JBM and EJB3 MDBs process the
+    orders. You can have your old client put messages in JBossMQ as normal,
+    but you set the bridge up to pull the messages from JBossMQ Order queue
+    and push them into the JBM Order queue.</para>
+
+    <para>This allows JBM and JBossMQ to interact together by pushing messages
+    back and forth between different systems.</para>
+
+    <para>The Following Assumptions are made:</para>
+
+    <itemizedlist>
+      <listitem>You have one JBoss instance set up for JBoss Messaging and One
+      Jboss instance set up that has your old JBoss MQ on it.</listitem>
+
+      <listitem>We are copying messages from JBossMQ(Source) to
+      JBM(Target)</listitem>
+    </itemizedlist>
+
+    <section id="inst.mqmessagemigration.steps">
+      <title>Steps to Set up the bridge</title>
+
       <itemizedlist>
-         <listitem>
-            <para><note>
-                   JBoss Messaging 1.4.0 requires a patched version of jboss-remoting.jar. The version is JBoss Remoting 2.2.2.SP8-brew. This version is available on JBoss EAP 4.3, so if you're using a different version you should download it. The patched jar can be found 
-                  <ulink
-                  url="http://repository.jboss.com/jboss/remoting/2.2.2.SP8-brew/lib/">here</ulink>
-                   . Please download it and make sure this jar is on your classpath *before* jbossall-client.jar. 
-               </note></para>
-         </listitem>
-         <listitem>
-            <para>jboss-messaging-client.jar - This is available in the
-            messaging distribution</para>
-         </listitem>
-         <listitem>
-            <para>jbossall-client.jar - This is available in your
-            $JBOSS_HOME/client directory</para>
-         </listitem>
-         <listitem>
-            <para>$JBOSS_HOME/server/&lt;SERVER_NAME&gt;/deploy/jboss-aop.deployer/jboss-aop.jar</para>
-            <para>JBoss AOP 1.5.5.GA+</para>
-            <para><ulink
-            url="http://repository.jboss.com/jboss/aop/1.5.5.GA/lib/">http://repository.jboss.com/jboss/aop/1.5.5.GA/lib/</ulink></para>
-            <para>(For AOP, sometimes you have to use a specific JAR according
-            to your JVM of choice. Use the most convenient for you)</para>
-         </listitem>
-         <listitem>
-            <para>$JBOSS_HOME/server/&lt;SERVER_NAME&gt;/lib/javassist.jar</para>
-            <para>Javassist 3.5.0.GA-brew+</para>
-            <para><ulink
-            url="http://repository.jboss.com/javassist/3.5.0.GA-brew/lib/">http://repository.jboss.com/javassist/3.5.0.GA-brew/lib/</ulink></para>
-         </listitem>
-         <listitem>
-            <para>$JBOSS_HOME/server/&lt;SERVER_NAME&gt;/lib/trove.jar</para>
-            <para>trove 1.0.2-brew</para>
-            <para><ulink
-            url="http://repository.jboss.com/trove/1.0.2-brew/lib/">http://repository.jboss.com/trove/1.0.2-brew/lib/</ulink></para>
-         </listitem>
-         <listitem>
-            <para>log4j</para>
-         </listitem>
-      </itemizedlist>
-   </section>
-   <section id="inst.mqmessagemigration">
-      <title>Migrating Messages from JBoss MQ to JBoss Messaging</title>
-      <para>This configuration will allow you to migrate your systems using JBossMQ to JBM(JBoss Messaging).
-         Many Enterprise systems are complex and have multiple applications and can't be migrated from JBossMQ to
-         JBM all at one time.</para>
-      <para>Made up Use Case: For instance, your business is selling items, some you make directly and some you farm
-         out to other distributors. Your ordering system is JBossMQ based. Customers place orders that are then queued
-         up to be processed(via JBossMQ). You also use MQ to queue up the orders that you need to produce and you also
-         queue up the orders that will go to your other distributors. You use MDB's in three separate places in your
-         operation. You want to do a staged migration from JBossMQ to JBM. That requires that JBossMQ and JBM work
-         together. This is exactly what the JBM bridge was meant to do. It's meant to take messages from one queue/topic
-         and transfer them to another queue/topic. This helps with the migration by allowing you to pull messages from
-         your JBossMQ queues automatically and push them into your JBM Queues. You can also do the opposite, you can
-         push messages from your JBM system to your JBossMQ system. In our example, we want to replace the ordering
-         side(producer) with JBM. We push messages into the JBM Order queue, but we set the bridge up to send all of
-         those messages to the JBossMQ Order queue. The rest of your processing happens as normal. Lets say you want
-         to leave your ordering system intact, but you want to have JBM and EJB3 MDBs process the orders. You can have
-         your old client put messages in JBossMQ as normal, but you set the bridge up to pull the messages from JBossMQ
-         Order queue and push them into the JBM Order queue.</para>
-      <para>This allows JBM and JBossMQ to interact together by pushing messages back and forth between different systems.</para>
-      <para>The Following Assumptions are made:</para>
-      <itemizedlist>
-         <listitem>You have one JBoss instance set up for JBoss Messaging and One Jboss instance set up that has your old JBoss MQ on it.</listitem>
-         <listitem>We are copying messages from JBossMQ(Source) to JBM(Target)</listitem>
-      </itemizedlist>
-      <section id="inst.mqmessagemigration.steps">
-         <title>Steps to Set up the bridge</title>
-         <itemizedlist>
-            <listitem>
-               <para>Copy the jbossmq.jar from the Source Machine(JBossMQ) under the server/default/lib/ to the
-                  messaging configuration on the Target JBM machine(server/messaging/lib)</para>
-               <note>substitute what ever your messaging server configuration is above. I used the default stand alone
-                  messaging server configuration note: This is required to dereference the JBossMQ objects that are
-                  dereferenced on the JBM side. If you don't copy the jar over, you will get a
-                  "java.lang.ClassCastException: javax.naming.Reference" exception and the bridge will not be able to start</note>
-            </listitem>
-            <listitem><para>Add the remote JBossMQ provider to the jms-ds.xml file in the server/messaging/deploy
-               directory on your target(JBM) machine.</para>
-               <para>Here is an example of the provider to add.</para>
-            <programlisting>
+        <listitem>
+          <para>Copy the jbossmq.jar from the Source Machine(JBossMQ) under
+          the server/default/lib/ to the messaging configuration on the Target
+          JBM machine(server/messaging/lib)</para>
+
+          <note>substitute what ever your messaging server configuration is
+          above. I used the default stand alone messaging server configuration
+          note: This is required to dereference the JBossMQ objects that are
+          dereferenced on the JBM side. If you don't copy the jar over, you
+          will get a "java.lang.ClassCastException: javax.naming.Reference"
+          exception and the bridge will not be able to start</note>
+        </listitem>
+
+        <listitem>
+          <para>Add the remote JBossMQ provider to the jms-ds.xml file in the
+          server/messaging/deploy directory on your target(JBM)
+          machine.</para>
+
+          <para>Here is an example of the provider to add.</para>
+
+          <programlisting>
 &lt;mbean code="org.jboss.jms.jndi.JMSProviderLoader"
                name="jboss.messaging:service=JMSProviderLoader,
                name=MyRemoteJMSProvider"&gt;
@@ -863,15 +1052,21 @@
   &lt;/attribute&gt;
 &lt;/mbean&gt;
             </programlisting>
-               <note>you will need to change the java.naming.provider.url so that it points to your JBossMQ machine.
-                  Everything else should remain the same. Keep your jms-ds.xml file open, because you will be addning
-                  another entry in it for the next step.</note>
-            </listitem>
-            <listitem>
-               <para>Add the Bridge provider to the jms-ds.xml file in the server/messaging/deploy directory on your
-                  target(JBM) machine.</para>
-               <para>Here is an example bridge configuration</para>
-               <programlisting>
+
+          <note>you will need to change the java.naming.provider.url so that
+          it points to your JBossMQ machine. Everything else should remain the
+          same. Keep your jms-ds.xml file open, because you will be addning
+          another entry in it for the next step.</note>
+        </listitem>
+
+        <listitem>
+          <para>Add the Bridge provider to the jms-ds.xml file in the
+          server/messaging/deploy directory on your target(JBM)
+          machine.</para>
+
+          <para>Here is an example bridge configuration</para>
+
+          <programlisting>
 &lt;mbean code="org.jboss.jms.server.bridge.BridgeService"
                   name="jboss.messaging:service=Bridge,name=TestBridge"
                   xmbean-dd="xmdesc/Bridge-xmbean.xml"&gt;
@@ -889,22 +1084,32 @@
      &lt;attribute name="FailureRetryInterval"&gt;5000&lt;/attribute&gt;
      &lt;attribute name="MaxRetries"&gt;-1&lt;/attribute&gt;
      &lt;attribute name="AddMessageIDInHeader"&gt;false&lt;/attribute&gt;
-&lt;/mbean&gt;                  
+&lt;/mbean&gt;
                </programlisting>
-               <note>my target is the current JBM JMS Provider and the source is the JBossMQ remote provider. If you
-                  have a pretty stock system and you want to move messages from JBossMQ to JBM, you will not have to
-                  change this example except for the queue Names. If you wish to move from JBM to JBossMQ, just switch
-                  the soure and target definitions.</note>
-            </listitem>
-         </itemizedlist>
-         <para>Start the JBossMQ system and then just start the JBM system and the messages will begin to move over.</para>
-         <para>The following is an example of the jms-ds.xml file that was used for the test. If you want to test the bridge first 
-            and you have a stock JBM system(JBM has been installed using the default configuration), then you can just
-            copy the jms-ds.xml file over the one in server/messaging/deploy and begin to put messages in the JBossMQ
-            system under the /queue/TestQueue. The messages will then be moved over to your JBM queue /queue/A. Both of
-            these queues exist in the stock versions of JBM and JBossMQ.</para>
-      </section>
-      <programlisting>
+
+          <note>my target is the current JBM JMS Provider and the source is
+          the JBossMQ remote provider. If you have a pretty stock system and
+          you want to move messages from JBossMQ to JBM, you will not have to
+          change this example except for the queue Names. If you wish to move
+          from JBM to JBossMQ, just switch the soure and target
+          definitions.</note>
+        </listitem>
+      </itemizedlist>
+
+      <para>Start the JBossMQ system and then just start the JBM system and
+      the messages will begin to move over.</para>
+
+      <para>The following is an example of the jms-ds.xml file that was used
+      for the test. If you want to test the bridge first and you have a stock
+      JBM system(JBM has been installed using the default configuration), then
+      you can just copy the jms-ds.xml file over the one in
+      server/messaging/deploy and begin to put messages in the JBossMQ system
+      under the /queue/TestQueue. The messages will then be moved over to your
+      JBM queue /queue/A. Both of these queues exist in the stock versions of
+      JBM and JBossMQ.</para>
+    </section>
+
+    <programlisting>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
 &lt;connection-factories&gt;
@@ -1007,7 +1212,9 @@
 &lt;/connection-factories&gt;
 
       </programlisting>
-      <para>You can also merge topics back and forth from JBM to JBossMQ, by setting the subscription name and client id.
-         You can see these arguments in the JBM Bridge chapter. </para>
-   </section>
-</chapter>
+
+    <para>You can also merge topics back and forth from JBM to JBossMQ, by
+    setting the subscription name and client id. You can see these arguments
+    in the JBM Bridge chapter.</para>
+  </section>
+</chapter>
\ No newline at end of file

Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/introduction.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/introduction.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/introduction.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -1,214 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter id="introduction">
-   <title>Introduction</title>
+  <title>Introduction</title>
 
-   <para>JBoss Messaging provides an open source and standards-based messaging
-   platform that brings enterprise-class messaging to the mass market.</para>
+  <para>JBoss Messaging provides an open source and standards-based messaging
+  platform that brings enterprise-class messaging to the mass market.</para>
 
-   <para>JBoss Messaging implements a high performance, robust messaging core
-   that is designed to support the largest and most heavily utilized SOAs,
-   enterprise service buses (ESBs) and other integration needs ranging from
-   the simplest to the highest demand networks.</para>
+  <para>JBoss Messaging implements a high performance, robust messaging core
+  that is designed to support the largest and most heavily utilized SOAs,
+  enterprise service buses (ESBs) and other integration needs ranging from the
+  simplest to the highest demand networks.</para>
 
-   <para>It will allow you to smoothly distribute your application load across
-   your cluster, intelligently balancing and utilizing each nodes CPU cycles,
-   with no single point of failure, providing a highly scalable and performant
-   clustering implementation.</para>
+  <para>It will allow you to smoothly distribute your application load across
+  your cluster, intelligently balancing and utilizing each nodes CPU cycles,
+  with no single point of failure, providing a highly scalable and performant
+  clustering implementation.</para>
 
-   <para>JBoss Messaging includes a JMS front-end to deliver messaging in a
-   standards-based format as well as being designed to be able to support
-   other messaging protocols in the future.</para>
+  <para>JBoss Messaging includes a JMS front-end to deliver messaging in a
+  standards-based format as well as being designed to be able to support other
+  messaging protocols in the future.</para>
 
-	<note>
-		<para>JBoss Messaging 1.4 is the default JMS provider in JBoss Enterprise Application Platform 4.3.</para>
-	</note>
+  <para>JBoss Messaging is destined to become an integral part of the JBoss
+  Enterprise Application Platform, and the new Service Integration
+  Platform.</para>
 
-   <section id="features">
-      <title>JBoss Messaging Features</title>
+  <para>Currently it is available for embedded use within the JBoss
+  Application Server 4.2.0.GA or later (JBossAS). Work to integrate JBoss
+  Messaging with the new JBoss Microcontainer is under way.</para>
 
-      <para>JBoss Messaging provides:</para>
+  <para>JBoss Messaging is also an integral part of Red Hat's strategy for
+  messaging. JBoss Messaging is committed to AMQP ( <ulink
+  url="http://www.amqp.org">AMQP</ulink>)- the new messaging standard from Red
+  Hat and others. Later versions of JBoss Messaging will support AMQP, and
+  JBoss Messaging will be focussed on becoming the premier AMQP Java
+  broker.</para>
 
-      <itemizedlist>
-         <listitem>
-            <para>A fully compatible and Sun certified JMS 1.1 implementation,
-            that currently works with a standard 4.3 or later JBoss
-            Application Platform installation.</para>
-         </listitem>
+  <section id="support">
+    <title>JBoss Messaging support cover from Red Hat</title>
 
-         <listitem>
-            <para>A strong focus on performance, reliability and scalability
-            with high throughput and low latency.</para>
-         </listitem>
+    <para>JBoss Messaging is part of JBoss Application Server Integration
+    Platform (JBoss EAP 4.3) and it is already the default JMS provider on
+    JBoss AS 5 (under Beta release at this current time).Production support is
+    already available through JBoss EAP 4.3, and we offer developer support
+    for JBoss 4.2.x.</para>
+  </section>
 
-         <listitem>
-            <para>A foundation for JBoss ESB for SOA initiatives; JBoss ESB
-            uses JBoss Messaging as its default JMS provider.</para>
-         </listitem>
-      </itemizedlist>
+  <section id="features">
+    <title>JBoss Messaging Features</title>
 
-      <para>Other JBoss Messaging features include:</para>
+    <para>JBoss Messaging provides:</para>
 
-      <itemizedlist>
-         <listitem>
-            <para>Publish-subscribe and point-to-point messaging models</para>
-         </listitem>
+    <itemizedlist>
+      <listitem>
+        <para>A fully compatible and Sun certified JMS 1.1 implementation,
+        that currently works with a standard 4.2 or later JBoss Application
+        Server installation.</para>
+      </listitem>
 
-         <listitem>
-            <para>Persistent and non-persistent messages</para>
-         </listitem>
+      <listitem>
+        <para>A strong focus on performance, reliability and scalability with
+        high throughput and low latency.</para>
+      </listitem>
 
-         <listitem>
-            <para>Guaranteed message delivery that ensures that messages
-            arrive once and only once where required</para>
-         </listitem>
+      <listitem>
+        <para>A foundation for JBoss ESB for SOA initiatives; JBoss ESB uses
+        JBoss Messaging as its default JMS provider.</para>
+      </listitem>
+    </itemizedlist>
 
-         <listitem>
-            <para>Transactional and reliable - supporting ACID
-            semantics</para>
-         </listitem>
+    <para>Other JBoss Messaging features include:</para>
 
-         <listitem>
-            <para>Customizable security framework based on JAAS</para>
-         </listitem>
+    <itemizedlist>
+      <listitem>
+        <para>Publish-subscribe and point-to-point messaging models</para>
+      </listitem>
 
-         <listitem>
-            <para>Fully integrated with JBoss Transactions (formerly known as
-            Arjuna JTA) for full transaction recoverability.</para>
-         </listitem>
+      <listitem>
+        <para>Persistent and non-persistent messages</para>
+      </listitem>
 
-         <listitem>
-            <para>Extensive JMX management interface</para>
-         </listitem>
+      <listitem>
+        <para>Guaranteed message delivery that ensures that messages arrive
+        once and only once where required</para>
+      </listitem>
 
-         <listitem>
-            <para>Support for most major databases including Oracle, Sybase,
-            MS SQL Server, PostgreSQL and MySQL</para>
-         </listitem>
+      <listitem>
+        <para>Transactional and reliable - supporting ACID semantics</para>
+      </listitem>
 
-         <listitem>
-            <para>HTTP transport to allow use through firewalls that only
-            allow HTTP traffic</para>
-         </listitem>
+      <listitem>
+        <para>Customizable security framework based on JAAS</para>
+      </listitem>
 
-         <listitem>
-            <para>SSL transport</para>
-         </listitem>
+      <listitem>
+        <para>Fully integrated with JBoss Transactions (formerly known as
+        Arjuna JTA) for full transaction recoverability.</para>
+      </listitem>
 
-         <listitem>
-            <para>Configurable DLQs (Dead Letter Queues) and Expiry
-            Queues</para>
-         </listitem>
+      <listitem>
+        <para>Extensive JMX management interface</para>
+      </listitem>
 
-         <listitem>
-            <para>Message statistics. Gives you a rolling historical view of
-            what messages were delivered to what queues and
-            subscriptions</para>
-         </listitem>
+      <listitem>
+        <para>Support for most major databases including Oracle, Sybase, MS
+        SQL Server, PostgreSQL and MySQL</para>
+      </listitem>
 
-         <listitem>
-            <para>Automatic paging of messages to storage. Allows the use of
-            very large queues - too large to fit in memory at once</para>
-         </listitem>
-      </itemizedlist>
+      <listitem>
+        <para>HTTP transport to allow use through firewalls that only allow
+        HTTP traffic</para>
+      </listitem>
 
-      <para>Clustering features:</para>
+      <listitem>
+        <para>SSL transport</para>
+      </listitem>
 
-      <itemizedlist>
-         <listitem>
-            <para>Fully clustered queues and topics. "Logical" queues and
-            topics are distributed across the cluster. You can send to a queue
-            or a topic from any node, and receive from any other.</para>
-         </listitem>
+      <listitem>
+        <para>Configurable DLQs (Dead Letter Queues) and Expiry Queues</para>
+      </listitem>
 
-         <listitem>
-            <para>Fully clustered durable subscriptions. A particular durable
-            subscription can be accessed from any node of the cluster -
-            allowing you to spread processing load from that subscription
-            across the cluster.</para>
-         </listitem>
+      <listitem>
+        <para>Message statistics. Gives you a rolling historical view of what
+        messages were delivered to what queues and subscriptions</para>
+      </listitem>
 
-         <listitem>
-            <para>Fully clustered temporary queues. Send a message with a
-            replyTo of a temp queue and it can be sent back on any node of the
-            cluster.</para>
-         </listitem>
+      <listitem>
+        <para>Automatic paging of messages to storage. Allows the use of very
+        large queues - too large to fit in memory at once</para>
+      </listitem>
+    </itemizedlist>
 
-         <listitem>
-            <para>Intelligent message redistribution. Messages are
-            automatically moved between different nodes of the cluster if
-            consumers are faster on one node than another. This can help
-            prevent starvation or build up of messages on particular
-            nodes.</para>
-         </listitem>
+    <para>Clustering features:</para>
 
-         <listitem>
-            <para>Message order protection. If you want to ensure that the
-            order of messages produced by a producer is the same as is
-            consumed by a consumer then you can set this to true. This works
-            even in the presence of message redistribution.</para>
-         </listitem>
+    <itemizedlist>
+      <listitem>
+        <para>Fully clustered queues and topics. "Logical" queues and topics
+        are distributed across the cluster. You can send to a queue or a topic
+        from any node, and receive from any other.</para>
+      </listitem>
 
-         <listitem>
-            <para>Fully transparent failover. When a server fails, your
-            sessions continue without exceptions on a new node as if nothing
-            happened. (Fully configurable - If you don't want this you can
-            fall back to exceptions being thrown and manually recreation of
-            connections on another node)</para>
-         </listitem>
+      <listitem>
+        <para>Fully clustered durable subscriptions. A particular durable
+        subscription can be accessed from any node of the cluster - allowing
+        you to spread processing load from that subscription across the
+        cluster.</para>
+      </listitem>
 
-         <listitem>
-            <para>High availability and seamless fail-over. If the node you
-            are connected to fails, you will automatically fail over to
-            another node and will not lose any persistent messages. You can
-            carry on with your session seamlessly where you left off. Once and
-            only once delivery of persistent messages is respected at all
-            times.</para>
-         </listitem>
+      <listitem>
+        <para>Fully clustered temporary queues. Send a message with a replyTo
+        of a temp queue and it can be sent back on any node of the
+        cluster.</para>
+      </listitem>
 
-         <listitem>
-            <para>Message bridge. JBoss Messaging contains a message bridge
-            component which enables you to bridge messages between any two
-            JMS1.1 destinations on the same or physical separate locations.
-            (E.g. separated by a WAN). This allows you to connect
-            geographically separate clusters, forming huge globally
-            distributed logical queues and topics.</para>
-         </listitem>
-      </itemizedlist>
-   </section>
+      <listitem>
+        <para>Intelligent message redistribution. Messages are automatically
+        moved between different nodes of the cluster if consumers are faster
+        on one node than another. This can help prevent starvation or build up
+        of messages on particular nodes.</para>
+      </listitem>
 
-   <section id="compatibility">
-      <title>Compatibility with JBossMQ</title>
+      <listitem>
+        <para>Message order protection. If you want to ensure that the order
+        of messages produced by a producer is the same as is consumed by a
+        consumer then you can set this to true. This works even in the
+        presence of message redistribution.</para>
+      </listitem>
 
-      <para>JBoss MQ is the JMS implementation currently shipped within JBoss
-      EAP 4.2. Since JBoss Messaging is JMS 1.1 and JMS 1.0.2b compatible, the JMS
-      code written against JBossMQ will run with JBoss Messaging without any
-      changes.</para>
+      <listitem>
+        <para>Fully transparent failover. When a server fails, your sessions
+        continue without exceptions on a new node as if nothing happened.
+        (Fully configurable - If you don't want this you can fall back to
+        exceptions being thrown and manually recreation of connections on
+        another node)</para>
+      </listitem>
 
-      <para>JBoss Messaging does not have wire format compatibility with JBoss
-      MQ so it would be necessary to upgrade JBoss MQ clients with JBoss
-      Messaging client jars</para>
+      <listitem>
+        <para>High availability and seamless fail-over. If the node you are
+        connected to fails, you will automatically fail over to another node
+        and will not lose any persistent messages. You can carry on with your
+        session seamlessly where you left off. Once and only once delivery of
+        persistent messages is respected at all times.</para>
+      </listitem>
 
-      <important>
-<para>
-             Even if JBoss Messaging deployment descriptors are very similar to JBoss MQ deployment descriptors, they are 
+      <listitem>
+        <para>Message bridge. JBoss Messaging contains a message bridge
+        component which enables you to bridge messages between any two JMS1.1
+        destinations on the same or physical separate locations. (E.g.
+        separated by a WAN). This allows you to connect geographically
+        separate clusters, forming huge globally distributed logical queues
+        and topics.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
 
-            <emphasis>not</emphasis>
+  <section id="compatibility">
+    <title>Compatibility with JBossMQ</title>
 
-             identical, so they will require some simple adjustments to get them to work with JBoss Messaging. Also, the database data model is completely different, so don't attempt to use JBoss Messaging with a JBoss MQ data schema and vice-versa. 
-</para>
-         </important>
-   </section>
-<section id="introduction-Feedback">
-		<title>Feedback</title>
-		<para>
-			If you spot a typo in this guide, or if you have thought of a way to make this manual better, we would love to hear from you! Submit a report in <ulink url="http://jira.jboss.com/jira/browse/JBPAPP">JIRA</ulink> against the Product: JBoss Enterprise Application Platform, Version: <replaceable>&lt;version&gt;</replaceable>, Component: <emphasis>Doc</emphasis>. If you have a suggestion for improving the documentation, try to be as specific as possible. If you have found an error, include the section number and some of the surrounding text so we can find it easily.
-		</para>
-	</section>
-	
-	<section id="introduction-Other_Manuals">
-		<title>Other Manuals</title>
-		<para>
-			If you are looking for detailed product information refer to the manuals available online at <ulink url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/"></ulink>.
-		</para>
-	</section>
-</chapter>
+    <para>JBoss MQ is the JMS implementation currently shipped within JBoss
+    AS. Since JBoss Messaging is JMS 1.1 and JMS 1.0.2b compatible, the JMS
+    code written against JBossMQ will run with JBoss Messaging without any
+    changes.</para>
+
+    <para>JBoss Messaging does not have wire format compatibility with JBoss
+    MQ so it would be necessary to upgrade JBoss MQ clients with JBoss
+    Messaging client jars</para>
+
+    <important>
+	    <para>
+         Even if JBoss Messaging deployment descriptors are very similar to JBoss MQ deployment descriptors, they are 
+
+        <emphasis>not</emphasis>
+
+	identical, so they will require some simple adjustments to get them to work with JBoss Messaging. Also, the database data model is completely different, so don't attempt to use JBoss Messaging with a JBoss MQ data schema and vice-versa. </para>
+      </important>
+  </section>
+</chapter>
\ No newline at end of file

Added: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recovery_config.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recovery_config.xml	                        (rev 0)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recovery_config.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="recovery">
+  <title>JBoss Messaging XA Recovery Configuration</title>
+
+  <para>This section describes how to configure JBoss Transactions in JBoss AS
+  4.2.0 to handle XA recovery for JBoss Messaging resources.</para>
+
+  <para>JBoss Transactions recovery manager can easily be configured to
+  continually poll for and recover JBoss Messaging XA resources, this provides
+  an extremely high level of durability of transactions.</para>
+
+  <para>Enabling JBoss Transactions Recovery Manager to recover JBoss
+  Messaging resources is a very simple matter and involves adding a line to
+  the file ${JBOSS_CONFIG}/conf/jbossjta-properties.xml</para>
+
+  <para>Here's an example section of a jbossjta-properties.xml file with the
+  line added (note the whole file is not shown)</para>
+
+  <programlisting>
+     &lt;properties depends="arjuna" name="jta"&gt;
+        &lt;!--
+        Support subtransactions in the JTA layer?
+        Default is NO.
+        --&gt;
+        &lt;property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/&gt;
+        &lt;property name="com.arjuna.ats.jta.jtaTMImplementation"
+           value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/&gt;
+        &lt;property name="com.arjuna.ats.jta.jtaUTImplementation"
+           value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/&gt;      
+        &lt;!--
+           *** Add this line to enable recovery for JMS resources using DefaultJMSProvider ***
+        --&gt;
+        &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
+           value="org.jboss.jms.server.recovery.MessagingXAResourceRecovery;java:/DefaultJMSProvider"/&gt;
+
+    &lt;/properties&gt;
+     
+  </programlisting>
+
+  <para>In the above example the recovery manager will attempt to recover JMS
+  resources using the JMSProviderLoader "DefaultJMSProvider"</para>
+
+  <para>DefaultJMSProvider is the default JMS provider loader that ships with
+  JBoss AS and is defined in jms-ds.xml (or hajndi-jms-ds.xml in a clustered
+  configuration). If you want to recovery using a different JMS provider
+  loader - e.g. one corresponding to a remote JMS provider then just add
+  another line and instead of DefaultJMSProvider specify the name of the
+  remote JMS provider as specified in it's MBean configuration.</para>
+
+  <para>For each line you add, the name must be unique, so you could specify
+  "com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1",
+  "com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING2, ..."
+  etc.</para>
+
+  <para>In actual fact, the recovery also should work with any JMS provider
+  that implements recoverable XAResources (i.e. it properly implements
+  XAResource.recover()) , not just JBoss Messaging</para>
+
+  <para>Please note that to configure the recovery manager to recovery
+  transactions from any node of the cluster it will be necessary to specify a
+  line in the configuration for every node of the cluster</para>
+</chapter>
\ No newline at end of file

Deleted: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recoveryconfig.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recoveryconfig.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/recoveryconfig.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="recovery">
-   <title>JBoss Messaging XA Recovery Configuration</title>
-   <para>This section describes how to configure JBoss Transactions in JBoss
-   EAP to handle XA recovery for JBoss Messaging resources.</para>
-   <para>JBoss Transactions recovery manager can easily be configured to
-   continually poll for and recover JBoss Messaging XA resources, this
-   provides an extremely high level of durability of transactions.</para>
-   <para>Enabling JBoss Transactions Recovery Manager to recover JBoss
-   Messaging resources is a very simple matter and involves adding a line to
-   the file ${JBOSS_CONFIG}/conf/jbossjta-properties.xml</para>
-   <para>Here's an example section of a jbossjta-properties.xml file with the
-   line added (note the whole file is not shown)</para>
-   <programlisting>
-     &lt;properties depends="arjuna" name="jta"&gt;
-        &lt;!--
-        Support subtransactions in the JTA layer?
-        Default is NO.
-        --&gt;
-        &lt;property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/&gt;
-        &lt;property name="com.arjuna.ats.jta.jtaTMImplementation"
-           value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/&gt;
-        &lt;property name="com.arjuna.ats.jta.jtaUTImplementation"
-           value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/&gt;      
-        &lt;!--
-           *** Add this line to enable recovery for JMS resources using DefaultJMSProvider ***
-        --&gt;
-        &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
-           value="org.jboss.jms.server.recovery.MessagingXAResourceRecovery;java:/DefaultJMSProvider"/&gt;
-
-    &lt;/properties&gt;
-     
-  </programlisting>
-   <para>In the above example the recovery manager will attempt to recover JMS
-   resources using the JMSProviderLoader "DefaultJMSProvider"</para>
-   <para>DefaultJMSProvider is the default JMS provider loader that ships with
-   JBoss EAP and is defined in jms-ds.xml (or hajndi-jms-ds.xml in a clustered
-   configuration). If you want to recovery using a different JMS provider
-   loader - e.g. one corresponding to a remote JMS provider then just add
-   another line and instead of DefaultJMSProvider specify the name of the
-   remote JMS provider as specified in it's MBean configuration.</para>
-   <para>For each line you add, the name must be unique, so you could specify
-   "com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1",
-   "com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING2, ..."
-   etc.</para>
-   <para>In actual fact, the recovery also should work with any JMS provider
-   that implements recoverable XAResources (i.e. it properly implements
-   XAResource.recover()) , not just JBoss Messaging</para>
-   <para>Please note that to configure the recovery manager to recovery
-   transactions from any node of the cluster it will be necessary to specify a
-   line in the configuration for every node of the cluster</para>
-</chapter>
\ No newline at end of file

Modified: projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/runningexamples.xml
===================================================================
--- projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/runningexamples.xml	2008-10-21 23:27:28 UTC (rev 5166)
+++ projects/eap-docs/trunk/JBoss_Messaging_User_Guide/en-US/runningexamples.xml	2008-10-22 03:00:27 UTC (rev 5167)
@@ -72,7 +72,7 @@
         <para>docs/example/distributed-queue</para>
 
         <para>This example demonstrates a JMS client interacting with a JBoss
-        Messaging distributed queue - it requires two JBoss EAP instances to be
+        Messaging distributed queue - it requires two JBoss AS instances to be
         running</para>
       </listitem>
 
@@ -80,7 +80,7 @@
         <para>docs/example/distributed-topic</para>
 
         <para>This example demonstrates a JMS client interacting with a JBoss
-        Messaging distributed topic - it requires two JBoss EAP instances to be
+        Messaging distributed topic - it requires two JBoss AS instances to be
         running</para>
       </listitem>
 
@@ -97,7 +97,7 @@
         <para>docs/example/bridge</para>
 
         <para>This example demonstrates using a message bridge. It deploys a
-        message bridge in JBoss EAP which then proceeds to move messages from a
+        message bridge in JBoss AS which then proceeds to move messages from a
         source to a target queue</para>
       </listitem>
     </itemizedlist></para>
@@ -108,10 +108,10 @@
   <para>Make sure you start the JBoss server(s) before running the
   examples!</para>
 
-  <para>The non clustered examples expect a JBoss EAP instance to be running
+  <para>The non clustered examples expect a JBoss AS instance to be running
   with all the default settings</para>
 
-  <para>The clustered examples expect two JBoss EAP instances to running with
+  <para>The clustered examples expect two JBoss AS instances to running with
   ports settings as per ports-01 and ports-02.</para>
 
   <para>For each example, you can always override the default ports it will




More information about the jboss-cvs-commits mailing list