Author: fhanik
Date: Thu Feb 23 15:11:54 2006
New Revision: 380265
URL: http://svn.apache.org/viewcvs?rev=380265&view=rev
Log:
more cleanup, should be fully backwards compatible to the old config
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java?rev=380265&r1=380264&r2=380265&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java
Thu Feb 23 15:11:54 2006
@@ -103,7 +103,11 @@
public void setClusterSender(ClusterSender sender);
+ public ClusterSender getClusterSender();
+
public void setClusterReceiver(ClusterReceiver receiver);
+
+ public ClusterReceiver getClusterReceiver();
public MembershipService getMembershipService();
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java?rev=380265&r1=380264&r2=380265&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java
Thu Feb 23 15:11:54 2006
@@ -107,7 +107,7 @@
digester.addSetProperties(prefix + "Receiver");
digester.addSetNext(prefix + "Receiver",
"setClusterReceiver",
-
"org.apache.catalina.cluster.tcp.ClusterReceiverBase");
+ "org.apache.catalina.cluster.ClusterReceiver");
digester.addObjectCreate(prefix + "Valve",
null, // MUST be specified in the element
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=380265&r1=380264&r2=380265&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:11:54 2006
@@ -168,11 +168,6 @@
*/
private Map properties = new HashMap();
- /**
- * The cluster log device name to log at level info
- */
- private String clusterLogName =
"org.apache.catalina.cluster.tcp.SimpleTcpCluster";
-
// ------------------------------------------------------------- Properties
public SimpleTcpCluster() {
@@ -264,9 +259,17 @@
public void setClusterSender(ClusterSender clusterSender) {
this.channel.setClusterSender(clusterSender);
}
+
+ public ClusterSender getClusterSender() {
+ return null;
+ }
public void setClusterReceiver(ClusterReceiver clusterReceiver) {
this.channel.setClusterReceiver(clusterReceiver);
+ }
+
+ public ClusterReceiver getClusterReceiver() {
+ return null;
}
public void setMembershipService(MembershipService membershipService) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
