pero 2005/07/16 14:00:12
Modified: modules/cluster/src/share/org/apache/catalina/cluster
CatalinaCluster.java ClusterManager.java
modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java SimpleTcpReplicationManager.java
Log:
Open Cluster APi that Context can have its own Cluster Manager config.
Revision Changes Path
1.13 +3 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java
Index: CatalinaCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CatalinaCluster.java 9 Jun 2005 20:37:33 -0000 1.12
+++ CatalinaCluster.java 16 Jul 2005 21:00:12 -0000 1.13
@@ -19,11 +19,10 @@
import java.util.Map;
import org.apache.catalina.Cluster;
-import org.apache.catalina.cluster.io.ListenCallback;
import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Manager;
import org.apache.catalina.Valve;
import org.apache.commons.logging.Log;
-import org.apache.catalina.Manager;
/**
* A <b>CatalinaCluster</b> interface allows to plug in and out the
@@ -124,7 +123,7 @@
*/
public Map getManagers();
public Manager getManager(String name);
- public void removeManager(String name);
+ public void removeManager(String name,Manager manager);
public void addManager(String name,Manager manager);
public Valve[] getValves();
1.10 +27 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ClusterManager.java 9 Jun 2005 20:37:33 -0000 1.9
+++ ClusterManager.java 16 Jul 2005 21:00:12 -0000 1.10
@@ -59,17 +59,42 @@
public String[] getInvalidatedSessions();
/**
- * Return the name of the manager, typically the context name such as
/replicator
+ * Return the name of the manager, at host /context name and at engine
hostname+/context
* @return String
+ * @since 5.5.10
*/
public String getName();
+ /**
+ * Set the name of the manager, at host /context name and at engine
hostname+/context
+ * @param name
+ * @since 5.5.10
+ */
public void setName(String name);
public CatalinaCluster getCluster();
public void setCluster(CatalinaCluster cluster);
+
+ /**
+ * @return Manager send only to same cluster domain
+ * @since 5.5.10
+ */
public boolean isSendClusterDomainOnly() ;
+ /**
+ * @param boolean
+ * @since 5.5.10
+ */
public void setSendClusterDomainOnly(boolean sendClusterDomainOnly) ;
-
+ /**
+ * @param mode
+ * @since 5.5.10
+ */
+ public void setDefaultMode(boolean mode) ;
+ /**
+ * @param overwrite properties from SimpleTcpCluster
+ * @since 5.5.10
+ */
+ public boolean isDefaultMode() ;
+
}
\ No newline at end of file
1.50 +18 -2
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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- DeltaManager.java 1 Jul 2005 16:47:10 -0000 1.49
+++ DeltaManager.java 16 Jul 2005 21:00:12 -0000 1.50
@@ -100,6 +100,8 @@
protected String name = null;
+ protected boolean defaultMode = false;
+
private CatalinaCluster cluster = null;
/**
@@ -497,6 +499,20 @@
this.notifyListenersOnReplication = notifyListenersOnReplication;
}
+
+ /**
+ * @return Returns the defaultMode.
+ */
+ public boolean isDefaultMode() {
+ return defaultMode;
+ }
+ /**
+ * @param defaultMode The defaultMode to set.
+ */
+ public void setDefaultMode(boolean defaultMode) {
+ this.defaultMode = defaultMode;
+ }
+
public CatalinaCluster getCluster() {
return cluster;
}
@@ -1112,7 +1128,7 @@
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.stopped", getName()));
- getCluster().removeManager(getName());
+ getCluster().removeManager(getName(),this);
// Validate and update our current component state
if (!started)
1.41 +15 -2
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- SimpleTcpReplicationManager.java 26 Jun 2005 21:21:49 -0000 1.40
+++ SimpleTcpReplicationManager.java 16 Jul 2005 21:00:12 -0000 1.41
@@ -74,7 +74,7 @@
//log to screen
protected boolean mPrintToScreen = true;
-
+ protected boolean defaultMode = false;
protected boolean mManagerRunning = false;
@@ -125,6 +125,19 @@
this.sendClusterDomainOnly = sendClusterDomainOnly;
}
+ /**
+ * @return Returns the defaultMode.
+ */
+ public boolean isDefaultMode() {
+ return defaultMode;
+ }
+ /**
+ * @param defaultMode The defaultMode to set.
+ */
+ public void setDefaultMode(boolean defaultMode) {
+ this.defaultMode = defaultMode;
+ }
+
public boolean isManagerRunning()
{
return mManagerRunning;
@@ -495,7 +508,7 @@
try
{
this.sessions.clear();
- cluster.removeManager(getName());
+ cluster.removeManager(getName(),this);
// mReplicationListener.stopListening();
// mReplicationTransmitter.stop();
// service.stop();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
