[Jboss-cvs] JBossAS SVN: r55857 - trunk/tomcat/src/resources

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-08-13 16:45:31 -0400 (Sun, 13 Aug 2006)
New Revision: 55857

Modified:
   trunk/tomcat/src/resources/tc6-cluster-service.xml
Log:
Use multiplexer
If multiplexer is disabled, use different port from Branch_4_0

Modified: trunk/tomcat/src/resources/tc6-cluster-service.xml
===================================================================
--- trunk/tomcat/src/resources/tc6-cluster-service.xml	2006-08-13 20:43:47 UTC (rev 55856)
+++ trunk/tomcat/src/resources/tc6-cluster-service.xml	2006-08-13 20:45:31 UTC (rev 55857)
@@ -21,12 +21,17 @@
         <!-- We need the AspectDeployer to deploy our FIELD granularity aspects -->
         <depends>jboss.aop:service=AspectDeployer</depends>
         
-        <!--uncomment next three statements if using JGroups multiplexer -->
-        <!--  
+        <!--JGroups multiplexer configuration. Allows cache to use a shared
+            JGroups channel with other clustering services.
+            If you don't want to use the multiplexer, you can uncomment 
+            the ClusterConfig attribute below. -->
         <depends>jgroups.mux:name=Multiplexer</depends>
         <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
         <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
-        -->
+        
+        <!-- Name of cluster. Needs to be the same for all clusters, in order
+             to find each other -->
+        <attribute name="ClusterName">Tomcat-${jboss.partition.name:Cluster}</attribute>
 
         <!-- make sure to specify BatchModeTransactionManager only! -->
         <attribute name="TransactionManagerLookupClass">org.jboss.cache.BatchModeTransactionManagerLookup</attribute>
@@ -43,26 +48,21 @@
         <!--
              Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC
              
-             If you use REPL_SYNC and a UDP-based ClusterConfig
+             If you use REPL_SYNC and a UDP-based JGroups channel
              we recommend you comment out the FC (flow control)
-             protocol in the ClusterConfig section below.
+             protocol in the channel config.
         -->
         <attribute name="CacheMode">REPL_ASYNC</attribute>
 
-        <!-- Name of cluster. Needs to be the same for all clusters, in order
-             to find each other
-        -->
-        <attribute name="ClusterName">Tomcat-${jboss.partition.name:Cluster}</attribute>
-
-        <!-- JGroups protocol stack properties. Can also be a URL,
-             e.g. file:/home/bela/default.xml
-           <attribute name="ClusterProperties"></attribute>
-        -->
-
+        <!-- JGroups protocol stack config in XML format.
+		     Not needed if multiplexer is used, so commented out by default.
+		     If your CacheMode is set to REPL_SYNC we recommend you comment
+             out the FC (flow control) protocol
+		     
         <attribute name="ClusterConfig">
             <config>
                 <UDP mcast_addr="${jboss.partition.udpGroup:230.1.2.7}" 
-                     mcast_port="45577"
+                     mcast_port="45578"
                      ucast_recv_buf_size="20000000"
                      ucast_send_buf_size="640000"
                      mcast_recv_buf_size="25000000" 
@@ -97,14 +97,21 @@
                 <pbcast.GMS print_local_addr="true" join_timeout="3000" 
                             down_thread="false" up_thread="false"
                             join_retry_timeout="2000" shun="true"/>
-                <!-- If your CacheMode is set to REPL_SYNC we recommend you
-                     comment out the FC (flow control) protocol -->
                 <FC max_credits="10000000" down_thread="false" up_thread="false"
                     min_threshold="0.20"/>
                 <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
                 <pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/>
             </config>
         </attribute>
+        -->
+        
+        <!-- JGroups protocol stack properties in String format. 
+             Not needed if multiplexer is used or ClusterConfig property is set. 
+             Can also be a URL, e.g. file:/home/bela/default.xml
+           <attribute name="ClusterProperties"></attribute>
+        -->
+        
+		
 
         <!--
             Number of milliseconds to wait until all responses for a