You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ju...@apache.org on 2004/01/04 16:51:59 UTC
cvs commit: incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering Tier.java Node.java NamedMBeanImpl.java
jules 2004/01/04 07:51:59
Modified: modules/clustering/src/java/org/apache/geronimo/clustering/web
WebTier.java
modules/clustering/src/java/org/apache/geronimo/clustering
Tier.java Node.java NamedMBeanImpl.java
Log:
a little bit more tidying up
Revision Changes Path
1.4 +3 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebTier.java 4 Jan 2004 14:18:06 -0000 1.3
+++ WebTier.java 4 Jan 2004 15:51:59 -0000 1.4
@@ -115,12 +115,13 @@
//----------------------------------------
// GeronimoMBeanTarget
//----------------------------------------
+
public static GeronimoMBeanInfo
getGeronimoMBeanInfo()
{
GeronimoMBeanInfo mbeanInfo=Tier.getGeronimoMBeanInfo();
mbeanInfo.setTargetClass(WebTier.class);
- mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("WebAppCount", true, false, "Number of WebApps deployed in this Tier"));
+ mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("WebAppCount", true, false, "Number of WebApps deployed in this Tier"));
mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("HttpSessionCount", true, false, "Number of HttpSessions stored in this Tier"));
return mbeanInfo;
}
1.5 +3 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Tier.java 4 Jan 2004 15:19:31 -0000 1.4
+++ Tier.java 4 Jan 2004 15:51:59 -0000 1.5
@@ -106,8 +106,8 @@
// Tier
//----------------------------------------
- public String getClusterName() {return _objectName.getKeyProperty("cluster");}
- public String getNodeName() {return _objectName.getKeyProperty("node");}
+ public String getClusterName(){return _objectName.getKeyProperty("cluster");}
+ public String getNodeName(){return _objectName.getKeyProperty("node");}
protected abstract Object alloc();
public abstract Object registerData(String uid, Object data);
1.5 +7 -12 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Node.java 4 Jan 2004 15:19:31 -0000 1.4
+++ Node.java 4 Jan 2004 15:51:59 -0000 1.5
@@ -105,13 +105,9 @@
*
* @return a <code>String</code> value
*/
- public String getCluster() {return _objectName.getKeyProperty("cluster");}
- /**
- * Returns the Node's Cluster's current membership.
- *
- * @return a <code>List</code> value
- */
- public List getMembers(){return _cluster.getMembers();}
+ public String getClusterName(){return _objectName.getKeyProperty("cluster");}
+
+ public Cluster getCluster(){return _cluster;}
//----------------------------------------
// MetaDataListener
@@ -191,7 +187,7 @@
public void
doStart()
{
- _log=LogFactory.getLog(getClass().getName()+"#"+getCluster()+"/"+getName());
+ _log=LogFactory.getLog(getClass().getName()+"#"+getClusterName()+"/"+getName());
_log.info("starting");
synchronized (_cluster)
@@ -222,9 +218,8 @@
{
GeronimoMBeanInfo mbeanInfo=MBeanImpl.getGeronimoMBeanInfo();
mbeanInfo.setTargetClass(Node.class);
- mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Cluster", true, false, "unique identifier for this Node's Cluster"));
- mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Members", true, false, "list of cluster members"));
- mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Data", true, false, "cluster state"));
+ mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterName", true, false, "Node's Cluster's Name"));
+ mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Data", true, false, "Node's state"));
return mbeanInfo;
}
}
1.2 +2 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamedMBeanImpl.java 4 Jan 2004 15:21:37 -0000 1.1
+++ NamedMBeanImpl.java 4 Jan 2004 15:51:59 -0000 1.2
@@ -77,7 +77,7 @@
protected Log _log=LogFactory.getLog(NamedMBeanImpl.class);
/**
- * Returns the Node's unique identifier within it's Cluster.
+ * Returns the MBean's name.
*
* @return a <code>String</code> value
*/