geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r356897 - in /geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat: ./ cluster/
Date Wed, 14 Dec 2005 22:46:03 GMT
Author: jgenender
Date: Wed Dec 14 14:45:55 2005
New Revision: 356897

URL: http://svn.apache.org/viewcvs?rev=356897&view=rev
Log:
Fixed clustering GBean by adding default constructors

Modified:
    geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
    geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
    geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java
    geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
    geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
    geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java

Modified: geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=356897&r1=356896&r2=356897&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
(original)
+++ geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Wed Dec 14 14:45:55 2005
@@ -457,7 +457,7 @@
         infoBuilder.addReference("RoleDesignateSource", RoleDesignateSource.class, NameFactory.JACC_MANAGER);
         infoBuilder.addReference("TomcatRealm", ObjectRetriever.class);
         infoBuilder.addReference("TomcatValveChain", ValveGBean.class);
-        infoBuilder.addReference("Cluster", CatalinaClusterGBean.class);
+        infoBuilder.addReference("Cluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
         infoBuilder.addReference("Manager", WADIGBean.class);
         infoBuilder.addAttribute("crossContext", boolean.class, true);
         infoBuilder.addAttribute("webServices", Map.class, true);

Modified: geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java?rev=356897&r1=356896&r2=356897&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
(original)
+++ geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
Wed Dec 14 14:45:55 2005
@@ -44,6 +44,10 @@
    public static final String J2EE_TYPE = "Cluster";
    
    private final CatalinaCluster cluster;
+   
+   public CatalinaClusterGBean(){
+       cluster=null;
+   }
 
    public CatalinaClusterGBean(String className, 
            Map initParams,            

Modified: geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java?rev=356897&r1=356896&r2=356897&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
(original)
+++ geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
Wed Dec 14 14:45:55 2005
@@ -36,6 +36,10 @@
 
     protected final ClusterDeployer deployer;
 
+    public ClusterDeployerGBean() {
+       deployer = null; 
+    }
+    
     public ClusterDeployerGBean(String className, Map initParams) throws Exception {
 
         super(); // TODO: make it an attribute

Modified: geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java?rev=356897&r1=356896&r2=356897&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java
(original)
+++ geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java
Wed Dec 14 14:45:55 2005
@@ -31,6 +31,10 @@
 
     private final ServerInfo serverInfo;
 
+    public FarmWarDeployerGBean(){
+       serverInfo = null;     
+    }
+    
     public FarmWarDeployerGBean(String tempDir,
                                 String deployDir,
                                 String watchDir,

Modified: geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java?rev=356897&r1=356896&r2=356897&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
(original)
+++ geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
Wed Dec 14 14:45:55 2005
@@ -37,6 +37,10 @@
 
     private final MembershipService membership;
 
+    public MembershipServiceGBean() {
+        membership=null;
+    }
+    
     public MembershipServiceGBean(String className, Map initParams) throws Exception {
 
         super(); // TODO: make it an attribute

Modified: geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java?rev=356897&r1=356896&r2=356897&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
(original)
+++ geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
Wed Dec 14 14:45:55 2005
@@ -36,6 +36,10 @@
     public static final String J2EE_TYPE = "Receiver";
 
     private final ClusterReceiver receiver;
+    
+    public ReceiverGBean() {
+        receiver = null;
+    }
 
     public ReceiverGBean(String className, Map initParams) throws Exception {
 

Modified: geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java?rev=356897&r1=356896&r2=356897&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java
(original)
+++ geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java
Wed Dec 14 14:45:55 2005
@@ -36,6 +36,10 @@
     public static final String J2EE_TYPE = "Sender";
 
     private final ClusterSender sender;
+    
+    public SenderGBean(){
+        sender = null;
+    }
 
     public SenderGBean(String className, Map initParams) throws Exception {
 



Mime
View raw message