tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r381806 - in /tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina: cluster/ ha/ ha/deploy/ ha/session/ ha/tcp/ ha/util/
Date Tue, 28 Feb 2006 23:00:54 GMT
Author: fhanik
Date: Tue Feb 28 15:00:47 2006
New Revision: 381806

URL: http://svn.apache.org/viewcvs?rev=381806&view=rev
Log:
Refactored the cluster2 module

Added:
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/
      - copied from r381805, tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/
Removed:
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/
Modified:
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterDeployer.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterListener.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterManager.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessage.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessageBase.java
    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/ClusterSession.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterValve.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/Constants.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileChangeListener.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessage.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessageFactory.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/UndeployMessage.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/WarWatcher.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/mbeans-descriptors.xml
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterManagerBase.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterSessionListener.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/Constants.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaRequest.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSessionFacade.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ReplicatedSession.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SerializablePrincipal.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionIDMessage.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessage.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessageImpl.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/mbeans-descriptors.xml
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/Constants.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/ReplicationValve.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SendMessageData.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/util/IDynamicProperty.java

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 import java.util.Map;
 

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterDeployer.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterDeployer.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterDeployer.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterDeployer.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 /**
  * A <b>ClusterDeployer</b> interface allows to plug in and out the

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterListener.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterListener.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterListener.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 
 

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterManager.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterManager.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterManager.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterManager.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 
 import org.apache.catalina.Manager;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessage.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessage.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessage.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessage.java Tue Feb 28 15:00:47 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 import java.io.Serializable;
 import org.apache.catalina.tribes.Member;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessageBase.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessageBase.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessageBase.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterMessageBase.java Tue Feb 28 15:00:47 2006
@@ -1,4 +1,4 @@
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 import org.apache.catalina.tribes.Member;
 
@@ -27,7 +27,7 @@
      * getAddress
      *
      * @return Member
-     * @todo Implement this org.apache.catalina.cluster.ClusterMessage method
+     * @todo Implement this org.apache.catalina.ha.ClusterMessage method
      */
     public Member getAddress() {
         return address;
@@ -45,7 +45,7 @@
      * setAddress
      *
      * @param member Member
-     * @todo Implement this org.apache.catalina.cluster.ClusterMessage method
+     * @todo Implement this org.apache.catalina.ha.ClusterMessage method
      */
     public void setAddress(Member member) {
         this.address = member;

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=381806&r1=381805&r2=381806&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 Tue Feb 28 15:00:47 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 
 import org.apache.tomcat.util.digester.Digester;
@@ -144,7 +144,7 @@
         digester.addSetProperties(prefix + "Deployer");
         digester.addSetNext(prefix + "Deployer",
                             "setClusterDeployer",
-                            "org.apache.catalina.cluster.ClusterDeployer");
+                            "org.apache.catalina.ha.ClusterDeployer");
         
         digester.addObjectCreate(prefix + "Listener",
                 null, // MUST be specified in the element
@@ -160,7 +160,7 @@
         digester.addSetProperties(prefix + "ClusterListener");
         digester.addSetNext(prefix + "ClusterListener",
                             "addClusterListener",
-                            "org.apache.catalina.cluster.ClusterListener");
+                            "org.apache.catalina.ha.ClusterListener");
         //Cluster configuration end
     }
 

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterSession.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterSession.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterSession.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterSession.java Tue Feb 28 15:00:47 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 import org.apache.catalina.Session;
 import javax.servlet.http.HttpSession;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterValve.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterValve.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterValve.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/ClusterValve.java Tue Feb 28 15:00:47 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 /**
  * Cluster Valve Interface to mark all Cluster Valves 

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/Constants.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/Constants.java Tue Feb 28 15:00:47 2006
@@ -15,10 +15,10 @@
  */
 
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.ha;
 
 /**
- * Manifest constants for the <code>org.apache.catalina.cluster</code>
+ * Manifest constants for the <code>org.apache.catalina.ha</code>
  * package.
  *
  * @author Bip Thelin
@@ -26,5 +26,5 @@
  */
 
 public final class Constants {
-    public static final String Package = "org.apache.catalina.cluster";
+    public static final String Package = "org.apache.catalina.ha";
 }

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.deploy;
+package org.apache.catalina.ha.deploy;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,12 +29,12 @@
 import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterDeployer;
-import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterDeployer;
+import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.tribes.Member;
 import org.apache.commons.modeler.Registry;
-import org.apache.catalina.cluster.ClusterListener;
+import org.apache.catalina.ha.ClusterListener;
 
 /**
  * <p>
@@ -159,7 +159,7 @@
     /*
      * stop cluster wide deployments
      * 
-     * @see org.apache.catalina.cluster.ClusterDeployer#stop()
+     * @see org.apache.catalina.ha.ClusterDeployer#stop()
      */
     public void stop() throws LifecycleException {
         started = false;
@@ -415,7 +415,7 @@
     /*
      * Modifcation from watchDir war detected!
      * 
-     * @see org.apache.catalina.cluster.deploy.FileChangeListener#fileModified(java.io.File)
+     * @see org.apache.catalina.ha.deploy.FileChangeListener#fileModified(java.io.File)
      */
     public void fileModified(File newWar) {
         try {
@@ -441,7 +441,7 @@
     /*
      * War remvoe from watchDir
      * 
-     * @see org.apache.catalina.cluster.deploy.FileChangeListener#fileRemoved(java.io.File)
+     * @see org.apache.catalina.ha.deploy.FileChangeListener#fileRemoved(java.io.File)
      */
     public void fileRemoved(File removeWar) {
         try {
@@ -560,7 +560,7 @@
     /*
      * Call watcher to check for deploy changes
      * 
-     * @see org.apache.catalina.cluster.ClusterDeployer#backgroundProcess()
+     * @see org.apache.catalina.ha.ClusterDeployer#backgroundProcess()
      */
     public void backgroundProcess() {
         if (started) {

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileChangeListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileChangeListener.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileChangeListener.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileChangeListener.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.deploy;
+package org.apache.catalina.ha.deploy;
 import java.io.File;
 
 public interface FileChangeListener {

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessage.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessage.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessage.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessage.java Tue Feb 28 15:00:47 2006
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.deploy;
+package org.apache.catalina.ha.deploy;
 
 import java.io.Serializable;
 
-import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.tribes.Member;
-import org.apache.catalina.cluster.ClusterMessageBase;
+import org.apache.catalina.ha.ClusterMessageBase;
 
 /**
  * Contains the data for a file being transferred over TCP, this is 

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessageFactory.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FileMessageFactory.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.deploy;
+package org.apache.catalina.ha.deploy;
 
 import java.io.File;
 import java.io.IOException;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/UndeployMessage.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/UndeployMessage.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/UndeployMessage.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/UndeployMessage.java Tue Feb 28 15:00:47 2006
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.deploy;
+package org.apache.catalina.ha.deploy;
 
 import java.io.Serializable;
 
-import org.apache.catalina.cluster.ClusterMessage;
-import org.apache.catalina.cluster.ClusterMessageBase;
+import org.apache.catalina.ha.ClusterMessage;
+import org.apache.catalina.ha.ClusterMessageBase;
 
 public class UndeployMessage extends ClusterMessageBase implements ClusterMessage,Serializable {
     private long timestamp;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/WarWatcher.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/WarWatcher.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/WarWatcher.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.deploy;
+package org.apache.catalina.ha.deploy;
 
 import java.io.File;
 import java.util.HashMap;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/mbeans-descriptors.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/mbeans-descriptors.xml?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/mbeans-descriptors.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/mbeans-descriptors.xml Tue Feb 28 15:00:47 2006
@@ -6,7 +6,7 @@
           description="Tcp Cluster implementation"
                domain="Catalina"
                 group="Cluster"
-                 type="org.apache.catalina.cluster.tcp.SimpleTcpCluster">
+                 type="org.apache.catalina.ha.tcp.SimpleTcpCluster">
 
     <attribute   name="protocolStack"
           description="JavaGroups protocol stack selection"
@@ -20,7 +20,7 @@
           description="Clustered implementation of the Manager interface"
                domain="Catalina"
                 group="Manager"
-                 type="org.apache.catalina.cluster.tcp.SimpleTcpReplicationManager">
+                 type="org.apache.catalina.ha.tcp.SimpleTcpReplicationManager">
 
     <attribute   name="algorithm"
           description="The message digest algorithm to be used when generating
@@ -77,7 +77,7 @@
           description="Valve for simple tcp replication"
                domain="Catalina"
                 group="Valve"
-                 type="org.apache.catalina.cluster.tcp.ReplicationValve">
+                 type="org.apache.catalina.ha.tcp.ReplicationValve">
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterManagerBase.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterManagerBase.java Tue Feb 28 15:00:47 2006
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
-import org.apache.catalina.cluster.ClusterManager;
+import org.apache.catalina.ha.ClusterManager;
 import java.beans.PropertyChangeListener;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.session.ManagerBase;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterSessionListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterSessionListener.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ClusterSessionListener.java Tue Feb 28 15:00:47 2006
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 import java.util.Map;
 
-import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.ClusterMessage;
-import org.apache.catalina.cluster.*;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.ClusterMessage;
+import org.apache.catalina.ha.*;
 
 /**
  * Receive replicated SessionMessage form other cluster node.

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/Constants.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/Constants.java Tue Feb 28 15:00:47 2006
@@ -15,10 +15,10 @@
  */
 
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 /**
- * Manifest constants for the <code>org.apache.catalina.cluster.session</code>
+ * Manifest constants for the <code>org.apache.catalina.ha.session</code>
  * package.
  *
  * @author Peter Rossbach Pero
@@ -26,6 +26,6 @@
 
 public class Constants {
 
-    public static final String Package = "org.apache.catalina.cluster.session";
+    public static final String Package = "org.apache.catalina.ha.session";
 
 }

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -40,12 +40,12 @@
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Loader;
 import org.apache.catalina.Session;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.tribes.Member;
 import org.apache.catalina.session.ManagerBase;
-import org.apache.catalina.cluster.tcp.ReplicationValve;
+import org.apache.catalina.ha.tcp.ReplicationValve;
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.catalina.util.StringManager;
 import org.apache.catalina.core.StandardContext;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaRequest.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaRequest.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaRequest.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaRequest.java Tue Feb 28 15:00:47 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 /**
  * This class is used to track the series of actions that happens when

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
@@ -48,7 +48,7 @@
 import org.apache.catalina.Session;
 import org.apache.catalina.SessionEvent;
 import org.apache.catalina.SessionListener;
-import org.apache.catalina.cluster.ClusterSession;
+import org.apache.catalina.ha.ClusterSession;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.util.Enumerator;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSessionFacade.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSessionFacade.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSessionFacade.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSessionFacade.java Tue Feb 28 15:00:47 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 
 import java.util.Enumeration;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java Tue Feb 28 15:00:47 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 import java.io.IOException;
 
@@ -30,10 +30,10 @@
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.ClusterMessage;
-import org.apache.catalina.cluster.ClusterValve;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.ClusterMessage;
+import org.apache.catalina.ha.ClusterValve;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.session.ManagerBase;
@@ -52,23 +52,23 @@
  * backup node and traffic don't go back too restarted cluster nodes!
  * 
  * At all cluster node you must configure the as ClusterListener since 5.5.10
- * {@link org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener JvmRouteSessionIDBinderListener}
+ * {@link org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener JvmRouteSessionIDBinderListener}
  * or before with
- * org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListenerLifecycle.
+ * org.apache.catalina.ha.session.JvmRouteSessionIDBinderListenerLifecycle.
  * 
  * Add this Valve to your host definition at conf/server.xml .
  * 
  * Since 5.5.10 as direct cluster valve:<br/>
  * <pre>
  *  &lt;Cluster&gt;
- *  &lt;Valve className=&quot;org.apache.catalina.cluster.session.JvmRouteBinderValve&quot; /&gt;  
+ *  &lt;Valve className=&quot;org.apache.catalina.ha.session.JvmRouteBinderValve&quot; /&gt;  
  *  &lt;/Cluster&gt;
  * </pre>
  * <br />
  * Before 5.5.10 as Host element:<br/>
  * <pre>
  *  &lt;Hostr&gt;
- *  &lt;Valve className=&quot;org.apache.catalina.cluster.session.JvmRouteBinderValve&quot; /&gt;  
+ *  &lt;Valve className=&quot;org.apache.catalina.ha.session.JvmRouteBinderValve&quot; /&gt;  
  *  &lt;/Hostr&gt;
  * </pre>
  * 
@@ -90,7 +90,7 @@
     /**
      * The descriptive information about this implementation.
      */
-    protected static final String info = "org.apache.catalina.cluster.session.JvmRouteBinderValve/1.2";
+    protected static final String info = "org.apache.catalina.ha.session.JvmRouteBinderValve/1.2";
 
     /*--Instance Variables--------------------------------------*/
 
@@ -119,7 +119,7 @@
      */
     protected long numberOfSessions = 0;
 
-    protected String sessionIdAttribute = "org.apache.catalina.cluster.session.JvmRouteOrignalSessionID";
+    protected String sessionIdAttribute = "org.apache.catalina.ha.session.JvmRouteOrignalSessionID";
 
     /**
      * The lifecycle event support for this component.

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java Tue Feb 28 15:00:47 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
@@ -24,7 +24,7 @@
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.cluster.CatalinaCluster;
+import org.apache.catalina.ha.CatalinaCluster;
 
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.util.StringManager;
@@ -32,7 +32,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.modeler.ManagedBean;
 import org.apache.commons.modeler.Registry;
-import org.apache.catalina.cluster.*;
+import org.apache.catalina.ha.*;
 
 /**
  * Register new JvmRouteSessionIDBinderListener to receive Session ID changes.
@@ -41,7 +41,7 @@
  * 
  * <pre>
  *        &lt;Host &gt;... 
- *          &lt;Listener className=&quot;org.apache.catalina.cluster.session.JvmRouteSessionIDBinderLifecycleListener&quot; /&gt;
+ *          &lt;Listener className=&quot;org.apache.catalina.ha.session.JvmRouteSessionIDBinderLifecycleListener&quot; /&gt;
  *          &lt;Cluster ...&gt;
  *        &lt;/Host&gt;
  * </pre>
@@ -57,7 +57,7 @@
     /**
      * The descriptive information string for this implementation.
      */
-    private static final String info = "org.apache.catalina.cluster.session.JvmRouteSessionIDBinderLifecycleListener/1.0";
+    private static final String info = "org.apache.catalina.ha.session.JvmRouteSessionIDBinderLifecycleListener/1.0";
 
     /**
      * The string resources for this package.

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 import java.io.IOException;
 
@@ -23,9 +23,9 @@
 import org.apache.catalina.Engine;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Session;
-import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.core.StandardEngine;
-import org.apache.catalina.cluster.*;
+import org.apache.catalina.ha.*;
 
 /**
  * Receive SessionID cluster change from other backup node after primary session
@@ -39,7 +39,7 @@
     /**
      * The descriptive information about this implementation.
      */
-    protected static final String info = "org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener/1.1";
+    protected static final String info = "org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener/1.1";
 
     //--Instance Variables--------------------------------------
 

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ReplicatedSession.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ReplicatedSession.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ReplicatedSession.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/ReplicatedSession.java Tue Feb 28 15:00:47 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 /**
  * Title:        Tomcat Session Replication for Tomcat 4.0 <BR>
@@ -46,7 +46,7 @@
 import java.security.Principal;
 
 public class ReplicatedSession extends org.apache.catalina.session.StandardSession
-implements org.apache.catalina.cluster.ClusterSession{
+implements org.apache.catalina.ha.ClusterSession{
 
     private transient Manager mManager = null;
     protected boolean isDirty = false;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SerializablePrincipal.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SerializablePrincipal.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SerializablePrincipal.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SerializablePrincipal.java Tue Feb 28 15:00:47 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 
 import java.util.Arrays;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionIDMessage.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionIDMessage.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionIDMessage.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionIDMessage.java Tue Feb 28 15:00:47 2006
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
-import org.apache.catalina.cluster.ClusterMessage;
-import org.apache.catalina.cluster.ClusterMessageBase;
+import org.apache.catalina.ha.ClusterMessage;
+import org.apache.catalina.ha.ClusterMessageBase;
 
 /**
  * Session id change cluster message

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessage.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessage.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessage.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessage.java Tue Feb 28 15:00:47 2006
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.session;
-import org.apache.catalina.cluster.ClusterMessage;
+package org.apache.catalina.ha.session;
+import org.apache.catalina.ha.ClusterMessage;
 
 /**
  *

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessageImpl.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessageImpl.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessageImpl.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SessionMessageImpl.java Tue Feb 28 15:00:47 2006
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 
-import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.tribes.Member;
-import org.apache.catalina.cluster.ClusterMessageBase;
+import org.apache.catalina.ha.ClusterMessageBase;
 
 /**
  * Session cluster message

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java Tue Feb 28 15:00:47 2006
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.session;
+package org.apache.catalina.ha.session;
 
 import java.io.IOException;
 
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Session;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.tribes.Member;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.session.StandardManager;
@@ -679,7 +679,7 @@
 
 
     /* 
-     * @see org.apache.catalina.cluster.ClusterManager#getCluster()
+     * @see org.apache.catalina.ha.ClusterManager#getCluster()
      */
     public CatalinaCluster getCluster() {
         return cluster;

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/mbeans-descriptors.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/mbeans-descriptors.xml Tue Feb 28 15:00:47 2006
@@ -4,7 +4,7 @@
    "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd">
 <mbeans-descriptors>
     <mbean name="JvmRouteBinderValve" description="mod_jk jvmRoute jsessionid cookie backup correction" domain="Catalina"
-        group="Valve" type="org.apache.catalina.cluster.session.JvmRouteBinderValve">
+        group="Valve" type="org.apache.catalina.ha.session.JvmRouteBinderValve">
         <attribute name="className"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
@@ -28,7 +28,7 @@
 		description="Monitors the jvmRoute activity"
 		domain="Catalina"
         group="Listener"
-		type="org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener">
+		type="org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener">
         <attribute name="info" 
 		           description="describe version" type="java.lang.String" writeable="false"/>
         <attribute name="numberOfSessions" 
@@ -41,7 +41,7 @@
           description="Cluster Manager implementation of the Manager interface"
                domain="Catalina"
                 group="Manager"
-                 type="org.apache.catalina.cluster.session.DeltaManager">
+                 type="org.apache.catalina.ha.session.DeltaManager">
 
     <attribute   name="info" 
 		  description="describe version"

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/Constants.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/Constants.java Tue Feb 28 15:00:47 2006
@@ -15,10 +15,10 @@
  */
 
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.ha.tcp;
 
 /**
- * Manifest constants for the <code>org.apache.catalina.cluster.tcp</code>
+ * Manifest constants for the <code>org.apache.catalina.ha.tcp</code>
  * package.
  *
  * @author Peter Rossbach
@@ -27,6 +27,6 @@
 
 public class Constants {
 
-    public static final String Package = "org.apache.catalina.cluster.tcp";
+    public static final String Package = "org.apache.catalina.ha.tcp";
 
 }

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/ReplicationValve.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/ReplicationValve.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.ha.tcp;
 
 import java.io.IOException;
 import java.util.StringTokenizer;
@@ -28,13 +28,13 @@
 import org.apache.catalina.Session;
 import org.apache.catalina.Context;
 import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.ClusterMessage;
-import org.apache.catalina.cluster.ClusterSession;
-import org.apache.catalina.cluster.ClusterValve;
-import org.apache.catalina.cluster.session.DeltaManager;
-import org.apache.catalina.cluster.session.DeltaSession;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.ClusterMessage;
+import org.apache.catalina.ha.ClusterSession;
+import org.apache.catalina.ha.ClusterValve;
+import org.apache.catalina.ha.session.DeltaManager;
+import org.apache.catalina.ha.session.DeltaSession;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.util.StringManager;
@@ -49,7 +49,7 @@
  * <p>This Valve may be attached to any Container, depending on the granularity
  * of the logging you wish to perform.</p>
  *
- * <p>primaryIndicator=true, then the request attribute <i>org.apache.catalina.cluster.tcp.isPrimarySession.</i>
+ * <p>primaryIndicator=true, then the request attribute <i>org.apache.catalina.ha.tcp.isPrimarySession.</i>
  * is set true, when request processing is at sessions primary node.
  * </p>
  *
@@ -71,7 +71,7 @@
      * The descriptive information related to this implementation.
      */
     private static final String info =
-        "org.apache.catalina.cluster.tcp.ReplicationValve/2.0";
+        "org.apache.catalina.ha.tcp.ReplicationValve/2.0";
 
 
     /**
@@ -118,7 +118,7 @@
     /**
      * Name of primary change indicator as request attribute
      */
-    protected String primaryIndicatorName = "org.apache.catalina.cluster.tcp.isPrimarySession";
+    protected String primaryIndicatorName = "org.apache.catalina.ha.tcp.isPrimarySession";
    
     // ------------------------------------------------------------- Properties
 

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SendMessageData.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SendMessageData.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SendMessageData.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/SendMessageData.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.ha.tcp;
 
 import org.apache.catalina.tribes.Member;
 

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=381806&r1=381805&r2=381806&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 Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.ha.tcp;
 
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
@@ -36,19 +36,19 @@
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Valve;
-import org.apache.catalina.cluster.CatalinaCluster;
+import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.catalina.tribes.Channel;
 import org.apache.catalina.tribes.ChannelListener;
-import org.apache.catalina.cluster.ClusterListener;
-import org.apache.catalina.cluster.ClusterManager;
-import org.apache.catalina.cluster.ClusterMessage;
-import org.apache.catalina.cluster.ClusterValve;
+import org.apache.catalina.ha.ClusterListener;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.ClusterMessage;
+import org.apache.catalina.ha.ClusterValve;
 import org.apache.catalina.tribes.Member;
 import org.apache.catalina.tribes.MembershipListener;
 import org.apache.catalina.tribes.group.GroupChannel;
 
-import org.apache.catalina.cluster.session.DeltaManager;
-import org.apache.catalina.cluster.util.IDynamicProperty;
+import org.apache.catalina.ha.session.DeltaManager;
+import org.apache.catalina.ha.util.IDynamicProperty;
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.catalina.util.StringManager;
 import org.apache.commons.logging.Log;
@@ -147,12 +147,12 @@
      */
     protected Map managers = new HashMap();
 
-    private String managerClassName = "org.apache.catalina.cluster.session.DeltaManager";
+    private String managerClassName = "org.apache.catalina.ha.session.DeltaManager";
 
 
     private List valves = new ArrayList();
 
-    private org.apache.catalina.cluster.ClusterDeployer clusterDeployer;
+    private org.apache.catalina.ha.ClusterDeployer clusterDeployer;
 
     /**
      * Listeners of messages
@@ -292,7 +292,7 @@
     /**
      * add cluster message listener and register cluster to this listener
      * 
-     * @see org.apache.catalina.cluster.CatalinaCluster#addClusterListener(org.apache.catalina.cluster.MessageListener)
+     * @see org.apache.catalina.ha.CatalinaCluster#addClusterListener(org.apache.catalina.ha.MessageListener)
      */
     public void addClusterListener(ClusterListener listener) {
         if (listener != null && !clusterListeners.contains(listener)) {
@@ -304,7 +304,7 @@
     /**
      * remove message listener and deregister Cluster from listener
      * 
-     * @see org.apache.catalina.cluster.CatalinaCluster#removeClusterListener(org.apache.catalina.cluster.MessageListener)
+     * @see org.apache.catalina.ha.CatalinaCluster#removeClusterListener(org.apache.catalina.ha.MessageListener)
      */
     public void removeClusterListener(ClusterListener listener) {
         if (listener != null) {
@@ -316,7 +316,7 @@
     /**
      * get current Deployer
      */
-    public org.apache.catalina.cluster.ClusterDeployer getClusterDeployer() {
+    public org.apache.catalina.ha.ClusterDeployer getClusterDeployer() {
         return clusterDeployer;
     }
 
@@ -324,7 +324,7 @@
      * set a new Deployer, must be set before cluster started!
      */
     public void setClusterDeployer(
-            org.apache.catalina.cluster.ClusterDeployer clusterDeployer) {
+            org.apache.catalina.ha.ClusterDeployer clusterDeployer) {
         this.clusterDeployer = clusterDeployer;
     }
 
@@ -477,7 +477,7 @@
             manager = (Manager) getClass().getClassLoader().loadClass(getManagerClassName()).newInstance();
         } catch (Exception x) {
             log.error("Unable to load class for replication manager", x);
-            manager = new org.apache.catalina.cluster.session.DeltaManager();
+            manager = new org.apache.catalina.ha.session.DeltaManager();
         } finally {
             if(manager != null) {
                 manager.setDistributable(true);
@@ -495,7 +495,7 @@
     /**
      * remove an application form cluster replication bus
      * 
-     * @see org.apache.catalina.cluster.CatalinaCluster#removeManager(java.lang.String,Manager)
+     * @see org.apache.catalina.ha.CatalinaCluster#removeManager(java.lang.String,Manager)
      */
     public void removeManager(String name,Manager manager) {
         if (manager != null) {
@@ -518,7 +518,7 @@
      *            of the context
      * @param manager
      *            manager to register
-     * @see org.apache.catalina.cluster.CatalinaCluster#addManager(java.lang.String,
+     * @see org.apache.catalina.ha.CatalinaCluster#addManager(java.lang.String,
      *      org.apache.catalina.Manager)
      */
     public void addManager(String name, Manager manager) {
@@ -563,7 +563,7 @@
     /*
      * Get Manager
      * 
-     * @see org.apache.catalina.cluster.CatalinaCluster#getManager(java.lang.String)
+     * @see org.apache.catalina.ha.CatalinaCluster#getManager(java.lang.String)
      */
     public Manager getManager(String name) {
         return (Manager) managers.get(name);
@@ -575,7 +575,7 @@
      * Execute a periodic task, such as reloading, etc. This method will be
      * invoked inside the classloading context of this container. Unexpected
      * throwables will be caught and logged.
-     * @see org.apache.catalina.cluster.deploy.FarmWarDeployer#backgroundProcess()
+     * @see org.apache.catalina.ha.deploy.FarmWarDeployer#backgroundProcess()
      * @see ReplicationTransmitter#backgroundProcess()
      */
     public void backgroundProcess() {
@@ -748,7 +748,7 @@
      * send message to all cluster members
      * @param msg message to transfer
      * 
-     * @see org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage)
+     * @see org.apache.catalina.ha.CatalinaCluster#send(org.apache.catalina.ha.ClusterMessage)
      */
     public void send(ClusterMessage msg) {
         send(msg, null);
@@ -757,7 +757,7 @@
     /**
      * send message to all cluster members same cluster domain
      * 
-     * @see org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage)
+     * @see org.apache.catalina.ha.CatalinaCluster#send(org.apache.catalina.ha.ClusterMessage)
      */
     public void sendClusterDomain(ClusterMessage msg) {
         send(msg,null);
@@ -769,8 +769,8 @@
      * 
      * @param msg message to transfer
      * @param dest Receiver member
-     * @see org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage,
-     *      org.apache.catalina.cluster.Member)
+     * @see org.apache.catalina.ha.CatalinaCluster#send(org.apache.catalina.ha.ClusterMessage,
+     *      org.apache.catalina.ha.Member)
      */
     public void send(ClusterMessage msg, Member dest) {
         try {
@@ -791,7 +791,7 @@
     /**
      * New cluster member is registered
      * 
-     * @see org.apache.catalina.cluster.MembershipListener#memberAdded(org.apache.catalina.cluster.Member)
+     * @see org.apache.catalina.ha.MembershipListener#memberAdded(org.apache.catalina.ha.Member)
      */
     public void memberAdded(Member member) {
         try {
@@ -809,7 +809,7 @@
     /**
      * Cluster member is gone
      * 
-     * @see org.apache.catalina.cluster.MembershipListener#memberDisappeared(org.apache.catalina.cluster.Member)
+     * @see org.apache.catalina.ha.MembershipListener#memberDisappeared(org.apache.catalina.ha.Member)
      */
     public void memberDisappeared(Member member) {
         if (log.isInfoEnabled()) log.info("Received member disappeared:" + member);

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/mbeans-descriptors.xml?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/mbeans-descriptors.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/mbeans-descriptors.xml Tue Feb 28 15:00:47 2006
@@ -8,7 +8,7 @@
            description="Tcp Cluster implementation"
                domain="Catalina"
                 group="Cluster"
-                 type="org.apache.catalina.cluster.tcp.SimpleTcpCluster">
+                 type="org.apache.catalina.ha.tcp.SimpleTcpCluster">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"
@@ -48,7 +48,7 @@
                returnType="void">
       <parameter name="message"
                  description="replication message"
-                 type="org.apache.catalina.cluster.ClusterMessage"/>
+                 type="org.apache.catalina.ha.ClusterMessage"/>
     </operation>
     
     <operation   name="sendClusterDomain"
@@ -57,7 +57,7 @@
                returnType="void">
       <parameter name="message"
                  description="replication message"
-                 type="org.apache.catalina.cluster.ClusterMessage"/>
+                 type="org.apache.catalina.ha.ClusterMessage"/>
     </operation>
         
     <operation   name="sendToMember"
@@ -90,7 +90,7 @@
            description="Tcp Cluster ReplicationListener implementation"
                domain="Catalina"
                 group="Cluster"
-                 type="org.apache.catalina.cluster.tcp.ClusterReceiverBase">
+                 type="org.apache.catalina.ha.tcp.ClusterReceiverBase">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"
@@ -183,7 +183,7 @@
            description="Tcp Cluster SocketReplicationListener implementation"
                domain="Catalina"
                 group="Cluster"
-                 type="org.apache.catalina.cluster.tcp.SocketReplicationListener">
+                 type="org.apache.catalina.ha.tcp.SocketReplicationListener">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"
@@ -276,7 +276,7 @@
           description="Tcp replication transmitter"
                domain="Catalina"
                 group="ClusterSender"
-                 type="org.apache.catalina.cluster.tcp.ReplicationTransmitter">
+                 type="org.apache.catalina.ha.tcp.ReplicationTransmitter">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"
@@ -358,7 +358,7 @@
           description="Async Cluster Sender"
                domain="Catalina"
                 group="IDataSender"
-                 type="org.apache.catalina.cluster.tcp.AsyncSocketSender">
+                 type="org.apache.catalina.ha.tcp.AsyncSocketSender">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"
@@ -537,7 +537,7 @@
           description="Fast Async Cluster Sender"
                domain="Catalina"
                 group="IDataSender"
-                 type="org.apache.catalina.cluster.tcp.FastAsyncSocketSender">
+                 type="org.apache.catalina.ha.tcp.FastAsyncSocketSender">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"
@@ -748,7 +748,7 @@
           description="Pooled Cluster Sender"
                domain="Catalina"
                 group="IDataSender"
-                 type="org.apache.catalina.cluster.tcp.PooledSocketSender">
+                 type="org.apache.catalina.ha.tcp.PooledSocketSender">
     <attribute   name="address"
           description="sender ip address"
                  type="java.net.InetAddress"
@@ -828,7 +828,7 @@
           description="Sync Cluster Sender"
                domain="Catalina"
                 group="IDataSender"
-                 type="org.apache.catalina.cluster.tcp.SocketSender">
+                 type="org.apache.catalina.ha.tcp.SocketSender">
     <attribute   name="address"
           description="sender ip address"
                  type="java.net.InetAddress"
@@ -987,7 +987,7 @@
           description="Valve for simple tcp replication"
                domain="Catalina"
                 group="Valve"
-                 type="org.apache.catalina.cluster.tcp.ReplicationValve">
+                 type="org.apache.catalina.ha.tcp.ReplicationValve">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/util/IDynamicProperty.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/util/IDynamicProperty.java?rev=381806&r1=381805&r2=381806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/util/IDynamicProperty.java (original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/util/IDynamicProperty.java Tue Feb 28 15:00:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.util;
+package org.apache.catalina.ha.util;
 
 import java.util.Iterator;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message