Author: fhanik
Date: Thu Feb 23 15:33:22 2006
New Revision: 380270
URL: http://svn.apache.org/viewcvs?rev=380270&view=rev
Log:
Completed. This stripped version is fully compatible with the existing 5.5.15
server.xml config.
It will serve as a base line.
My plan is to maintain 5.5.x compatibility with server.xml until we start TC6
development.
However, this uses the new groupcom module, so alot of the queueing and
messaging features that exists in the DeltaManager can now be safely removed
and replaced with smart interceptors.
Added:
tomcat/container/tc5.5.x/modules/build.properties
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/cluster/group/ChannelCoordinator.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Added: tomcat/container/tc5.5.x/modules/build.properties
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/build.properties?rev=380270&view=auto
==============================================================================
--- tomcat/container/tc5.5.x/modules/build.properties (added)
+++ tomcat/container/tc5.5.x/modules/build.properties Thu Feb 23 15:33:22 2006
@@ -0,0 +1,2 @@
+#Uncomment the following line to enable the new cluster set
+cluster-ha=true
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/cluster/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/cluster/group/ChannelCoordinator.java?rev=380270&r1=380269&r2=380270&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/cluster/group/ChannelCoordinator.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/cluster/group/ChannelCoordinator.java
Thu Feb 23 15:33:22 2006
@@ -79,7 +79,12 @@
*/
public void start(int svc) throws ChannelException {
try {
+ //synchronize, big time FIXME
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
getClusterReceiver().getPort());
+ clusterReceiver.setSendAck(clusterSender.isWaitForAck());
+ clusterReceiver.setCompress(clusterSender.isCompress());
+ //end FIXME
+
if ( (svc & ClusterChannel.MBR_RX_SEQ) ==
ClusterChannel.MBR_RX_SEQ) membershipService.start(MembershipService.MBR_RX);
if ( (svc & ClusterChannel.SND_RX_SEQ) ==
ClusterChannel.SND_RX_SEQ) clusterReceiver.start();
if ( (svc & ClusterChannel.SND_TX_SEQ) ==
ClusterChannel.SND_TX_SEQ) clusterSender.start();
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=380270&r1=380269&r2=380270&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Thu Feb 23 15:33:22 2006
@@ -794,7 +794,7 @@
* @see
org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage)
*/
public void sendClusterDomain(ClusterMessage msg) {
- throw new UnsupportedOperationException();
+ send(msg,null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
