Make server.xml nice and pretty without including a giant blob about clustering

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@464705 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/server.xml b/conf/server.xml
index 8eb2dca..5aac397 100644 (file)
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -119,42 +119,10 @@
     <!-- Define the top level container in our container hierarchy -->
     <Engine name="Catalina" defaultHost="localhost">
 
+      <!--For clustering, please check out /docs/cluster-howto.html and
+          /docs/config/cluster.html (reference documentation) -->
       <!--
-      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"
-               channelSendOptions="11">
-        <Manager className="org.apache.catalina.ha.session.DeltaManager"
-                 expireSessionsOnShutdown="false"
-                 notifyListenersOnReplication="true"/>
-      
-        <Channel className="org.apache.catalina.tribes.group.GroupChannel">
-          <Membership className="org.apache.catalina.tribes.membership.McastService"
-                      address="228.0.0.4"
-                      port="45564"
-                      frequency="500"
-                      dropTime="3000"/>
-          <Receiver className="org.apache.catalina.tribes.transport.nio.NioReceiver"
-                    address="auto"
-                    port="auto"
-                    selectorTimeout="100"
-                    maxThreads="6"/>
-          <Sender className="org.apache.catalina.tribes.transport.ReplicationTransmitter">
-            <Transport className="org.apache.catalina.tribes.transport.nio.PooledParallelSender"/>
-          </Sender>
-          <Interceptor className="org.apache.catalina.tribes.group.interceptors.TcpFailureDetector"/>
-          <Interceptor className="org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor"/>
-          <Interceptor className="org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor"/>
-        </Channel>
-
-        <Valve className="org.apache.catalina.ha.tcp.ReplicationValve"
-               filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
-
-        <Deployer className="org.apache.catalina.ha.deploy.FarmWarDeployer"
-                  tempDir="/tmp/war-temp/"
-                  deployDir="/tmp/war-deploy/"
-                  watchDir="/tmp/war-listen/"
-                  watchEnabled="false"/>
-        <ClusterListener className="org.apache.catalina.ha.session.ClusterSessionListener"/>
-      </Cluster>
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
       -->        
 
 

diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index c3bbef1..2c817e4 100644 (file)
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -218,6 +218,54 @@ should be completed:</p>
 
 </section>
 
+<section name="Configuration Example">
+<source>
+        &lt;Cluster className=&quot;org.apache.catalina.ha.tcp.SimpleTcpCluster&quot;
+                 channelSendOptions=&quot;6&quot;&gt;
+
+          &lt;Manager className=&quot;org.apache.catalina.ha.session.BackupManager&quot;
+                   expireSessionsOnShutdown=&quot;false&quot;
+                   notifyListenersOnReplication=&quot;true&quot;
+                   mapSendOptions=&quot;6&quot;/&gt;
+          &lt;!--
+          &lt;Manager className=&quot;org.apache.catalina.ha.session.DeltaManager&quot;
+                   expireSessionsOnShutdown=&quot;false&quot;
+                   notifyListenersOnReplication=&quot;true&quot;/&gt;
+          --&gt;        
+          &lt;Channel className=&quot;org.apache.catalina.tribes.group.GroupChannel&quot;&gt;
+            &lt;Membership className=&quot;org.apache.catalina.tribes.membership.McastService&quot;
+                        address=&quot;228.0.0.4&quot;
+                        port=&quot;45564&quot;
+                        frequency=&quot;500&quot;
+                        dropTime=&quot;3000&quot;/&gt;
+            &lt;Receiver className=&quot;org.apache.catalina.tribes.transport.nio.NioReceiver&quot;
+                      address=&quot;auto&quot;
+                      port=&quot;5000&quot;
+                      selectorTimeout=&quot;100&quot;
+                      maxThreads=&quot;6&quot;/&gt;
+
+            &lt;Sender className=&quot;org.apache.catalina.tribes.transport.ReplicationTransmitter&quot;&gt;
+              &lt;Transport className=&quot;org.apache.catalina.tribes.transport.nio.PooledParallelSender&quot;/&gt;
+            &lt;/Sender&gt;
+            &lt;Interceptor className=&quot;org.apache.catalina.tribes.group.interceptors.TcpFailureDetector&quot;/&gt;
+            &lt;Interceptor className=&quot;org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor&quot;/&gt;
+            &lt;Interceptor className=&quot;org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor&quot;/&gt;
+          &lt;/Channel&gt;
+
+          &lt;Valve className=&quot;org.apache.catalina.ha.tcp.ReplicationValve&quot;
+                 filter=&quot;.*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;&quot;/&gt;
+
+          &lt;Deployer className=&quot;org.apache.catalina.ha.deploy.FarmWarDeployer&quot;
+                    tempDir=&quot;/tmp/war-temp/&quot;
+                    deployDir=&quot;/tmp/war-deploy/&quot;
+                    watchDir=&quot;/tmp/war-listen/&quot;
+                    watchEnabled=&quot;false&quot;/&gt;
+
+          &lt;ClusterListener className=&quot;org.apache.catalina.ha.session.ClusterSessionListener&quot;/&gt;
+        &lt;/Cluster&gt;
+</source>
+</section>
+
 <section name="Cluster Architecture">
 
 <p><b>Component Levels:</b>