[jboss-cvs] JBossAS SVN: r95363 - in projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3: en-US and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 22 01:31:05 EDT 2009


Author: benlc
Date: 2009-10-22 01:31:05 -0400 (Thu, 22 Oct 2009)
New Revision: 95363

Modified:
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/Makefile
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Book_Info.xml
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Bridge.xml
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Configuration.xml
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Introduction.xml
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/JBoss_Messaging_User_Guide.xml
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Ordering_Group.xml
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Revision_History.xml
   projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Running_Examples.xml
Log:
'Committing Messaging 1.4.6 Update files'


Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/Makefile
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/Makefile	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/Makefile	2009-10-22 05:31:05 UTC (rev 95363)
@@ -6,7 +6,7 @@
 #OTHER_LANGS	= as-IN bn-IN de-DE es-ES fr-FR gu-IN hi-IN it-IT ja-JP kn-IN ko-KR ml-IN mr-IN or-IN pa-IN pt-BR ru-RU si-LK ta-IN te-IN zh-CN zh-TW
 
 # Extra Parameters start here
-SHOW_REMARKS=1
+SHOW_REMARKS=0
 # Extra Parameters stop here
 COMMON_CONFIG  = /usr/share/publican
 include $(COMMON_CONFIG)/make/Makefile.common

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Book_Info.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Book_Info.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Book_Info.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -6,7 +6,7 @@
 	<title>JBoss Messaging User Guide</title>
       <subtitle>for Use with JBoss Enterprise Application Platform 5.0</subtitle>
     <edition>1</edition>
-    <pubsnumber>1</pubsnumber>
+    <pubsnumber>2</pubsnumber>
 	<productname>JBoss Enterprise Application Platform</productname>
 	<productnumber>5.0</productnumber>
     <pubdate>September, 2009</pubdate>

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Bridge.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Bridge.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Bridge.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -98,83 +98,95 @@
       The following code is an example configuration of the message bridge, showing all attributes. Some attributes have been commented out for this configuration, since not all attributes should be specified at once.
     </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;
-          
-      &lt;!-- The JMS provider loader that is used to lookup the source destination --&gt;   
-      &lt;depends optional-attribute-name="SourceProviderLoader"&gt;
-          jboss.messaging:service=JMSProviderLoader,name=JMSProvider&lt;/depends&gt;
+<programlisting><![CDATA[
+<mbean code="org.jboss.jms.server.bridge.BridgeService"
+  name="jboss.messaging:service=Bridge,name=TestBridge"
+  xmbean-dd="xmdesc/Bridge-xmbean.xml">
+  
+  <!-- The JMS provider loader that is used to lookup the source 
+       destination 
+  -->   
+  <depends optional-attribute-name="SourceProviderLoader">
+  jboss.messaging:service=JMSProviderLoader,name=JMSProvider</depends>
       
-      &lt;!-- The JMS provider loader that is used to lookup the target destination --&gt;
-      &lt;depends optional-attribute-name="TargetProviderLoader"&gt;
-          jboss.messaging:service=JMSProviderLoader,name=JMSProvider&lt;/depends&gt;    
-      
-      &lt;!-- The JNDI lookup for the source destination --&gt;
-      &lt;attribute name="SourceDestinationLookup"&gt;/queue/A&lt;/attribute&gt; 
-      
-      &lt;!-- The JNDI lookup for the target destination --&gt;
-      &lt;attribute name="TargetDestinationLookup"&gt;/queue/B&lt;/attribute&gt;
-      
-      &lt;!-- The username to use for the source connection 
-      &lt;attribute name="SourceUsername"&gt;bob&lt;/attribute&gt;
-      --&gt;
-      
-      &lt;!-- The password to use for the source connection
-      &lt;attribute name="SourcePassword"&gt;cheesecake&lt;/attribute&gt;
-      --&gt;
-      
-      &lt;!-- The username to use for the target connection
-      &lt;attribute name="TargetUsername"&gt;mary&lt;/attribute&gt;
-      --&gt;
-      
-      &lt;!-- The password to use for the target connection
-      &lt;attribute name="TargetPassword"&gt;hotdog&lt;/attribute&gt;
-      --&gt;
-      
-      &lt;!-- Optional: The Quality Of Service mode to use, one of:
-           QOS_AT_MOST_ONCE = 0;
-           QOS_DUPLICATES_OK = 1;
-           QOS_ONCE_AND_ONLY_ONCE = 2; --&gt;
-      &lt;attribute name="QualityOfServiceMode"&gt;0&lt;/attribute&gt;
-      
-      &lt;!-- JMS selector to use for consuming messages from the source
-      &lt;attribute name="Selector"&gt;specify jms selector here&lt;/attribute&gt;
-      --&gt;
-      
-      &lt;!-- The maximum number of messages to consume from the source
-          before sending to the target --&gt;
-      &lt;attribute name="MaxBatchSize"&gt;5&lt;/attribute&gt;     
-      
-      &lt;!-- The maximum time to wait (in ms) before sending a batch to the target
-          even if MaxBatchSize is not exceeded.
-           -1 means wait forever --&gt;   
-      &lt;attribute name="MaxBatchTime"&gt;-1&lt;/attribute&gt;
-      
-      &lt;!-- If consuming from a durable subscription this is the subscription name
-      &lt;attribute name="SubName"&gt;mysub&lt;/attribute&gt;
-      --&gt;
-      
-      &lt;!-- If consuming from a durable subscription this is the client ID to use
-      &lt;attribute name="ClientID"&gt;myClientID&lt;/attribute&gt;
-      --&gt;
-      
-      &lt;!-- The number of ms to wait between connection retrues in the event connections
-          to source or target fail --&gt;
-      &lt;attribute name="FailureRetryInterval"&gt;5000&lt;/attribute&gt;      
-      
-      &lt;!-- The maximum number of connection retries to make in case of failure,
-          before giving up -1 means try forever--&gt;
-      &lt;attribute name="MaxRetries"&gt;-1&lt;/attribute&gt;
+  <!-- The JMS provider loader that is used to lookup the target 
+       destination 
+  -->
+  <depends optional-attribute-name="TargetProviderLoader">
+  jboss.messaging:service=JMSProviderLoader,name=JMSProvider</depends>    
+  
+  <!-- The JNDI lookup for the source destination -->
+  <attribute name="SourceDestinationLookup">/queue/A</attribute> 
+  
+  <!-- The JNDI lookup for the target destination -->
+  <attribute name="TargetDestinationLookup">/queue/B</attribute>
+  
+  <!-- The username to use for the source connection 
+  <attribute name="SourceUsername">bob</attribute>
+  -->
+  
+  <!-- The password to use for the source connection
+  <attribute name="SourcePassword">cheesecake</attribute>
+  -->
+  
+  <!-- The username to use for the target connection
+  <attribute name="TargetUsername">mary</attribute>
+  -->
+  
+  <!-- The password to use for the target connection
+  <attribute name="TargetPassword">hotdog</attribute>
+  -->
+  
+  <!-- Optional: The Quality Of Service mode to use, one of:
+    QOS_AT_MOST_ONCE = 0;
+    QOS_DUPLICATES_OK = 1;
+    QOS_ONCE_AND_ONLY_ONCE = 2; 
+  -->
+  <attribute name="QualityOfServiceMode">0</attribute>
+  
+  <!-- JMS selector to use for consuming messages from the source
+  <attribute name="Selector">specify jms selector here</attribute>
+  -->
+  
+  <!-- The maximum number of messages to consume from the source
+       before sending to the target 
+  -->
+  <attribute name="MaxBatchSize">5</attribute>     
+  
+  <!-- The maximum time to wait (in ms) before sending a batch to the
+       target even if MaxBatchSize is not exceeded. -1 means wait forever 
+  -->   
+  <attribute name="MaxBatchTime">-1</attribute>
+  
+  <!-- If consuming from a durable subscription this is the subscription
+       name
+       <attribute name="SubName">mysub</attribute>
+  -->
+  
+  <!-- If consuming from a durable subscription this is the client ID to
+       use
+       <attribute name="ClientID">myClientID</attribute>
+  -->
+  
+  <!-- The number of ms to wait between connection retrues in the event
+       connections to source or target fail 
+  -->
+  <attribute name="FailureRetryInterval">5000</attribute>  
+  
+  <!-- The maximum number of connection retries to make in case of failure,
+       before giving up -1 means try forever
+  -->
+  <attribute name="MaxRetries">-1</attribute>
 
-      &lt;!-- If true then the message ID of the message before bridging will be added
-          as a header to the message so it is available to the receiver. Can then be
-          sent as correlation ID to correlate in a distributed request-response --&gt;
-      &lt;attribute name="AddMessageIDInHeader"&gt;false&lt;/attribute&gt;
-      
-    &lt;/mbean&gt;
-      </programlisting>
+  <!-- If true then the message ID of the message before bridging will be
+       added as a header to the message so it is available to the 
+       receiver. Can then be sent as correlation ID to correlate in a 
+       distributed request-response 
+  -->
+  <attribute name="AddMessageIDInHeader">false</attribute>
+  
+    </mbean>
+]]></programlisting>
 
       <para>
         The next section discusses these attributes in detail.

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Configuration.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Configuration.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Configuration.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -33,94 +33,121 @@
     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;
 
-      &lt;!-- The unique id of the server peer - in a cluster each node MUST have a unique value - must be an integer --&gt;
+<programlisting><![CDATA[
+<!-- ServerPeer MBean configuration
+============================== -->
+<mbean code="org.jboss.jms.server.ServerPeer" 
+ name="jboss.messaging:service=ServerPeer 
+ xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
 
-      &lt;attribute name="ServerPeerID"&gt;0&lt;/attribute&gt;
-      
-      &lt;!-- The default JNDI context to use for queues when they are deployed without specifying one --&gt; 
-      
-      &lt;attribute name="DefaultQueueJNDIContext"&gt;/queue&lt;/attribute&gt;
-      
-      &lt;!-- The default JNDI context to use for topics when they are deployed without specifying one --&gt; 
-      
-      &lt;attribute name="DefaultTopicJNDIContext"&gt;/topic&lt;/attribute&gt;
+  <!-- The unique id of the server peer - in a cluster each node 
+       MUST have a unique value - must be an integer -->
 
-	  &lt;attribute name="PostOffice"&gt;jboss.messaging:service=PostOffice&lt;/attribute&gt;
+  <attribute name="ServerPeerID">0</attribute>
+  
+  <!-- The default JNDI context to use for queues when they are deployed 
+       without specifying one --> 
+  
+  <attribute name="DefaultQueueJNDIContext">/queue</attribute>
+  
+  <!-- The default JNDI context to use for topics when they are deployed 
+       without specifying one --> 
+  
+  <attribute name="DefaultTopicJNDIContext">/topic</attribute>
+
+  <attribute name="PostOffice">
+    jboss.messaging:service=PostOffice
+  </attribute>
 	  
-      &lt;!-- The default Dead Letter Queue (DLQ) to use for destinations.
-           This can be overridden on a per destination basis --&gt;
-      
-      &lt;attribute name="DefaultDLQ"&gt;jboss.messaging.destination:service=Queue,name=DLQ&lt;/attribute&gt;
-      
-      &lt;!-- The default maximum number of times to attempt delivery of a message before sending to the DLQ (if configured).
-           This can be overridden on a per destination basis --&gt;
-      
-      &lt;attribute name="DefaultMaxDeliveryAttempts"&gt;10&lt;/attribute&gt;
-      
-      &lt;!-- The default Expiry Queue to use for destinations. This can be overridden on a per destination basis --&gt;
-      
-      &lt;attribute name="DefaultExpiryQueue"&gt;jboss.messaging.destination:service=Queue,name=ExpiryQueue&lt;/attribute&gt;
-      
-      &lt;!-- The default redelivery delay to impose. This can be overridden on a per destination basis --&gt;
-      
-      &lt;attribute name="DefaultRedeliveryDelay"&gt;0&lt;/attribute&gt;
-      
-      &lt;!-- The periodicity of the message counter manager enquiring on queues for statistics --&gt;
-      
-      &lt;attribute name="MessageCounterSamplePeriod"&gt;5000&lt;/attribute&gt;
-      
-      &lt;!-- The maximum amount of time for a client to wait for failover to start on the server side after
-           it has detected failure --&gt;
-      
-      &lt;attribute name="FailoverStartTimeout"&gt;60000&lt;/attribute&gt;
-      
-      &lt;!-- The maximum amount of time for a client to wait for failover to complete on the server side after
-           it has detected failure --&gt;
-      
-      &lt;attribute name="FailoverCompleteTimeout"&gt;300000&lt;/attribute&gt;
-      
-      &lt;!-- The maximum number of days results to maintain in the message counter history --&gt;
-      
-      &lt;attribute name="DefaultMessageCounterHistoryDayLimit"&gt;-1&lt;/attribute&gt;
-      
-      &lt;!-- The name of the connection factory to use for creating connections between nodes to pull messages --&gt;
-      
-      &lt;attribute name="ClusterPullConnectionFactoryName"&gt;jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory&lt;/attribute&gt;
-      
-      &lt;!-- When redistributing messages in the cluster. Do we need to preserve the order of messages received
-            by a particular consumer from a particular producer? --&gt;
-            
-      &lt;attribute name="DefaultPreserveOrdering"&gt;false&lt;/attribute&gt;
-      
-      &lt;!-- Max. time to hold previously delivered messages back waiting for clients to reconnect after failover --&gt;
-      
-      &lt;attribute name="RecoverDeliveriesTimeout"&gt;300000&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;
-      --&gt;
+  <!-- The default Dead Letter Queue (DLQ) to use for destinations.
+       This can be overridden on a per destination basis -->
+  
+  <attribute name="DefaultDLQ">
+    jboss.messaging.destination:service=Queue,name=DLQ
+  </attribute>
+  
+  <!-- The default maximum number of times to attempt delivery of a 
+       message before sending to the DLQ (if configured). This can be 
+       overridden on a per destination basis -->
+  
+  <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
+  
+  <!-- The default Expiry Queue to use for destinations. This can be 
+       overridden on a per destination basis -->
+  
+  <attribute name="DefaultExpiryQueue">
+    jboss.messaging.destination:service=Queue,name=ExpiryQueue
+  </attribute>
+  
+  <!-- The default redelivery delay to impose. This can be overridden on 
+       a per destination basis -->
+  
+  <attribute name="DefaultRedeliveryDelay">0</attribute>
+  
+  <!-- The periodicity of the message counter manager enquiring on queues 
+       for statistics -->
+  
+  <attribute name="MessageCounterSamplePeriod">5000</attribute>
+  
+  <!-- The maximum amount of time for a client to wait for failover to 
+       start on the server side after it has detected failure -->
+  
+  <attribute name="FailoverStartTimeout">60000</attribute>
+  
+  <!-- The maximum amount of time for a client to wait for failover to 
+       complete on the server side after it has detected failure -->
+  
+  <attribute name="FailoverCompleteTimeout">300000</attribute>
+  
+  <!-- The maximum number of days results to maintain in the message 
+       counter history -->
+  
+  <attribute name="DefaultMessageCounterHistoryDayLimit">-1</attribute>
+  
+  <!-- The name of the connection factory to use for creating 
+       connections between nodes to pull messages -->
+  
+  <attribute name="ClusterPullConnectionFactoryName">
+    jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory
+  </attribute>
+  
+  <!-- When redistributing messages in the cluster. Do we need to preserve 
+       the order of messages received by a particular consumer from a 
+       particular producer? -->
+    
+  <attribute name="DefaultPreserveOrdering">false</attribute>
+  
+  <!-- Max. time to hold previously delivered messages back waiting for 
+       clients to reconnect after failover -->
+  
+  <attribute name="RecoverDeliveriesTimeout">300000</attribute>
+  
+  <attribute name="EnableMessageCounters">false</attribute>
+  
+  
+  <!-- The password used by the message sucker connections to create 
+       connections.
+       THIS SHOULD ALWAYS BE CHANGED AT INSTALL TIME TO SECURE SYSTEM
+  <attribute name="SuckerPassword"></attribute>
+  -->
 
-      &lt;depends optional-attribute-name="PersistenceManager"&gt;jboss.messaging:service=PersistenceManager&lt;/depends&gt;
-      
-      &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;
+  <depends optional-attribute-name="PersistenceManager">
+    jboss.messaging:service=PersistenceManager
+  </depends>
+  
+  <depends optional-attribute-name="JMSUserManager">
+    jboss.messaging:service=JMSUserManager
+  </depends>
+  
+  <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
+  <depends optional-attribute-name="SecurityStore" 
+   proxy-type="org.jboss.jms.server.SecurityStore">
+    jboss.messaging:service=SecurityStore
+  </depends>
           
-   &lt;/mbean&gt;
-</programlisting>
-
+</mbean>
+]]></programlisting>
     <section id="conf.serverpeer.attributes">
       <title>ServerPeer attributes</title>
 
@@ -273,7 +300,7 @@
       </section>
       
       <section id="conf.serverpeer.attributes.suckerconnectionretryTimes">
-        <title><remark>SuckerConnectionRetryTimes</remark></title>
+        <title>SuckerConnectionRetryTimes</title>
 
         <para>
         	This is the maximum number of times a sucker's connection is permitted to retry in the event of a failure. The default value is <literal>-1</literal> which represents "retry indefinitely".
@@ -281,7 +308,7 @@
       </section>
 
       <section id="conf.serverpeer.attributes.suckerconnectionretryinterval">
-        <title><remark>SuckerConnectionRetryInterval</remark></title>
+        <title>SuckerConnectionRetryInterval</title>
 
         <para>This is the interval in milliseconds between each retry of the failed sucker's 
          connection. The default value is <literal>5000</literal>.</para>
@@ -312,7 +339,7 @@
       </section>
 
       <section id="conf.serverpeer.attributes.messagestatistics">
-        <title><remark>MessageStatistics</remark></title>
+        <title>MessageStatistics</title>
 
         <para>
           Statistics about each message counter for each queue.
@@ -513,168 +540,206 @@
     <para>
       You can configure the post office in your <filename>&lt;your database type&gt;-persistence-service.xml</filename> file. For example:
     </para>
- 
-    <programlisting>
-&lt;mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
+
+<!-- Added here -->
+<programlisting><![CDATA[
+<mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
   name="jboss.messaging:service=PostOffice"
-  xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml"&gt;
-  
-  &lt;depends optional-attribute-name="ServerPeer"&gt;jboss.messaging:service=ServerPeer&lt;/depends&gt;
-            
-  &lt;depends&gt;jboss.jca:service=DataSourceBinding,name=DefaultDS&lt;/depends&gt;
-  
-  &lt;depends optional-attribute-name="TransactionManager"&gt;jboss:service=TransactionManager&lt;/depends&gt;
-  
-  &lt;!-- The name of the post office --&gt;                  
-  
-  &lt;attribute name="PostOfficeName"&gt;JMS post office&lt;/attribute&gt;
-  
-  &lt;!-- The datasource used by the post office to access it's binding information --&gt;                     
-  
-  &lt;attribute name="DataSource"&gt;java:/DefaultDS&lt;/attribute&gt;
-  
-  &lt;!-- If true will attempt to create tables and indexes on every start-up --&gt;
-                    
-  &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;
-  
-  &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 (?, ?, ?, ?, ?, ?, ?, ?)
-DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
-LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
-  ]]&gt;&lt;/attribute&gt;
-  
-  &lt;!-- This post office is clustered. If you don't want a clustered post office then set to false --&gt;
-  
-  &lt;attribute name="Clustered"&gt;true&lt;/attribute&gt;
-  
-  &lt;!-- All the remaining properties only have to be specified if the post office is clustered.
-        You can safely comment them out if your post office is non clustered --&gt;
-  
-  &lt;!-- The JGroups group name that the post office will use --&gt;            
-  
-  &lt;attribute name="GroupName"&gt;${jboss.messaging.groupname:MessagingPostOffice}&lt;/attribute&gt;
-  
-  &lt;!-- Max time to wait for state to arrive when the post office joins the cluster --&gt;            
-              
-  &lt;attribute name="StateTimeout"&gt;5000&lt;/attribute&gt;
-  
-  &lt;!-- Max time to wait for a synchronous call to node members using the MessageDispatcher --&gt;            
-              
-  &lt;attribute name="CastTimeout"&gt;50000&lt;/attribute&gt;
-  
-  &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; 
+  xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
+      
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
                 
-  &lt;!-- By default we use the TCP stack for data --&gt;                  
-  &lt;attribute name="DataChannelConfig"&gt;      
-      &lt;config&gt;
-        &lt;TCP start_port="7900"
-              loopback="true"
-              recv_buf_size="20000000"
-              send_buf_size="640000"
-              discard_incompatible_packets="true"
-              max_bundle_size="64000"
-              max_bundle_timeout="30"
-              use_incoming_packet_handler="true"
-              use_outgoing_packet_handler="false"
-              down_thread="false" up_thread="false"
-              enable_bundling="false"
-              use_send_queues="false"
-              sock_conn_timeout="300"
-              skip_suspected_members="true"/&gt;
-        &lt;MPING timeout="4000"
-              bind_to_all_interfaces="true"
-              mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
-              mcast_port="${jboss.messaging.datachanneludpport:45567}"
-              ip_ttl="8"
-              num_initial_members="2"
-              num_ping_requests="1"/&gt;                     
-        &lt;MERGE2 max_interval="100000"
-                down_thread="false" up_thread="false" min_interval="20000"/&gt;
-        &lt;FD_SOCK down_thread="false" up_thread="false"/&gt;            
-        &lt;VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/&gt;
-        &lt;pbcast.NAKACK max_xmit_size="60000"
-                        use_mcast_xmit="false" gc_lag="0"
-                        retransmit_timeout="300,600,1200,2400,4800"
-                        down_thread="false" up_thread="false"
-                        discard_delivered_msgs="true"/&gt;
-        &lt;pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                        down_thread="false" up_thread="false"
-                        max_bytes="400000"/&gt;
-        &lt;pbcast.GMS print_local_addr="true" join_timeout="3000"
-                    down_thread="false" up_thread="false"
-                    join_retry_timeout="2000" shun="false"
-                    view_bundling="true"/&gt;
-    &lt;/config&gt;        
-  &lt;/attribute&gt;
-  
-  &lt;!-- JGroups stack configuration to use for the control channel - used for control messages --&gt;         
-          
-  &lt;!-- We use udp stack for the control channel --&gt;
-  &lt;attribute name="ControlChannelConfig"&gt;
-      &lt;config&gt;
-        &lt;UDP
-              mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
-              mcast_port="${jboss.messaging.controlchanneludpport:45568}"
-              tos="8"
-              ucast_recv_buf_size="20000000"
-              ucast_send_buf_size="640000"
-              mcast_recv_buf_size="25000000"
-              mcast_send_buf_size="640000"
-              loopback="false"
-              discard_incompatible_packets="true"
-              max_bundle_size="64000"
-              max_bundle_timeout="30"
-              use_incoming_packet_handler="true"
-              use_outgoing_packet_handler="false"
-              ip_ttl="2"
-              down_thread="false" up_thread="false"
-              enable_bundling="false"/&gt;
-        &lt;PING timeout="2000"
-              down_thread="false" up_thread="false" num_initial_members="3"/&gt;
-        &lt;MERGE2 max_interval="100000"
-                down_thread="false" up_thread="false" min_interval="20000"/&gt;
-        &lt;FD_SOCK down_thread="false" up_thread="false"/&gt;
-        &lt;FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/&gt;
-        &lt;VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/&gt;
-        &lt;pbcast.NAKACK max_xmit_size="60000"
-                        use_mcast_xmit="false" gc_lag="0"
-                        retransmit_timeout="300,600,1200,2400,4800"
-                        down_thread="false" up_thread="false"
-                        discard_delivered_msgs="true"/&gt;
-        &lt;UNICAST timeout="300,600,1200,2400,3600"
-                  down_thread="false" up_thread="false"/&gt;
-        &lt;pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                        down_thread="false" up_thread="false"
-                        max_bytes="400000"/&gt;
-        &lt;pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
-                    down_thread="false" up_thread="false"
-                    join_retry_timeout="2000" shun="false"
-                    view_bundling="true"/&gt;
-        &lt;FRAG2 frag_size="60000" down_thread="false" up_thread="false"/&gt;
-        &lt;pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/&gt;
-        &lt;pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/&gt;
-    &lt;/config&gt;
-  &lt;/attribute&gt;	   
-  
-&lt;/mbean&gt;
-      </programlisting>
+  <depends>
+    jboss.jca:service=DataSourceBinding,name=DefaultDS
+  </depends>
+      
+  <depends optional-attribute-name="TransactionManager">
+    jboss:service=TransactionManager
+  </depends>
+      
+  <!-- The name of the post office -->                  
+    
+  <attribute name="PostOfficeName">JMS post office</attribute>
+      
+  <!-- The datasource used by the post office to access it's 
+       binding information -->                     
+      
+  <attribute name="DataSource">java:/DefaultDS</attribute>
+      
+  <!-- If true will attempt to create tables and indexes on 
+       every start-up -->
+                        
+  <attribute name="CreateTablesOnStartup">true</attribute>
+      
+  <!-- If true then we will automatically detect and reject 
+       duplicate messages sent during failover -->
+      
+  <attribute name="DetectDuplicates">true</attribute>
+      
+  <!-- The size of the id cache to use when detecting duplicate 
+       messages -->
+      
+  <attribute name="IDCacheSize">500</attribute>
+      
+  <attribute name="SqlProperties">
+    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 (?, ?, ?, ?, ?, ?, ?, ?)
+
+    DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE 
+      POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
+
+    LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, 
+      CHANNEL_ID, CLUSTERED, ALL_NODES FROM 
+	  JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
+  </attribute>
+      
+  <!-- This post office is clustered. If you don't want a clustered post 
+       office then set to false -->
+      
+  <attribute name="Clustered">true</attribute>
+      
+  <!-- All the remaining properties only have to be specified if the post 
+       office is clustered. You can safely comment them out if your post 
+       office is non clustered -->
+      
+  <!-- The JGroups group name that the post office will use -->            
+      
+  <attribute name="GroupName">
+    ${jboss.messaging.groupname:MessagingPostOffice}
+  </attribute>
+      
+  <!-- Max time to wait for state to arrive when the post office 
+       joins the cluster -->            
+                  
+  <attribute name="StateTimeout">5000</attribute>
+      
+  <!-- Max time to wait for a synchronous call to node members using 
+       the MessageDispatcher -->            
+                  
+  <attribute name="CastTimeout">50000</attribute>
+      
+  <!-- Set this to true if you want failover of connections to occur 
+       when a node is shut down -->
+      
+  <attribute name="FailoverOnNodeLeave">false</attribute>
+      
+  <!-- JGroups stack configuration for the data channel - used for sending 
+       data across the cluster --> 
+                   
+  <!-- By default we use the TCP stack for data -->                  
+  <attribute name="DataChannelConfig">
+    <config>
+      <TCP start_port="7900"
+        loopback="true"
+        recv_buf_size="20000000"
+        send_buf_size="640000"
+        discard_incompatible_packets="true"
+        max_bundle_size="64000"
+        max_bundle_timeout="30"
+        use_incoming_packet_handler="true"
+        use_outgoing_packet_handler="false"
+        down_thread="false" up_thread="false"
+        enable_bundling="false"
+        use_send_queues="false"
+        sock_conn_timeout="300"
+        skip_suspected_members="true"/>
+      <MPING timeout="4000"
+        bind_to_all_interfaces="true"
+        mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+        mcast_port="${jboss.messaging.datachanneludpport:45567}"
+        ip_ttl="8"
+        num_initial_members="2"
+        num_ping_requests="1"/>                     
+      <MERGE2 max_interval="100000"
+        down_thread="false" up_thread="false" min_interval="20000"/>
+      <FD_SOCK down_thread="false" up_thread="false"/>            
+      <VERIFY_SUSPECT timeout="1500" down_thread="false" 
+       up_thread="false"/>
+      <pbcast.NAKACK max_xmit_size="60000"
+        use_mcast_xmit="false" gc_lag="0"
+        retransmit_timeout="300,600,1200,2400,4800"
+        down_thread="false" up_thread="false"
+        discard_delivered_msgs="true"/>
+      <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+        down_thread="false" up_thread="false"
+        max_bytes="400000"/>
+      <pbcast.GMS print_local_addr="true" join_timeout="3000"
+        down_thread="false" up_thread="false"
+        join_retry_timeout="2000" shun="false"
+        view_bundling="true"/>
+    </config>        
+  </attribute>
+      
+  <!-- JGroups stack configuration to use for 
+       the control channel - used for control messages -->         
+              
+  <!-- We use udp stack for the control channel -->
+  <attribute name="ControlChannelConfig">
+    <config>
+      <UDP
+        mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
+        mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+        tos="8"
+        ucast_recv_buf_size="20000000"
+        ucast_send_buf_size="640000"
+        mcast_recv_buf_size="25000000"
+        mcast_send_buf_size="640000"
+        loopback="false"
+        discard_incompatible_packets="true"
+        max_bundle_size="64000"
+        max_bundle_timeout="30"
+        use_incoming_packet_handler="true"
+        use_outgoing_packet_handler="false"
+        ip_ttl="2"
+        down_thread="false" up_thread="false"
+        enable_bundling="false"/>
+      <PING timeout="2000"
+        down_thread="false" up_thread="false" num_initial_members="3"/>
+      <MERGE2 max_interval="100000"
+        down_thread="false" up_thread="false" min_interval="20000"/>
+      <FD_SOCK down_thread="false" up_thread="false"/>
+      <FD timeout="10000" max_tries="5" down_thread="false" 
+        up_thread="false" shun="true"/>
+      <VERIFY_SUSPECT timeout="1500" down_thread="false" 
+       up_thread="false"/>
+      <pbcast.NAKACK max_xmit_size="60000"
+        use_mcast_xmit="false" gc_lag="0"
+        retransmit_timeout="300,600,1200,2400,4800"
+        down_thread="false" up_thread="false"
+        discard_delivered_msgs="true"/>
+      <UNICAST timeout="300,600,1200,2400,3600"
+        down_thread="false" up_thread="false"/>
+      <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+        down_thread="false" up_thread="false"
+        max_bytes="400000"/>
+      <pbcast.GMS print_local_addr="true" join_timeout="3000" 
+        use_flush="true" flush_timeout="3000"
+        down_thread="false" up_thread="false"
+        join_retry_timeout="2000" shun="false"
+        view_bundling="true"/>
+      <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+      <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" 
+        use_flush="true" flush_timeout="3000"/>
+      <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" 
+        auto_flush_conf="false"/>
+    </config>
+  </attribute>	   
+      
+</mbean>
+]]></programlisting>
+ <!-- End Added -->     
+
     <section id="conf.postoffice.attributes">
       <title>Post office attributes</title>
       <para>
@@ -838,85 +903,190 @@
       The following code is the default Hypersonic persistence configuration file:
     </para>
 
-    <programlisting>
-	 &lt;mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
-      name="jboss.messaging:service=PersistenceManager"
-      xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml"&gt;
+<programlisting><![CDATA[
+<mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
+  name="jboss.messaging:service=PersistenceManager"
+  xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
+  
+  <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+  
+  <depends optional-attribute-name="TransactionManager">
+    jboss:service=TransactionManager
+  </depends>
+  
+  <!-- The datasource to use for the persistence manager -->
+        
+  <attribute name="DataSource">java:/DefaultDS</attribute>
+  
+  <!-- If true will attempt to create tables and indexes on 
+       every start-up -->
       
-      &lt;depends&gt;jboss.jca:service=DataSourceBinding,name=DefaultDS&lt;/depends&gt;
+  <attribute name="CreateTablesOnStartup">true</attribute>
+  
+  <!-- If true then will use JDBC batch updates -->
       
-      &lt;depends optional-attribute-name="TransactionManager"&gt;jboss:service=TransactionManager&lt;/depends&gt;
+  <attribute name="UsingBatchUpdates">true</attribute>
+  
+  <attribute name="SqlProperties">
+    CREATE_DUAL=CREATE TABLE JBM_DUAL 
+      (DUMMY INTEGER, PRIMARY KEY (DUMMY)) ENGINE = INNODB
+     
+    CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF 
+      (CHANNEL_ID BIGINT, MESSAGE_ID BIGINT, TRANSACTION_ID BIGINT, 
+      STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INTEGER, 
+      SCHED_DELIVERY BIGINT, PRIMARY KEY(CHANNEL_ID, MESSAGE_ID)) 
+      ENGINE = INNODB
       
-      &lt;!-- The datasource to use for the persistence manager --&gt;
-                    
-      &lt;attribute name="DataSource"&gt;java:/DefaultDS&lt;/attribute&gt;      
+    CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX 
+      ON JBM_MSG_REF (TRANSACTION_ID)
+   
+    CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JBM_MSG_REF_ORD 
+      ON JBM_MSG_REF (ORD)
+   
+    CREATE_IDX_MESSAGE_REF_PAGE_ORD=CREATE INDEX JBM_MSG_REF_PAGE_ORD 
+      ON JBM_MSG_REF (PAGE_ORD)
+   
+    CREATE_IDX_MESSAGE_REF_MESSAGE_ID=
+     CREATE INDEX JBM_MSG_REF_MESSAGE_ID ON JBM_MSG_REF (MESSAGE_ID)
+     
+    CREATE_IDX_MESSAGE_REF_SCHED_DELIVERY=
+      CREATE INDEX JBM_MSG_REF_SCHED_DELIVERY 
+      ON JBM_MSG_REF (SCHED_DELIVERY)
+     
+    CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID BIGINT, 
+      RELIABLE CHAR(1), EXPIRATION BIGINT, TIMESTAMP BIGINT, 
+      PRIORITY TINYINT, TYPE TINYINT, HEADERS MEDIUMBLOB, 
+      PAYLOAD LONGBLOB, PRIMARY KEY (MESSAGE_ID)) ENGINE = INNODB
+     
+    CREATE_IDX_MESSAGE_TIMESTAMP=CREATE INDEX JBM_MSG_REF_TIMESTAMP 
+      ON JBM_MSG (TIMESTAMP)
+    
+    CREATE_TRANSACTION=CREATE TABLE JBM_TX (NODE_ID INTEGER, 
+      TRANSACTION_ID BIGINT, BRANCH_QUAL VARBINARY(254), 
+      FORMAT_ID INTEGER, GLOBAL_TXID VARBINARY(254), 
+      PRIMARY KEY (TRANSACTION_ID)) ENGINE = INNODB
+     
+    CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR(255), 
+     NEXT_ID BIGINT, PRIMARY KEY(NAME)) ENGINE = INNODB
+     
+    INSERT_DUAL=INSERT INTO JBM_DUAL VALUES (1)
+   
+    CHECK_DUAL=SELECT 1 FROM JBM_DUAL
+   
+    INSERT_MESSAGE_REF=INSERT INTO JBM_MSG_REF (CHANNEL_ID, MESSAGE_ID,
+      TRANSACTION_ID, STATE, ORD, PAGE_ORD, DELIVERY_COUNT, 
+      SCHED_DELIVERY) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+     
+    DELETE_MESSAGE_REF=DELETE FROM JBM_MSG_REF WHERE MESSAGE_ID=? 
+      AND CHANNEL_ID=? AND STATE='C'
+   
+    UPDATE_MESSAGE_REF=UPDATE JBM_MSG_REF SET TRANSACTION_ID=?, STATE='-' 
+      WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+     
+    UPDATE_PAGE_ORDER=UPDATE JBM_MSG_REF SET PAGE_ORD = ? 
+      WHERE MESSAGE_ID=? AND CHANNEL_ID=?
+    
+    COMMIT_MESSAGE_REF1=UPDATE JBM_MSG_REF SET STATE='C', 
+      TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='+'
+     
+    COMMIT_MESSAGE_REF2=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? 
+      AND STATE='-'
+   
+    ROLLBACK_MESSAGE_REF1=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? 
+      AND STATE='+'
+   
+    ROLLBACK_MESSAGE_REF2=UPDATE JBM_MSG_REF SET STATE='C', 
+      TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='-'
+     
+    LOAD_PAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, PAGE_ORD, 
+      SCHED_DELIVERY FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND PAGE_ORD 
+      BETWEEN ? AND ? ORDER BY PAGE_ORD
+     
+    LOAD_UNPAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY 
+      FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? AND PAGE_ORD 
+      IS NULL ORDER BY ORD
+     
+    LOAD_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY 
+      FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? ORDER BY ORD
+          
+    UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE 
+      PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
+     
+    SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) 
+      FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
+     
+    SELECT_EXISTS_REF_MESSAGE_ID=SELECT MESSAGE_ID FROM JBM_MSG_REF 
+      WHERE MESSAGE_ID = ?
+   
+    UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? 
+      WHERE CHANNEL_ID = ? AND MESSAGE_ID = ?
+     
+    UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? 
+      WHERE CHANNEL_ID = ?
+    
+    LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, 
+      PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
+     
+    INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION,
+      TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) 
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+     
+    INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, 
+      EXPIRATION, TIMESTAMP, PRIORITY, TYPE, INST_TIME) 
+      SELECT ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS 
+      (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+     
+    UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? 
+      WHERE MESSAGE_ID=?
+   
+    INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, 
+      RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) 
+      SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS 
+      (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+        
+    MESSAGE_ID_COLUMN=MESSAGE_ID
       
-      &lt;!-- If true will attempt to create tables and indexes on every start-up --&gt;
-                  
-      &lt;attribute name="CreateTablesOnStartup"&gt;true&lt;/attribute&gt;
+    DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS 
+      (SELECT * FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
+       
+    INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, 
+      BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
+     
+    DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? 
+      AND TRANSACTION_ID = ?
+   
+    SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, 
+      FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
+     
+    SELECT_MESSAGE_ID_FOR_REF=SELECT MESSAGE_ID, CHANNEL_ID 
+      FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '+' 
+      ORDER BY ORD
+     
+    SELECT_MESSAGE_ID_FOR_ACK=SELECT MESSAGE_ID, CHANNEL_ID 
+      FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '-' 
+      ORDER BY ORD
+     
+    UPDATE_COUNTER=UPDATE JBM_COUNTER SET NEXT_ID = ? WHERE NAME=?
+   
+    SELECT_COUNTER=SELECT NEXT_ID FROM JBM_COUNTER WHERE NAME=? FOR UPDATE
+   
+    INSERT_COUNTER=INSERT INTO JBM_COUNTER (NAME, NEXT_ID) VALUES (?, ?)
+   
+    SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
+   
+    UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
+   
+  </attribute>
+  
+  <!-- The maximum number of parameters to include in a prepared 
+       statement -->
       
-      &lt;!-- If true then will use JDBC batch updates --&gt;
-                  
-      &lt;attribute name="UsingBatchUpdates"&gt;true&lt;/attribute&gt;
-      
-      &lt;attribute name="SqlProperties"&gt;&lt;![CDATA[
-   CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY)) ENGINE = INNODB
-   CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (CHANNEL_ID BIGINT, MESSAGE_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INTEGER, SCHED_DELIVERY BIGINT, PRIMARY KEY(CHANNEL_ID, MESSAGE_ID)) ENGINE = INNODB
-   CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID)
-   CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JBM_MSG_REF_ORD ON JBM_MSG_REF (ORD)
-   CREATE_IDX_MESSAGE_REF_PAGE_ORD=CREATE INDEX JBM_MSG_REF_PAGE_ORD ON JBM_MSG_REF (PAGE_ORD)
-   CREATE_IDX_MESSAGE_REF_MESSAGE_ID=CREATE INDEX JBM_MSG_REF_MESSAGE_ID ON JBM_MSG_REF (MESSAGE_ID)
-   CREATE_IDX_MESSAGE_REF_SCHED_DELIVERY=CREATE INDEX JBM_MSG_REF_SCHED_DELIVERY ON JBM_MSG_REF (SCHED_DELIVERY)
-   CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID BIGINT, RELIABLE CHAR(1), EXPIRATION BIGINT, TIMESTAMP BIGINT, PRIORITY TINYINT, TYPE TINYINT, HEADERS MEDIUMBLOB, PAYLOAD LONGBLOB, PRIMARY KEY (MESSAGE_ID)) ENGINE = INNODB
-   CREATE_IDX_MESSAGE_TIMESTAMP=CREATE INDEX JBM_MSG_REF_TIMESTAMP ON JBM_MSG (TIMESTAMP)
-   CREATE_TRANSACTION=CREATE TABLE JBM_TX (NODE_ID INTEGER, TRANSACTION_ID BIGINT, BRANCH_QUAL VARBINARY(254), FORMAT_ID INTEGER, GLOBAL_TXID VARBINARY(254), PRIMARY KEY (TRANSACTION_ID)) ENGINE = INNODB
-   CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR(255), NEXT_ID BIGINT, PRIMARY KEY(NAME)) ENGINE = INNODB
-   INSERT_DUAL=INSERT INTO JBM_DUAL VALUES (1)
-   CHECK_DUAL=SELECT 1 FROM JBM_DUAL
-   INSERT_MESSAGE_REF=INSERT INTO JBM_MSG_REF (CHANNEL_ID, MESSAGE_ID, TRANSACTION_ID, STATE, ORD, PAGE_ORD, DELIVERY_COUNT, SCHED_DELIVERY) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-   DELETE_MESSAGE_REF=DELETE FROM JBM_MSG_REF WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
-   UPDATE_MESSAGE_REF=UPDATE JBM_MSG_REF SET TRANSACTION_ID=?, STATE='-' WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
-   UPDATE_PAGE_ORDER=UPDATE JBM_MSG_REF SET PAGE_ORD = ? WHERE MESSAGE_ID=? AND CHANNEL_ID=?
-   COMMIT_MESSAGE_REF1=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='+'
-   COMMIT_MESSAGE_REF2=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='-'
-   ROLLBACK_MESSAGE_REF1=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='+'
-   ROLLBACK_MESSAGE_REF2=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='-'
-   LOAD_PAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, PAGE_ORD, SCHED_DELIVERY FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND PAGE_ORD BETWEEN ? AND ? ORDER BY PAGE_ORD
-   LOAD_UNPAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? AND PAGE_ORD IS NULL ORDER BY ORD
-   LOAD_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? ORDER BY ORD     
-   UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
-   SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
-   SELECT_EXISTS_REF_MESSAGE_ID=SELECT MESSAGE_ID FROM JBM_MSG_REF WHERE MESSAGE_ID = ?
-   UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE CHANNEL_ID = ? AND MESSAGE_ID = ?
-   UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?
-   LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
-   INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-   INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, INST_TIME) SELECT ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
-   UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
-   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)   
-   MESSAGE_ID_COLUMN=MESSAGE_ID   
-   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT * FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)      
-   INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
-   DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
-   SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
-   SELECT_MESSAGE_ID_FOR_REF=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '+' ORDER BY ORD
-   SELECT_MESSAGE_ID_FOR_ACK=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '-' ORDER BY ORD
-   UPDATE_COUNTER=UPDATE JBM_COUNTER SET NEXT_ID = ? WHERE NAME=?
-   SELECT_COUNTER=SELECT NEXT_ID FROM JBM_COUNTER WHERE NAME=? FOR UPDATE
-   INSERT_COUNTER=INSERT INTO JBM_COUNTER (NAME, NEXT_ID) VALUES (?, ?)
-   SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
-   UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
-      ]]&gt;&lt;/attribute&gt;
-      
-      &lt;!-- The maximum number of parameters to include in a prepared statement --&gt;
-                  
-      &lt;attribute name="MaxParams"&gt;500&lt;/attribute&gt;
+  <attribute name="MaxParams">500</attribute>
 
-      &lt;attribute name="UseNDBFailoverStrategy"&gt;true&lt;/attribute&gt;
+  <attribute name="UseNDBFailoverStrategy">true</attribute>
          
-   &lt;/mbean&gt;
-	  
-	   </programlisting>
+</mbean>
+]]></programlisting>
 
            <important>
               <para>
@@ -1018,29 +1188,32 @@
       The following is an example <literal>JMSUserManager</literal> configuration:
     </para>
 
-    <programlisting>
-   &lt;mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
-      name="jboss.messaging:service=JMSUserManager"
-      xmbean-dd="xmdesc/JMSUserManager-xmbean.xml"&gt;
-      &lt;depends&gt;jboss.jca:service=DataSourceBinding,name=DefaultDS&lt;/depends&gt;
-      &lt;depends optional-attribute-name="TransactionManager"&gt;
-               jboss:service=TransactionManager
-      &lt;/depends&gt;
-      &lt;attribute name="DataSource"&gt;java:/DefaultDS&lt;/attribute&gt;
-      &lt;attribute name="CreateTablesOnStartup"&gt;true&lt;/attribute&gt;
-      &lt;attribute name="SqlProperties"&gt;&lt;![CDATA[
-               CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR(32) NOT NULL,
-               PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128),
-               PRIMARY KEY(USER_ID)) ENGINE = INNODB
-               CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR(32) NOT NULL,
-               USER_ID VARCHAR(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
-               ENGINE = INNODB
-               SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
-               POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID)
-               VALUES ('dilbert','dogbert','dilbert-id')
-      ]]&gt;&lt;/attribute&gt;
-   &lt;/mbean&gt;
-           </programlisting>
+<programlisting><![CDATA[
+<mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+  name="jboss.messaging:service=JMSUserManager"
+  xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+  <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+  <depends optional-attribute-name="TransactionManager">
+    jboss:service=TransactionManager
+  </depends>
+  <attribute name="DataSource">java:/DefaultDS</attribute>
+  <attribute name="CreateTablesOnStartup">true</attribute>
+  <attribute name="SqlProperties">
+    CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR(32) NOT NULL,
+      PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128),
+      PRIMARY KEY(USER_ID)) ENGINE = INNODB
+    
+    CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR(32) NOT NULL,
+      USER_ID VARCHAR(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
+      ENGINE = INNODB
+    
+    SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
+    
+    POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID)
+      VALUES ('dilbert','dogbert','dilbert-id')   
+  </attribute>
+</mbean>
+]]></programlisting>
 
     <section id="conf.jmsusermanager.attributes">
       <title>JMSUserManager Managed Bean Attributes</title>
@@ -1085,152 +1258,156 @@
         JBoss Messaging ships with a default set of preconfigured destinations that are deployed as the server starts up. The configuration information for these destinations can be found in the following section of <filename>destinations-service.xml</filename>:
       </para>
 
-      <programlisting>
-   &lt;!--
-      The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
-   --&gt;
+<programlisting><![CDATA[
+   <!--
+      The Default Dead Letter Queue. This destination is a dependency 
+      of an EJB MDB container.
+   -->
 
-   &lt;mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=DLQ"
-      xmbean-dd="xmdesc/Queue-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.QueueService"
+  name="jboss.messaging.destination:service=Queue,name=DLQ"
+  xmbean-dd="xmdesc/Queue-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+</mbean>
 
 
-   &lt;mbean code="org.jboss.jms.server.destination.TopicService"
-      name="jboss.messaging.destination:service=Topic,name=testTopic"
-      xmbean-dd="xmdesc/Topic-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-      &lt;attribute name="SecurityConfig"&gt;
-         &lt;security&gt;
-            &lt;role name="guest" read="true" write="true"/&gt;
-            &lt;role name="publisher" read="true" write="true" create="false"/&gt;
-            &lt;role name="durpublisher" read="true" write="true" create="true"/&gt;
-         &lt;/security&gt;
-      &lt;/attribute&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.TopicService"
+  name="jboss.messaging.destination:service=Topic,name=testTopic"
+  xmbean-dd="xmdesc/Topic-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+  <attribute name="SecurityConfig">
+    <security>
+      <role name="guest" read="true" write="true"/>
+      <role name="publisher" read="true" write="true" create="false"/>
+      <role name="durpublisher" read="true" write="true" create="true"/>
+    </security>
+  </attribute>
+</mbean>
 
-   &lt;mbean code="org.jboss.jms.server.destination.TopicService"
-      name="jboss.messaging.destination:service=Topic,name=securedTopic"
-      xmbean-dd="xmdesc/Topic-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-      &lt;attribute name="SecurityConfig"&gt;
-         &lt;security&gt;
-            &lt;role name="publisher" read="true" write="true" create="false"/&gt;
-         &lt;/security&gt;
-      &lt;/attribute&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.TopicService"
+  name="jboss.messaging.destination:service=Topic,name=securedTopic"
+  xmbean-dd="xmdesc/Topic-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+  <attribute name="SecurityConfig">
+    <security>
+      <role name="publisher" read="true" write="true" create="false"/>
+    </security>
+  </attribute>
+</mbean>
 
 
-   &lt;mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testQueue"
-      xmbean-dd="xmdesc/Queue-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-      &lt;attribute name="SecurityConfig"&gt;
-         &lt;security&gt;
-            &lt;role name="guest" read="true" write="true"/&gt;
-            &lt;role name="publisher" read="true" write="true" create="false"/&gt;
-            &lt;role name="noacc" read="false" write="false" create="false"/&gt;
-         &lt;/security&gt;
-      &lt;/attribute&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.QueueService"
+  name="jboss.messaging.destination:service=Queue,name=testQueue"
+  xmbean-dd="xmdesc/Queue-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+  <attribute name="SecurityConfig">
+    <security>
+      <role name="guest" read="true" write="true"/>
+      <role name="publisher" read="true" write="true" create="false"/>
+      <role name="noacc" read="false" write="false" create="false"/>
+    </security>
+  </attribute>
+</mbean>
 
-   &lt;mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=A"
-      xmbean-dd="xmdesc/Queue-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.QueueService"
+  name="jboss.messaging.destination:service=Queue,name=A"
+  xmbean-dd="xmdesc/Queue-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+</mbean>
 
 
-   &lt;!-- It's possible for indiviual queues and topics to use a specific queue for
-   an expiry or DLQ --&gt;
+<!-- It's possible for indiviual queues and topics to use a specific 
+     queue for an expiry or DLQ -->
 
-   &lt;mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
-      xmbean-dd="xmdesc/Queue-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.QueueService"
+  name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+  xmbean-dd="xmdesc/Queue-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+</mbean>
 
-   &lt;mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
-      xmbean-dd="xmdesc/Queue-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.QueueService"
+  name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+  xmbean-dd="xmdesc/Queue-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+</mbean>
 
-   &lt;mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
-      xmbean-dd="xmdesc/Queue-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-      &lt;attribute name="DLQ"&gt;
-                  jboss.messaging.destination:service=Queue,name=PrivateDLQ
-      &lt;/attribute&gt;
-      &lt;attribute name="ExpiryQueue"&gt;
-                  jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue
-      &lt;/attribute&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.QueueService"
+  name="jboss.messaging.destination:service=Queue,
+        name=QueueWithOwnDLQAndExpiryQueue"
+  xmbean-dd="xmdesc/Queue-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+  <attribute name="DLQ">
+    jboss.messaging.destination:service=Queue,name=PrivateDLQ
+  </attribute>
+  <attribute name="ExpiryQueue">
+    jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue
+  </attribute>
+</mbean>
 
-   &lt;mbean code="org.jboss.jms.server.destination.TopicService"
-      name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
-      xmbean-dd="xmdesc/Topic-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-      &lt;attribute name="DLQ"&gt;
-                  jboss.messaging.destination:service=Queue,name=PrivateDLQ
-      &lt;/attribute&gt;
-      &lt;attribute name="ExpiryQueue"&gt;
-                  jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue
-      &lt;/attribute&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.TopicService"
+  name="jboss.messaging.destination:service=Topic,
+        name=TopicWithOwnDLQAndExpiryQueue"
+  xmbean-dd="xmdesc/Topic-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+  <attribute name="DLQ">
+    jboss.messaging.destination:service=Queue,name=PrivateDLQ
+  </attribute>
+  <attribute name="ExpiryQueue">
+    jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue
+  </attribute>
+</mbean>
 
 
-   &lt;mbean code="org.jboss.jms.server.destination.TopicService"
-      name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
-      xmbean-dd="xmdesc/Topic-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-      &lt;attribute name="RedeliveryDelay"&gt;5000&lt;/attribute&gt;
-   &lt;/mbean&gt;
+<mbean code="org.jboss.jms.server.destination.TopicService"
+  name="jboss.messaging.destination:service=Topic,
+        name=TopicWithOwnRedeliveryDelay"
+  xmbean-dd="xmdesc/Topic-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+  <attribute name="RedeliveryDelay">5000</attribute>
+</mbean>
 
 
-   &lt;mbean code="org.jboss.jms.server.destination.TopicService"
-      name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
-      xmbean-dd="xmdesc/Topic-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                  jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
-      &lt;attribute name="Clustered"&gt;true&lt;/attribute&gt;
-   &lt;/mbean&gt;
-....
-              </programlisting>
+<mbean code="org.jboss.jms.server.destination.TopicService"
+  name="jboss.messaging.destination:service=Topic,
+        name=testDistributedTopic"
+  xmbean-dd="xmdesc/Topic-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
+  <attribute name="Clustered">true</attribute>
+</mbean>
+]]></programlisting>
     </section>
 
     <!-- end conf.preconf.destinations -->
@@ -1361,7 +1538,7 @@
 Message msg = sess.createMessage();  
     
 msg.setLongProperty(JBossMessage.JMS_JBOSS_SCHEDULED_DELIVERY_PROP_NAME,
-        now + 1000 * 60 * 60 * 2);
+  now + 1000 * 60 * 60 * 2);
 
 prod.send(msg);
                             
@@ -1758,50 +1935,52 @@
       Enable support for automatic failover or load balancing by setting the relevant attributes in your connection factory:
     </para>
 
-    <programlisting>
-&lt;mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
-      name="jboss.messaging.connectionfactory:service=MyConnectionFactory"
-      xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml"&gt;
-      &lt;depends optional-attribute-name="ServerPeer"&gt;
-                 jboss.messaging:service=ServerPeer
-      &lt;/depends&gt;
-      &lt;depends optional-attribute-name="Connector"&gt;
-                 jboss.messaging:service=Connector,transport=bisocket
-      &lt;/depends&gt;
-      &lt;depends&gt;jboss.messaging:service=PostOffice&lt;/depends&gt;
+<programlisting><![CDATA[
+<mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+  name="jboss.messaging.connectionfactory:service=MyConnectionFactory"
+  xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends optional-attribute-name="Connector">
+    jboss.messaging:service=Connector,transport=bisocket
+  </depends>
+  <depends>jboss.messaging:service=PostOffice</depends>
 
-      &lt;attribute name="JNDIBindings"&gt;
-         &lt;bindings&gt;
-            &lt;binding&gt;/MyConnectionFactory&lt;/binding&gt;
-            &lt;binding&gt;/factories/cf&lt;/binding&gt;
-         &lt;/bindings&gt;
-      &lt;/attribute&gt;
-      
-      &lt;attribute name="ClientID"&gt;myClientID&lt;/attribute&gt;
+  <attribute name="JNDIBindings">
+    <bindings>
+    <binding>/MyConnectionFactory</binding>
+    <binding>/factories/cf</binding>
+    </bindings>
+  </attribute>
+  
+  <attribute name="ClientID">myClientID</attribute>
 
-      &lt;attribute name="SupportsFailover"&gt;true&lt;/attribute&gt;
+  <attribute name="SupportsFailover">true</attribute>
+  
+  <attribute name="SupportsLoadBalancing">false</attribute>  
+  
+  <attribute name="LoadBalancingFactory">
+    org.acme.MyLoadBalancingFactory
+  </attribute>
       
-      &lt;attribute name="SupportsLoadBalancing"&gt;false&lt;/attribute&gt;  
-      
-      &lt;attribute name="LoadBalancingFactory"&gt;org.acme.MyLoadBalancingFactory&lt;/attribute&gt;
-          
-      &lt;attribute name="PrefetchSize"&gt;1000&lt;/attribute&gt; 
+  <attribute name="PrefetchSize">1000</attribute> 
 
-      &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;
+  <attribute name="SlowConsumers">false</attribute>
+  
+  <attribute name="StrictTck">true</attribute>
+  
+  <attribute name="SendAcksAsync">false</attribute>
 
-      &lt;attribute name="DefaultTempQueueFullSize"&gt;50000&lt;/attribute&gt;
-      
-      &lt;attribute name="DefaultTempQueuePageSize"&gt;1000&lt;/attribute&gt; 
-            
-      &lt;attribute name="DefaultTempQueueDownCacheSize"&gt;1000&lt;/attribute&gt; 
-      
-      &lt;attribute name="DupsOKBatchSize"&gt;10000&lt;/attribute&gt; 
-   &lt;/mbean&gt;
-             </programlisting>
+  <attribute name="DefaultTempQueueFullSize">50000</attribute>
+  
+  <attribute name="DefaultTempQueuePageSize">1000</attribute> 
+    
+  <attribute name="DefaultTempQueueDownCacheSize">1000</attribute> 
+  
+  <attribute name="DupsOKBatchSize">10000</attribute> 
+</mbean>
+]]></programlisting>
 
     <para>
       The example configuration would create a connection factory with the preconfigured client ID <literal>myClientID</literal>, which would be bound to two locations in the JNDI tree: <literal>/MyConnectionFactory</literal> and <literal>/factories/cf</literal>. This connection factory overrides the default values for <varname>PreFetchSize</varname>, <varname>DefaultTempQueueFullSize</varname>, <varname>DefaultTempQueuePageSize</varname>, <varname>DefaultTempQueueDownCacheSize</varname> and <varname>DupsOKBatchSize</varname>, <varname>SupportsFailover</varname>, <varname>SupportsLoadBalancing</varname> and <varname>LoadBalancingFactory</varname>. 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.
@@ -1836,7 +2015,7 @@
       </section>
 
       <section id="conf.connectionfactory.attributes.slowconsumers">
-        <title><remark>SlowConsumers</remark></title>
+        <title>SlowConsumers</title>
 		
 		<para>  
           The allowable buffer size for slow consumers should be minimized to increase the potential for messages to be consumed by faster consumers. It is not possible to totally disable buffering, however, setting the <varname>SlowConsumers</varname> attribute to <literal>true</literal> will reduce the buffer size. Setting this attribute to <literal>true</literal> is equivalent to setting <varname>PrefetchSize</varname> to <literal>1</literal> which is the lowest possible value available.
@@ -1934,7 +2113,7 @@
       </section>
       
         <section id="conf.connectionfactory.attributes.enableorderinggroup">
-        <title><remark>EnableOrderingGroup</remark></title>
+        <title>EnableOrderingGroup</title>
 
         <para>
         	This parameter controls whether strict message ordering is enabled on the <literal>ConnectionFactory</literal>. If set to <literal>true</literal>, any messages sent from producers which are created from the enabled connection factory become ordering group messages. The default value for this parameter is <literal>false</literal>.
@@ -1942,7 +2121,7 @@
       </section>
 
       <section id="conf.connectionfactory.attributes.defaultorderinggroupname">
-        <title><remark>DefaultOrderingGroupName</remark></title>
+        <title>DefaultOrderingGroupName</title>
 
         <para>
         	This is the default name for the message ordering group which will take effect once the <literal>EnableOrderingGroup</literal> parameter is set to <literal>true</literal> . If this attribute is missing, the group name will be generated automatically.
@@ -1980,50 +2159,144 @@
     <para>
       Remoting configuration details can be seen in <filename>$JBOSS_HOME/server/$SERVER/deploy/jboss-messaging/remoting-bisocket-service.xml</filename>. The following code is an example of a bisocket remoting configuration:
     </para>
-    <programlisting>
-&lt;config&gt;
-  &lt;invoker transport="bisocket"&gt;
-  
-      &lt;!-- There should be no reason to change these parameters - warning!
-          Changing them may stop JBoss Messaging working correctly --&gt;            
-      &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="timeout" isParam="true"&gt;0&lt;/attribute&gt;
-      &lt;attribute name="serverBindAddress"&gt;${jboss.bind.address}&lt;/attribute&gt;
-      &lt;attribute name="serverBindPort"&gt;4457&lt;/attribute&gt;
-      &lt;attribute name="clientSocketClass" isParam="true"&gt;org.jboss.jms.client.remoting.ClientSocketWrapper&lt;/attribute&gt;
-      &lt;attribute name="serverSocketClass" isParam="true"&gt;org.jboss.jms.server.remoting.ServerSocketWrapper&lt;/attribute&gt;
-      &lt;attribute name="numberOfCallRetries" isParam="true"&gt;1&lt;/attribute&gt;
-      &lt;attribute name="pingFrequency" isParam="true"&gt;214748364&lt;/attribute&gt;
-      &lt;attribute name="pingWindowFactor" isParam="true"&gt;10&lt;/attribute&gt;
-      &lt;attribute name="onewayThreadPool"&gt;org.jboss.jms.server.remoting.DirectThreadPool&lt;/attribute&gt;
-      
-      &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;
+    
+       <!-- Addition start here -->
+<programlisting><![CDATA[     
+<?xml version="1.0" encoding="UTF-8"?>
 
-      &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;
+<!--
+  Standard bisocket-based Remoting service deployment descriptor.
 
-      &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="clientMaxPoolSize" isParam="true"&gt;200&lt;/attribute&gt;
-      
-      &lt;!-- Use these parameters to specify values for binding and connecting control connections to 
-          work with your firewall/NAT configuration
-      &lt;attribute name="secondaryBindPort"&gt;xyz&lt;/attribute&gt;                           
-      &lt;attribute name="secondaryConnectPort"&gt;abc&lt;/attribute&gt;               
-      --&gt;
-                    
-  &lt;/invoker&gt;
-  &lt;handlers&gt;
-      &lt;handler subsystem="JMS"&gt;org.jboss.jms.server.remoting.JMSServerInvocationHandler&lt;/handler&gt;
-  &lt;/handlers&gt;
-&lt;/config&gt;
-      </programlisting>
+  $Id: remoting-bisocket-service.xml 3981 2008-03-28 18:00:41Z tf $
+-->
 
+<server>
 
+  <!-- Standard bisocket connector - the bisocket transport only opens 
+       connection from client->server so can be used with firewalls where
+       only outgoing connections are allowed. For examples of HTTP and 
+       SSL transports see docs/examples -->
+  <mbean code="org.jboss.remoting.transport.Connector"
+    name="jboss.messaging:service=Connector,transport=bisocket"
+    display-name="Bisocket Transport Connector">
+    <attribute name="Configuration">
+      <config>
+        <invoker transport="bisocket">
+           
+        <!-- There should be no reason to change these parameters - warning!
+            Changing them may stop JBoss Messaging working correctly -->           
+        <attribute name="marshaller" isParam="true">
+          org.jboss.jms.wireformat.JMSWireFormat
+        </attribute>
+        <attribute name="unmarshaller" isParam="true">
+          org.jboss.jms.wireformat.JMSWireFormat
+        </attribute>
+        <attribute name="dataType" isParam="true">
+          jms
+        </attribute>
+        <attribute name="socket.check_connection" isParam="true">
+          false
+        </attribute>               
+        <attribute name="serverBindAddress">
+          ${jboss.bind.address}
+        </attribute>
+        <attribute name="serverBindPort">
+          ${jboss.messaging.connector.bisocket.port:4457}
+        </attribute>
+        <attribute name="clientSocketClass" isParam="true">
+          org.jboss.jms.client.remoting.ClientSocketWrapper
+        </attribute>
+        <attribute name="serverSocketClass">
+          org.jboss.jms.server.remoting.ServerSocketWrapper
+        </attribute>
+        <attribute name="onewayThreadPool">
+          org.jboss.jms.server.remoting.DirectThreadPool
+        </attribute>
+
+        <!-- the following parameters are useful when there is a 
+             firewall between client and server. Uncomment them if so.-->
+        <!--	       
+        <attribute name="numberOfCallRetries" isParam="true">
+          5
+        </attribute>
+        <attribute name="pingFrequency" isParam="true">
+          30000
+        </attribute>
+        <attribute name="pingWindowFactor" isParam="true">
+          71582
+        </attribute>
+        <attribute name="generalizeSocketException" isParam="true">
+         true
+        </attribute>
+        -->
+
+        <!-- Now remoting supports socket write timeout configuration. 
+             Uncomment this if you need it. -->
+        <!--         
+        <attribute name="writeTimeout" isParam="true">30000</attribute>
+        -->
+
+        <!-- End immutable parameters -->
+        
+        <attribute name="stopLeaseOnFailure" isParam="true">true</attribute>
+        
+        <!-- Periodicity of client pings. Server window by default 
+             is twice this figure -->                   
+        <attribute name="clientLeasePeriod" isParam="true">
+          10000
+        </attribute>
+        <attribute name="validatorPingPeriod" isParam="true">
+          10000
+        </attribute>
+        <attribute name="validatorPingTimeout" isParam="true">
+          5000
+        </attribute>
+
+        attribute name="failureDisconnectTimeout" isParam="true">
+          0
+        </attribute>
+        <attribute name="callbackErrorsAllowed">1</attribute>
+        <attribute name="registerCallbackListener">false</attribute>
+        <attribute name="useClientConnectionIdentity" isParam="true">
+          true
+        </attribute>
+        
+        <attribute name="timeout" isParam="true">0</attribute>
+
+        <!-- Max Number of connections in client pool. This should be 
+             significantly higher than the max number of sessions/
+             consumers you expect -->
+        <attribute name="JBM_clientMaxPoolSize" isParam="true">
+          200
+        </attribute>
+        
+        <!-- The maximum time to wait before timing out on trying to 
+             write a message to socket for delivery -->
+        <attribute name="callbackTimeout">
+          10000
+        </attribute> 
+        
+        <!-- Use these parameters to specify values for binding and 
+             connecting control connections to work with your 
+             firewall/NAT configuration
+        <attribute name="secondaryBindPort">xyz</attribute>                   
+        <attribute name="secondaryConnectPort">abc</attribute>        
+        -->
+                  
+        </invoker>
+        <handlers>
+          <handler subsystem="JMS">
+            org.jboss.jms.server.remoting.JMSServerInvocationHandler
+          </handler>
+        </handlers>
+       </config>
+     </attribute>
+   </mbean>
+
+</server>
+]]></programlisting> <!-- Addition ends here -->
+
+
     <para>
       Some attributes should not be changed unless you know exactly what you are doing. Attributes that can be changed include:
     </para>

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Introduction.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Introduction.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Introduction.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -19,7 +19,7 @@
   </para>
 
   <section id="features">
-    <title><remark>JBoss Messaging Features</remark></title>
+    <title>JBoss Messaging Features</title>
 
     <para>JBoss Messaging provides the following features:</para>
 
@@ -84,9 +84,7 @@
       </listitem>
       
  	  <listitem>
- 	  <formalpara><title><remark>1.4.6 Update Here</remark></title>     
        	<para>servlet transport to allow messaging through a dedicated servlet;</para>
-       	</formalpara>
       </listitem>
 
 
@@ -106,11 +104,10 @@
         <para>the automatic paging of messages to storage, which lets you use very large queues that would be too large to fit entirely within system memory.</para>
       </listitem>
       
-       <listitem><formalpara><title><remark>1.4.6 Update Here</remark></title>
+       <listitem>
         <para>
         	strict message ordering which results in messages belonging to a particular message group being delivered according to the order of their arrival at the target queue.  
-        	</para>
-        </formalpara>
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -210,10 +207,10 @@
   </section>
   
   <section id="properties">
-    <title><remark>System Properties used by JBoss Messaging</remark></title>
+    <title>System Properties used by JBoss Messaging</title>
 
       <section id="properties.supportBytesId">
-        <title><remark>support.bytesId</remark></title>
+        <title>support.bytesId</title>
 
         <para>
         	This system property controls the default behavior when constructing a <literal>JBossMessage</literal> object from a foreign message object. If this property is set to <literal>true</literal>, the <literal>JBossMessage</literal> constructor will try to extract the native byte[] correlation ID from the foreign message headers. If set to <literal>false</literal>, it will use the normal string type <literal>JMSCorrelationID</literal>. This property will default to <literal>true</literal> if not set or when set to something other than <literal>true</literal> or <literal>false</literal>.
@@ -221,10 +218,10 @@
       </section>
 
       <section id="properties.retainOldxabehaviour">
-      <title><remark>retain.oldxabehaviour</remark></title>
+      <title>retain.oldxabehaviour</title>
 
         <para>
-          	This system property controls the type of exception thrown by a JMS XAResource in the event that the prepare is called after the connection is broken. If this property is not defined, an <literal>XAException</literal> with an <literal>XA_RBCOMMFAIL</literal> error code will be thrown. Otherwise an <literal>XAException</literal> with an <literal>XA_RETRY</literal> error code will be thrown. It should be noted that JBoss Messaging does not define this property by default.
+          	This system property controls the type of exception thrown by a JMS XAResource in the event that the prepar() method is called after the connection is broken. If this property is not defined, an <literal>XAException</literal> with an <literal>XA_RBCOMMFAIL</literal> error code will be thrown. Otherwise an <literal>XAException</literal> with an <literal>XA_RETRY</literal> error code will be thrown. It should be noted that JBoss Messaging does not define this property by default.
         </para>
       </section>
 

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/JBoss_Messaging_User_Guide.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/JBoss_Messaging_User_Guide.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/JBoss_Messaging_User_Guide.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -5,7 +5,7 @@
 <book id="JBoss_Messaging_User_Guide">
 	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="About.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+      <xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Getting_Started.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Running_Examples.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Ordering_Group.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Ordering_Group.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Ordering_Group.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter id="orderinggroup">
-  <title><remark>Enabling JBoss Messaging Ordering Group</remark></title>
+  <title>Enabling JBoss Messaging Ordering Group</title>
 
   <para>
   	This section describes how to use the JBoss Messaging ordering group feature to achieve strict message ordering.
@@ -47,7 +47,7 @@
     
   <note><title>Note</title>  
    <para>
-  	If the message consumer is closed, the message being processed at the time of its closure will be deemed as completed. This is regardless of whether an <literal>ACKNOWLEGE</literal> is called prior to the closure of the consumer.
+  	If the message consumer is closed, the message being processed at the time of its closure will be deemed as completed. This is regardless of whether an <literal>*_ACKNOWLEGE</literal> is called prior to the closure of the consumer.
   </para>
   <!--
   <para>
@@ -149,34 +149,34 @@
 </note>
 <para>The following factory service configuration file sample demonstrates how to enable the ordering group feature:</para>
 
-  <programlisting>
-  &lt;mbean code=&quot;org.jboss.jms.server.connectionfactory.ConnectionFactory&quot;
-    name=&quot;jboss.messaging.connectionfactory:service=ConnectionFactory&quot;
-    xmbean-dd=&quot;xmdesc/ConnectionFactory-xmbean.xml&quot;&gt;
-    &lt;depends optional-attribute-name=&quot;ServerPeer&quot;&gt;
-      jboss.messaging:service=ServerPeer
-    &lt;/depends&gt;
-    &lt;depends optional-attribute-name=&quot;Connector&quot;&gt;
-      jboss.messaging:service=Connector,transport=bisocket
-    &lt;/depends&gt;
-    &lt;depends&gt;
-      jboss.messaging:service=PostOffice
-    &lt;/depends&gt;
+<programlisting><![CDATA[
+<mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory";
+  name="jboss.messaging.connectionfactory:service=ConnectionFactory";
+  xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+  <depends optional-attribute-name="ServerPeer">
+    jboss.messaging:service=ServerPeer
+  </depends>
+  <depends optional-attribute-name="Connector">
+    jboss.messaging:service=Connector,transport=bisocket
+  </depends>
+  <depends>
+    jboss.messaging:service=PostOffice
+  </depends>
 
-    &lt;attribute name=&quot;JNDIBindings&quot;&gt;
-      &lt;bindings&gt;
-      &lt;binding&gt;/MyConnectionFactory&lt;/binding&gt;
-      &lt;binding&gt;/XAConnectionFactory&lt;/binding&gt;
-      &lt;binding&gt;java:/MyConnectionFactory&lt;/binding&gt;
-      &lt;binding&gt;java:/XAConnectionFactory&lt;/binding&gt;
-      &lt;/bindings&gt;
-    &lt;/attribute&gt;
-      
-    &lt;!-- This are the two properties --&gt;
-    &lt;attribute name=&quot;EnableOrderingGroup&quot;&gt;true&lt;/attribute&gt;
-    &lt;attribute name=&quot;DefaultOrderingGroupName&quot;&gt;MyOrderingGroup&lt;/attribute&gt;
-  &lt;/mbean&gt;
-  </programlisting>
+  <attribute name="JNDIBindings">
+    <bindings>
+    <binding>/MyConnectionFactory</binding>
+    <binding>/XAConnectionFactory</binding>
+    <binding>java:/MyConnectionFactory</binding>
+    <binding>java:/XAConnectionFactory</binding>
+    </bindings>
+  </attribute>
+    
+  <!-- This are the two properties -->
+  <attribute name="EnableOrderingGroup">true</attribute>
+  <attribute name="DefaultOrderingGroupName">MyOrderingGroup</attribute>
+</mbean>
+]]></programlisting>
 
 	<para>
 		The advantage of enabling the ordering group feature by making configuration changes is the ease with which message ordering functionality can be achieved without the need for code changes. 

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Revision_History.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Revision_History.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Revision_History.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -7,8 +7,8 @@
 	<simpara>
 		<revhistory>
 			<revision>
-				<revnumber>1.1</revnumber>
-				<date>Tue Oct 20 2009</date>
+				<revnumber>1.2</revnumber>
+				<date>Tue Oct 22 2009</date>
 				<author>
 					<firstname></firstname>
 					<surname></surname>

Modified: projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Running_Examples.xml
===================================================================
--- projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Running_Examples.xml	2009-10-22 05:27:35 UTC (rev 95362)
+++ projects/docs/enterprise/5.0/JBoss_Messaging_1.4.3/en-US/Running_Examples.xml	2009-10-22 05:31:05 UTC (rev 95363)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter id="examples">
-  <title><remark>Running the Examples</remark></title>
+  <title>Running the Examples</title>
 
   <para>
     The <filename>/doc/examples/jboss-messaging-examples/</filename> directory contains a set of examples that demonstrate the various aspects of JBoss Messaging at work.
@@ -123,22 +123,18 @@
     <varlistentry>
       <term><filename>/doc/examples/jboss-messaging-examples/servlet/</filename></term>
       <listitem>
-      <formalpara><title><remark>1.4.6 Update Here</remark></title>
         <para>
           This example demonstrates how to use servlet transport with JBoss Messaging. It deploys a servlet and a <literal>ConnectionFactory</literal> which uses the servlet transport.
-        </para>
-      </formalpara>  
+        </para>  
       </listitem>
     </varlistentry>
     
     <varlistentry>
       <term><filename>/doc/examples/jboss-messaging-examples/ordering-group/</filename></term>
       <listitem>
-      <formalpara><title><remark>1.4.6 Update Here</remark></title>
         <para>
          This example demonstrates the use of strict message ordering. It uses the JBoss Messaging ordering group API to deliver strictly ordered messages, regardless of the message priority.
         </para>
-        </formalpara>
       </listitem>
     </varlistentry>
     
@@ -161,12 +157,8 @@
     The non-clustered examples expect an instance of JBoss AS to be running with all default settings.
   </para>
 
-  <formalpara><title><remark>1.4.6 Update Here</remark></title>
   <para>
     Use of the clustered examples requires two instances of JBoss AS to be running with corresponding port settings of <literal>ports-01</literal> and <literal>ports-02</literal>. The default ports for a particular example can be overidden by editing the  <filename>jndi.properties</filename> file in that example's root directory.
   </para>
-  </formalpara>
-  
-
     
 </chapter>




More information about the jboss-cvs-commits mailing list