[jboss-cvs] JBoss Messaging SVN: r2516 - trunk/docs/userguide-2/en/modules.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Feb 28 23:43:21 EST 2007


Author: sam.griffith at jboss.com
Date: 2007-02-28 23:43:21 -0500 (Wed, 28 Feb 2007)
New Revision: 2516

Modified:
   trunk/docs/userguide-2/en/modules/CLUST_configuration.xml
   trunk/docs/userguide-2/en/modules/CLUST_installation.xml
   trunk/docs/userguide-2/en/modules/UG2_configuration.xml
   trunk/docs/userguide-2/en/modules/UG2_installation.xml
   trunk/docs/userguide-2/en/modules/UG2_introduction.xml
   trunk/docs/userguide-2/en/modules/UG2_runningexamples.xml
Log:
More edits


Modified: trunk/docs/userguide-2/en/modules/CLUST_configuration.xml
===================================================================
--- trunk/docs/userguide-2/en/modules/CLUST_configuration.xml	2007-03-01 04:10:17 UTC (rev 2515)
+++ trunk/docs/userguide-2/en/modules/CLUST_configuration.xml	2007-03-01 04:43:21 UTC (rev 2516)
@@ -90,69 +90,85 @@
       <para>An example of a Clustered Post Office configuration is shown below:</para>
 
       <programlisting>
-         &lt;mbean code="org.jboss.messaging.core.plugin.ClusteredPostOfficeService"
-         name="jboss.messaging:service=PostOffice"
-         xmbean-dd="xmdesc/ClusteredPostOffice-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;attribute name="PostOfficeName"&gt;Clustered JMS&lt;/attribute&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_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(1023), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, IS_FAILED_OVER CHAR(1), FAILED_NODE_ID INTEGER)
-         INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, IS_FAILED_OVER, FAILED_NODE_ID) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-         DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
-         LOAD_BINDINGS=SELECT NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, IS_FAILED_OVER, FAILED_NODE_ID FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME  = ?
-         ]]&gt;&lt;/attribute&gt;
-         &lt;attribute name="GroupName"&gt;DefaultPostOffice&lt;/attribute&gt;
-         &lt;attribute name="StateTimeout"&gt;5000&lt;/attribute&gt;
-         &lt;attribute name="CastTimeout"&gt;5000&lt;/attribute&gt;
-         &lt;attribute name="StatsSendPeriod"&gt;10000&lt;/attribute&gt;
-         &lt;attribute name="MessagePullPolicy"&gt;org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy&lt;/attribute&gt;
-         &lt;attribute name="ClusterRouterFactory"&gt;org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory&lt;/attribute&gt;
+&lt;mbean code="org.jboss.messaging.core.plugin.ClusteredPostOfficeService"
+name="jboss.messaging:service=PostOffice"
+xmbean-dd="xmdesc/ClusteredPostOffice-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;attribute name="PostOfficeName"&gt;Clustered JMS&lt;/attribute&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_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), 
+	NODE_ID INTEGER, QUEUE_NAME VARCHAR(1023), COND VARCHAR(1023), SELECTOR VARCHAR(1023), 
+	CHANNEL_ID BIGINT, IS_FAILED_OVER CHAR(1), FAILED_NODE_ID INTEGER)
+INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, 
+	SELECTOR, CHANNEL_ID, IS_FAILED_OVER, FAILED_NODE_ID) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
+LOAD_BINDINGS=SELECT NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, IS_FAILED_OVER, 
+	FAILED_NODE_ID FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME  = ?
+]]&gt;&lt;/attribute&gt;
+&lt;attribute name="GroupName"&gt;DefaultPostOffice&lt;/attribute&gt;
+&lt;attribute name="StateTimeout"&gt;5000&lt;/attribute&gt;
+&lt;attribute name="CastTimeout"&gt;5000&lt;/attribute&gt;
+&lt;attribute name="StatsSendPeriod"&gt;10000&lt;/attribute&gt;
+&lt;attribute name="MessagePullPolicy"&gt;
+	org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy&lt;/attribute&gt;
+&lt;attribute name="ClusterRouterFactory"&gt;
+	org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory&lt;/attribute&gt;
 
-         &lt;attribute name="AsyncChannelConfig"&gt;
-         &lt;config&gt;
-         &lt;UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
-         mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
-         mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/&gt;
-         &lt;AUTOCONF down_thread="false" up_thread="false"/&gt;
-         &lt;PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/&gt;
-         &lt;MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/&gt;
-         &lt;FD timeout="2000" max_tries="3" 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="8192" down_thread="false" use_mcast_xmit="true" gc_lag="50" up_thread="false"
-         retransmit_timeout="100,200,600,1200,2400,4800"/&gt;
-         &lt;UNICAST timeout="1200,2400,3600" down_thread="false" up_thread="false"/&gt;
-         &lt;pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" down_thread="false" max_bytes="0" up_thread="false"/&gt;
-         &lt;FRAG frag_size="8192" down_thread="false" up_thread="false"/&gt;
-         &lt;VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" /&gt;
-         &lt;pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" join_retry_timeout="2000" up_thread="false" shun="true"/&gt;
-         &lt;/config&gt;
-         &lt;/attribute&gt;
+&lt;attribute name="AsyncChannelConfig"&gt;
+&lt;config&gt;
+&lt;UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
+mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
+mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" 
+	ip_ttl="32" bind_addr="127.0.0.1"/&gt;
+&lt;AUTOCONF down_thread="false" up_thread="false"/&gt;
+&lt;PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/&gt;
+&lt;MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/&gt;
+&lt;FD timeout="2000" max_tries="3" 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="8192" down_thread="false" use_mcast_xmit="true" gc_lag="50" 
+	up_thread="false"
+retransmit_timeout="100,200,600,1200,2400,4800"/&gt;
+&lt;UNICAST timeout="1200,2400,3600" down_thread="false" up_thread="false"/&gt;
+&lt;pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" down_thread="false" 
+	max_bytes="0" up_thread="false"/&gt;
+&lt;FRAG frag_size="8192" down_thread="false" up_thread="false"/&gt;
+&lt;VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" /&gt;
+&lt;pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" join_retry_timeout="2000" 
+	up_thread="false" shun="true"/&gt;
+&lt;/config&gt;
+&lt;/attribute&gt;
 
-         &lt;attribute name="SyncChannelConfig"&gt;
-         &lt;config&gt;
-         &lt;UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
-         mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
-         mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/&gt;
-         &lt;AUTOCONF down_thread="false" up_thread="false"/&gt;
-         &lt;PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/&gt;
-         &lt;MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/&gt;
-         &lt;FD timeout="2000" max_tries="3" 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="8192" down_thread="false" use_mcast_xmit="true" gc_lag="50" up_thread="false"
-         retransmit_timeout="100,200,600,1200,2400,4800"/&gt;
-         &lt;UNICAST timeout="1200,2400,3600" down_thread="false" up_thread="false"/&gt;
-         &lt;pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" down_thread="false" max_bytes="0" up_thread="false"/&gt;
-         &lt;FRAG frag_size="8192" down_thread="false" up_thread="false"/&gt;
-         &lt;VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" /&gt;
-         &lt;pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" join_retry_timeout="2000" up_thread="false" shun="true"/&gt;
-         &lt;pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/&gt;
-         &lt;/config&gt;
-         &lt;/attribute&gt;
-         &lt;/mbean&gt;
+&lt;attribute name="SyncChannelConfig"&gt;
+&lt;config&gt;
+&lt;UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
+mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
+mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" 
+	ip_ttl="32" bind_addr="127.0.0.1"/&gt;
+&lt;AUTOCONF down_thread="false" up_thread="false"/&gt;
+&lt;PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/&gt;
+&lt;MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/&gt;
+&lt;FD timeout="2000" max_tries="3" 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="8192" down_thread="false" use_mcast_xmit="true" gc_lag="50" 
+	up_thread="false"
+retransmit_timeout="100,200,600,1200,2400,4800"/&gt;
+&lt;UNICAST timeout="1200,2400,3600" down_thread="false" up_thread="false"/&gt;
+&lt;pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" down_thread="false" 
+	max_bytes="0" up_thread="false"/&gt;
+&lt;FRAG frag_size="8192" down_thread="false" up_thread="false"/&gt;
+&lt;VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" /&gt;
+&lt;pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" join_retry_timeout="2000" 
+	up_thread="false" shun="true"/&gt;
+&lt;pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/&gt;
+&lt;/config&gt;
+&lt;/attribute&gt;
+&lt;/mbean&gt;
       </programlisting>
 
       <para>Relevant clustered Post Office configuration attributes are discussed below:</para>

Modified: trunk/docs/userguide-2/en/modules/CLUST_installation.xml
===================================================================
--- trunk/docs/userguide-2/en/modules/CLUST_installation.xml	2007-03-01 04:10:17 UTC (rev 2515)
+++ trunk/docs/userguide-2/en/modules/CLUST_installation.xml	2007-03-01 04:43:21 UTC (rev 2516)
@@ -59,10 +59,10 @@
    </para>
 
    <programlisting>
-      ant -f release-admin.xml cluster-node
-      ant -f release-admin.xml -Did=1 -Dports=ports-01 cluster-node
-      ant -f release-admin.xml -Did=2 -Dports=ports-02 cluster-node
-      ant -f release-admin.xml -Did=3 -Dports=ports-03 cluster-node
+ant -f release-admin.xml cluster-node
+ant -f release-admin.xml -Did=1 -Dports=ports-01 cluster-node
+ant -f release-admin.xml -Did=2 -Dports=ports-02 cluster-node
+ant -f release-admin.xml -Did=3 -Dports=ports-03 cluster-node
    </programlisting>
 
    <para>
@@ -97,17 +97,17 @@
       </para>
 
    <programlisting>
-      cd $JBOSS_HOME/bin
-      ./run.sh -c messaging-node0
+cd $JBOSS_HOME/bin
+./run.sh -c messaging-node0
 
-      cd $JBOSS_HOME/bin
-      ./run.sh -c messaging-node1
+cd $JBOSS_HOME/bin
+./run.sh -c messaging-node1
 
-      cd $JBOSS_HOME/bin
-      ./run.sh -c messaging-node2
+cd $JBOSS_HOME/bin
+./run.sh -c messaging-node2
 
-      cd $JBOSS_HOME/bin
-      ./run.sh -c messaging-node3
+cd $JBOSS_HOME/bin
+./run.sh -c messaging-node3
     </programlisting>
 
 
@@ -122,53 +122,53 @@
 
 
    <programlisting>
-      ...
+...
 
-      00:24:04,796 WARN  [JDBCPersistenceManager]
+00:24:04,796 WARN  [JDBCPersistenceManager]
 
-      JBoss Messaging Warning: DataSource connection transaction isolation should be READ_COMMITTED, but it is currently REPEATABLE_READ.
-                               Using an isolation level less strict than READ_COMMITTED may lead to data consistency problems.
-                               Using an isolation level more strict than READ_COMMITTED may lead to deadlock.
+JBoss Messaging Warning: DataSource connection transaction isolation should be READ_COMMITTED, but it is currently REPEATABLE_READ.
+                         Using an isolation level less strict than READ_COMMITTED may lead to data consistency problems.
+                         Using an isolation level more strict than READ_COMMITTED may lead to deadlock.
 
-      00:24:05,718 INFO  [ServerPeer] JBoss Messaging 1.2.0.CR1 server [0] started
-      00:24:06,328 INFO  [STDOUT]
-      -------------------------------------------------------
-      GMS: address is 127.0.0.1:2452
-      -------------------------------------------------------
-      00:24:08,406 INFO  [DefaultClusteredPostOffice] ClusteredPostOffice[0:Clustered JMS:127.0.0.1:2452] got new view [127.0.0.1:2452|0] [127.0.0.1:2452]
-      00:24:08,468 INFO  [STDOUT]
-      -------------------------------------------------------
-      GMS: address is 127.0.0.1:2455
-      -------------------------------------------------------
-      00:24:10,906 INFO  [ConnectionFactory] Connector socket://10.11.14.105:4457 has leasing enabled, lease period 10000 milliseconds
-      00:24:10,921 INFO  [ConnectionFactory] [/ConnectionFactory, /XAConnectionFactory, java:/ConnectionFactory, java:/XAConnectionFactory] started
-      00:24:10,953 INFO  [QueueService] Queue[/queue/DLQ] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,953 INFO  [QueueService] Queue[/queue/ExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,953 INFO  [TopicService] Topic[/topic/testTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,953 INFO  [TopicService] Topic[/topic/securedTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,968 INFO  [TopicService] Topic[/topic/testDurableTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,968 INFO  [QueueService] Queue[/queue/testQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,968 INFO  [QueueService] Queue[/queue/A] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,968 INFO  [QueueService] Queue[/queue/B] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,968 INFO  [QueueService] Queue[/queue/C] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,968 INFO  [QueueService] Queue[/queue/D] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,968 INFO  [QueueService] Queue[/queue/ex] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,984 INFO  [QueueService] Queue[/queue/PrivateDLQ] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,984 INFO  [QueueService] Queue[/queue/PrivateExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,984 INFO  [QueueService] Queue[/queue/QueueWithOwnDLQAndExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,984 INFO  [TopicService] Topic[/topic/TopicWithOwnDLQAndExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,984 INFO  [QueueService] Queue[/queue/QueueWithOwnRedeliveryDelay] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:10,984 INFO  [TopicService] Topic[/topic/TopicWithOwnRedeliveryDelay] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:11,000 INFO  [QueueService] Queue[/queue/testDistributedQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:11,000 INFO  [TopicService] Topic[/topic/testDistributedTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:24:11,093 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 'jboss.jca:name=JmsXA,service=ConnectionFactoryBinding' to JNDI name 'java:JmsXA'
-      00:24:11,375 INFO  [TomcatDeployer] deploy, ctxPath=/jmx-console, warUrl=.../deploy/jmx-console.war/
-      00:24:12,171 INFO  [Http11BaseProtocol] Starting Coyote HTTP/1.1 on http-0.0.0.0-8080
-      00:24:12,421 INFO  [ChannelSocket] JK: ajp13 listening on /0.0.0.0:8009
-      00:24:12,453 INFO  [JkMain] Jk running ID=0 time=0/47  config=null
-      00:24:12,515 INFO  [Server] JBoss (MX MicroKernel) [4.0.5.GA (build: CVSTag=Branch_4_0 date=200611221632)] Started in 30s:375ms
+00:24:05,718 INFO  [ServerPeer] JBoss Messaging 1.2.0.CR1 server [0] started
+00:24:06,328 INFO  [STDOUT]
+-------------------------------------------------------
+GMS: address is 127.0.0.1:2452
+-------------------------------------------------------
+00:24:08,406 INFO  [DefaultClusteredPostOffice] ClusteredPostOffice[0:Clustered JMS:127.0.0.1:2452] got new view [127.0.0.1:2452|0] [127.0.0.1:2452]
+00:24:08,468 INFO  [STDOUT]
+-------------------------------------------------------
+GMS: address is 127.0.0.1:2455
+-------------------------------------------------------
+00:24:10,906 INFO  [ConnectionFactory] Connector socket://10.11.14.105:4457 has leasing enabled, lease period 10000 milliseconds
+00:24:10,921 INFO  [ConnectionFactory] [/ConnectionFactory, /XAConnectionFactory, java:/ConnectionFactory, java:/XAConnectionFactory] started
+00:24:10,953 INFO  [QueueService] Queue[/queue/DLQ] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,953 INFO  [QueueService] Queue[/queue/ExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,953 INFO  [TopicService] Topic[/topic/testTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,953 INFO  [TopicService] Topic[/topic/securedTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,968 INFO  [TopicService] Topic[/topic/testDurableTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,968 INFO  [QueueService] Queue[/queue/testQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,968 INFO  [QueueService] Queue[/queue/A] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,968 INFO  [QueueService] Queue[/queue/B] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,968 INFO  [QueueService] Queue[/queue/C] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,968 INFO  [QueueService] Queue[/queue/D] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,968 INFO  [QueueService] Queue[/queue/ex] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,984 INFO  [QueueService] Queue[/queue/PrivateDLQ] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,984 INFO  [QueueService] Queue[/queue/PrivateExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,984 INFO  [QueueService] Queue[/queue/QueueWithOwnDLQAndExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,984 INFO  [TopicService] Topic[/topic/TopicWithOwnDLQAndExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,984 INFO  [QueueService] Queue[/queue/QueueWithOwnRedeliveryDelay] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:10,984 INFO  [TopicService] Topic[/topic/TopicWithOwnRedeliveryDelay] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:11,000 INFO  [QueueService] Queue[/queue/testDistributedQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:11,000 INFO  [TopicService] Topic[/topic/testDistributedTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:24:11,093 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 'jboss.jca:name=JmsXA,service=ConnectionFactoryBinding' to JNDI name 'java:JmsXA'
+00:24:11,375 INFO  [TomcatDeployer] deploy, ctxPath=/jmx-console, warUrl=.../deploy/jmx-console.war/
+00:24:12,171 INFO  [Http11BaseProtocol] Starting Coyote HTTP/1.1 on http-0.0.0.0-8080
+00:24:12,421 INFO  [ChannelSocket] JK: ajp13 listening on /0.0.0.0:8009
+00:24:12,453 INFO  [JkMain] Jk running ID=0 time=0/47  config=null
+00:24:12,515 INFO  [Server] JBoss (MX MicroKernel) [4.0.5.GA (build: CVSTag=Branch_4_0 date=200611221632)] Started in 30s:375ms
 
-      00:27:21,343 INFO  [DefaultClusteredPostOffice] ClusteredPostOffice[0:Clustered JMS:127.0.0.1:2452] got new view [127.0.0.1:2452|1] [127.0.0.1:2452, 127.0.0.1:2474]
+00:27:21,343 INFO  [DefaultClusteredPostOffice] ClusteredPostOffice[0:Clustered JMS:127.0.0.1:2452] got new view [127.0.0.1:2452|1] [127.0.0.1:2452, 127.0.0.1:2474]
 
 </programlisting>
 
@@ -178,51 +178,72 @@
 
    <programlisting>
 
-      ...
+...
 
-      00:33:54,468 WARN  [JDBCPersistenceManager]
+00:33:54,468 WARN  [JDBCPersistenceManager]
 
-      JBoss Messaging Warning: DataSource connection transaction isolation should be READ_COMMITTED, but it is currently REPEATABLE_READ.
-                               Using an isolation level less strict than READ_COMMITTED may lead to data consistency problems.
-                               Using an isolation level more strict than READ_COMMITTED may lead to deadlock.
+JBoss Messaging Warning: 
+	DataSource connection transaction isolation should be READ_COMMITTED, but it is 
+		currently REPEATABLE_READ.
+  Using an isolation level less strict than READ_COMMITTED may lead to data consistency 
+		problems.
+  Using an isolation level more strict than READ_COMMITTED may lead to deadlock.
 
-      00:33:55,062 INFO  [ServerPeer] JBoss Messaging 1.2.0.CR1 server [1] started
-      00:33:55,609 INFO  [STDOUT]
-      -------------------------------------------------------
-      GMS: address is 127.0.0.1:2514
-      -------------------------------------------------------
-      00:33:57,734 INFO  [DefaultClusteredPostOffice] ClusteredPostOffice[1:Clustered JMS:127.0.0.1:2514] got new view [127.0.0.1:2452|3] [127.0.0.1:2452, 127.0.0.1:2514]
-      00:33:57,765 INFO  [STDOUT]
-      -------------------------------------------------------
-      GMS: address is 127.0.0.1:2519
-      -------------------------------------------------------
-      00:34:00,203 INFO  [ConnectionFactory] Connector socket://10.11.14.105:4557 has leasing enabled, lease period 20000 milliseconds
-      00:34:00,203 INFO  [ConnectionFactory] [/ConnectionFactory, /XAConnectionFactory, java:/ConnectionFactory, java:/XAConnectionFactory] started
-      00:34:00,234 INFO  [QueueService] Queue[/queue/DLQ] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,234 INFO  [QueueService] Queue[/queue/ExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,234 INFO  [TopicService] Topic[/topic/testTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [TopicService] Topic[/topic/securedTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [TopicService] Topic[/topic/testDurableTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [QueueService] Queue[/queue/testQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [QueueService] Queue[/queue/A] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [QueueService] Queue[/queue/B] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [QueueService] Queue[/queue/C] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [QueueService] Queue[/queue/D] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,250 INFO  [QueueService] Queue[/queue/ex] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,265 INFO  [QueueService] Queue[/queue/PrivateDLQ] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,265 INFO  [QueueService] Queue[/queue/PrivateExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,265 INFO  [QueueService] Queue[/queue/QueueWithOwnDLQAndExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,265 INFO  [TopicService] Topic[/topic/TopicWithOwnDLQAndExpiryQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,265 INFO  [QueueService] Queue[/queue/QueueWithOwnRedeliveryDelay] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,265 INFO  [TopicService] Topic[/topic/TopicWithOwnRedeliveryDelay] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,296 INFO  [QueueService] Queue[/queue/testDistributedQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,296 INFO  [TopicService] Topic[/topic/testDistributedTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-      00:34:00,343 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 'jboss.jca:name=JmsXA,service=ConnectionFactoryBinding' to JNDI name 'java:JmsXA'
-      00:34:00,453 INFO  [TomcatDeployer] deploy, ctxPath=/jmx-console, warUrl=.../deploy/jmx-console.war/
-      00:34:00,796 INFO  [Http11BaseProtocol] Starting Coyote HTTP/1.1 on http-0.0.0.0-8180
-      00:34:01,078 INFO  [ChannelSocket] JK: ajp13 listening on /0.0.0.0:8109
-      00:34:01,125 INFO  [JkMain] Jk running ID=0 time=0/125  config=null
-      00:34:01,125 INFO  [Server] JBoss (MX MicroKernel) [4.0.5.GA (build: CVSTag=Branch_4_0 date=200611221632)] Started in 22s:547ms
+00:33:55,062 INFO  [ServerPeer] JBoss Messaging 1.2.0.CR1 server [1] started
+00:33:55,609 INFO  [STDOUT]
+-------------------------------------------------------
+GMS: address is 127.0.0.1:2514
+-------------------------------------------------------
+00:33:57,734 INFO  [DefaultClusteredPostOffice] ClusteredPostOffice[1:Clustered JMS:127.0.0.1:2514] got new view [127.0.0.1:2452|3] [127.0.0.1:2452, 127.0.0.1:2514]
+00:33:57,765 INFO  [STDOUT]
+-------------------------------------------------------
+GMS: address is 127.0.0.1:2519
+-------------------------------------------------------
+00:34:00,203 INFO  [ConnectionFactory] Connector socket://10.11.14.105:4557 has leasing enabled, 
+	lease period 20000 milliseconds
+00:34:00,203 INFO  [ConnectionFactory] [/ConnectionFactory, /XAConnectionFactory, 
+	java:/ConnectionFactory, java:/XAConnectionFactory] started
+00:34:00,234 INFO  [QueueService] Queue[/queue/DLQ] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,234 INFO  [QueueService] Queue[/queue/ExpiryQueue] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,234 INFO  [TopicService] Topic[/topic/testTopic] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,250 INFO  [TopicService] Topic[/topic/securedTopic] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,250 INFO  [TopicService] Topic[/topic/testDurableTopic] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,250 INFO  [QueueService] Queue[/queue/testQueue] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,250 INFO  [QueueService] Queue[/queue/A] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:34:00,250 INFO  [QueueService] Queue[/queue/B] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:34:00,250 INFO  [QueueService] Queue[/queue/C] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:34:00,250 INFO  [QueueService] Queue[/queue/D] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:34:00,250 INFO  [QueueService] Queue[/queue/ex] started, fullSize=75000, pageSize=2000, downCacheSize=2000
+00:34:00,265 INFO  [QueueService] Queue[/queue/PrivateDLQ] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,265 INFO  [QueueService] Queue[/queue/PrivateExpiryQueue] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,265 INFO  [QueueService] Queue[/queue/QueueWithOwnDLQAndExpiryQueue] started, fullSize=75000, 
+	pageSize=2000, downCacheSize=2000
+00:34:00,265 INFO  [TopicService] Topic[/topic/TopicWithOwnDLQAndExpiryQueue] started, fullSize=75000, 
+	pageSize=2000, downCacheSize=2000
+00:34:00,265 INFO  [QueueService] Queue[/queue/QueueWithOwnRedeliveryDelay] started, fullSize=75000, 
+	pageSize=2000, downCacheSize=2000
+00:34:00,265 INFO  [TopicService] Topic[/topic/TopicWithOwnRedeliveryDelay] started, fullSize=75000, 
+	pageSize=2000, downCacheSize=2000
+00:34:00,296 INFO  [QueueService] Queue[/queue/testDistributedQueue] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,296 INFO  [TopicService] Topic[/topic/testDistributedTopic] started, fullSize=75000, pageSize=2000, 
+	downCacheSize=2000
+00:34:00,343 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 'jboss.jca:name=JmsXA,
+	service=ConnectionFactoryBinding' to JNDI name 'java:JmsXA'
+00:34:00,453 INFO  [TomcatDeployer] deploy, ctxPath=/jmx-console, warUrl=.../deploy/jmx-console.war/
+00:34:00,796 INFO  [Http11BaseProtocol] Starting Coyote HTTP/1.1 on http-0.0.0.0-8180
+00:34:01,078 INFO  [ChannelSocket] JK: ajp13 listening on /0.0.0.0:8109
+00:34:01,125 INFO  [JkMain] Jk running ID=0 time=0/125  config=null
+00:34:01,125 INFO  [Server] JBoss (MX MicroKernel) [4.0.5.GA (build: CVSTag=Branch_4_0 date=200611221632)] 
+	Started in 22s:547ms
 
 
    </programlisting>

Modified: trunk/docs/userguide-2/en/modules/UG2_configuration.xml
===================================================================
--- trunk/docs/userguide-2/en/modules/UG2_configuration.xml	2007-03-01 04:10:17 UTC (rev 2515)
+++ trunk/docs/userguide-2/en/modules/UG2_configuration.xml	2007-03-01 04:43:21 UTC (rev 2516)
@@ -38,32 +38,33 @@
 
      <programlisting>
 
-  &lt;mbean code="org.jboss.jms.server.ServerPeer"
-      name="jboss.messaging:service=ServerPeer"
-      xmbean-dd="xmdesc/ServerPeer-xmbean.xml"&gt;
+&lt;mbean code="org.jboss.jms.server.ServerPeer"
+    name="jboss.messaging:service=ServerPeer"
+    xmbean-dd="xmdesc/ServerPeer-xmbean.xml"&gt;
 
-      &lt;constructor&gt;
-         &lt;!-- ServerPeerID --&gt;
-         &lt;arg type="java.lang.String" value="server.0"/&gt;
-         &lt;!-- DefaultQueueJNDIContext --&gt;
-         &lt;arg type="java.lang.String" value="/queue"/&gt;
-         &lt;!-- DefaultTopicJNDIContext --&gt;
-         &lt;arg type="java.lang.String" value="/topic"/&gt;
-      &lt;/constructor&gt;
+    &lt;constructor&gt;
+       &lt;!-- ServerPeerID --&gt;
+       &lt;arg type="java.lang.String" value="server.0"/&gt;
+       &lt;!-- DefaultQueueJNDIContext --&gt;
+       &lt;arg type="java.lang.String" value="/queue"/&gt;
+       &lt;!-- DefaultTopicJNDIContext --&gt;
+       &lt;arg type="java.lang.String" value="/topic"/&gt;
+    &lt;/constructor&gt;
 
-      &lt;depends optional-attribute-name="ThreadPool"&gt;jboss.messaging:service=ThreadPool&lt;/depends&gt;
-      &lt;depends optional-attribute-name="PersistenceManager"&gt;jboss.messaging:service=PersistenceManager&lt;/depends&gt;
-      &lt;depends optional-attribute-name="MessageStore"&gt;jboss.messaging:service=MessageStore&lt;/depends&gt;
-      &lt;depends optional-attribute-name="ChannelMapper"&gt;jboss.messaging:service=ChannelMapper&lt;/depends&gt;
+    &lt;depends optional-attribute-name="ThreadPool"&gt;jboss.messaging:service=ThreadPool&lt;/depends&gt;
+    &lt;depends optional-attribute-name="PersistenceManager"
+			&gt;jboss.messaging:service=PersistenceManager&lt;/depends&gt;
+    &lt;depends optional-attribute-name="MessageStore"&gt;jboss.messaging:service=MessageStore&lt;/depends&gt;
+    &lt;depends optional-attribute-name="ChannelMapper"&gt;jboss.messaging:service=ChannelMapper&lt;/depends&gt;
 
-      &lt;!-- Set to -1 to completely disable client leasing --&gt;
-      &lt;attribute name="SecurityDomain"&gt;java:/jaas/messaging&lt;/attribute&gt;
-      &lt;attribute name="DefaultSecurityConfig"&gt;
-        &lt;security&gt;
-            &lt;role name="guest" read="true" write="true" create="true"/&gt;
-        &lt;/security&gt;
-      &lt;/attribute&gt;
-   &lt;/mbean&gt;
+    &lt;!-- Set to -1 to completely disable client leasing --&gt;
+    &lt;attribute name="SecurityDomain"&gt;java:/jaas/messaging&lt;/attribute&gt;
+    &lt;attribute name="DefaultSecurityConfig"&gt;
+      &lt;security&gt;
+          &lt;role name="guest" read="true" write="true" create="true"/&gt;
+      &lt;/security&gt;
+    &lt;/attribute&gt;
+ &lt;/mbean&gt;
 
      </programlisting>
 
@@ -186,8 +187,10 @@
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-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;depends optional-attribute-name="ChannelMapper"&gt;jboss.messaging:service=ChannelMapper&lt;/depends&gt;
+      &lt;depends optional-attribute-name="TransactionManager"&gt;
+				jboss:service=TransactionManager&lt;/depends&gt;
+      &lt;depends optional-attribute-name="ChannelMapper"&gt;
+				jboss.messaging:service=ChannelMapper&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="UsingBatchUpdates"&gt;true&lt;/attribute&gt;
@@ -197,7 +200,8 @@
       name="jboss.messaging:service=ChannelMapper"
       xmbean-dd="xmdesc/JDBCChannelMapper-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;depends optional-attribute-name="TransactionManager"&gt;
+				jboss:service=TransactionManager&lt;/depends&gt;
       &lt;attribute name="DataSource"&gt;java:/DefaultDS&lt;/attribute&gt;
    &lt;/mbean&gt;
 &lt;/server&gt;
@@ -213,19 +217,30 @@
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-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;depends optional-attribute-name="ChannelMapper"&gt;jboss.messaging:service=ChannelMapper&lt;/depends&gt;
+      &lt;depends optional-attribute-name="TransactionManager"&gt;
+				jboss:service=TransactionManager&lt;/depends&gt;
+      &lt;depends optional-attribute-name="ChannelMapper"&gt;
+				jboss.messaging:service=ChannelMapper&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="UsingBatchUpdates"&gt;true&lt;/attribute&gt;
       &lt;attribute name="SqlProperties"&gt;&lt;![CDATA[
-CREATE_MESSAGE_REF=CREATE TABLE JMS_MESSAGE_REFERENCE (CHANNELID BIGINT, MESSAGEID BIGINT, TRANSACTIONID BIGINT, STATE CHAR(1), ORD BIGINT, DELIVERYCOUNT INTEGER, RELIABLE CHAR(1), LOADED CHAR(1), PRIMARY KEY(CHANNELID, MESSAGEID))
-CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JMS_MESSAGE_REF_TX ON JMS_MESSAGE_REFERENCE (TRANSACTIONID)
+CREATE_MESSAGE_REF=CREATE TABLE JMS_MESSAGE_REFERENCE 
+	(CHANNELID BIGINT, MESSAGEID BIGINT, TRANSACTIONID BIGINT, STATE CHAR(1), 
+	ORD BIGINT, DELIVERYCOUNT INTEGER, RELIABLE CHAR(1), LOADED CHAR(1), 
+	PRIMARY KEY(CHANNELID, MESSAGEID))
+CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JMS_MESSAGE_REF_TX ON 
+	JMS_MESSAGE_REFERENCE (TRANSACTIONID)
 CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JMS_MESSAGE_REF_ORD ON JMS_MESSAGE_REFERENCE (ORD)
-CREATE_IDX_MESSAGE_REF_MESSAGEID=CREATE INDEX JMS_MESSAGE_REF_MESSAGEID ON JMS_MESSAGE_REFERENCE (MESSAGEID)
-CREATE_IDX_MESSAGE_REF_LOADED=CREATE INDEX JMS_MESSAGE_REF_LOADED ON JMS_MESSAGE_REFERENCE (LOADED)
-CREATE_IDX_MESSAGE_REF_RELIABLE=CREATE INDEX JMS_MESSAGE_REF_RELIABLE ON JMS_MESSAGE_REFERENCE (RELIABLE)
-INSERT_MESSAGE_REF=INSERT INTO JMS_MESSAGE_REFERENCE (CHANNELID, MESSAGEID, TRANSACTIONID, STATE, ORD, DELIVERYCOUNT, RELIABLE, LOADED) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+CREATE_IDX_MESSAGE_REF_MESSAGEID=CREATE INDEX JMS_MESSAGE_REF_MESSAGEID ON 
+	JMS_MESSAGE_REFERENCE (MESSAGEID)
+CREATE_IDX_MESSAGE_REF_LOADED=CREATE INDEX JMS_MESSAGE_REF_LOADED ON 
+	JMS_MESSAGE_REFERENCE (LOADED)
+CREATE_IDX_MESSAGE_REF_RELIABLE=CREATE INDEX JMS_MESSAGE_REF_RELIABLE ON 
+	JMS_MESSAGE_REFERENCE (RELIABLE)
+INSERT_MESSAGE_REF=INSERT INTO JMS_MESSAGE_REFERENCE (CHANNELID, MESSAGEID, 
+	TRANSACTIONID, STATE, ORD, DELIVERYCOUNT, RELIABLE, LOADED) 
+	VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 ....      ]]&gt;
       &lt;/attribute&gt;
       &lt;attribute name="MaxParams"&gt;500&lt;/attribute&gt;
@@ -235,11 +250,14 @@
       name="jboss.messaging:service=ChannelMapper"
       xmbean-dd="xmdesc/JDBCChannelMapper-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;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="SqlProperties"&gt;&lt;![CDATA[
-CREATE_USER_TABLE=CREATE TABLE JMS_USER (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
-CREATE_ROLE_TABLE=CREATE TABLE JMS_ROLE (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, PRIMARY KEY(USERID, ROLEID))
+CREATE_USER_TABLE=CREATE TABLE JMS_USER (USERID VARCHAR(32) NOT NULL, 
+	PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
+CREATE_ROLE_TABLE=CREATE TABLE JMS_ROLE (ROLEID VARCHAR(32) NOT NULL, 
+	USERID VARCHAR(32) NOT NULL, PRIMARY KEY(USERID, ROLEID))
 SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JMS_USER WHERE USERID=?
 ....
       ]]&gt;
@@ -333,7 +351,8 @@
 &lt;mbean code="org.jboss.jms.server.destination.Queue"
        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 optional-attribute-name="ServerPeer"&gt;
+				jboss.messaging:service=ServerPeer&lt;/depends&gt;
 &lt;/mbean&gt;
 
 ....
@@ -341,7 +360,8 @@
 &lt;mbean code="org.jboss.jms.server.destination.Topic"
        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 optional-attribute-name="ServerPeer"&gt;
+		jboss.messaging:service=ServerPeer&lt;/depends&gt;
    &lt;attribute name="SecurityConfig"&gt;
       &lt;security&gt;
          &lt;role name="guest" read="true" write="true"/&gt;
@@ -356,7 +376,8 @@
 &lt;mbean code="org.jboss.jms.server.destination.Queue"
        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 optional-attribute-name="ServerPeer"&gt;
+		jboss.messaging:service=ServerPeer&lt;/depends&gt;
    &lt;attribute name="SecurityConfig"&gt;
       &lt;security&gt;
          &lt;role name="guest" read="true" write="true"/&gt;
@@ -506,12 +527,16 @@
  &lt;mbean code=&quot;org.jboss.jms.server.destination.Queue&quot;
            name=&quot;jboss.messaging.destination:service=Queue,name=testQueue&quot;
            xmbean-dd=&quot;xmdesc/Queue-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;ServerPeer&quot;&gt;
+						jboss.messaging:service=ServerPeer&lt;/depends&gt;
            &lt;attribute name=&quot;SecurityConfig&quot;&gt;
               &lt;security&gt;
-                 &lt;role name=&quot;guest&quot; read=&quot;true&quot; write=&quot;true&quot;/&gt;
-                 &lt;role name=&quot;publisher&quot; read=&quot;true&quot; write=&quot;true&quot; create=&quot;false&quot;/&gt;
-                 &lt;role name=&quot;noacc&quot; read=&quot;false&quot; write=&quot;false&quot; create=&quot;false&quot;/&gt;
+                 &lt;role name=&quot;guest&quot; read=&quot;true&quot; 
+									write=&quot;true&quot;/&gt;
+                 &lt;role name=&quot;publisher&quot; read=&quot;true&quot; 
+									write=&quot;true&quot; create=&quot;false&quot;/&gt;
+                 &lt;role name=&quot;noacc&quot; read=&quot;false&quot; 
+									write=&quot;false&quot; create=&quot;false&quot;/&gt;
                &lt;/security&gt;
            &lt;/attribute&gt;
            &lt;attribute name=&quot;fullSize&quot;&gt;75000&lt;/attribute&gt;
@@ -563,8 +588,10 @@
            &lt;constructor&gt;
               &lt;arg type=&quot;java.lang.String&quot; value=&quot;myClientID&quot;/&gt;
            &lt;/constructor&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=socket&lt;/depends&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=socket&lt;/depends&gt;
            &lt;attribute name=&quot;PrefetchSize&quot;&gt;10&lt;/attribute&gt;
            &lt;attribute name=&quot;DefaultTempQueueFullSize&quot;&gt;1000&lt;/attribute&gt;
            &lt;attribute name=&quot;DefaultTempQueuePageSize&quot;&gt;50&lt;/attribute&gt;

Modified: trunk/docs/userguide-2/en/modules/UG2_installation.xml
===================================================================
--- trunk/docs/userguide-2/en/modules/UG2_installation.xml	2007-03-01 04:10:17 UTC (rev 2515)
+++ trunk/docs/userguide-2/en/modules/UG2_installation.xml	2007-03-01 04:43:21 UTC (rev 2516)
@@ -78,25 +78,42 @@
 ....
 14:23:56,174 WARN  [JDBCPersistenceManager]
 
-JBoss Messaging Warning: DataSource connection transaction isolation should be READ_COMMITTED, but it is currently NONE.
-                         Using an isolation level less strict than READ_COMMITTED may lead to data consistency problems.
-                         Using an isolation level more strict than READ_COMMITTED may lead to deadlock.
+JBoss Messaging Warning: 
+	DataSource connection transaction isolation should be READ_COMMITTED, but it is 
+	currently NONE.
+	Using an isolation level less strict than READ_COMMITTED may lead to data consistency 
+	problems.
+	Using an isolation level more strict than READ_COMMITTED may lead to deadlock.
 
 14:23:57,276 INFO  [ServerPeer] JBoss Messaging 1.0.1.GA server [server.0] started
-14:23:57,937 INFO  [ConnectionFactory] Connector has leasing enabled, lease period 20000 milliseconds
-14:23:57,937 INFO  [ConnectionFactory] [/ConnectionFactory, /XAConnectionFactory, java:/ConnectionFactory, java:/XAConnectionFactory] deployed
-14:23:57,987 INFO  [Queue] Queue[/queue/DLQ] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:57,997 INFO  [Topic] Topic[/topic/testTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,017 INFO  [Topic] Topic[/topic/securedTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,017 INFO  [Topic] Topic[/topic/testDurableTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,027 INFO  [Queue] Queue[/queue/testQueue] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,027 INFO  [Queue] Queue[/queue/A] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,037 INFO  [Queue] Queue[/queue/B] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,057 INFO  [Queue] Queue[/queue/C] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,067 INFO  [Queue] Queue[/queue/D] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,077 INFO  [Queue] Queue[/queue/ex] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,077 INFO  [Topic] Topic[/topic/openTopic] started, fullSize=75000, pageSize=2000, downCacheSize=2000
-14:23:58,117 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 'jboss.jca:service=ConnectionFactoryBinding,name=JmsXA' to JNDI name 'java:JmsXA'
+14:23:57,937 INFO  [ConnectionFactory] Connector has leasing enabled, lease period 
+20000 milliseconds
+14:23:57,937 INFO  [ConnectionFactory] [/ConnectionFactory, /XAConnectionFactory, 
+java:/ConnectionFactory, java:/XAConnectionFactory] deployed
+14:23:57,987 INFO  [Queue] Queue[/queue/DLQ] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:57,997 INFO  [Topic] Topic[/topic/testTopic] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,017 INFO  [Topic] Topic[/topic/securedTopic] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,017 INFO  [Topic] Topic[/topic/testDurableTopic] started, fullSize=75000, 
+pageSize=2000, downCacheSize=2000
+14:23:58,027 INFO  [Queue] Queue[/queue/testQueue] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,027 INFO  [Queue] Queue[/queue/A] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,037 INFO  [Queue] Queue[/queue/B] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,057 INFO  [Queue] Queue[/queue/C] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,067 INFO  [Queue] Queue[/queue/D] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,077 INFO  [Queue] Queue[/queue/ex] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,077 INFO  [Topic] Topic[/topic/openTopic] started, fullSize=75000, pageSize=2000, 
+downCacheSize=2000
+14:23:58,117 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
+'jboss.jca:service=ConnectionFactoryBinding,name=JmsXA' to JNDI name 'java:JmsXA'
 ....
    </programlisting>
 

Modified: trunk/docs/userguide-2/en/modules/UG2_introduction.xml
===================================================================
--- trunk/docs/userguide-2/en/modules/UG2_introduction.xml	2007-03-01 04:10:17 UTC (rev 2515)
+++ trunk/docs/userguide-2/en/modules/UG2_introduction.xml	2007-03-01 04:43:21 UTC (rev 2516)
@@ -248,7 +248,6 @@
 					The JIRA issue link is:
 				
 					<ulink url="http://jira.jboss.org/jira/browse/JBMESSAGING-574">
-						http://jira.jboss.org/jira/browse/JBMESSAGING-574
 					</ulink>
 				
 	       </para>
@@ -259,7 +258,6 @@
 				JBoss Messaging 1.2.0.GA contains all features planned for the GA release, with the 
 				exception of the "unreliable link scenario" 
 				<ulink url="http://jira.jboss.org/jira/browse/JBMESSAGING-676">
-					http://jira.jboss.org/jira/browse/JBMESSAGING-676
 				</ulink>
 				whose development is still on-going on a parallel branch.
 				</para>

Modified: trunk/docs/userguide-2/en/modules/UG2_runningexamples.xml
===================================================================
--- trunk/docs/userguide-2/en/modules/UG2_runningexamples.xml	2007-03-01 04:10:17 UTC (rev 2515)
+++ trunk/docs/userguide-2/en/modules/UG2_runningexamples.xml	2007-03-01 04:43:21 UTC (rev 2516)
@@ -544,7 +544,9 @@
          with an error message similar to:
 
          <programlisting>
-C:\work\src\cvs\jboss-head\jms\docs\examples\ejb3mdb\build.xml:60: EJB3 does not seem to be installed in C:\work\src\jboss-4.0.3-src\build\output\jboss-4.0.3/server/messaging! Install it and try again.
+C:\work\src\cvs\jboss-head\jms\docs\examples\ejb3mdb\build.xml:60: EJB3 does not seem 
+to be installed in C:\work\src\jboss-4.0.3-src\build\output\jboss-4.0.3/server/messaging! 
+Install it and try again.
          </programlisting>
 
          <para>
@@ -558,78 +560,80 @@
          The EJB3 Message Driven Bean source code:
       </para>
      <programlisting>
-        @MessageDriven(activateConfig =
-        {
-              @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-              @ActivationConfigProperty(propertyName="destination", propertyValue="queue/testQueue")
-        })
-        public class EJB3MDBExample implements MessageListener
-        {
-           public void onMessage(Message m)
-           {
-              businessLogic(m);
-           }
+ at MessageDriven(activateConfig =
+{
+      @ActivationConfigProperty(propertyName="destinationType", 
+				propertyValue="javax.jms.Queue"),
+      @ActivationConfigProperty(propertyName="destination", 
+				propertyValue="queue/testQueue")
+})
+public class EJB3MDBExample implements MessageListener
+{
+   public void onMessage(Message m)
+   {
+      businessLogic(m);
+   }
 
 
-           private void businessLogic(Message m)
-           {
-              Connection conn = null;
-              Session session = null;
+   private void businessLogic(Message m)
+   {
+      Connection conn = null;
+      Session session = null;
 
-              try
-              {
-                 TextMessage tm = (TextMessage)m;
+      try
+      {
+         TextMessage tm = (TextMessage)m;
 
-                 String text = tm.getText();
-                 System.out.println("message " + text + " received");
+         String text = tm.getText();
+         System.out.println("message " + text + " received");
 
-                 // flip the string
-                 String result = "";
-                 for(int i = 0; i &lt; text.length(); i++)
-                 {
-                    result = text.charAt(i) + result;
-                 }
+         // flip the string
+         String result = "";
+         for(int i = 0; i &lt; text.length(); i++)
+         {
+            result = text.charAt(i) + result;
+         }
 
-                 System.out.println("message processed, result: " + result);
+         System.out.println("message processed, result: " + result);
 
 
-                 InitialContext ic = new InitialContext();
-                 ConnectionFactory cf = (ConnectionFactory)ic.lookup("java:/JmsXA");
-                 ic.close();
+         InitialContext ic = new InitialContext();
+         ConnectionFactory cf = (ConnectionFactory)ic.lookup("java:/JmsXA");
+         ic.close();
 
-                 conn = cf.createConnection();
-                 conn.start();
-                 session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         conn = cf.createConnection();
+         conn.start();
+         session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-                 Destination replyTo = m.getJMSReplyTo();
-                 MessageProducer producer = session.createProducer(replyTo);
-                 TextMessage reply = session.createTextMessage(result);
+         Destination replyTo = m.getJMSReplyTo();
+         MessageProducer producer = session.createProducer(replyTo);
+         TextMessage reply = session.createTextMessage(result);
 
-                 producer.send(reply);
-                 producer.close();
+         producer.send(reply);
+         producer.close();
 
-              }
-              catch(Exception e)
-              {
-                 e.printStackTrace();
-                 System.out.println("The Message Driven Bean failed!");
-              }
-              finally
-              {
-                 if (conn != null)
-                 {
-                    try
-                    {
-                       conn.close();
-                    }
-                    catch(Exception e)
-                    {
-                       System.out.println("Could not close the connection!" +e);
-                    }
-                 }
-              }
-           }
-        }
+      }
+      catch(Exception e)
+      {
+         e.printStackTrace();
+         System.out.println("The Message Driven Bean failed!");
+      }
+      finally
+      {
+         if (conn != null)
+         {
+            try
+            {
+               conn.close();
+            }
+            catch(Exception e)
+            {
+               System.out.println("Could not close the connection!" +e);
+            }
+         }
+      }
+   }
+}
      </programlisting>
 
      <para>The basic test examples in this chapter serve as the sanity check for your JBoss Messaging installation. They also provide basic programming examples. To develop your own JMS services, you probably need to configure JBoss Messaging to setup your own destinations and connection factories etc. In <xref linkend="configuration"/>, we will discuss JBoss Messaging configuration files and options.</para>




More information about the jboss-cvs-commits mailing list