Author: fhanik
Date: Mon Mar 20 11:30:50 2006
New Revision: 387285
URL: http://svn.apache.org/viewcvs?rev=387285&view=rev
Log:
Made sure the new config was working
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
tomcat/container/tc5.5.x/modules/groupcom/to-do.txt
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java?rev=387285&r1=387284&r2=387285&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationTransmitter.java
Mon Mar 20 11:30:50 2006
@@ -16,10 +16,6 @@
package org.apache.catalina.tribes.tcp;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelSender;
Modified: tomcat/container/tc5.5.x/modules/groupcom/to-do.txt
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/to-do.txt?rev=387285&r1=387284&r2=387285&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/to-do.txt (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/to-do.txt Mon Mar 20 11:30:50 2006
@@ -19,7 +19,9 @@
5. Ability to send on multiple streams at the same time, in parallel, to
improve performance
- 6. Future version will have WAN membership and replication
+ 6. Designed with replication in mind, that some pieces of data don't need to
be totally ordered.
+
+ 7. Future version will have WAN membership and replication
Code Tasks:
===========================================
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterRuleSet.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterRuleSet.java?rev=387285&r1=387284&r2=387285&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterRuleSet.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterRuleSet.java
Mon Mar 20 11:30:50 2006
@@ -113,6 +113,15 @@
"setChannelSender",
"org.apache.catalina.tribes.ChannelSender");
+ digester.addObjectCreate(channelPrefix + "Sender/Transport",
+ null, // MUST be specified in the element
+ "className");
+ digester.addSetProperties(channelPrefix + "Sender/Transport");
+ digester.addSetNext(channelPrefix + "Sender/Transport",
+ "setTransport",
+
"org.apache.catalina.tribes.tcp.MultiPointSender");
+
+
digester.addObjectCreate(channelPrefix + "Receiver",
null, // MUST be specified in the element
"className");
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=387285&r1=387284&r2=387285&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Mon Mar 20 11:30:50 2006
@@ -779,11 +779,11 @@
msg.setAddress(getLocalMember());
if (dest != null) {
if (!getLocalMember().equals(dest)) {
- channel.send(new Member[] {dest}, msg,0);
+ channel.send(new Member[] {dest},
msg,channel.SEND_OPTIONS_DEFAULT);
} else
log.error("Unable to send message to local member " + msg);
} else {
- channel.send(channel.getMembers(),msg,0);
+
channel.send(channel.getMembers(),msg,channel.SEND_OPTIONS_DEFAULT);
}
} catch (Exception x) {
log.error("Unable to send message through cluster sender.", x);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
