tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r988499 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: authenticator/ mcast/ membership/ session/ tcp/
Date Tue, 24 Aug 2010 12:05:13 GMT
Author: rjung
Date: Tue Aug 24 12:05:12 2010
New Revision: 988499

URL: http://svn.apache.org/viewvc?rev=988499&view=rev
Log:
Tab police. Remove some trailing whitespace.

Modified:
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java Tue Aug 24 12:05:12 2010
@@ -248,7 +248,7 @@ public class ClusterSingleSignOn
         sendSSOIdWithAuth(ssoId,
                 authType, username, password,
                 SingleSignOnMessage.REGISTER_SESSION);
-     	registerLocal(ssoId, principal, authType, username, password);
+        registerLocal(ssoId, principal, authType, username, password);
     }
 
     protected void registerLocal(String ssoId, Principal principal, String authType,

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java Tue Aug 24 12:05:12 2010
@@ -108,7 +108,7 @@ public class McastService implements Mem
     public String getInfo() {
         return (info);
     }
-    
+
     /**
      * Transmitter ObjectName
      * 
@@ -177,7 +177,7 @@ public class McastService implements Mem
     public String getLocalMemberName() {
         return localMember.toString() ;
     }
- 
+
     /**
      * Return the local member
      */
@@ -185,7 +185,7 @@ public class McastService implements Mem
         localMember.setMemberAliveTime(System.currentTimeMillis()-impl.getServiceStartTime());
         return localMember;
     }
-    
+
     /**
      * Sets the local member properties for broadcasting
      */
@@ -193,7 +193,7 @@ public class McastService implements Mem
         properties.setProperty("tcpListenHost",listenHost);
         properties.setProperty("tcpListenPort",String.valueOf(listenPort));
     }
-    
+
     public void setMcastAddr(String addr) {
         properties.setProperty("mcastAddress", addr);
     }
@@ -226,7 +226,7 @@ public class McastService implements Mem
         String p = properties.getProperty("mcastPort");
         return new Integer(p).intValue();
     }
-    
+
     public void setMcastFrequency(long time) {
         properties.setProperty("msgFrequency", String.valueOf(time));
     }
@@ -263,7 +263,7 @@ public class McastService implements Mem
         start(2);
         registerMBean();
     }
-    
+
     public void start(int level) throws java.lang.Exception {
         if ( impl != null ) {
             impl.start(level);
@@ -313,23 +313,23 @@ public class McastService implements Mem
                                     this);
         String value = properties.getProperty("recoveryEnabled","true");
         boolean recEnabled = Boolean.valueOf(value).booleanValue() ;
-        impl.setRecoveryEnabled(recEnabled);        
+        impl.setRecoveryEnabled(recEnabled);
         int recCnt = Integer.parseInt(properties.getProperty("recoveryCounter","10"));
         impl.setRecoveryCounter(recCnt);
         long recSlpTime = Long.parseLong(properties.getProperty("recoverySleepTime","5000"));
         impl.setRecoverySleepTime(recSlpTime);
         if(log.isDebugEnabled())
             log.debug("Recovery Options (enabled=" + recEnabled + ",counter=" +recCnt+ ",time=" +recSlpTime+").");
-        
+
         impl.start(level);
-		long memberwait = (Long.parseLong(properties.getProperty("msgFrequency"))*4);
+        long memberwait = (Long.parseLong(properties.getProperty("msgFrequency"))*4);
         if(log.isInfoEnabled())
             log.info("Sleeping for "+memberwait+" milliseconds to establish cluster membership");
         Thread.sleep(memberwait);
 
     }
 
- 
+
     /**
      * Stop broadcasting and listening to membership pings
      */
@@ -354,7 +354,7 @@ public class McastService implements Mem
             "mbeans-descriptors.xml"));
       }
     }
-    
+
     /**
      * register MBeans for Membership
      *
@@ -418,7 +418,7 @@ public class McastService implements Mem
             membernames = new String[0] ;
         return membernames ;
     }
- 
+
     /**
      * Return the member by name
      */
@@ -494,7 +494,7 @@ public class McastService implements Mem
             return impl.getRecoveryCounter() ;
         else return Integer.parseInt(properties.getProperty("recoveryCounter","10"));
     }
-    
+
     public boolean isRecoveryEnabled() {
         if(impl != null)
             return impl.isRecoveryEnabled() ;
@@ -506,7 +506,7 @@ public class McastService implements Mem
             return impl.getRecoverySleepTime() ;
         else return Long.parseLong(properties.getProperty("recoverySleepTime","5000"));
     }
-    
+
     public void setRecoveryCounter(int recoveryCounter) {
         properties.setProperty("recoveryCounter", String.valueOf(recoveryCounter));
     }
@@ -525,7 +525,7 @@ public class McastService implements Mem
      * @throws Exception If an error occurs
      */
     public static void main(String args[]) throws Exception {
-		if(log.isInfoEnabled())
+        if(log.isInfoEnabled())
             log.info("Usage McastService hostname tcpport");
         McastService service = new McastService();
         java.util.Properties p = new java.util.Properties();
@@ -541,7 +541,7 @@ public class McastService implements Mem
         service.start();
         Thread.sleep(60*1000*60);
     }
-    
-    
-    
+
+
+
 }

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java Tue Aug 24 12:05:12 2010
@@ -107,7 +107,7 @@ public class McastService implements Mem
     public String getInfo() {
         return (info);
     }
-    
+
     /**
      * Transmitter ObjectName
      * 
@@ -176,7 +176,7 @@ public class McastService implements Mem
     public String getLocalMemberName() {
         return localMember.toString() ;
     }
- 
+
     /**
      * Return the local member
      */
@@ -184,7 +184,7 @@ public class McastService implements Mem
         localMember.setMemberAliveTime(System.currentTimeMillis()-impl.getServiceStartTime());
         return localMember;
     }
-    
+
     /**
      * Sets the local member properties for broadcasting
      */
@@ -192,7 +192,7 @@ public class McastService implements Mem
         properties.setProperty("tcpListenHost",listenHost);
         properties.setProperty("tcpListenPort",String.valueOf(listenPort));
     }
-    
+
     public void setMcastAddr(String addr) {
         properties.setProperty("mcastAddress", addr);
     }
@@ -225,7 +225,7 @@ public class McastService implements Mem
         String p = properties.getProperty("mcastPort");
         return new Integer(p).intValue();
     }
-    
+
     public void setMcastFrequency(long time) {
         properties.setProperty("msgFrequency", String.valueOf(time));
     }
@@ -262,7 +262,7 @@ public class McastService implements Mem
         start(2);
         registerMBean();
     }
-    
+
     public void start(int level) throws java.lang.Exception {
         if ( impl != null ) {
             impl.start(level);
@@ -312,23 +312,23 @@ public class McastService implements Mem
                                     this);
         String value = properties.getProperty("recoveryEnabled","true");
         boolean recEnabled = Boolean.valueOf(value).booleanValue() ;
-        impl.setRecoveryEnabled(recEnabled);        
+        impl.setRecoveryEnabled(recEnabled);
         int recCnt = Integer.parseInt(properties.getProperty("recoveryCounter","10"));
         impl.setRecoveryCounter(recCnt);
         long recSlpTime = Long.parseLong(properties.getProperty("recoverySleepTime","5000"));
         impl.setRecoverySleepTime(recSlpTime);
         if(log.isDebugEnabled())
             log.debug("Recovery Options (enabled=" + recEnabled + ",counter=" +recCnt+ ",time=" +recSlpTime+").");
-        
+
         impl.start(level);
-		long memberwait = (Long.parseLong(properties.getProperty("msgFrequency"))*4);
+        long memberwait = (Long.parseLong(properties.getProperty("msgFrequency"))*4);
         if(log.isInfoEnabled())
             log.info("Sleeping for "+memberwait+" milliseconds to establish cluster membership");
         Thread.sleep(memberwait);
 
     }
 
- 
+
     /**
      * Stop broadcasting and listening to membership pings
      */
@@ -352,7 +352,7 @@ public class McastService implements Mem
             log.error("Unable to stop the mcast service, level:"+svc+".",x);
         }
     }
-    
+
     /**
      * register mbean descriptor for package mcast 
      * @throws Exception
@@ -364,7 +364,7 @@ public class McastService implements Mem
             "mbeans-descriptors.xml"));
       }
     }
-    
+
     /**
      * register MBeans for Membership
      *
@@ -428,7 +428,7 @@ public class McastService implements Mem
             membernames = new String[0] ;
         return membernames ;
     }
- 
+
     /**
      * Return the member by name
      */
@@ -504,7 +504,7 @@ public class McastService implements Mem
             return impl.getRecoveryCounter() ;
         else return Integer.parseInt(properties.getProperty("recoveryCounter","10"));
     }
-    
+
     public boolean isRecoveryEnabled() {
         if(impl != null)
             return impl.isRecoveryEnabled() ;
@@ -516,7 +516,7 @@ public class McastService implements Mem
             return impl.getRecoverySleepTime() ;
         else return Long.parseLong(properties.getProperty("recoverySleepTime","5000"));
     }
-    
+
     public void setRecoveryCounter(int recoveryCounter) {
         properties.setProperty("recoveryCounter", String.valueOf(recoveryCounter));
     }
@@ -535,7 +535,7 @@ public class McastService implements Mem
      * @throws Exception If an error occurs
      */
     public static void main(String args[]) throws Exception {
-		if(log.isInfoEnabled())
+        if(log.isInfoEnabled())
             log.info("Usage McastService hostname tcpport");
         McastService service = new McastService();
         java.util.Properties p = new java.util.Properties();
@@ -551,7 +551,7 @@ public class McastService implements Mem
         service.start();
         Thread.sleep(60*1000*60);
     }
-    
-    
-    
+
+
+
 }

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java Tue Aug 24 12:05:12 2010
@@ -28,98 +28,98 @@ import org.apache.catalina.cluster.Clust
  */
 public class SessionIDMessage extends ClusterMessageBase implements ClusterMessage {
 
-	private int messageNumber;
+    private int messageNumber;
 
-	private String originalSessionID;
+    private String originalSessionID;
 
-	private String backupSessionID;
+    private String backupSessionID;
 
-	private String host ;
-	private String contextPath;
+    private String host ;
+    private String contextPath;
 
-	public String getUniqueId() {
-		StringBuffer result = new StringBuffer(getOriginalSessionID());
-		result.append("#-#");
-		result.append(getHost());
-                result.append("#-#");
-                result.append(getContextPath());
-		result.append("#-#");
-		result.append(getMessageNumber());
-		result.append("#-#");
-		result.append(System.currentTimeMillis());
-		return result.toString();
-	}
-
-	/**
-         * @return Returns the host.
-         */
-        public String getHost() {
-             return host;
-        }
-    
-        /**
-         * @param host The host to set.
-         */
-         public void setHost(String host) {
-             this.host = host;
-        }
-    
-	/**
-	 * @return Returns the contextPath.
-	 */
-	public String getContextPath() {
-		return contextPath;
-	}
-	/**
-	 * @param contextPath The contextPath to set.
-	 */
-	public void setContextPath(String contextPath) {
-		this.contextPath = contextPath;
-	}
-	/**
-	 * @return Returns the messageNumber.
-	 */
-	public int getMessageNumber() {
-		return messageNumber;
-	}
-
-	/**
-	 * @param messageNumber
-	 *            The messageNumber to set.
-	 */
-	public void setMessageNumber(int messageNumber) {
-		this.messageNumber = messageNumber;
-	}
-
-	/**
-	 * @return Returns the backupSessionID.
-	 */
-	public String getBackupSessionID() {
-		return backupSessionID;
-	}
-
-	/**
-	 * @param backupSessionID
-	 *            The backupSessionID to set.
-	 */
-	public void setBackupSessionID(String backupSessionID) {
-		this.backupSessionID = backupSessionID;
-	}
-
-	/**
-	 * @return Returns the originalSessionID.
-	 */
-	public String getOriginalSessionID() {
-		return originalSessionID;
-	}
-
-	/**
-	 * @param originalSessionID
-	 *            The originalSessionID to set.
-	 */
-	public void setOriginalSessionID(String originalSessionID) {
-		this.originalSessionID = originalSessionID;
-	}
+    public String getUniqueId() {
+        StringBuffer result = new StringBuffer(getOriginalSessionID());
+        result.append("#-#");
+        result.append(getHost());
+        result.append("#-#");
+        result.append(getContextPath());
+        result.append("#-#");
+        result.append(getMessageNumber());
+        result.append("#-#");
+        result.append(System.currentTimeMillis());
+        return result.toString();
+    }
+
+    /**
+     * @return Returns the host.
+     */
+    public String getHost() {
+         return host;
+    }
+
+    /**
+     * @param host The host to set.
+     */
+     public void setHost(String host) {
+         this.host = host;
+    }
+
+    /**
+     * @return Returns the contextPath.
+     */
+    public String getContextPath() {
+        return contextPath;
+    }
+    /**
+     * @param contextPath The contextPath to set.
+     */
+    public void setContextPath(String contextPath) {
+        this.contextPath = contextPath;
+    }
+    /**
+     * @return Returns the messageNumber.
+     */
+    public int getMessageNumber() {
+        return messageNumber;
+    }
+
+    /**
+     * @param messageNumber
+     *            The messageNumber to set.
+     */
+    public void setMessageNumber(int messageNumber) {
+        this.messageNumber = messageNumber;
+    }
+
+    /**
+     * @return Returns the backupSessionID.
+     */
+    public String getBackupSessionID() {
+        return backupSessionID;
+    }
+
+    /**
+     * @param backupSessionID
+     *            The backupSessionID to set.
+     */
+    public void setBackupSessionID(String backupSessionID) {
+        this.backupSessionID = backupSessionID;
+    }
+
+    /**
+     * @return Returns the originalSessionID.
+     */
+    public String getOriginalSessionID() {
+        return originalSessionID;
+    }
+
+    /**
+     * @param originalSessionID
+     *            The originalSessionID to set.
+     */
+    public void setOriginalSessionID(String originalSessionID) {
+        this.originalSessionID = originalSessionID;
+    }
 
     public String toString() {
         return "SESSIONID-UPDATE#" + getHost() + "." + getContextPath() + "#" + getOriginalSessionID() + ":" + getBackupSessionID();

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml Tue Aug 24 12:05:12 2010
@@ -19,100 +19,100 @@
    "-//Apache Software Foundation//DTD Model MBeans Configuration File"
    "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">
-      
+
         <attribute name="className"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
-               writeable="false"/>        
-      
-        <attribute name="info" 
-		           description="describe version" type="java.lang.String" writeable="false"/>
-      
-        <attribute name="enabled" 
-		           description="enable a jvm Route check" type="boolean"/>
-      
+               writeable="false"/>
+
+        <attribute name="info"
+                   description="describe version" type="java.lang.String" writeable="false"/>
+
+        <attribute name="enabled"
+                   description="enable a jvm Route check" type="boolean"/>
+
         <attribute name="numberOfSessions"
-		           description="number of jvmRoute session corrections" type="long" writeable="false"/>
-      
-        <attribute name="sessionIdAttribute" 
-		    description="Name of request attribute with sessionid value before turnover a session" 
-		    type="java.lang.String" 
-		    />
-      
-        <operation name="start" description="Stops the Cluster JvmRouteBinderValve" 
-		           impact="ACTION" returnType="void"/>
-      
-        <operation name="stop" description="Stops the Cluster JvmRouteBinderValve" 
-		           impact="ACTION" returnType="void"/>
+                   description="number of jvmRoute session corrections" type="long" writeable="false"/>
+
+        <attribute name="sessionIdAttribute"
+            description="Name of request attribute with sessionid value before turnover a session"
+            type="java.lang.String"
+            />
+
+        <operation name="start" description="Stops the Cluster JvmRouteBinderValve"
+                   impact="ACTION" returnType="void"/>
+
+        <operation name="stop" description="Stops the Cluster JvmRouteBinderValve"
+                   impact="ACTION" returnType="void"/>
     </mbean>
-    
+
     <mbean name="JvmRouteMigrationValve" description="migrate session to other cluster nodes" domain="Catalina"
         group="Valve" type="org.apache.catalina.cluster.session.JvmRouteMigrationValve">
         <attribute name="className"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
-               writeable="false"/>        
-      
-        <attribute name="info" 
-		           description="describe version" type="java.lang.String" writeable="false"/>
-      
-        <attribute name="enabled" 
-		           description="enable migration" type="boolean"/>
-      
-        <attribute name="jvmRoutes" 
-		    description="comma-delimited set of the jvmRoutes for migration nodes" 
-		    type="java.lang.String" 
-		    />
-      
+               writeable="false"/>
+
+        <attribute name="info"
+                   description="describe version" type="java.lang.String" writeable="false"/>
+
+        <attribute name="enabled"
+                   description="enable migration" type="boolean"/>
+
+        <attribute name="jvmRoutes"
+            description="comma-delimited set of the jvmRoutes for migration nodes"
+            type="java.lang.String"
+            />
+
         <attribute name="numberOfSessions"
-		           description="number of migrated sessions" type="long" writeable="false"/>
-      
-        <attribute name="sessionIdAttribute" 
-		    description="Name of request attribute with sessionid value before migrate a session" 
-		    type="java.lang.String" 
-		    />
-      
-        <operation name="start" description="Stops the Cluster JvmRouteMigrationValve" 
-		           impact="ACTION" returnType="void"/>
-      
-        <operation name="stop" description="Stops the Cluster JvmRouteMigrationValve" 
-		           impact="ACTION" returnType="void"/>
+                   description="number of migrated sessions" type="long" writeable="false"/>
+
+        <attribute name="sessionIdAttribute"
+            description="Name of request attribute with sessionid value before migrate a session"
+            type="java.lang.String"
+            />
+
+        <operation name="start" description="Stops the Cluster JvmRouteMigrationValve"
+                   impact="ACTION" returnType="void"/>
+
+        <operation name="stop" description="Stops the Cluster JvmRouteMigrationValve"
+                   impact="ACTION" returnType="void"/>
     </mbean>
-    
-	<mbean name="JvmRouteSessionIDBinderListener"
-		description="Monitors the jvmRoute activity"
-		domain="Catalina"
+
+    <mbean name="JvmRouteSessionIDBinderListener"
+        description="Monitors the jvmRoute activity"
+        domain="Catalina"
         group="Listener"
-		type="org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener">
-      
-        <attribute name="info" 
-		           description="describe version" type="java.lang.String" writeable="false"/>
-      
-        <attribute name="numberOfSessions" 
-		    description="number of jvmRoute session corrections" 
-		    type="long" 
-		    writeable="false"/>
+        type="org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener">
+
+        <attribute name="info"
+            description="describe version" type="java.lang.String" writeable="false"/>
+
+        <attribute name="numberOfSessions"
+            description="number of jvmRoute session corrections"
+            type="long"
+            writeable="false"/>
     </mbean>
-    
-    <mbean        name="DeltaManager"
+
+    <mbean       name="DeltaManager"
           description="Cluster Manager implementation of the Manager interface"
                domain="Catalina"
                 group="Manager"
                  type="org.apache.catalina.cluster.session.DeltaManager">
 
-    <attribute   name="info" 
-		  description="describe version"
-		         type="java.lang.String"
-		    writeable="false"/>
-		    
+    <attribute   name="info"
+          description="describe version"
+                 type="java.lang.String"
+            writeable="false"/>
+
     <attribute   name="algorithm"
           description="The message digest algorithm to be used when generating
                        session identifiers"
                  type="java.lang.String"/>
-                 
+
     <attribute   name="randomFile"
           description="File source of random - /dev/urandom or a pipe"
                  type="java.lang.String"/>
@@ -143,10 +143,10 @@
                        created by this Manager"
                  type="int"/>
 
-    <attribute name="processExpiresFrequency"
-               description="The frequency of the manager checks (expiration and passivation)"
-               type="int"/>
-               
+    <attribute   name="processExpiresFrequency"
+          description="The frequency of the manager checks (expiration and passivation)"
+                 type="int"/>
+
     <attribute   name="sessionIdLength"
           description="The session id length (in bytes) of Sessions
                        created by this Manager"
@@ -160,7 +160,7 @@
 
     <attribute   name="activeSessions"
           description="Number of active sessions at this moment"
-                 type="int" 
+                 type="int"
             writeable="false"/>
 
     <attribute   name="sessionCounter"
@@ -292,11 +292,11 @@
           description="Count the failed session transfers noStateTransfered"
                  type="int"
             writeable="false" />
-            
+
     <attribute   name="receivedQueueSize"
           description="length of receive queue size when session received from other node"
                  type="int"
-            writeable="false" />            
+            writeable="false" />
 
     <attribute   name="expireSessionsOnShutdown"
                    is="true"
@@ -325,14 +325,14 @@
     <attribute   name="sendAllSessionsWaitTime"
           description="wait time between send session block (default 2 sec)"
                  type="int" />
-                 
+
     <attribute   name="expireTolerance"
           description="Auto expire tolerance interval for backup sessions (default 300 sec)"
                  type="int" />
-                 
+
     <attribute   name="updateActiveInterval"
           description="Send session access to backup after this interval (default 60 sec)"
-                 type="int" />     
+                 type="int" />
 
     <operation   name="listSessionIds"
           description="Return the list of active session ids"
@@ -378,7 +378,7 @@
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-    
+
     <operation   name="getCreationTime"
           description="Get the creation time"
                impact="ACTION"
@@ -387,7 +387,7 @@
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-    
+
     <operation   name="getLastAccessedTimestamp"
           description="Get the last access timestamp"
                impact="ACTION"
@@ -412,19 +412,19 @@
                returnType="void">
     </operation>
 
-	<operation name="processExpires"
+    <operation name="processExpires"
                description="force process to expire sessions"
                impact="ACTION"
                returnType="void">
     </operation>
-    
-	<operation name="resetStatistics"
+
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
     </operation>
-    
-	<operation name="getAllClusterSessions"
+
+    <operation name="getAllClusterSessions"
                description="send to oldest cluster member that this node need all cluster sessions (resync member)"
                impact="ACTION"
                returnType="void">

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java Tue Aug 24 12:05:12 2010
@@ -63,7 +63,7 @@ import org.apache.catalina.valves.ValveB
 
 public class ReplicationValve
     extends ValveBase implements ClusterValve {
-    
+
     private static final org.apache.juli.logging.Log log =
         org.apache.juli.logging.LogFactory.getLog( ReplicationValve.class );
 
@@ -88,22 +88,22 @@ public class ReplicationValve
      * holds file endings to not call for like images and others
      */
     protected java.util.regex.Pattern[] reqFilters = new java.util.regex.Pattern[0];
-    
+
     /**
      * Orginal filter 
      */
     protected String filter ;
-    
+
     /**
      * crossContext session container 
      */
     protected ThreadLocal crossContextSessions = new ThreadLocal() ;
-    
+
     /**
      * doProcessingStats (default = off)
      */
     protected boolean doProcessingStats = false;
-    
+
     protected long totalRequestTime = 0;
     protected long totalSendTime = 0;
     protected long nrOfRequests = 0;
@@ -111,22 +111,22 @@ public class ReplicationValve
     protected long nrOfFilterRequests = 0;
     protected long nrOfSendRequests = 0;
     protected long nrOfCrossContextSendRequests = 0;
-    
+
     /**
      * must primary change indicator set 
      */
     protected boolean primaryIndicator = false ;
-    
+
     /**
      * Name of primary change indicator as request attribute
      */
     protected String primaryIndicatorName = "org.apache.catalina.cluster.tcp.isPrimarySession";
-   
+
     // ------------------------------------------------------------- Properties
 
     public ReplicationValve() {
     }
-    
+
     /**
      * Return descriptive information about this Valve implementation.
      */
@@ -135,21 +135,21 @@ public class ReplicationValve
         return (info);
 
     }
-    
+
     /**
      * @return Returns the cluster.
      */
     public CatalinaCluster getCluster() {
         return cluster;
     }
-    
+
     /**
      * @param cluster The cluster to set.
      */
     public void setCluster(CatalinaCluster cluster) {
         this.cluster = cluster;
     }
- 
+
     /**
      * @return Returns the filter
      */
@@ -196,21 +196,21 @@ public class ReplicationValve
     public void setPrimaryIndicator(boolean primaryIndicator) {
         this.primaryIndicator = primaryIndicator;
     }
-    
+
     /**
      * @return Returns the primaryIndicatorName.
      */
     public String getPrimaryIndicatorName() {
         return primaryIndicatorName;
     }
-    
+
     /**
      * @param primaryIndicatorName The primaryIndicatorName to set.
      */
     public void setPrimaryIndicatorName(String primaryIndicatorName) {
         this.primaryIndicatorName = primaryIndicatorName;
     }
-    
+
     /**
      * Calc processing stats
      */
@@ -232,14 +232,14 @@ public class ReplicationValve
     public long getLastSendTime() {
         return lastSendTime;
     }
-    
+
     /**
      * @return Returns the nrOfRequests.
      */
     public long getNrOfRequests() {
         return nrOfRequests;
     }
-    
+
     /**
      * @return Returns the nrOfFilterRequests.
      */
@@ -267,7 +267,7 @@ public class ReplicationValve
     public long getTotalRequestTime() {
         return totalRequestTime;
     }
-    
+
     /**
      * @return Returns the totalSendTime.
      */
@@ -281,17 +281,17 @@ public class ReplicationValve
     protected java.util.regex.Pattern[] getReqFilters() {
         return reqFilters;
     }
-    
+
     /**
      * @param reqFilters The reqFilters to set.
      */
     protected void setReqFilters(java.util.regex.Pattern[] reqFilters) {
         this.reqFilters = reqFilters;
     }
-    
-    
+
+
     // --------------------------------------------------------- Public Methods
-    
+
     /**
      * Register all cross context sessions inside endAccess.
      * Use a list with contains check, that the Portlet API can include a lot of fragments from same or
@@ -347,25 +347,25 @@ public class ReplicationValve
             }
             getNext().invoke(request, response);
             if(context != null) {
-	            Manager manager = context.getManager();
-	            if (manager != null && manager instanceof ClusterManager) {
-	                ClusterManager clusterManager = (ClusterManager) manager;
-	                CatalinaCluster containerCluster = (CatalinaCluster) getContainer().getCluster();
-	                if (containerCluster == null) {
-	                    if (log.isWarnEnabled())
-	                        log.warn(sm.getString("ReplicationValve.nocluster"));
-	                    return;
-	                }
-	                // valve cluster can access manager - other cluster handle replication 
-	                // at host level - hopefully!
-	                if(containerCluster.getManager(clusterManager.getName()) == null)
-	                    return ;
-	                if(containerCluster.hasMembers()) {
-	                    sendReplicationMessage(request, totalstart, isCrossContext, clusterManager, containerCluster);
-	                } else {
-	                    resetReplicationRequest(request,isCrossContext);
-	                }        
-	            }
+                Manager manager = context.getManager();
+                if (manager != null && manager instanceof ClusterManager) {
+                    ClusterManager clusterManager = (ClusterManager) manager;
+                    CatalinaCluster containerCluster = (CatalinaCluster) getContainer().getCluster();
+                    if (containerCluster == null) {
+                        if (log.isWarnEnabled())
+                            log.warn(sm.getString("ReplicationValve.nocluster"));
+                        return;
+                    }
+                    // valve cluster can access manager - other cluster handle replication 
+                    // at host level - hopefully!
+                    if(containerCluster.getManager(clusterManager.getName()) == null)
+                        return ;
+                    if(containerCluster.hasMembers()) {
+                        sendReplicationMessage(request, totalstart, isCrossContext, clusterManager, containerCluster);
+                    } else {
+                        resetReplicationRequest(request,isCrossContext);
+                    }
+                }
             }
         } finally {
             // Array must be remove: Current master request send endAccess at recycle. 
@@ -380,7 +380,7 @@ public class ReplicationValve
         }
     }
 
-    
+
     /**
      * reset the active statitics 
      */
@@ -393,7 +393,7 @@ public class ReplicationValve
         nrOfSendRequests = 0;
         nrOfCrossContextSendRequests = 0;
     }
-    
+
     /**
      * Return a String rendering of this object.
      */
@@ -450,10 +450,10 @@ public class ReplicationValve
         Object sessions = crossContextSessions.get();
         if(sessions != null && sessions instanceof List
                 && ((List)sessions).size() >0) {
-            for(Iterator iter = ((List)sessions).iterator(); iter.hasNext() ;) {          
+            for(Iterator iter = ((List)sessions).iterator(); iter.hasNext() ;) {
                 Session session = (Session)iter.next();
                 if(log.isDebugEnabled())
-                    log.debug(sm.getString("ReplicationValve.crossContext.sendDelta",  
+                    log.debug(sm.getString("ReplicationValve.crossContext.sendDelta",
                             session.getManager().getContainer().getName() ));
                 sendMessage(session,(ClusterManager)session.getManager(),containerCluster);
                 if(isDoProcessingStats()) {
@@ -462,7 +462,7 @@ public class ReplicationValve
             }
         }
     }
-  
+
     /**
      * Fix memory leak for long sessions with many changes, when no backup member exists!
      * set primarySession flag at request session and all crossContext sessions
@@ -481,14 +481,14 @@ public class ReplicationValve
             if(sessions != null && sessions instanceof List
                && ((List)sessions).size() >0) {
                 Iterator iter = ((List)sessions).iterator();
-                for(; iter.hasNext() ;) {          
+                for(; iter.hasNext() ;) {
                     Session session = (Session)iter.next();
                     resetDeltaRequest(session);
                     if(session instanceof DeltaSession)
-                        ((DeltaSession)contextSession).setPrimarySession(true);                        
+                        ((DeltaSession)contextSession).setPrimarySession(true);
                 }
             }
-        }                     
+        }
     }
 
     /**
@@ -497,7 +497,7 @@ public class ReplicationValve
      */
     protected void resetDeltaRequest(Session session) {
         if(log.isDebugEnabled()) {
-            log.debug(sm.getString("ReplicationValve.resetDeltaRequest" , 
+            log.debug(sm.getString("ReplicationValve.resetDeltaRequest" ,
                 session.getManager().getContainer().getName() ));
         }
         ((DeltaSession)session).resetDeltaRequest();
@@ -560,7 +560,7 @@ public class ReplicationValve
                 nrOfSendRequests++;
         }
     }
-    
+
     /**
      * check for session invalidations
      * @param manager
@@ -578,7 +578,7 @@ public class ReplicationValve
             }
         }
     }
-    
+
     /**
      * is request without possible session change
      * @param uri The request uri
@@ -634,32 +634,32 @@ public class ReplicationValve
     protected void createPrimaryIndicator(Request request) throws IOException {
         String id = request.getRequestedSessionId();
         if ((id != null) && (id.length() > 0)) {
-        	Context context = request.getContext() ;
-        	if(context != null) {
-        		Manager manager = context.getManager();
-	            Session session = manager.findSession(id);
-	            if (session instanceof ClusterSession) {
-	                ClusterSession cses = (ClusterSession) session;
-	                if (cses != null) {
-	                    Boolean isPrimary = new Boolean(cses.isPrimarySession());
-	                    if (log.isDebugEnabled())
-	                        log.debug(sm.getString(
-	                                "ReplicationValve.session.indicator", context.getName(),id,
-	                                primaryIndicatorName, isPrimary));
-	                    request.setAttribute(primaryIndicatorName, isPrimary);
-	                }
-	            } else {
-	                if (log.isDebugEnabled()) {
-	                    if (session != null) {
-	                        log.debug(sm.getString(
-	                                "ReplicationValve.session.found", context.getName(),id));
-	                    } else {
-	                        log.debug(sm.getString(
-	                                "ReplicationValve.session.invalid", context.getName(),id));
-	                    }
-	                }
-	            }
-        	}
+            Context context = request.getContext() ;
+            if(context != null) {
+                Manager manager = context.getManager();
+                Session session = manager.findSession(id);
+                if (session instanceof ClusterSession) {
+                    ClusterSession cses = (ClusterSession) session;
+                    if (cses != null) {
+                        Boolean isPrimary = new Boolean(cses.isPrimarySession());
+                        if (log.isDebugEnabled())
+                            log.debug(sm.getString(
+                                    "ReplicationValve.session.indicator", context.getName(),id,
+                                    primaryIndicatorName, isPrimary));
+                        request.setAttribute(primaryIndicatorName, isPrimary);
+                    }
+                } else {
+                    if (log.isDebugEnabled()) {
+                        if (session != null) {
+                            log.debug(sm.getString(
+                                    "ReplicationValve.session.found", context.getName(),id));
+                        } else {
+                            log.debug(sm.getString(
+                                    "ReplicationValve.session.invalid", context.getName(),id));
+                        }
+                    }
+                }
+            }
         }
     }
 

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java Tue Aug 24 12:05:12 2010
@@ -46,7 +46,7 @@ public class TcpReplicationThread extend
     private SelectionKey key;
     private boolean sendAck=true;
 
-    
+
     TcpReplicationThread ()
     {
     }
@@ -65,7 +65,7 @@ public class TcpReplicationThread extend
                 Thread.interrupted();
             }
             if (key == null) {
-                continue;	// just in case
+                continue;    // just in case
             }
             try {
                 drainChannel (key);
@@ -78,7 +78,7 @@ public class TcpReplicationThread extend
                 } else if ( log.isErrorEnabled() ) {
                     //this is a real error, log it.
                     log.error("Exception caught in TcpReplicationThread.drainChannel.",e);
-                } 
+                }
 
                 // close channel and nudge selector
                 try {
@@ -111,7 +111,7 @@ public class TcpReplicationThread extend
         this.sendAck=sendAck;
         key.interestOps (key.interestOps() & (~SelectionKey.OP_READ));
         key.interestOps (key.interestOps() & (~SelectionKey.OP_WRITE));
-        this.notify();		// awaken the thread
+        this.notify();    // awaken the thread
     }
 
     /**
@@ -128,33 +128,33 @@ public class TcpReplicationThread extend
         boolean packetReceived=false;
         SocketChannel channel = (SocketChannel) key.channel();
         int count;
-        buffer.clear();			// make buffer empty
+        buffer.clear();    // make buffer empty
         ObjectReader reader = (ObjectReader)key.attachment();
         // loop while data available, channel is non-blocking
         while ((count = channel.read (buffer)) > 0) {
-            buffer.flip();		// make buffer readable
+            buffer.flip();    // make buffer readable
             reader.append(buffer.array(),0,count);
-            buffer.clear();		// make buffer empty
+            buffer.clear();    // make buffer empty
         }
         //check to see if any data is available
         int pkgcnt = reader.execute();
         if (log.isTraceEnabled()) {
             log.trace("sending " + pkgcnt + " ack packages to " + channel.socket().getLocalPort() );
         }
-        
+
         if (sendAck) {
             while ( pkgcnt > 0 ) {
                 sendAck(key,channel);
                 pkgcnt--;
             }
         }
-        
+
         if (count < 0) {
             // close channel on EOF, invalidates the key
             channel.close();
             return;
         }
-        
+
         //acquire the interestOps mutex
         Object mutex = this.getPool().getInterestOpsMutex();
         synchronized (mutex) {
@@ -164,7 +164,7 @@ public class TcpReplicationThread extend
             int resumeOps = key.interestOps() | SelectionKey.OP_READ;
             key.interestOps(resumeOps);
         }
-        
+
     }
 
     /**
@@ -173,7 +173,7 @@ public class TcpReplicationThread extend
      * @param channel
      */
     protected void sendAck(SelectionKey key, SocketChannel channel) {
-        
+
         try {
             channel.write(ByteBuffer.wrap(ACK_COMMAND));
             if (log.isTraceEnabled()) {

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml?rev=988499&r1=988498&r2=988499&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml Tue Aug 24 12:05:12 2010
@@ -21,18 +21,18 @@
 <mbeans-descriptors>
 
   <mbean         name="SimpleTcpCluster"
-           description="Tcp Cluster implementation"
+          description="Tcp Cluster implementation"
                domain="Catalina"
                 group="Cluster"
                  type="org.apache.catalina.cluster.tcp.SimpleTcpCluster">
     <attribute   name="info"
           description="Class version info"
                  type="java.lang.String"
-                 writeable="false"/>
+            writeable="false"/>
     <attribute   name="notifyLifecycleListenerOnFailure"
           description="notify lifecycleListener from message transfer failure"
-			     is="true"
-                 type="boolean"/>                 
+                   is="true"
+                 type="boolean"/>
     <attribute   name="clusterName"
           description="name of cluster"
                  type="java.lang.String"/>
@@ -43,18 +43,18 @@
           description="Name of cluster transfer log device"
                  type="java.lang.String"/>
     <attribute   name="doClusterLog"
-			     is="true"
+                   is="true"
           description="enable cluster log transfer logging"
                  type="boolean"/>
     <operation   name="setProperty"
-               description="set a property to all cluster managers (with prefix 'manager.')"
+          description="set a property to all cluster managers (with prefix 'manager.')"
                impact="ACTION"
-               returnType="void">
+           returnType="void">
       <parameter name="key"
-                 description="Property name"
+          description="Property name"
                  type="java.lang.String"/>
       <parameter name="value"
-                 description="Property value"
+          description="Property value"
                  type="java.lang.String"/>
     </operation>
 
@@ -66,7 +66,7 @@
                  description="replication message"
                  type="org.apache.catalina.cluster.ClusterMessage"/>
     </operation>
-    
+
     <operation   name="sendClusterDomain"
                description="send message to all cluster members with same domain"
                impact="ACTION"
@@ -75,7 +75,7 @@
                  description="replication message"
                  type="org.apache.catalina.cluster.ClusterMessage"/>
     </operation>
-        
+
     <operation   name="sendToMember"
                description="send message to one cluster member"
                impact="ACTION"
@@ -93,13 +93,13 @@
                impact="ACTION"
                returnType="void">
     </operation>
-    
+
     <operation name="stop"
                description="Stop the cluster"
                impact="ACTION"
                returnType="void">
     </operation>
-                 
+
   </mbean>
 
   <mbean         name="SimpleTcpReplicationManager"
@@ -189,24 +189,24 @@
                  type="int"/>
     <attribute   name="tcpNoDelay"
           description="set tcpNoDelay (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soKeepAlive"
           description="set soKeepAlive (default false)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="ooBInline"
           description="set ooBInline (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soReuseAddress"
           description="set soReuseAddress (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soLingerOn"
           description="set soLingerOn (default false)"
-			     is="true"
-                 type="boolean" />             
+                 is="true"
+                 type="boolean" />
     <attribute   name="soLingerTime"
           description="if soLingerOn use soLingerTime (default 3 msec)"
                  type="int"/>
@@ -239,8 +239,8 @@
                  writeable="false"/>
     <attribute   name="doReceivedProcessingStats"
           description="create received processing time stats"
-			     is="true"
-                 type="boolean" />                
+                 is="true"
+                 type="boolean" />
     <attribute   name="avgTotalReceivedBytes"
           description="received totalReceivedBytes / nrOfMsgsReceived (msec)"
                  type="long"
@@ -251,38 +251,38 @@
                  writeable="false"/>
     <attribute   name="sendAck"
           description="send ack after data received"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
     <attribute   name="compress"
           description="data received compressed"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
     <attribute   name="doListen"
           description="is port really started"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
-                 
-	<operation name="resetStatistics"
+
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
-    </operation>	
+    </operation>
 
     <operation   name="start"
                description="Start the cluster"
                impact="ACTION"
                returnType="void">
     </operation>
-    
+
     <operation name="stop"
                description="Stop the cluster"
                impact="ACTION"
                returnType="void">
     </operation>
-                 
+
   </mbean>
 
   <mbean         name="SocketReplicationListener"
@@ -305,7 +305,7 @@
                  type="int"/>
     <attribute   name="tcpListenTimeout"
           description="max tcp listen timeout (sec) wait for ServerSocket start"
-                 type="int"/>                
+                 type="int"/>
     <attribute   name="nrOfMsgsReceived"
           description="number of messages received from other nodes"
                  type="long"
@@ -321,24 +321,24 @@
                  type="int"/>
     <attribute   name="tcpNoDelay"
           description="set tcpNoDelay (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soKeepAlive"
           description="set soKeepAlive (default false)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="ooBInline"
           description="set ooBInline (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soReuseAddress"
           description="set soReuseAddress (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soLingerOn"
           description="set soLingerOn (default false)"
-			     is="true"
-                 type="boolean" />             
+                 is="true"
+                 type="boolean" />
     <attribute   name="soLingerTime"
           description="if soLingerOn use soLingerTime (default 3 msec)"
                  type="int"/>
@@ -367,8 +367,8 @@
                  writeable="false"/>
     <attribute   name="doReceivedProcessingStats"
           description="create received processing time stats"
-			     is="true"
-                 type="boolean" />                
+                 is="true"
+                 type="boolean" />
     <attribute   name="avgTotalReceivedBytes"
           description="received totalReceivedBytes / nrOfMsgsReceived (msec)"
                  type="long"
@@ -379,40 +379,40 @@
                  writeable="false"/>
     <attribute   name="sendAck"
           description="send ack after data received"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
    <attribute   name="compress"
           description="data received compressed"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
    <attribute   name="doListen"
           description="is port really started"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
-                 
-	<operation name="resetStatistics"
+
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
-    </operation>	
+    </operation>
 
     <operation   name="start"
                description="Start the cluster"
                impact="ACTION"
                returnType="void">
     </operation>
-    
+
     <operation name="stop"
                description="Stop the cluster"
                impact="ACTION"
                returnType="void">
     </operation>
-                 
+
   </mbean>
-  
+
   <mbean         name="ReplicationTransmitter"
           description="Tcp replication transmitter"
                domain="Catalina"
@@ -430,11 +430,11 @@
                  type="long"/>
     <attribute   name="autoConnect"
           description="is sender disabled, fork a new socket"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="waitForAck"
           description="Wait for ack after data send"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
     <attribute   name="processingTime"
@@ -455,8 +455,8 @@
                  writeable="false"/>
     <attribute   name="doTransmitterProcessingStats"
           description="create processing time stats"
-			     is="true"
-                 type="boolean" />                
+                 is="true"
+                 type="boolean" />
     <attribute   name="nrOfRequests"
           description="number of send messages to other members"
                  type="long"
@@ -469,7 +469,7 @@
           description="number of wrong transfers"
                  type="long"
                  writeable="false"/>
-	<attribute name="senderObjectNames"
+    <attribute name="senderObjectNames"
                description="get all sender object names"
                type="[Ljavax.management.ObjectName;"
                writeable="false"/>
@@ -477,18 +477,18 @@
                description="Start the cluster"
                impact="ACTION"
                returnType="void">
-    </operation>    
+    </operation>
     <operation name="stop"
                description="Stop the cluster"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="resetStatistics"
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
-    </operation>	
-	<operation name="checkKeepAlive"
+    </operation>
+    <operation name="checkKeepAlive"
                description="Check all sender connection for close socket (keepalive)"
                impact="ACTION"
                returnType="void">
@@ -517,7 +517,7 @@
                  type="boolean"/>
     <attribute   name="waitForAck"
           description="Wait for ack after data send"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false"/>
     <attribute   name="txBufSize"
@@ -525,24 +525,24 @@
                  type="int"/>
     <attribute   name="tcpNoDelay"
           description="set tcpNoDelay (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soKeepAlive"
           description="set soKeepAlive (default false)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="ooBInline"
           description="set ooBInline (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soReuseAddress"
           description="set soReuseAddress (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soLingerOn"
           description="set soLingerOn (default false)"
-			     is="true"
-                 type="boolean" />             
+                 is="true"
+                 type="boolean" />
     <attribute   name="soLingerTime"
           description="if soLingerOn use soLingerTime (default 3 msec)"
                  type="int"/>
@@ -551,7 +551,7 @@
                  type="long"/>
     <attribute   name="ackTimeout"
           description="acknowledge timeout acknowledge timeout (deprecated use timeout)"
-                 type="long"/>                 
+                 type="long"/>
     <attribute   name="avgMessageSize"
                  writeable="false"
           description="avg message size (totalbytes/nrOfRequests)"
@@ -585,7 +585,7 @@
                  writeable="false"/>
     <attribute   name="resend"
           description="after send failure make a resend"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="connected"
                  is="true"
@@ -618,7 +618,7 @@
                  writeable="false"/>
     <attribute   name="doProcessingStats"
           description="create processing time stats"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="waitAckTime"
           description="sending waitAck time (msec)"
@@ -638,7 +638,7 @@
                  writeable="false"/>
     <attribute   name="doWaitAckStats"
           description="create waitAck time stats"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="connectCounter"
           description="counts connects"
@@ -655,7 +655,7 @@
     <attribute   name="socketOpenFailureCounter"
           description="counts open socket failures"
                  type="long"
-                 writeable="false"/>                 				 
+                 writeable="false"/>
     <attribute   name="socketCloseCounter"
           description="counts closed socket (KeepAlive and disconnects)"
                  type="long"
@@ -684,27 +684,27 @@
           description="create time of sender"
                  type="long"
                  writeable="false"/>
-	<operation name="connect"
+    <operation name="connect"
                description="connect to other replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="disconnect"
+    <operation name="disconnect"
                description="disconnect to other replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="checkKeepAlive"
+    <operation name="checkKeepAlive"
                description="Check connection for close socket"
                impact="ACTION"
                returnType="boolean">
     </operation>
-	<operation name="resetStatistics"
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
     </operation>
-				 
+
   </mbean>
 
  <mbean         name="FastAsyncSocketSender"
@@ -718,7 +718,7 @@
                  writeable="false"/>
     <attribute   name="threadPriority"
           description="change queue thread priority"
-                 type="int"/>                 
+                 type="int"/>
     <attribute   name="address"
           description="sender ip address"
                  type="java.net.InetAddress"
@@ -732,7 +732,7 @@
                  type="boolean"/>
     <attribute   name="waitForAck"
           description="Wait for ack after data send"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false"/>
     <attribute   name="soTrafficClass"
@@ -746,24 +746,24 @@
                  type="int"/>
     <attribute   name="tcpNoDelay"
           description="set tcpNoDelay (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soKeepAlive"
           description="set soKeepAlive (default false)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="ooBInline"
           description="set ooBInline (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soReuseAddress"
           description="set soReuseAddress (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soLingerOn"
           description="set soLingerOn (default false)"
-			     is="true"
-                 type="boolean" />             
+                 is="true"
+                 type="boolean" />
     <attribute   name="soLingerTime"
           description="if soLingerOn use soLingerTime (default 3)"
                  type="int"/>
@@ -827,7 +827,7 @@
                  writeable="false"/>
     <attribute   name="resend"
           description="after send failure make a resend (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="recoverTimeout"
           description="recover Timeout after push message failure (default 5000 msec)"
@@ -866,8 +866,8 @@
                  writeable="false"/>
     <attribute   name="doProcessingStats"
           description="create Processing time stats"
-			     is="true"
-                 type="boolean" />                 
+                 is="true"
+                 type="boolean" />
     <attribute   name="waitAckTime"
           description="sending waitAck time (msec)"
                  type="long"
@@ -886,7 +886,7 @@
                  writeable="false"/>
     <attribute   name="doWaitAckStats"
           description="create waitAck time stats"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="connectCounter"
           description="counts connects"
@@ -899,11 +899,11 @@
     <attribute   name="socketOpenCounter"
           description="counts open socket (KeepAlive and connects)"
                  type="long"
-                 writeable="false"/>				 
+                 writeable="false"/>
     <attribute   name="socketOpenFailureCounter"
           description="counts open socket failures"
                  type="long"
-                 writeable="false"/>                 				 
+                 writeable="false"/>
     <attribute   name="socketCloseCounter"
           description="counts closed socket (KeepAlive and disconnects)"
                  type="long"
@@ -940,27 +940,27 @@
           description="create time of sender"
                  type="long"
                  writeable="false"/>
- 	<operation name="connect"
+     <operation name="connect"
                description="connect to other replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="disconnect"
+    <operation name="disconnect"
                description="disconnect to other replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="checkKeepAlive"
+    <operation name="checkKeepAlive"
                description="Check connection for close socket"
                impact="ACTION"
                returnType="boolean">
     </operation>
-	<operation name="resetStatistics"
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
     </operation>
-				 
+
   </mbean>
 
   <mbean         name="PooledSocketSender"
@@ -990,24 +990,24 @@
                  type="int"/>
     <attribute   name="tcpNoDelay"
           description="set tcpNoDelay (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soKeepAlive"
           description="set soKeepAlive (default false)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="ooBInline"
           description="set ooBInline (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soReuseAddress"
           description="set soReuseAddress (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soLingerOn"
           description="set soLingerOn (default false)"
-			     is="true"
-                 type="boolean" />             
+                 is="true"
+                 type="boolean" />
     <attribute   name="soLingerTime"
           description="if soLingerOn use soLingerTime (default 3)"
                  type="int"/>
@@ -1019,7 +1019,7 @@
                  type="long"/>
     <attribute   name="waitForAck"
           description="Wait for ack after data send"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
     <attribute   name="maxPoolSocketLimit"
@@ -1030,7 +1030,7 @@
                  type="int"/>
     <attribute   name="inUsePoolSize"
           description="get size of current busy SocketSender from pool"
-                 type="int"/>                 
+                 type="int"/>
     <attribute   name="keepAliveTimeout"
           description="active socket keep alive timeout (msec)"
                  type="long"/>
@@ -1039,7 +1039,7 @@
                  type="int"/>
     <attribute   name="resend"
           description="after send failure make a resend"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="connected"
                  is="true"
@@ -1070,22 +1070,22 @@
           description="create time of sender"
                  type="long"
                  writeable="false"/>
-	<operation name="connect"
+    <operation name="connect"
                description="start Queue to connect to ohter replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="disconnect"
+    <operation name="disconnect"
                description="stop Queue to other replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="resetStatistics"
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
     </operation>
-				 
+
   </mbean>
 
   <mbean         name="SocketSender"
@@ -1115,24 +1115,24 @@
                  type="int"/>
     <attribute   name="tcpNoDelay"
           description="set tcpNoDelay (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soKeepAlive"
           description="set soKeepAlive (default false)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="ooBInline"
           description="set ooBInline (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soReuseAddress"
           description="set soReuseAddress (default true)"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="soLingerOn"
           description="set soLingerOn (default false)"
-			     is="true"
-                 type="boolean" />             
+                 is="true"
+                 type="boolean" />
     <attribute   name="soLingerTime"
           description="if soLingerOn use soLingerTime (default 3)"
                  type="int"/>
@@ -1144,7 +1144,7 @@
                  type="long"/>
     <attribute   name="waitForAck"
           description="Wait for ack after data send (default false)"
-			     is="true"
+                 is="true"
                  type="boolean"
                  writeable="false" />
     <attribute   name="keepAliveTimeout"
@@ -1168,7 +1168,7 @@
                  writeable="false"/>
     <attribute   name="resend"
           description="after send failure make a resend"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="connected"
                  is="true"
@@ -1205,7 +1205,7 @@
                  writeable="false"/>
     <attribute   name="doProcessingStats"
           description="create Processing time stats"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="waitAckTime"
           description="sending waitAck time (msec)"
@@ -1225,7 +1225,7 @@
                  writeable="false"/>
     <attribute   name="doWaitAckStats"
           description="create waitAck time stats"
-			     is="true"
+                 is="true"
                  type="boolean" />
     <attribute   name="connectCounter"
           description="counts connects"
@@ -1242,11 +1242,11 @@
     <attribute   name="socketOpenFailureCounter"
           description="counts open socket failures"
                  type="long"
-                 writeable="false"/>                 				 
+                 writeable="false"/>
     <attribute   name="socketOpenCounter"
           description="counts open socket (KeepAlive and connects)"
                  type="long"
-                 writeable="false"/>				 
+                 writeable="false"/>
     <attribute   name="missingAckCounter"
           description="counts missing ack"
                  type="long"
@@ -1263,29 +1263,29 @@
           description="create time of sender"
                  type="long"
                  writeable="false"/>
-	<operation name="connect"
+    <operation name="connect"
                description="connect to other replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="disconnect"
+    <operation name="disconnect"
                description="disconnect to other replication node"
                impact="ACTION"
                returnType="void">
     </operation>
-	<operation name="checkKeepAlive"
+    <operation name="checkKeepAlive"
                description="Check connection for close socket"
                impact="ACTION"
                returnType="boolean">
     </operation>
-	<operation name="resetStatistics"
+    <operation name="resetStatistics"
                description="Reset all statistics"
                impact="ACTION"
                returnType="void">
     </operation>
-				 
+
   </mbean>
-    
+
   <mbean         name="ReplicationValve"
           description="Valve for simple tcp replication"
                domain="Catalina"
@@ -1303,29 +1303,29 @@
           description="resource filter to disable session replication check"
                  type="java.lang.String"/>
     <attribute   name="primaryIndicator"
- 			     is="true"
+                  is="true"
           description="set indicator that request processing is at primary session node"
                  type="boolean"/>
     <attribute   name="primaryIndicatorName"
           description="Request attribute name to indicate that request processing is at primary session node"
                  type="java.lang.String"/>
     <attribute   name="doProcessingStats"
- 			     is="true"
+                  is="true"
           description="active statistics counting"
                  type="boolean"/>
-	<attribute   name="nrOfRequests"
+    <attribute   name="nrOfRequests"
           description="number of replicated requests"
                  type="long"
                  writeable="false"/>
-	<attribute   name="nrOfFilterRequests"
+    <attribute   name="nrOfFilterRequests"
           description="number of filtered requests"
                  type="long"
                  writeable="false"/>
-	<attribute   name="nrOfSendRequests"
+    <attribute   name="nrOfSendRequests"
           description="number of send requests"
                  type="long"
                  writeable="false"/>
-	<attribute   name="nrOfCrossContextSendRequests"
+    <attribute   name="nrOfCrossContextSendRequests"
           description="number of send cross context session requests"
                  type="long"
                  writeable="false"/>
@@ -1346,7 +1346,7 @@
                impact="ACTION"
                returnType="void">
     </operation>
-                 
+
   </mbean>
 
 



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


Mime
View raw message