jules 2004/01/06 16:15:38
Modified: modules/clustering/src/java/org/apache/geronimo/clustering/web
WebTier.java HttpSessionManager.java
modules/clustering/src/java/org/apache/geronimo/clustering/ejb
EJBTier.java
modules/clustering/src/java/org/apache/geronimo/clustering
package.html Tier.java Node.java Cluster.java
modules/clustering/src/deploy clustering-service.xml
Added: modules/clustering/src/java/org/apache/geronimo/clustering/jndi
package.html JNDITier.java
Log:
more changes to Cluster/Node/Tier - I think I have it sorted now.
explanatory javadoc in package.html
addition of JNDI Tier
Revision Changes Path
1.5 +18 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebTier.java 4 Jan 2004 15:51:59 -0000 1.4
+++ WebTier.java 7 Jan 2004 00:15:38 -0000 1.5
@@ -80,7 +80,23 @@
WebTier
extends Tier
{
- protected Log _log=LogFactory.getLog(WebTier.class);
+ // protected Log _log=LogFactory.getLog(WebTier.class);
+
+ /**
+ * Makes an ObjectName for a Tier MBean with the given parameters.
+ *
+ * @param clusterName a String value
+ * @param nodeName a String value
+ * @param tierName a String value
+ * @return an ObjectName 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.6 +3 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpSessionManager.java 4 Jan 2004 15:19:31 -0000 1.5
+++ HttpSessionManager.java 7 Jan 2004 00:15:38 -0000 1.6
@@ -121,7 +121,8 @@
try
{
// find our tier
- _tier=(Tier)_server.getAttribute(Tier.makeObjectName(getClusterName(), getNodeName(), "web"), "Reference");
+ _tier=(Tier)_server.getAttribute(WebTier.makeObjectName(getClusterName(), getNodeName()), "Reference");
+ _log.debug("Tier: "+_tier);
}
catch (Exception e)
{
1.1 incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/jndi/package.html
Index: package.html
===================================================================
The Geronimo JNDI Tier Clustering binding.
1.1 incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/jndi/JNDITier.java
Index: JNDITier.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
*
* ====================================================================
*/
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 -
* i.e. StatefulSessions.
*
* @version $Revision: 1.1 $ $Date: 2004/01/07 00:15:38 $
*/
public class
JNDITier
extends Tier
{
// protected Log _log=LogFactory.getLog(JNDITier.class);
/**
* Makes an ObjectName for a Tier MBean with the given parameters.
*
* @param clusterName a String value
* @param nodeName a String value
* @param tierName a String value
* @return an ObjectName value
* @exception Exception if an error occurs
*/
public static ObjectName
makeObjectName(String clusterName, String nodeName)
throws Exception
{
return Tier.makeObjectName(clusterName, nodeName, "jndi");
}
//----------------------------------------
// JNDITier
//----------------------------------------
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);}}
//----------------------------------------
// GeronimoMBeanTarget
//----------------------------------------
public static GeronimoMBeanInfo
getGeronimoMBeanInfo()
{
GeronimoMBeanInfo mbeanInfo=Tier.getGeronimoMBeanInfo();
mbeanInfo.setTargetClass(JNDITier.class);
return mbeanInfo;
}
}
1.4 +19 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EJBTier.java 4 Jan 2004 14:18:06 -0000 1.3
+++ EJBTier.java 7 Jan 2004 00:15:38 -0000 1.4
@@ -80,7 +80,23 @@
EJBTier
extends Tier
{
- protected Log _log=LogFactory.getLog(EJBTier.class);
+ // protected Log _log=LogFactory.getLog(EJBTier.class);
+
+ /**
+ * Makes an ObjectName for a Tier MBean with the given parameters.
+ *
+ * @param clusterName a String value
+ * @param nodeName a String value
+ * @param tierName a String value
+ * @return an ObjectName value
+ * @exception Exception if an error occurs
+ */
+ public static ObjectName
+ makeObjectName(String clusterName, String nodeName)
+ throws Exception
+ {
+ return Tier.makeObjectName(clusterName, nodeName, "ejb");
+ }
//----------------------------------------
// EJBTier
@@ -115,6 +131,7 @@
//----------------------------------------
// GeronimoMBeanTarget
//----------------------------------------
+
public static GeronimoMBeanInfo
getGeronimoMBeanInfo()
{
1.2 +50 -4 incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 28 Dec 2003 19:12:51 -0000 1.1
+++ package.html 7 Jan 2004 00:15:38 -0000 1.2
@@ -1,9 +1,55 @@
-
-
-
+
The Geronimo Clustering implementation.
-
+
+
+
+ Basically it works like this...
+
+
+
+ A Geronimo instance has N Cluster instances.
+
+ A Cluster instance has N Node instances.
+
+ A Node instance has N Tier instances (each of a different
+ type - e.g. web/ejb/jndi/etc.).
+
+ Each Tier instance is responsible for connecting Application
+ state, of a corresponding type, to the Cluster's Data Collection
+ .
+
+
+
+ Clusters, Nodes and Tiers are statically described in a
+ descriptor (clustering-service.xml) that is deployed in the
+ Geronimo instance.
+
+
+
+ Other types, more closely bound to the Application arena
+ (e.g. HttpSessionManager) are created dynamically as and when
+ required and hooked to a corresponding Tier Object as described
+ above.
+
+
+
+ Messages may travel to and from these types, via their Cluster.
+
+
+
+ Clusters map onto backends that are capable of transporting
+ these messages between JVMs, hence this collection of types
+ forms the backbone of Geronimo's distributed architecture.
+
+
+
+ All of these types are MBeans, so will register with Geronimo's
+ JMX Agent and export interfaces to it that allow useful
+ information about their internal state to be read and possible
+ written by JMX Clients.
+
+