jules 2004/01/07 14:09:47
Modified: modules/clustering/src/java/org/apache/geronimo/clustering/web
WebTier.java HttpSessionManager.java
modules/clustering/src/java/org/apache/geronimo/clustering/jndi
JNDITier.java
modules/clustering/src/java/org/apache/geronimo/clustering/ejb
EJBTier.java
modules/clustering/src/deploy clustering-service.xml
Log:
abstract Tier name/type from different concrete Tiers back into Tier
HttpSessionManager now needs to know TierName
Revision Changes Path
1.6 +1 -17
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebTier.java 7 Jan 2004 00:15:38 -0000 1.5
+++ WebTier.java 7 Jan 2004 22:09:47 -0000 1.6
@@ -82,22 +82,6 @@
{
// protected Log _log=LogFactory.getLog(WebTier.class);
- /**
- * Makes an ObjectName for a Tier MBean with the given parameters.
- *
- * @param clusterName a <code>String</code> value
- * @param nodeName a <code>String</code> value
- * @param tierName a <code>String</code> value
- * @return an <code>ObjectName</code> value
- * @exception Exception if an error occurs
- */
- public static ObjectName
- makeObjectName(String clusterName, String nodeName)
- throws Exception
- {
- return Tier.makeObjectName(clusterName, nodeName, "web");
- }
-
//----------------------------------------
// WebTier
//----------------------------------------
1.7 +7 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpSessionManager.java 7 Jan 2004 00:15:38 -0000 1.6
+++ HttpSessionManager.java 7 Jan 2004 22:09:47 -0000 1.7
@@ -102,6 +102,10 @@
public String getNodeName(){return _nodeName;}
public void setNodeName(String nodeName){_nodeName=nodeName;}
+ protected String _tierName="web";
+ public String getTierName(){return _tierName;}
+ public void setTierName(String tierName){_tierName=tierName;}
+
protected String _contextPath;
public String getContextPath(){return _contextPath;}
public void setContextPath(String contextPath){_contextPath=contextPath;}
@@ -121,7 +125,7 @@
try
{
// find our tier
-
_tier=(Tier)_server.getAttribute(WebTier.makeObjectName(getClusterName(),
getNodeName()), "Reference");
+ _tier=(Tier)_server.getAttribute(Tier.makeObjectName(getClusterName(),
getNodeName(), getTierName()), "Reference");
_log.debug("Tier: "+_tier);
}
catch (Exception e)
@@ -167,6 +171,7 @@
// TODO - these should probably become RO...
mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterName",
true, true, "name of Cluster upon which this webapp is deployed"));
mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("NodeName",
true, true, "name of Cluster Node upon which this webapp is deployed"));
+ mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("TierName",
true, true, "name of Tier to which this webapp is attached"));
mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ContextPath",
true, true, "context path at which this webapp is deployed"));
return mbeanInfo;
}
1.2 +7 -17
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNDITier.java 7 Jan 2004 00:15:38 -0000 1.1
+++ JNDITier.java 7 Jan 2004 22:09:47 -0000 1.2
@@ -82,22 +82,6 @@
{
// protected Log _log=LogFactory.getLog(JNDITier.class);
- /**
- * Makes an ObjectName for a Tier MBean with the given parameters.
- *
- * @param clusterName a <code>String</code> value
- * @param nodeName a <code>String</code> value
- * @param tierName a <code>String</code> value
- * @return an <code>ObjectName</code> value
- * @exception Exception if an error occurs
- */
- public static ObjectName
- makeObjectName(String clusterName, String nodeName)
- throws Exception
- {
- return Tier.makeObjectName(clusterName, nodeName, "jndi");
- }
-
//----------------------------------------
// JNDITier
//----------------------------------------
@@ -105,6 +89,12 @@
protected Object alloc(){return new HashMap();}
public Object registerData(String uid, Object data) {synchronized (_tier)
{return ((Map)_tier).put(uid, data);}}
public Object deregisterData(String uid) {synchronized (_tier){return
((Map)_tier).remove(uid);}}
+
+ //----------------------------------------
+ // Tier
+ //----------------------------------------
+
+ public String getTierName(){return "jndi";}
//----------------------------------------
// GeronimoMBeanTarget
1.5 +1 -17
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EJBTier.java 7 Jan 2004 00:15:38 -0000 1.4
+++ EJBTier.java 7 Jan 2004 22:09:47 -0000 1.5
@@ -82,22 +82,6 @@
{
// protected Log _log=LogFactory.getLog(EJBTier.class);
- /**
- * Makes an ObjectName for a Tier MBean with the given parameters.
- *
- * @param clusterName a <code>String</code> value
- * @param nodeName a <code>String</code> value
- * @param tierName a <code>String</code> value
- * @return an <code>ObjectName</code> value
- * @exception Exception if an error occurs
- */
- public static ObjectName
- makeObjectName(String clusterName, String nodeName)
- throws Exception
- {
- return Tier.makeObjectName(clusterName, nodeName, "ejb");
- }
-
//----------------------------------------
// EJBTier
//----------------------------------------
1.9 +1 -0
incubator-geronimo/modules/clustering/src/deploy/clustering-service.xml
Index: clustering-service.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/clustering/src/deploy/clustering-service.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clustering-service.xml 7 Jan 2004 00:15:38 -0000 1.8
+++ clustering-service.xml 7 Jan 2004 22:09:47 -0000 1.9
@@ -98,6 +98,7 @@
>
<attribute name="ClusterName">GERONIMO</attribute>
<attribute name="NodeName">0</attribute>
+ <attribute name="TierName">web</attribute>
<attribute name="ContextPath">/dummy</attribute>
</mbean>
