Author: kfujino
Date: Wed Aug 4 08:59:48 2010
New Revision: 982165
URL: http://svn.apache.org/viewvc?rev=982165&view=rev
Log:
Remove domainReplication attribute from ClusterManager.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/trunk/webapps/docs/config/cluster-manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java Wed Aug 4
08:59:48 2010
@@ -77,13 +77,6 @@ public interface CatalinaCluster extends
* @param dest Member
*/
public void send(ClusterMessage msg, Member dest);
-
- /**
- * Sends a message to a all members at local cluster domain
- *
- * @param msg ClusterMessage
- */
- public void sendClusterDomain(ClusterMessage msg);
/**
* Returns that cluster has members.
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java Wed Aug 4
08:59:48 2010
@@ -78,18 +78,6 @@ public interface ClusterManager extends
public CatalinaCluster getCluster();
public void setCluster(CatalinaCluster cluster);
-
- /**
- * @return Manager send only to same cluster domain.
- * @since 5.5.10
- */
- public boolean doDomainReplication();
-
- /**
- * @param domainReplication Flag value.
- * @since 5.5.10
- */
- public void setDomainReplication(boolean domainReplication);
public ReplicationStream getReplicationStream(byte[] data) throws
IOException;
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Wed Aug 4 08:59:48 2010
@@ -201,7 +201,7 @@ public class ClusterSingleSignOn
msg.setAction(SingleSignOnMessage.ADD_SESSION);
- cluster.sendClusterDomain(msg);
+ cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug("SingleSignOnMessage Send with action "
@@ -241,7 +241,7 @@ public class ClusterSingleSignOn
msg.setAction(SingleSignOnMessage.DEREGISTER_SESSION);
- cluster.sendClusterDomain(msg);
+ cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug("SingleSignOnMessage Send with action "
+ msg.getAction());
@@ -275,7 +275,7 @@ public class ClusterSingleSignOn
ssoId, null);
msg.setAction(SingleSignOnMessage.LOGOUT_SESSION);
- cluster.sendClusterDomain(msg);
+ cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug("SingleSignOnMessage Send with action "
+ msg.getAction());
@@ -317,7 +317,7 @@ public class ClusterSingleSignOn
msg.setUsername(username);
msg.setPassword(password);
- cluster.sendClusterDomain(msg);
+ cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug("SingleSignOnMessage Send with action "
+ msg.getAction());
@@ -375,7 +375,7 @@ public class ClusterSingleSignOn
msg.setUsername(username);
msg.setPassword(password);
- cluster.sendClusterDomain(msg);
+ cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug("SingleSignOnMessage Send with action "
+ msg.getAction());
@@ -415,7 +415,7 @@ public class ClusterSingleSignOn
msg.setAction(SingleSignOnMessage.REMOVE_SESSION);
- cluster.sendClusterDomain(msg);
+ cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug("SingleSignOnMessage Send with action "
+ msg.getAction());
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Wed Aug
4 08:59:48 2010
@@ -82,16 +82,6 @@ public class BackupManager extends Clust
public void messageDataReceived(ClusterMessage msg) {
}
- public boolean doDomainReplication() {
- return false;
- }
-
- /**
- * @param sendClusterDomainOnly The sendClusterDomainOnly to set.
- */
- public void setDomainReplication(boolean sendClusterDomainOnly) {
- }
-
public void setExpireSessionsOnShutdown(boolean expireSessionsOnShutdown)
{
mExpireSessionsOnShutdown = expireSessionsOnShutdown;
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Aug
4 08:59:48 2010
@@ -100,7 +100,6 @@ public class DeltaManager extends Cluste
private volatile boolean stateTransfered = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
- private boolean sendClusterDomainOnly = true ;
private int sendAllSessionsSize = 1000 ;
/**
@@ -346,20 +345,6 @@ public class DeltaManager extends Cluste
}
/**
- * @return Returns the sendClusterDomainOnly.
- */
- public boolean doDomainReplication() {
- return sendClusterDomainOnly;
- }
-
- /**
- * @param sendClusterDomainOnly The sendClusterDomainOnly to set.
- */
- public void setDomainReplication(boolean sendClusterDomainOnly) {
- this.sendClusterDomainOnly = sendClusterDomainOnly;
- }
-
- /**
* @return Returns the stateTimestampDrop.
*/
public boolean isStateTimestampDrop() {
@@ -511,10 +496,7 @@ public class DeltaManager extends Cluste
*/
protected void send(SessionMessage msg) {
if(cluster != null) {
- if(doDomainReplication())
- cluster.sendClusterDomain(msg);
- else
- cluster.send(msg);
+ cluster.send(msg);
}
}
@@ -1234,7 +1216,7 @@ public class DeltaManager extends Cluste
* requesting node
*/
protected void messageReceived(SessionMessage msg, Member sender) {
- if(doDomainReplication() && !checkSenderDomain(msg,sender)) {
+ if(!checkSenderDomain(msg,sender)) {
return;
}
ClassLoader contextLoader =
Thread.currentThread().getContextClassLoader();
@@ -1492,7 +1474,6 @@ public class DeltaManager extends Cluste
result.notifySessionListenersOnReplication =
notifySessionListenersOnReplication;
result.stateTransferTimeout = stateTransferTimeout;
result.sendAllSessions = sendAllSessions;
- result.sendClusterDomainOnly = sendClusterDomainOnly ;
result.sendAllSessionsSize = sendAllSessionsSize;
result.sendAllSessionsWaitTime = sendAllSessionsWaitTime ;
result.receiverQueue = receiverQueue ;
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Wed Aug
4 08:59:48 2010
@@ -402,11 +402,7 @@ public class DeltaSession extends Standa
CatalinaCluster cluster = dmanager.getCluster();
ClusterMessage msg = dmanager.requestCompleted(expiredId, true);
if (msg != null) {
- if(dmanager.doDomainReplication()) {
- cluster.sendClusterDomain(msg);
- } else {
- cluster.send(msg);
- }
+ cluster.send(msg);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Wed Aug 4 08:59:48 2010
@@ -421,10 +421,7 @@ public class JvmRouteBinderValve extends
Context context = request.getContext();
msg.setContextPath(context.getPath());
msg.setHost(context.getParent().getName());
- if(manager.doDomainReplication())
- cluster.sendClusterDomain(msg);
- else
- cluster.send(msg);
+ cluster.send(msg);
}
/**
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Wed
Aug 4 08:59:48 2010
@@ -275,11 +275,6 @@
description="Total number of sessions created by this manager"
type="long"/>
<attribute
- name="sendClusterDomainOnly"
- is="true"
- description="The sendClusterDomainOnly flag send sessions only to
members as same cluster domain"
- type="boolean"/>
- <attribute
name="sessionIdLength"
description="The session id length (in bytes) of Sessions created by
this Manager"
type="int"/>
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Wed Aug
4 08:59:48 2010
@@ -539,11 +539,7 @@ public class ReplicationValve
protected void send(ClusterManager manager, CatalinaCluster cluster,
String sessionId) {
ClusterMessage msg = manager.requestCompleted(sessionId);
if (msg != null) {
- if(manager.doDomainReplication()) {
- cluster.sendClusterDomain(msg);
- } else {
- cluster.send(msg);
- }
+ cluster.send(msg);
if(doStatistics())
nrOfSendRequests++;
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Wed Aug
4 08:59:48 2010
@@ -769,16 +769,6 @@ public class SimpleTcpCluster extends Li
public void send(ClusterMessage msg) {
send(msg, null);
}
-
- /**
- * send message to all cluster members same cluster domain
- *
- * @see
org.apache.catalina.ha.CatalinaCluster#send(org.apache.catalina.ha.ClusterMessage)
- */
- public void sendClusterDomain(ClusterMessage msg) {
- send(msg,null);
- }
-
/**
* send a cluster message to one member
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml Wed Aug
4 08:59:48 2010
@@ -79,16 +79,6 @@
type="org.apache.catalina.ha.ClusterMessage"/>
</operation>
<operation
- name="sendClusterDomain"
- description="send message to all cluster members with same domain"
- impact="ACTION"
- returnType="void">
- <parameter
- name="message"
- description="replication message"
- type="org.apache.catalina.ha.ClusterMessage"/>
- </operation>
- <operation
name="start"
description="Start the cluster"
impact="ACTION"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 4 08:59:48 2010
@@ -48,6 +48,15 @@
</update>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ Remove domainReplication attribute from ClusterManager.
+ If you send session to only same domain, use DomainFilterInterceptor.
+ (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-interceptor.xml?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Wed Aug 4
08:59:48 2010
@@ -96,6 +96,17 @@
</attributes>
</subsection>
+ <subsection
name="org.apache.catalina.tribes.group.interceptors.DomainFilterInterceptor
Attributes">
+ <attributes>
+ <attribute name="domain" required="true">
+ The logical cluster domain that this Interceptor accepts.
+ Two different type of values are possible:<br/>
+ 1. Regular string values like "staging-domain" or
"tomcat-cluster" will be converted into bytes
+ using ISO-8859-1 encoding.<br/>
+ 2. byte array in string form, for example {216,123,12,3}<br/>
+ </attribute>
+ </attributes>
+ </subsection>
<subsection
name="org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor
Attributes">
<attributes>
<attribute name="className" required="true">
Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=982165&r1=982164&r2=982165&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Wed Aug 4 08:59:48
2010
@@ -87,13 +87,6 @@
</subsection>
<subsection name="org.apache.catalina.ha.session.DeltaManager Attributes">
<attributes>
- <attribute name="domainReplication" required="false">
- Set to true if you wish sessions to be replicated only to members that
- have the same logical domain set. If set to false, session replication
- will ignore the domain setting the
- <code><a href="cluster-membership.html"><Membership></a></code>
- element.
- </attribute>
<attribute name="expireSessionsOnShutdown" required="false">
When a web application is being shutdown, Tomcat issues an expire call
to each session to notify all the listeners. If you wish for all
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
