fhanik 2004/07/22 08:41:15
Modified: modules/cluster/src/share/org/apache/catalina/cluster
ClusterManager.java
modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java SessionMessageImpl.java
SimpleTcpReplicationManager.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationValve.java SimpleTcpCluster.java
Added: modules/cluster/src/share/org/apache/catalina/cluster/session
SessionMessage.java
Removed: modules/cluster/src/share/org/apache/catalina/cluster
SessionMessage.java
Log:
Moved the session message to the session package, it is completely unrelated to all
other cluster activities
Revision Changes Path
1.6 +2 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterManager.java
Index: ClusterManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClusterManager.java 26 May 2004 16:31:15 -0000 1.5
+++ ClusterManager.java 22 Jul 2004 15:41:15 -0000 1.6
@@ -36,7 +36,7 @@
* receiving replication messages.
* @param msg - the message received.
*/
- public void messageDataReceived(SessionMessage msg);
+ public void messageDataReceived(ClusterMessage msg);
/**
* When the request has been completed, the replication valve
@@ -48,7 +48,7 @@
* @param sessionId - the sessionId that just completed.
* @return a SessionMessage to be sent,
*/
- public SessionMessage requestCompleted(String sessionId);
+ public ClusterMessage requestCompleted(String sessionId);
/**
* When the manager expires session not tied to a request.
1.29 +9 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Index: DeltaManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DeltaManager.java 1 Jul 2004 09:44:26 -0000 1.28
+++ DeltaManager.java 22 Jul 2004 15:41:15 -0000 1.29
@@ -40,7 +40,7 @@
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.SessionMessage;
+import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.cluster.Member;
import org.apache.catalina.cluster.CatalinaCluster;
@@ -753,8 +753,12 @@
* receiving replication messages.
* @param msg - the message received.
*/
- public void messageDataReceived(SessionMessage msg) {
- messageReceived(msg,
msg.getAddress()!=null?(Member)msg.getAddress():null);
+ public void messageDataReceived(ClusterMessage cmsg) {
+ if ( cmsg instanceof SessionMessage ) {
+ SessionMessage msg = (SessionMessage)cmsg;
+ messageReceived(msg,
+ msg.getAddress() != null ? (Member) msg.getAddress()
: null);
+ }
}
/**
@@ -767,7 +771,7 @@
* @param sessionId - the sessionId that just completed.
* @return a SessionMessage to be sent,
*/
- public SessionMessage requestCompleted(String sessionId) {
+ public ClusterMessage requestCompleted(String sessionId) {
try {
DeltaSession session = (DeltaSession) findSession(sessionId);
DeltaRequest deltaRequest = session.getDeltaRequest();
1.3 +1 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
Index: SessionMessageImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionMessageImpl.java 29 May 2004 02:43:58 -0000 1.2
+++ SessionMessageImpl.java 22 Jul 2004 15:41:15 -0000 1.3
@@ -1,6 +1,6 @@
package org.apache.catalina.cluster.session;
-import org.apache.catalina.cluster.SessionMessage;
+
import org.apache.catalina.cluster.Member;
/**
* <p>Title: </p>
1.31 +8 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Index: SimpleTcpReplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SimpleTcpReplicationManager.java 1 Jul 2004 09:44:26 -0000 1.30
+++ SimpleTcpReplicationManager.java 22 Jul 2004 15:41:15 -0000 1.31
@@ -20,8 +20,8 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Session;
import org.apache.catalina.cluster.CatalinaCluster;
+import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.SessionMessage;
import org.apache.catalina.realm.GenericPrincipal;
/**
@@ -236,7 +236,7 @@
}
- public SessionMessage requestCompleted(String sessionId)
+ public ClusterMessage requestCompleted(String sessionId)
{
if ( !getDistributable() ) {
log.warn("Received requestCompleted message, although this context["+
@@ -580,9 +580,13 @@
}
}
- public void messageDataReceived(SessionMessage msg) {
+ public void messageDataReceived(ClusterMessage cmsg) {
try {
- messageReceived(msg,
msg.getAddress()!=null?(Member)msg.getAddress():null);
+ if ( cmsg instanceof SessionMessage ) {
+ SessionMessage msg = (SessionMessage)cmsg;
+ messageReceived(msg,
+ msg.getAddress() != null ? (Member)
msg.getAddress() : null);
+ }
} catch(Throwable ex){
log.error("InMemoryReplicationManager.messageDataReceived()", ex);
}//catch
1.6 +30 -232
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SessionMessage.java
1.15 +5 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Index: ReplicationValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ReplicationValve.java 23 Jun 2004 08:25:04 -0000 1.14
+++ ReplicationValve.java 22 Jul 2004 15:41:15 -0000 1.15
@@ -27,7 +27,8 @@
import org.apache.catalina.cluster.CatalinaCluster;
import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.SessionMessage;
+import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.cluster.session.SessionMessage;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.StringManager;
@@ -146,8 +147,7 @@
if ( invalidIds.length > 0 ) {
for ( int i=0;i<invalidIds.length; i++ ) {
try {
- SessionMessage imsg = manager.requestCompleted(
- invalidIds[i]);
+ ClusterMessage imsg =
manager.requestCompleted(invalidIds[i]);
if (imsg != null)
cluster.send(imsg);
}catch ( Exception x ) {
@@ -185,7 +185,7 @@
log.debug("Invoking replication request on "+uri);
- SessionMessage msg = manager.requestCompleted(id);
+ ClusterMessage msg = manager.requestCompleted(id);
if ( msg == null ) return;
1.45 +2 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Index: SimpleTcpCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- SimpleTcpCluster.java 13 Jul 2004 09:43:59 -0000 1.44
+++ SimpleTcpCluster.java 22 Jul 2004 15:41:15 -0000 1.45
@@ -37,7 +37,7 @@
import org.apache.catalina.cluster.MembershipListener;
import org.apache.catalina.cluster.MembershipService;
import org.apache.catalina.cluster.MessageListener;
-import org.apache.catalina.cluster.SessionMessage;
+import org.apache.catalina.cluster.session.SessionMessage;
import org.apache.catalina.cluster.io.ListenCallback;
import org.apache.catalina.cluster.session.ReplicationStream;
import org.apache.catalina.util.LifecycleSupport;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
