Author: fhanik
Date: Thu Mar 23 00:41:18 2006
New Revision: 388111
URL: http://svn.apache.org/viewcvs?rev=388111&view=rev
Log:
Corrected the XML
Modified:
tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
Modified: tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml?rev=388111&r1=388110&r2=388111&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml Thu Mar 23
00:41:18 2006
@@ -280,10 +280,10 @@
-->
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"
- managerClassName="org.apache.catalina.ha.session.DeltaManager"
+
managerClassName="org.apache.catalina.ha.session.BackupManager"
expireSessionsOnShutdown="false"
- useDirtyFlag="true"
- notifyListenersOnReplication="true">
+ notifyListenersOnReplication="true"
+ channelSendOptions="11">
<Channel className="org.apache.catalina.tribes.group.GroupChannel">
<Membership
@@ -297,43 +297,23 @@
className="org.apache.catalina.tribes.tcp.nio.NioReceiver"
tcpListenAddress="auto"
tcpListenPort="4001"
- tcpSelectorTimeout="100"
- tcpThreadCount="6"
- sendAck="true"
- synchronized="true"
+ minThreads="6"
+ maxThreads="25"
rxBufSize="43800"
- txBufSize="25188"/>
+ txBufSize="25188"
+ autoBind="10"/>
<Sender
className="org.apache.catalina.tribes.tcp.ReplicationTransmitter">
- <transport
className="org.apache.catalina.tribes.tcp.nio.PooledParallelSender"
- maxRetryAttempts="2"
- timeout="15000"
- waitForAck="true"
- ackTimeout="15000"
- rxBufSize="43800"
- txBufSize="25188"
- autoConnect="true"
- poolSize="25"/>
- <!--
- <transport
className="org.apache.catalina.tribes.tcp.bio.PooledMultiSender"
- maxRetryAttempts="2"
- timeout="15000"
- waitForAck="true"
- ackTimeout="15000"
- rxBufSize="43800"
- txBufSize="25188"
- autoConnect="true"
- poolSize="25"/>
- -->
-
+ <Transport
className="org.apache.catalina.tribes.tcp.nio.PooledParallelSender"
+ rxBufSize="43800"
+ txBufSize="25188"/>
</Sender>
-
-
<!--
<Interceptor
className="org.apache.catalina.tribes.group.interceptors.GzipInterceptor"/>
<Interceptor
className="org.apache.catalina.tribes.group.interceptors.FragmentationInterceptor"/>
<Interceptor
className="org.apache.catalina.tribes.group.interceptors.OrderInterceptor"/>
+ <Interceptor
className="org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor"/>
-->
</Channel>
@@ -384,6 +364,22 @@
-->
<!--
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+ directory="logs" prefix="localhost_access_log." suffix=".txt"
+ pattern="common" resolveHosts="false"/>
+ -->
+ <!-- Access log processes all requests for this virtual host. By
+ default, log files are created in the "logs" directory relative to
+ $CATALINA_HOME. If you wish, you can specify a different
+ directory with the "directory" attribute. Specify either a
relative
+ (to $CATALINA_HOME) or absolute path to the desired directory.
+ This access log implementation is optimized for maximum
performance,
+ but is hardcoded to support only the "common" and "combined"
patterns.
+
+ This valve use NIO direct Byte Buffer to asynchornously store the
+ log.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.ByteBufferAccessLogValve"
directory="logs" prefix="localhost_access_log." suffix=".txt"
pattern="common" resolveHosts="false"/>
-->
Modified: tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml?rev=388111&r1=388110&r2=388111&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml Thu Mar 23
00:41:18 2006
@@ -280,10 +280,10 @@
-->
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"
- managerClassName="org.apache.catalina.ha.session.DeltaManager"
+
managerClassName="org.apache.catalina.ha.session.BackupManager"
expireSessionsOnShutdown="false"
- useDirtyFlag="true"
- notifyListenersOnReplication="true">
+ notifyListenersOnReplication="true"
+ channelSendOptions="11">
<Channel className="org.apache.catalina.tribes.group.GroupChannel">
<Membership
@@ -294,25 +294,27 @@
mcastDropTime="3000"/>
<Receiver
-
className="org.apache.catalina.tribes.tcp.ReplicationListener"
+ className="org.apache.catalina.tribes.tcp.nio.NioReceiver"
tcpListenAddress="auto"
tcpListenPort="4001"
- tcpSelectorTimeout="100"
- tcpThreadCount="6"
- sendAck="true"
- synchronized="true"
+ minThreads="6"
+ maxThreads="25"
rxBufSize="43800"
- txBufSize="25188"/>
+ txBufSize="25188"
+ autoBind="10"/>
<Sender
-
className="org.apache.catalina.tribes.tcp.ReplicationTransmitter"
- replicationMode="parallel"
- ackTimeout="15000"
- waitForAck="true"
- rxBufSize="43800"
- txBufSize="25188"/>
-
- <!--<Interceptor
className="org.apache.catalina.tribes.group.interceptors.GzipInterceptor"/>-->
+
className="org.apache.catalina.tribes.tcp.ReplicationTransmitter">
+ <Transport
className="org.apache.catalina.tribes.tcp.nio.PooledParallelSender"
+ rxBufSize="43800"
+ txBufSize="25188"/>
+ </Sender>
+ <!--
+ <Interceptor
className="org.apache.catalina.tribes.group.interceptors.GzipInterceptor"/>
+ <Interceptor
className="org.apache.catalina.tribes.group.interceptors.FragmentationInterceptor"/>
+ <Interceptor
className="org.apache.catalina.tribes.group.interceptors.OrderInterceptor"/>
+ <Interceptor
className="org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor"/>
+ -->
</Channel>
<Valve className="org.apache.catalina.ha.tcp.ReplicationValve"
@@ -362,6 +364,22 @@
-->
<!--
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+ directory="logs" prefix="localhost_access_log." suffix=".txt"
+ pattern="common" resolveHosts="false"/>
+ -->
+ <!-- Access log processes all requests for this virtual host. By
+ default, log files are created in the "logs" directory relative to
+ $CATALINA_HOME. If you wish, you can specify a different
+ directory with the "directory" attribute. Specify either a
relative
+ (to $CATALINA_HOME) or absolute path to the desired directory.
+ This access log implementation is optimized for maximum
performance,
+ but is hardcoded to support only the "common" and "combined"
patterns.
+
+ This valve use NIO direct Byte Buffer to asynchornously store the
+ log.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.ByteBufferAccessLogValve"
directory="logs" prefix="localhost_access_log." suffix=".txt"
pattern="common" resolveHosts="false"/>
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
