geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r511136 - in /geronimo/server/trunk: ./ configs/tomcat6/ modules/geronimo-tomcat6/ modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ modules/geronim...
Date Fri, 23 Feb 2007 22:12:11 GMT
Author: pmcmahan
Date: Fri Feb 23 14:12:09 2007
New Revision: 511136

URL: http://svn.apache.org/viewvc?view=rev&rev=511136
Log:
GERONIMO-2805   tribes clustering support for tomcat

copied the tomcat clustering support from server/branches/1.2 and refactored it to work with catalina-ha
and tribes from tomcat6.  Added InterceptorGBean, ChannelGBean, and morphed MessageListenerGBean into
ClusterListenerGBean to correspond with the new arch in tomcat 6. I will attach a geronimo config.xml to
the JIRA that can be used to startup a clustered server.  Reenabled the clustering support in EngineGBean
and the various o.a.g.tomcat classes.


Added:
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
      - copied, changed from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java   (with props)
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java   (with props)
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
      - copied, changed from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterListenerGBean.java
      - copied, changed from r509673, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MessageListenerGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java
      - copied, changed from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
      - copied, changed from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
      - copied, changed from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java
      - copied, changed from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java
Modified:
    geronimo/server/trunk/configs/tomcat6/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebModule.java   (props changed)
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/stats/ConnectorStats.java   (props changed)
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java   (props changed)
    geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java   (props changed)
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Fri Feb 23 14:12:09 2007
@@ -76,6 +76,16 @@
             <version>${version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>catalina-ha</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tribes</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml Fri Feb 23 14:12:09 2007
@@ -83,6 +83,11 @@
         
         <dependency>
             <groupId>org.apache.tomcat</groupId>
+            <artifactId>catalina-ha</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
             <artifactId>jasper</artifactId>
             <scope>test</scope>
         </dependency>

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java Fri Feb 23 14:12:09 2007
@@ -19,6 +19,8 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
+
+import org.apache.catalina.Cluster;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
 import org.apache.catalina.Manager;
@@ -34,6 +36,7 @@
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
 
 /**
  * @version $Rev$ $Date$
@@ -53,7 +56,7 @@
             Collection hosts,
             ObjectRetriever realmGBean,
             ValveGBean tomcatValveChain,
-//            CatalinaClusterGBean clusterGBean,
+            CatalinaClusterGBean clusterGBean,
             ManagerGBean manager) throws Exception {
         super(); // TODO: make it an attribute
 
@@ -142,9 +145,9 @@
 
 
         //Add clustering
-//        if (clusterGBean != null){
-//            engine.setCluster((Cluster)clusterGBean.getInternalObject());
-//        }
+        if (clusterGBean != null){
+            engine.setCluster((Cluster)clusterGBean.getInternalObject());
+        }
     }
 
     private void removeHost(ObjectRetriever objRetriever) {
@@ -188,7 +191,7 @@
         infoFactory.addReference("Hosts", ObjectRetriever.class, HostGBean.J2EE_TYPE);
         infoFactory.addReference("RealmGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
-//        infoFactory.addReference("CatalinaCluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
+        infoFactory.addReference("CatalinaCluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
         infoFactory.addReference("Manager", ManagerGBean.class, ManagerGBean.J2EE_TYPE);
         infoFactory.addOperation("getInternalObject");
         infoFactory.setConstructor(new String[] { 
@@ -198,7 +201,7 @@
                 "Hosts", 
                 "RealmGBean", 
                 "TomcatValveChain",
-//                "CatalinaCluster",
+                "CatalinaCluster",
                 "Manager"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Fri Feb 23 14:12:09 2007
@@ -39,6 +39,7 @@
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.catalina.valves.ValveBase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -162,9 +163,9 @@
             }
         }
 
-//        CatalinaCluster cluster = ctx.getCluster();
-//        if (cluster != null)
-//            this.setCluster(cluster);
+        CatalinaCluster cluster = ctx.getCluster();
+        if (cluster != null)
+            this.setCluster(cluster);
 
         Manager manager = ctx.getManager();
         if (manager != null)

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java Fri Feb 23 14:12:09 2007
@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Map;
+
+import org.apache.catalina.Cluster;
 import org.apache.catalina.Host;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Realm;
@@ -30,6 +32,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
 
 /**
  * @version $Rev$ $Date$
@@ -53,7 +56,7 @@
             ArrayList aliases,
             ObjectRetriever realmGBean,            
             ValveGBean tomcatValveChain,
-//            CatalinaClusterGBean clusterGBean,
+            CatalinaClusterGBean clusterGBean,
             ManagerGBean manager) throws Exception {
         super(); // TODO: make it an attribute
         
@@ -105,9 +108,9 @@
         }
 
         //Add clustering
-//        if (clusterGBean != null){
-//            host.setCluster((Cluster)clusterGBean.getInternalObject());
-//        }
+        if (clusterGBean != null){
+            host.setCluster((Cluster)clusterGBean.getInternalObject());
+        }
         
         //Add manager
         if (manager != null)
@@ -139,7 +142,7 @@
         infoFactory.addAttribute("aliases", ArrayList.class, true);
         infoFactory.addReference("RealmGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
-//        infoFactory.addReference("CatalinaCluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
+        infoFactory.addReference("CatalinaCluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
         infoFactory.addReference("Manager", ManagerGBean.class, ManagerGBean.J2EE_TYPE);
         infoFactory.addOperation("getInternalObject");
         infoFactory.setConstructor(new String[] { 
@@ -148,7 +151,7 @@
                 "aliases", 
                 "RealmGBean", 
                 "TomcatValveChain",
-//                "CatalinaCluster",
+                "CatalinaCluster",
                 "Manager"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java Fri Feb 23 14:12:09 2007
@@ -25,6 +25,7 @@
 import org.apache.catalina.Context;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Realm;
+import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.tomcat.util.SecurityHolder;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
@@ -64,7 +65,7 @@
 
     public List getValveChain();
 
-//    public CatalinaCluster getCluster();
+    public CatalinaCluster getCluster();
 
     public Manager getManager();
 

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Fri Feb 23 14:12:09 2007
@@ -40,6 +40,7 @@
 import org.apache.catalina.Realm;
 import org.apache.catalina.Valve;
 import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
@@ -58,6 +59,7 @@
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebModule;
 import org.apache.geronimo.tomcat.util.SecurityHolder;
+import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
 import org.apache.geronimo.tomcat.stats.ModuleStats;
 import org.apache.geronimo.transaction.GeronimoUserTransaction;
 import org.apache.geronimo.webservices.WebServiceContainer;
@@ -89,7 +91,7 @@
 
     private final List valveChain;
 
-//    private final CatalinaCluster catalinaCluster;
+    private final CatalinaCluster catalinaCluster;
 
     private final Manager manager;
 
@@ -146,7 +148,7 @@
             TomcatContainer container,
             ObjectRetriever tomcatRealm,
             ValveGBean tomcatValveChain,
-//            CatalinaClusterGBean cluster,
+            CatalinaClusterGBean cluster,
             ManagerGBean manager,
             boolean crossContext,
             boolean disableCookies,
@@ -212,11 +214,11 @@
         }
 
         //Add the cluster
-//        if (cluster != null) {
-//            catalinaCluster = (CatalinaCluster) cluster.getInternalObject();
-//        } else {
-//            catalinaCluster = null;
-//        }
+        if (cluster != null) {
+            catalinaCluster = (CatalinaCluster) cluster.getInternalObject();
+        } else {
+            catalinaCluster = null;
+        }
 
         //Add the manager
         if (manager != null) {
@@ -404,9 +406,9 @@
         return valveChain;
     }
 
-//    public CatalinaCluster getCluster() {
-//        return catalinaCluster;
-//    }
+    public CatalinaCluster getCluster() {
+        return catalinaCluster;
+    }
 
     public Manager getManager() {
         return manager;
@@ -546,7 +548,7 @@
         infoBuilder.addReference("Container", TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
         infoBuilder.addReference("TomcatRealm", ObjectRetriever.class);
         infoBuilder.addReference("TomcatValveChain", ValveGBean.class);
-//        infoBuilder.addReference("Cluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
+        infoBuilder.addReference("Cluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
         infoBuilder.addReference("Manager", ManagerGBean.class);
         infoBuilder.addAttribute("crossContext", boolean.class, true);
         infoBuilder.addAttribute("disableCookies", boolean.class, true);
@@ -572,7 +574,7 @@
                 "Container",
                 "TomcatRealm",
                 "TomcatValveChain",
-//                "Cluster",
+                "Cluster",
                 "Manager",
                 "crossContext",
                 "disableCookies",

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebModule.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Feb 23 14:12:09 2007
@@ -1 +1 @@
-Date Revision
+Date Author Id Revision HeadURL

Copied: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java (from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java?view=diff&rev=511136&p1=geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java&r1=509307&p2=geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java&r2=511136
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java Fri Feb 23 14:12:09 2007
@@ -19,12 +19,10 @@
 import java.util.Map;
 
 import org.apache.catalina.Valve;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterDeployer;
-import org.apache.catalina.cluster.ClusterReceiver;
-import org.apache.catalina.cluster.ClusterSender;
-import org.apache.catalina.cluster.MembershipService;
-import org.apache.catalina.cluster.MessageListener;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterDeployer;
+import org.apache.catalina.ha.ClusterListener;
+import org.apache.catalina.tribes.Channel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -51,12 +49,10 @@
 
    public CatalinaClusterGBean(String className, 
            Map initParams,            
-           MembershipServiceGBean membership,
-           ReceiverGBean receiver,
-           SenderGBean sender,
-           MessageListenerGBean messageListenerChain,
+           ClusterListenerGBean clusterListenerChain,
            ValveGBean tomcatValveChain,
-           ClusterDeployerGBean deployer) throws Exception {
+           ClusterDeployerGBean deployer,
+           ChannelGBean channel) throws Exception {
        
        super(); // TODO: make it an attribute
        
@@ -71,27 +67,12 @@
        //Set the parameters
        setParameters(cluster, initParams);
        
-       //Add the MembershipService
-       if (membership != null){
-           cluster.setMembershipService((MembershipService)membership.getInternalObject());
-       }
-       
-       //Add Receiver
-       if (receiver != null){
-           cluster.setClusterReceiver((ClusterReceiver)receiver.getInternalObject());
-       }
-       
-       //Add Sender
-       if (sender != null){
-           cluster.setClusterSender((ClusterSender)sender.getInternalObject());
-       }
-
-       //Add the message listeners list
-       if (messageListenerChain != null){
-           MessageListenerGBean messageListenerGBean = messageListenerChain;
-           while(messageListenerGBean != null){
-               cluster.addClusterListener((MessageListener)messageListenerGBean.getInternalObject());
-               messageListenerGBean = messageListenerGBean.getNextValve();
+       //Add the cluster listeners list
+       if (clusterListenerChain != null){
+           ClusterListenerGBean clusterListenerGBean = clusterListenerChain;
+           while(clusterListenerGBean != null){
+               cluster.addClusterListener((ClusterListener)clusterListenerGBean.getInternalObject());
+               clusterListenerGBean = clusterListenerGBean.getNextValve();
            }
        }
 
@@ -108,6 +89,11 @@
        if (deployer != null){
            cluster.setClusterDeployer((ClusterDeployer)deployer.getInternalObject());
        }
+
+       //Add channel
+       if (channel != null){
+           cluster.setChannel((Channel)channel.getInternalObject());
+       }
    }
 
    public Object getInternalObject() {
@@ -132,22 +118,18 @@
        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("CatalinaCluster", CatalinaClusterGBean.class, J2EE_TYPE);
        infoFactory.addAttribute("className", String.class, true);
        infoFactory.addAttribute("initParams", Map.class, true);
-       infoFactory.addReference("Membership", MembershipServiceGBean.class, MembershipServiceGBean.J2EE_TYPE);
-       infoFactory.addReference("Receiver", ReceiverGBean.class, ReceiverGBean.J2EE_TYPE);
-       infoFactory.addReference("Sender", SenderGBean.class, SenderGBean.J2EE_TYPE);
-       infoFactory.addReference("MessageListenerChain", MessageListenerGBean.class, MessageListenerGBean.J2EE_TYPE);
+       infoFactory.addReference("ClusterListenerChain", ClusterListenerGBean.class, ClusterListenerGBean.J2EE_TYPE);
        infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
        infoFactory.addReference("ClusterDeployer", ClusterDeployerGBean.class, ClusterDeployerGBean.J2EE_TYPE);
-       infoFactory.addOperation("getInternalObject");
+       infoFactory.addReference("Channel", ChannelGBean.class, ChannelGBean.J2EE_TYPE);
+       infoFactory.addOperation("getInternalObject", "Object");
        infoFactory.setConstructor(new String[] { 
                "className", 
                "initParams", 
-               "Membership", 
-               "Receiver",
-               "Sender",
-               "MessageListenerChain",
+               "ClusterListenerChain",
                "TomcatValveChain",
-               "ClusterDeployer" });
+               "ClusterDeployer",
+               "Channel"});
        GBEAN_INFO = infoFactory.getBeanInfo();
    }
 

Added: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java?view=auto&rev=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java Fri Feb 23 14:12:09 2007
@@ -0,0 +1,143 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.tomcat.cluster;
+
+import java.util.Map;
+
+import org.apache.catalina.tribes.Channel;
+import org.apache.catalina.tribes.ChannelInterceptor;
+import org.apache.catalina.tribes.ChannelReceiver;
+import org.apache.catalina.tribes.ChannelSender;
+import org.apache.catalina.tribes.MembershipService;
+import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.tomcat.BaseGBean;
+import org.apache.geronimo.tomcat.ObjectRetriever;
+
+/**
+* @version $Rev$ $Date$
+*/
+public class ChannelGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
+
+   private static final Log log = LogFactory.getLog(ChannelGBean.class);
+   
+   public static final String J2EE_TYPE = "Channel";
+   
+   private final Channel channel;
+   
+   public ChannelGBean(){
+       channel=null;
+   }
+
+   public ChannelGBean(String className, 
+           Map initParams,            
+           MembershipServiceGBean membership,
+           ReceiverGBean receiver,
+           SenderGBean sender,
+           ChannelInterceptorGBean interceptorChain) throws Exception {
+       
+       super(); // TODO: make it an attribute
+       
+       //Validate
+       if (className == null){
+           throw new IllegalArgumentException("Must have a 'className' attribute.");
+       }
+       
+       //Create the Channel object
+       channel = (Channel)Class.forName(className).newInstance();
+       
+       //Set the parameters
+       setParameters(channel, initParams);
+       
+       // if the channel is a GroupChannel then add the sender, receiver, and membership service
+       if (channel instanceof GroupChannel) {
+           GroupChannel groupChannel = (GroupChannel)channel;
+           //Add the MembershipService
+           if (membership != null){
+               groupChannel.setMembershipService((MembershipService)membership.getInternalObject());
+           }
+           
+           //Add Receiver
+           if (receiver != null){
+               groupChannel.setChannelReceiver((ChannelReceiver)receiver.getInternalObject());
+           }
+           
+           //Add Sender
+           if (sender != null){
+               groupChannel.setChannelSender((ChannelSender)sender.getInternalObject());
+           }
+       } else {
+           log.warn(className + " is not an instance of GroupChannel. Did not set Receiver, Sender, or MembershipService");
+       }
+       
+       
+       //Add the interceptros
+       if (interceptorChain != null){
+           ChannelInterceptorGBean channelInterceptorGBean = interceptorChain;
+           while(channelInterceptorGBean != null){
+               channel.addInterceptor((ChannelInterceptor)channelInterceptorGBean.getInternalObject());
+               channelInterceptorGBean = channelInterceptorGBean.getNextInterceptor();
+           }
+       }
+
+   }
+
+   public Object getInternalObject() {
+       return channel;
+   }
+
+   public void doFail() {
+       log.warn("Failed");
+   }
+
+   public void doStart() throws Exception {
+       log.debug("Started channel gbean.");
+   }
+
+   public void doStop() throws Exception {
+       log.debug("Stopped channel gbean.");
+   }
+
+   public static final GBeanInfo GBEAN_INFO;
+
+   static {
+       GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Channel", ChannelGBean.class, J2EE_TYPE);
+       infoFactory.addAttribute("className", String.class, true);
+       infoFactory.addAttribute("initParams", Map.class, true);
+       infoFactory.addReference("Membership", MembershipServiceGBean.class, MembershipServiceGBean.J2EE_TYPE);
+       infoFactory.addReference("Receiver", ReceiverGBean.class, ReceiverGBean.J2EE_TYPE);
+       infoFactory.addReference("Sender", SenderGBean.class, SenderGBean.J2EE_TYPE);
+       infoFactory.addReference("ChannelInterceptor", ChannelInterceptorGBean.class, ChannelInterceptorGBean.J2EE_TYPE);
+       infoFactory.addOperation("getInternalObject", "Object");
+       infoFactory.setConstructor(new String[] { 
+               "className", 
+               "initParams", 
+               "Membership", 
+               "Receiver",
+               "Sender",
+               "ChannelInterceptor"});
+       GBEAN_INFO = infoFactory.getBeanInfo();
+   }
+
+   public static GBeanInfo getGBeanInfo() {
+       return GBEAN_INFO;
+   }
+}

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java?view=auto&rev=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java Fri Feb 23 14:12:09 2007
@@ -0,0 +1,109 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.tomcat.cluster;
+
+import java.util.Map;
+
+import org.apache.geronimo.tomcat.BaseGBean;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.catalina.tribes.ChannelInterceptor;
+
+public class ChannelInterceptorGBean extends BaseGBean {
+
+    private static final Log log = LogFactory.getLog(SenderGBean.class);
+
+    public static final String J2EE_TYPE = "ChannelInterceptor";
+
+    private final ChannelInterceptor interceptor;
+    private final ChannelInterceptorGBean nextInterceptor;
+
+    public ChannelInterceptorGBean() {
+        interceptor = null;
+        nextInterceptor = null;
+    }
+
+    public ChannelInterceptorGBean(String className, Map initParams, ChannelInterceptorGBean nextInterceptor) throws Exception {
+
+        super(); // TODO: make it an attribute
+
+        // Validate
+        if (className == null) {
+            throw new IllegalArgumentException("Must have a 'className' attribute.");
+        }
+
+        if (nextInterceptor != null){
+            if (!(nextInterceptor.getInternalObject() instanceof ChannelInterceptor)){
+                throw new IllegalArgumentException("nextInterceptor is not of type ChannelInterceptor.");                
+            }
+            
+            this.nextInterceptor = nextInterceptor;
+        } else {
+            this.nextInterceptor = null;
+        }
+
+        // Create the ChannelInterceptor object
+        interceptor = (ChannelInterceptor) Class.forName(className).newInstance();
+
+        // Set the parameters
+        setParameters(interceptor, initParams);
+
+    }
+
+    public Object getInternalObject() {
+        return interceptor;
+    }
+
+    public void doFail() {
+        log.warn("Failed");
+    }
+
+    public void doStart() throws Exception {
+        log.debug("Started channel interceptor gbean.");
+    }
+
+    public void doStop() throws Exception {
+        log.debug("Stopped channel interceptor gbean.");
+    }
+    
+    public ChannelInterceptorGBean getNextInterceptor() {
+        return nextInterceptor;
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("ChannelInterceptor", ChannelInterceptorGBean.class, J2EE_TYPE);
+        infoFactory.addAttribute("className", String.class, true);
+        infoFactory.addAttribute("initParams", Map.class, true);
+        infoFactory.addReference("NextInterceptor", ChannelInterceptorGBean.class, J2EE_TYPE);
+        infoFactory.addOperation("getInternalObject", "Object");
+        infoFactory.addOperation("getNextInterceptor","ChannelInterceptorGBean");
+        infoFactory.setConstructor(new String[] { 
+                "className", 
+                "initParams", 
+                "NextInterceptor" });
+        
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java (from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java?view=diff&rev=511136&p1=geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java&r1=509307&p2=geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java&r2=511136
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java Fri Feb 23 14:12:09 2007
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.apache.catalina.cluster.ClusterDeployer;
+import org.apache.catalina.ha.ClusterDeployer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -85,7 +85,7 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("ClusterDeployer", ClusterDeployerGBean.class, J2EE_TYPE);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
-        infoFactory.addOperation("getInternalObject");
+        infoFactory.addOperation("getInternalObject", "Object");
         infoFactory.setConstructor(new String[] { "className", "initParams" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Copied: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterListenerGBean.java (from r509673, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MessageListenerGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterListenerGBean.java?view=diff&rev=511136&p1=geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MessageListenerGBean.java&r1=509673&p2=geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterListenerGBean.java&r2=511136
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MessageListenerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterListenerGBean.java Fri Feb 23 14:12:09 2007
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.apache.catalina.cluster.MessageListener;
+import org.apache.catalina.ha.ClusterListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -27,24 +27,24 @@
 import org.apache.geronimo.tomcat.BaseGBean;
 import org.apache.geronimo.tomcat.ObjectRetriever;
 
-public class MessageListenerGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
+public class ClusterListenerGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory.getLog(MessageListenerGBean.class);
+    private static final Log log = LogFactory.getLog(ClusterListenerGBean.class);
 
-    public static final String J2EE_TYPE = "MessageListener";
+    public static final String J2EE_TYPE = "ClusterListener";
         
-    private final MessageListener listener;
-    private final MessageListenerGBean nextListener;
+    private final ClusterListener listener;
+    private final ClusterListenerGBean nextListener;
     private final String className;
  
     
-    public MessageListenerGBean(){      
+    public ClusterListenerGBean(){      
         listener = null;
         nextListener = null;
         className = null;
     }
     
-    public MessageListenerGBean(String className, Map initParams, MessageListenerGBean nextListener) throws Exception{
+    public ClusterListenerGBean(String className, Map initParams, ClusterListenerGBean nextListener) throws Exception{
 
         //Validate
         if (className == null){
@@ -52,8 +52,8 @@
         }
         
         if (nextListener != null){
-            if (!(nextListener.getInternalObject() instanceof MessageListener)){
-                throw new IllegalArgumentException("nextListener is not of type MessageListener.");                
+            if (!(nextListener.getInternalObject() instanceof ClusterListener)){
+                throw new IllegalArgumentException("nextListener is not of type ClusterListener.");                
             }
             
             this.nextListener = nextListener;
@@ -63,8 +63,8 @@
         
         this.className = className;
         
-        //Create the Valve object
-        listener = (MessageListener)Class.forName(className).newInstance();
+        //Create the listener object
+        listener = (ClusterListener)Class.forName(className).newInstance();
 
         //Set the parameters
         setParameters(listener, initParams);
@@ -87,19 +87,19 @@
         return listener;
     }
 
-    public MessageListenerGBean getNextValve() {
+    public ClusterListenerGBean getNextValve() {
         return nextListener;
     }
     
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(MessageListenerGBean.class, J2EE_TYPE);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("ClusterListener", ClusterListenerGBean.class, J2EE_TYPE);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
-        infoFactory.addReference("NextListener", MessageListenerGBean.class, J2EE_TYPE);
-        infoFactory.addOperation("getInternalObject");
-        infoFactory.addOperation("getNextValve");
+        infoFactory.addReference("NextListener", ClusterListenerGBean.class, J2EE_TYPE);
+        infoFactory.addOperation("getInternalObject", "Object");
+        infoFactory.addOperation("getNextValve", "ClusterListenerGBean");
         infoFactory.setConstructor(new String[] { 
                 "className", 
                 "initParams", 

Copied: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java (from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java?view=diff&rev=511136&p1=geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java&r1=509307&p2=geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java&r2=511136
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java Fri Feb 23 14:12:09 2007
@@ -21,7 +21,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.catalina.cluster.deploy.FarmWarDeployer;
+import org.apache.catalina.ha.deploy.FarmWarDeployer;
 
 
 public class FarmWarDeployerGBean extends ClusterDeployerGBean{
@@ -81,7 +81,7 @@
         infoFactory.addAttribute("watchEnabled", boolean.class, true);
         infoFactory.addAttribute("processDeployFrequency", int.class, true);
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
-        infoFactory.addOperation("getInternalObject");
+        infoFactory.addOperation("getInternalObject", "Object");
         infoFactory.setConstructor(new String[] {
                 "tempDir",
                 "deployDir",

Copied: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java (from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java?view=diff&rev=511136&p1=geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java&r1=509307&p2=geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java&r2=511136
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java Fri Feb 23 14:12:09 2007
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.apache.catalina.cluster.MembershipService;
+import org.apache.catalina.tribes.MembershipService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -30,8 +30,7 @@
 public class MembershipServiceGBean extends BaseGBean implements
         GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory
-            .getLog(MembershipServiceGBean.class);
+    private static final Log log = LogFactory.getLog(MembershipServiceGBean.class);
 
     public static final String J2EE_TYPE = "MembershipService";
 
@@ -47,8 +46,7 @@
 
         // Validate
         if (className == null) {
-            throw new IllegalArgumentException(
-                    "Must have a 'className' attribute.");
+            throw new IllegalArgumentException("Must have a 'className' attribute.");
         }
 
         // Create the CatalinaCluster object
@@ -81,7 +79,7 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("MembershipService", MembershipServiceGBean.class, J2EE_TYPE);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
-        infoFactory.addOperation("getInternalObject");
+        infoFactory.addOperation("getInternalObject", "Object");
         infoFactory.setConstructor(new String[] { "className", "initParams" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Copied: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java (from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java?view=diff&rev=511136&p1=geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java&r1=509307&p2=geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java&r2=511136
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java Fri Feb 23 14:12:09 2007
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.apache.catalina.cluster.ClusterReceiver;
+import org.apache.catalina.tribes.ChannelReceiver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -30,12 +30,11 @@
 public class ReceiverGBean  extends BaseGBean implements
         GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory
-            .getLog(ReceiverGBean.class);
+    private static final Log log = LogFactory.getLog(ReceiverGBean.class);
 
     public static final String J2EE_TYPE = "Receiver";
 
-    private final ClusterReceiver receiver;
+    private final ChannelReceiver receiver;
     
     public ReceiverGBean() {
         receiver = null;
@@ -47,12 +46,11 @@
 
         // Validate
         if (className == null) {
-            throw new IllegalArgumentException(
-                    "Must have a 'className' attribute.");
+            throw new IllegalArgumentException("Must have a 'className' attribute.");
         }
 
         // Create the CatalinaCluster object
-        receiver = (ClusterReceiver) Class.forName(className).newInstance();
+        receiver = (ChannelReceiver) Class.forName(className).newInstance();
 
         // Set the parameters
         setParameters(receiver, initParams);
@@ -81,7 +79,7 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Receiver", ReceiverGBean.class, J2EE_TYPE);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
-        infoFactory.addOperation("getInternalObject");
+        infoFactory.addOperation("getInternalObject", "Object");
         infoFactory.setConstructor(new String[] { "className", "initParams" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Copied: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java (from r509307, geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java?view=diff&rev=511136&p1=geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java&r1=509307&p2=geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java&r2=511136
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java Fri Feb 23 14:12:09 2007
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.apache.catalina.cluster.ClusterSender;
+import org.apache.catalina.tribes.ChannelSender;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -30,12 +30,11 @@
 public class SenderGBean extends BaseGBean implements
         GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory
-            .getLog(SenderGBean.class);
+    private static final Log log = LogFactory.getLog(SenderGBean.class);
 
     public static final String J2EE_TYPE = "Sender";
 
-    private final ClusterSender sender;
+    private final ChannelSender sender;
     
     public SenderGBean(){
         sender = null;
@@ -47,12 +46,11 @@
 
         // Validate
         if (className == null) {
-            throw new IllegalArgumentException(
-                    "Must have a 'className' attribute.");
+            throw new IllegalArgumentException("Must have a 'className' attribute.");
         }
 
         // Create the CatalinaCluster object
-        sender = (ClusterSender) Class.forName(className).newInstance();
+        sender = (ChannelSender) Class.forName(className).newInstance();
 
         // Set the parameters
         setParameters(sender, initParams);
@@ -81,7 +79,7 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Sender", SenderGBean.class, J2EE_TYPE);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
-        infoFactory.addOperation("getInternalObject");
+        infoFactory.addOperation("getInternalObject", "Object");
         infoFactory.setConstructor(new String[] { "className", "initParams" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/stats/ConnectorStats.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Feb 23 14:12:09 2007
@@ -1 +1 @@
-Date Revision
+Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Feb 23 14:12:09 2007
@@ -1 +1 @@
-Date Revision
+Date Author Id Revision HeadURL

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Fri Feb 23 14:12:09 2007
@@ -79,6 +79,7 @@
                 tomcatRealm,
                 valveChain,
                 null,
+                null,
                 false,
                 false,
                 null,
@@ -159,7 +160,7 @@
         initParams.put("name", "localhost");
         initParams.put("appBase", "");
 
-        HostGBean host = new HostGBean("org.apache.catalina.core.StandardHost", initParams, null, realm, null, null);
+        HostGBean host = new HostGBean("org.apache.catalina.core.StandardHost", initParams, null, realm, null, null, null);
         //Default Engine
         initParams = Collections.singletonMap("name", "Geronimo");
 
@@ -168,6 +169,7 @@
                 host,
                 Collections.singleton(host),
                 realm,
+                null,
                 null,
                 null);
         engine.doStart();

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Feb 23 14:12:09 2007
@@ -1 +1 @@
-Date Revision
+Date Author Id Revision HeadURL

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=511136&r1=511135&r2=511136
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Feb 23 14:12:09 2007
@@ -896,6 +896,18 @@
 
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
+                <artifactId>catalina-ha</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tribes</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
                 <artifactId>coyote</artifactId>
                 <version>${tomcatVersion}</version>
             </dependency>



Mime
View raw message