You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ho...@apache.org on 2005/12/19 06:55:32 UTC
svn commit: r357645 - in
/geronimo/branches/1.0/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster:
ClusterDeployerGBean.java FarmWarDeployerGBean.java
Author: hogstrom
Date: Sun Dec 18 21:55:30 2005
New Revision: 357645
URL: http://svn.apache.org/viewcvs?rev=357645&view=rev
Log:
Fixed problem with Tomcat GBean for clustering - from JGenender
Modified:
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
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=357645&r1=357644&r2=357645&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 Sun Dec 18 21:55:30 2005
@@ -40,6 +40,11 @@
deployer = null;
}
+ protected ClusterDeployerGBean(String className) throws Exception{
+ super();
+ deployer = (ClusterDeployer)Class.forName(className).newInstance();
+ }
+
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=357645&r1=357644&r2=357645&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 Sun Dec 18 21:55:30 2005
@@ -73,7 +73,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("ClusterDeployer", FarmWarDeployerGBean.class, J2EE_TYPE);
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("ClusterDeployer", FarmWarDeployerGBean.class, ClusterDeployerGBean.GBEAN_INFO);
infoFactory.addAttribute("tempDir", String.class, true);
infoFactory.addAttribute("deployDir", String.class, true);
@@ -83,12 +83,11 @@
infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
infoFactory.addOperation("getInternalObject");
infoFactory.setConstructor(new String[] {
- "className",
- "initParams",
"tempDir",
"deployDir",
"watchDir",
"watchEnabled",
+ "processDeployFrequency",
"ServerInfo"
});
GBEAN_INFO = infoFactory.getBeanInfo();