geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/web HttpSessionManager.java WebTier.java
Date Thu, 22 Jan 2004 09:13:17 GMT
djencks     2004/01/22 01:13:17

  Modified:    modules/clustering/src/java/org/apache/geronimo/clustering
                        Cluster.java LocalCluster.java MBeanImpl.java
                        NamedMBeanImpl.java Node.java Tier.java
               modules/clustering/src/java/org/apache/geronimo/clustering/ejb
                        EJBTier.java
               modules/clustering/src/java/org/apache/geronimo/clustering/jndi
                        JNDITier.java
               modules/clustering/src/java/org/apache/geronimo/clustering/web
                        HttpSessionManager.java WebTier.java
  Log:
  Remove geronimombean dependencies from clustering module by commenting them out, since the
design needs some refactoring to work with gbeans.
  
  Revision  Changes    Path
  1.10      +7 -8      incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Cluster.java
  
  Index: Cluster.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Cluster.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Cluster.java	7 Jan 2004 00:15:38 -0000	1.9
  +++ Cluster.java	22 Jan 2004 09:13:16 -0000	1.10
  @@ -56,14 +56,11 @@
   package org.apache.geronimo.clustering;
   
   import java.util.List;
  -import javax.management.MBeanServer;
  +
   import javax.management.ObjectName;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * A 'Cluster' is a point of connection between all 'Cluster's with
  @@ -144,14 +141,15 @@
     {
       _log.debug("failing");
     }
  -
  +  /*
     public void
       setMBeanContext(GeronimoMBeanContext context)
     {
       super.setMBeanContext(context);
       _log=LogFactory.getLog(Cluster.class.getName()+"#"+getName());
     }
  -
  +  */
  +    /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -161,4 +159,5 @@
       mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Data",    true, false, "Cluster's
current state"));
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.13      +4 -8      incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/LocalCluster.java
  
  Index: LocalCluster.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/LocalCluster.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- LocalCluster.java	4 Jan 2004 14:35:06 -0000	1.12
  +++ LocalCluster.java	22 Jan 2004 09:13:16 -0000	1.13
  @@ -56,17 +56,12 @@
   package org.apache.geronimo.clustering;
   
   import java.util.Collections;
  -import java.util.HashMap;
   import java.util.Iterator;
   import java.util.List;
  -import java.util.Map;
   import java.util.Vector;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * A uniquely identifiable n->n intra-vm event-raising communications
  @@ -184,7 +179,7 @@
         }
       }
     }
  -
  +  /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -192,4 +187,5 @@
       mbeanInfo.setTargetClass(LocalCluster.class);
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.3       +7 -9      incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/MBeanImpl.java
  
  Index: MBeanImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/MBeanImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MBeanImpl.java	21 Jan 2004 14:12:12 -0000	1.2
  +++ MBeanImpl.java	22 Jan 2004 09:13:16 -0000	1.3
  @@ -57,12 +57,9 @@
   
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * A base class containing fnality useful to the MBeans of the
  @@ -72,7 +69,7 @@
    */
   public abstract class
     MBeanImpl
  -  implements GeronimoMBeanTarget
  +  //implements GeronimoMBeanTarget
   {
     protected Log         _log=LogFactory.getLog(MBeanImpl.class);
     protected ObjectName  _objectName;
  @@ -96,16 +93,16 @@
     public void doStart(){}
     public void doStop(){}
     public void doFail(){}
  -
  +  /*
     public void
       setMBeanContext(GeronimoMBeanContext context)
     {
       _objectName=(context==null)?null:context.getObjectName();
       _server    =(context==null)?null:context.getServer();
     }
  -
  +  */
     public ObjectName getObjectName() {return _objectName;}
  -
  +  /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -114,4 +111,5 @@
       mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Reference", true, false, "a local
reference to this Object"));
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.3       +3 -8      incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/NamedMBeanImpl.java
  
  Index: NamedMBeanImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/NamedMBeanImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamedMBeanImpl.java	4 Jan 2004 15:51:59 -0000	1.2
  +++ NamedMBeanImpl.java	22 Jan 2004 09:13:16 -0000	1.3
  @@ -55,14 +55,8 @@
    */
   package org.apache.geronimo.clustering;
   
  -import javax.management.MBeanServer;
  -import javax.management.ObjectName;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * A base class containing fnality useful to Named MBeans of the
  @@ -100,7 +94,7 @@
   
       return true;
     }
  -
  +  /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -109,4 +103,5 @@
       mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Name", true, false, "this Object's
name"));
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.8       +7 -9      incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Node.java
  
  Index: Node.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Node.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Node.java	21 Jan 2004 14:12:12 -0000	1.7
  +++ Node.java	22 Jan 2004 09:13:16 -0000	1.8
  @@ -56,15 +56,11 @@
   package org.apache.geronimo.clustering;
   
   import java.util.List;
  -import javax.management.MBeanServer;
  -import javax.management.MalformedObjectNameException;
  +
   import javax.management.ObjectName;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * A Node is an instance of a connection to a Cluster. Nodes are named
  @@ -213,14 +209,15 @@
       _log.info("failing");
       _cluster.leave(this);	// TODO - ??
     }
  -
  +  /*
     public void
       setMBeanContext(GeronimoMBeanContext context)
     {
       super.setMBeanContext(context);
       _log=LogFactory.getLog(getClass().getName()+"#"+getClusterName()+"/"+getName());
     }
  -
  +  */
  +  /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -232,4 +229,5 @@
   
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.8       +7 -12     incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Tier.java
  
  Index: Tier.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Tier.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Tier.java	21 Jan 2004 14:12:12 -0000	1.7
  +++ Tier.java	22 Jan 2004 09:13:16 -0000	1.8
  @@ -55,19 +55,12 @@
    */
   package org.apache.geronimo.clustering;
   
  -import java.util.HashMap;
   import java.util.Map;
  -import javax.management.MBeanOperationInfo;
  -import javax.management.MBeanServer;
  +
   import javax.management.ObjectName;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
  -import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
  -import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
   
   /**
    * Tier abstracts code common to different Tier impls
  @@ -174,14 +167,15 @@
       }
       _log.info("Node Data:"+data);
     }
  -
  +  /*
     public void
       setMBeanContext(GeronimoMBeanContext context)
     {
       super.setMBeanContext(context);
       _log=LogFactory.getLog(getClass().getName()+"#"+getClusterName()+"/"+getNodeName()+"/"+getName());
     }
  -
  +  */
  +    /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -192,4 +186,5 @@
       mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("NodeObjectName", true, false,
"ObjectName of this Tier's Node"));
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.6       +4 -12     incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/ejb/EJBTier.java
  
  Index: EJBTier.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/ejb/EJBTier.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EJBTier.java	7 Jan 2004 22:09:47 -0000	1.5
  +++ EJBTier.java	22 Jan 2004 09:13:17 -0000	1.6
  @@ -57,18 +57,9 @@
   
   import java.util.HashMap;
   import java.util.Iterator;
  -import java.util.List;
   import java.util.Map;
  -import javax.management.MBeanServer;
  -import javax.management.ObjectName;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +
   import org.apache.geronimo.clustering.Tier;
  -import org.apache.geronimo.clustering.Data;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * Responsible for maintaining state stored in the EJB tier -
  @@ -115,7 +106,7 @@
     //----------------------------------------
     // GeronimoMBeanTarget
     //----------------------------------------
  -
  +  /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -125,4 +116,5 @@
       mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("StatefulSessionCount", true,
false, "Number of Stateful Sessions stored in this Tier"));
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.3       +4 -13     incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/jndi/JNDITier.java
  
  Index: JNDITier.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/jndi/JNDITier.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JNDITier.java	7 Jan 2004 22:09:47 -0000	1.2
  +++ JNDITier.java	22 Jan 2004 09:13:17 -0000	1.3
  @@ -56,19 +56,9 @@
   package org.apache.geronimo.clustering.jndi;
   
   import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.List;
   import java.util.Map;
  -import javax.management.MBeanServer;
  -import javax.management.ObjectName;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +
   import org.apache.geronimo.clustering.Tier;
  -import org.apache.geronimo.clustering.Data;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * Responsible for maintaining state stored in the JNDI tier -
  @@ -99,7 +89,7 @@
     //----------------------------------------
     // GeronimoMBeanTarget
     //----------------------------------------
  -
  + /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -107,4 +97,5 @@
       mbeanInfo.setTargetClass(JNDITier.class);
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.9       +6 -11     incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/web/HttpSessionManager.java
  
  Index: HttpSessionManager.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/web/HttpSessionManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HttpSessionManager.java	21 Jan 2004 14:12:12 -0000	1.8
  +++ HttpSessionManager.java	22 Jan 2004 09:13:17 -0000	1.9
  @@ -56,20 +56,14 @@
   package org.apache.geronimo.clustering.web;
   
   import java.util.HashMap;
  -import java.util.List;
   import java.util.Map;
  -import javax.management.MBeanServer;
  +
   import javax.management.ObjectName;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.clustering.LocalCluster;
  -import org.apache.geronimo.clustering.Data;
  -import org.apache.geronimo.clustering.Tier;
   import org.apache.geronimo.clustering.MBeanImpl;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
  +import org.apache.geronimo.clustering.Tier;
   
   /**
    * An HttpSessionManager for <distributable/> webapps, which
  @@ -161,7 +155,7 @@
       _tier.deregisterData(getUID());
       // TODO - leave cluster
     }
  -
  +  /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -179,4 +173,5 @@
   
       return mbeanInfo;
     }
  +  */
   }
  
  
  
  1.7       +4 -12     incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/web/WebTier.java
  
  Index: WebTier.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/web/WebTier.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebTier.java	7 Jan 2004 22:09:47 -0000	1.6
  +++ WebTier.java	22 Jan 2004 09:13:17 -0000	1.7
  @@ -57,18 +57,9 @@
   
   import java.util.HashMap;
   import java.util.Iterator;
  -import java.util.List;
   import java.util.Map;
  -import javax.management.MBeanServer;
  -import javax.management.ObjectName;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +
   import org.apache.geronimo.clustering.Tier;
  -import org.apache.geronimo.clustering.Data;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   /**
    * Responsible for maintaining state stored in the Web tier -
  @@ -115,7 +106,7 @@
     //----------------------------------------
     // GeronimoMBeanTarget
     //----------------------------------------
  -
  +  /*
     public static GeronimoMBeanInfo
       getGeronimoMBeanInfo()
     {
  @@ -125,4 +116,5 @@
       mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("HttpSessionCount", true, false,
"Number of HttpSessions stored in this Tier"));
       return mbeanInfo;
     }
  +  */
   }
  
  
  

Mime
View raw message