You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gd...@apache.org on 2008/04/22 11:45:24 UTC
svn commit: r650429 - in
/geronimo/server/trunk/plugins/clustering/geronimo-farm/src:
main/java/org/apache/geronimo/farm/config/
main/java/org/apache/geronimo/farm/deployment/
test/java/org/apache/geronimo/farm/deployment/
Author: gdamour
Date: Tue Apr 22 02:45:20 2008
New Revision: 650429
URL: http://svn.apache.org/viewvc?rev=650429&view=rev
Log:
Use annotation style GBean configuration.
Modified:
geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicClusterInfo.java
geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java
geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java
geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStore.java
geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java
geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java
geronimo/server/trunk/plugins/clustering/geronimo-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicClusterInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicClusterInfo.java?rev=650429&r1=650428&r2=650429&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicClusterInfo.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicClusterInfo.java Tue Apr 22 02:45:20 2008
@@ -21,8 +21,8 @@
import java.util.Collection;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
/**
*
@@ -32,7 +32,8 @@
private final String name;
private final Collection<NodeInfo> nodes;
- public BasicClusterInfo(String name, Collection<NodeInfo> nodes) {
+ public BasicClusterInfo(@ParamAttribute(name=GBEAN_ATTR_CLUSTER_NAME) String name,
+ @ParamReference(name=GBEAN_REF_NODE_INFOS) Collection<NodeInfo> nodes) {
if (null == name) {
throw new IllegalArgumentException("name is required");
} else if (null == nodes) {
@@ -50,23 +51,6 @@
return nodes;
}
- public static final GBeanInfo GBEAN_INFO;
-
- public static final String GBEAN_J2EE_TYPE = "ClusterInfo";
public static final String GBEAN_ATTR_CLUSTER_NAME = "name";
public static final String GBEAN_REF_NODE_INFOS = "NodeInfos";
-
- static {
- GBeanInfoBuilder builder = GBeanInfoBuilder.createStatic(BasicClusterInfo.class, GBEAN_J2EE_TYPE);
- builder.addAttribute(GBEAN_ATTR_CLUSTER_NAME, String.class, true);
- builder.addReference(GBEAN_REF_NODE_INFOS, NodeInfo.class, "NodeInfo");
- builder.addInterface(ClusterInfo.class);
- builder.setConstructor(new String[]{GBEAN_ATTR_CLUSTER_NAME, GBEAN_REF_NODE_INFOS});
- GBEAN_INFO = builder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java?rev=650429&r1=650428&r2=650429&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java Tue Apr 22 02:45:20 2008
@@ -28,8 +28,9 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.system.jmx.KernelDelegate;
@@ -42,7 +43,9 @@
private final ExtendedJMXConnectorInfo connectorInfo;
private final Kernel kernel;
- public BasicNodeInfo(Kernel kernel, String name, ExtendedJMXConnectorInfo connectorInfo) {
+ public BasicNodeInfo(@ParamSpecial(type=SpecialAttributeType.kernel) Kernel kernel,
+ @ParamAttribute(name=GBEAN_ATTR_NODE_NAME) String name,
+ @ParamAttribute(name=GBEAN_ATTR_EXT_JMX_CONN_INFO) ExtendedJMXConnectorInfo connectorInfo) {
if (null == kernel) {
throw new IllegalArgumentException("kernel is required");
} else if (null == name) {
@@ -85,30 +88,6 @@
return new KernelDelegate(mbServerConnection);
}
- public static final GBeanInfo GBEAN_INFO;
-
- public static final String GBEAN_J2EE_TYPE = "NodeInfo";
- public static final String GBEAN_ATTR_KERNEL = "kernel";
public static final String GBEAN_ATTR_NODE_NAME = "name";
public static final String GBEAN_ATTR_EXT_JMX_CONN_INFO = "extendedJMXConnectorInfo";
- static {
- GBeanInfoBuilder builder = GBeanInfoBuilder.createStatic(BasicNodeInfo.class, GBEAN_J2EE_TYPE);
-
- builder.addAttribute(GBEAN_ATTR_KERNEL, Kernel.class, false);
- builder.addAttribute(GBEAN_ATTR_NODE_NAME, String.class, true);
- builder.addAttribute(GBEAN_ATTR_EXT_JMX_CONN_INFO, ExtendedJMXConnectorInfo.class, true);
-
- builder.addInterface(NodeInfo.class);
-
- builder.setConstructor(new String[]{GBEAN_ATTR_KERNEL,
- GBEAN_ATTR_NODE_NAME,
- GBEAN_ATTR_EXT_JMX_CONN_INFO});
-
- GBEAN_INFO = builder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java?rev=650429&r1=650428&r2=650429&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java Tue Apr 22 02:45:20 2008
@@ -23,9 +23,10 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.farm.config.ClusterInfo;
import org.apache.geronimo.farm.config.NodeInfo;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -35,6 +36,7 @@
*
* @version $Rev:$ $Date:$
*/
+@GBean(j2eeType=BasicClusterConfigurationController.GBEAN_J2EE_TYPE)
public class BasicClusterConfigurationController implements GBeanLifecycle, ClusterConfigurationController {
private static final Log log = LogFactory.getLog(BasicClusterConfigurationController.class);
@@ -44,11 +46,11 @@
private boolean startConfigurationUponStart;
private boolean ignoreStartConfigurationFailureUponStart;
- public BasicClusterConfigurationController(ClusterInfo clusterInfo,
- String nodeName,
- Artifact artifact,
- boolean startConfigurationUponStart,
- boolean ignoreStartConfigurationFailureUponStart) {
+ public BasicClusterConfigurationController(@ParamReference(name=GBEAN_REF_CLUSTER_INFO) ClusterInfo clusterInfo,
+ @ParamAttribute(name=GBEAN_ATTR_NODE_NAME) String nodeName,
+ @ParamAttribute(name=GBEAN_ATTR_ARTIFACT) Artifact artifact,
+ @ParamAttribute(name=GBEAN_ATTR_START_CONF_UPON_START) boolean startConfigurationUponStart,
+ @ParamAttribute(name=GBEAN_ATTR_IGNORE_START_CONF_FAIL_UPON_START) boolean ignoreStartConfigurationFailureUponStart) {
if (null == clusterInfo) {
throw new IllegalArgumentException("clusterInfo is required");
} else if (null == nodeName) {
@@ -129,38 +131,11 @@
return ConfigurationUtil.getConfigurationManager(kernel);
}
- public static final GBeanInfo GBEAN_INFO;
-
public static final String GBEAN_J2EE_TYPE = "ClusterConfigurationController";
public static final String GBEAN_ATTR_NODE_NAME = "nodeName";
public static final String GBEAN_ATTR_ARTIFACT = "artifact";
public static final String GBEAN_ATTR_START_CONF_UPON_START= "startConfigurationUponStart";
public static final String GBEAN_ATTR_IGNORE_START_CONF_FAIL_UPON_START= "ignoreStartConfigurationFailureUponStart";
public static final String GBEAN_REF_CLUSTER_INFO = "ClusterInfo";
-
- static {
- GBeanInfoBuilder builder = GBeanInfoBuilder.createStatic(BasicClusterConfigurationController.class, GBEAN_J2EE_TYPE);
-
- builder.addAttribute(GBEAN_ATTR_NODE_NAME, String.class, true);
- builder.addAttribute(GBEAN_ATTR_ARTIFACT, Artifact.class, true);
- builder.addAttribute(GBEAN_ATTR_START_CONF_UPON_START, boolean.class, true);
- builder.addAttribute(GBEAN_ATTR_IGNORE_START_CONF_FAIL_UPON_START, boolean.class, true);
-
- builder.addReference(GBEAN_REF_CLUSTER_INFO, ClusterInfo.class);
-
- builder.addInterface(ClusterConfigurationController.class);
-
- builder.setConstructor(new String[] {GBEAN_REF_CLUSTER_INFO,
- GBEAN_ATTR_NODE_NAME,
- GBEAN_ATTR_ARTIFACT,
- GBEAN_ATTR_START_CONF_UPON_START,
- GBEAN_ATTR_IGNORE_START_CONF_FAIL_UPON_START});
- GBEAN_INFO = builder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStore.java?rev=650429&r1=650428&r2=650429&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStore.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStore.java Tue Apr 22 02:45:20 2008
@@ -22,8 +22,8 @@
import java.io.File;
import java.io.IOException;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.IOUtil;
@@ -35,10 +35,11 @@
*
* @version $Rev:$ $Date:$
*/
+@GBean(j2eeType=BasicClusterConfigurationStore.GBEAN_J2EE_TYPE)
public class BasicClusterConfigurationStore implements ClusterConfigurationStore {
private final ConfigurationStore actualConfigurationStore;
- public BasicClusterConfigurationStore(ConfigurationStore actualConfigurationStore) {
+ public BasicClusterConfigurationStore(@ParamReference(name=GBEAN_REF_CONF_STORE, namingType="ConfigurationStore") ConfigurationStore actualConfigurationStore) {
if (null == actualConfigurationStore) {
throw new IllegalArgumentException("actualConfigurationStore is required");
}
@@ -72,25 +73,6 @@
return new ZipDirectoryPackager();
}
- public static final GBeanInfo GBEAN_INFO;
-
public static final String GBEAN_J2EE_TYPE = "ClusterConfigurationStore";
public static final String GBEAN_REF_CONF_STORE = "ConfigurationStore";
-
- static {
- GBeanInfoBuilder builder = GBeanInfoBuilder.createStatic(BasicClusterConfigurationStore.class, GBEAN_J2EE_TYPE);
-
- builder.addReference(GBEAN_REF_CONF_STORE, ConfigurationStore.class, "ConfigurationStore");
-
- builder.addInterface(ClusterConfigurationStore.class);
-
- builder.setConstructor(new String[]{GBEAN_REF_CONF_STORE});
-
- GBEAN_INFO = builder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java?rev=650429&r1=650428&r2=650429&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java Tue Apr 22 02:45:20 2008
@@ -28,16 +28,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.farm.config.ClusterInfo;
-import org.apache.geronimo.farm.config.ExtendedJMXConnectorInfo;
-import org.apache.geronimo.farm.config.NodeInfo;
import org.apache.geronimo.deployment.plugin.remote.FileUploadClient;
import org.apache.geronimo.deployment.plugin.remote.FileUploadProgress;
import org.apache.geronimo.deployment.plugin.remote.FileUploadServletClient;
+import org.apache.geronimo.farm.config.ClusterInfo;
+import org.apache.geronimo.farm.config.ExtendedJMXConnectorInfo;
+import org.apache.geronimo.farm.config.NodeInfo;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.InvalidConfigException;
@@ -58,7 +57,7 @@
private final DirectoryPackager packager;
private final FileUploadClient fileUploadClient;
- public BasicClusterConfigurationStoreClient(AbstractNameQuery clusterConfigurationStoreNameQuery) {
+ public BasicClusterConfigurationStoreClient(@ParamAttribute(name=GBEAN_ATTR_CLUSTER_CONF_STORE_NAME_QUERY) AbstractNameQuery clusterConfigurationStoreNameQuery) {
if (null == clusterConfigurationStoreNameQuery) {
throw new IllegalArgumentException("clusterConfigurationStoreNameQuery is required");
}
@@ -211,25 +210,5 @@
}
}
- public static final GBeanInfo GBEAN_INFO;
-
- public static final String GBEAN_J2EE_TYPE = "ClusterConfigurationStoreClient";
public static final String GBEAN_ATTR_CLUSTER_CONF_STORE_NAME_QUERY = "clusterConfigurationStoreNameQuery";
-
- static {
- GBeanInfoBuilder builder = GBeanInfoBuilder.createStatic(BasicClusterConfigurationStoreClient.class, GBEAN_J2EE_TYPE);
-
- builder.addAttribute(GBEAN_ATTR_CLUSTER_CONF_STORE_NAME_QUERY, AbstractNameQuery.class, true);
-
- builder.addInterface(ClusterConfigurationStoreClient.class);
-
- builder.setConstructor(new String[]{GBEAN_ATTR_CLUSTER_CONF_STORE_NAME_QUERY});
-
- GBEAN_INFO = builder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java?rev=650429&r1=650428&r2=650429&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java Tue Apr 22 02:45:20 2008
@@ -36,8 +36,11 @@
import org.apache.geronimo.farm.config.NodeInfo;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -55,6 +58,7 @@
*
* @version $Rev:$ $Date:$
*/
+@GBean(j2eeType=MasterConfigurationStore.GBEAN_J2EE_TYPE)
public class MasterConfigurationStore implements ConfigurationStore {
private static final Log log = LogFactory.getLog(MasterConfigurationStore.class);
@@ -65,13 +69,14 @@
private final ClusterConfigurationStoreClient storeDelegate;
private final SlaveConfigurationNameBuilder slaveConfigNameBuilder;
- public MasterConfigurationStore(Kernel kernel,
- String objectName,
- AbstractName abstractName,
- WritableListableRepository repository,
- Environment defaultEnvironment,
- ClusterInfo clusterInfo,
- ClusterConfigurationStoreClient storeDelegate) {
+
+ public MasterConfigurationStore(@ParamSpecial(type=SpecialAttributeType.kernel) Kernel kernel,
+ @ParamSpecial(type=SpecialAttributeType.objectName) String objectName,
+ @ParamSpecial(type=SpecialAttributeType.abstractName) AbstractName abstractName,
+ @ParamReference(name=GBEAN_REF_REPOSITORY, namingType="Repository") WritableListableRepository repository,
+ @ParamAttribute(name=GBEAN_ATTR_DEFAULT_ENV) Environment defaultEnvironment,
+ @ParamReference(name=GBEAN_REF_CLUSTER_INFO) ClusterInfo clusterInfo,
+ @ParamReference(name=GBEAN_REF_CLUSTER_CONF_STORE_CLIENT) ClusterConfigurationStoreClient storeDelegate) {
if (null == kernel) {
throw new IllegalArgumentException("kernel is required");
} else if (null == objectName) {
@@ -267,7 +272,7 @@
protected GBeanData buildControllerGBean(Artifact configId, NodeInfo nodeInfo, Artifact slaveConfigId) {
AbstractName controllerName = buildControllerName(configId, nodeInfo);
- GBeanData gbean = new GBeanData(controllerName, BasicClusterConfigurationController.GBEAN_INFO);
+ GBeanData gbean = new GBeanData(controllerName, BasicClusterConfigurationController.class);
gbean.setAttribute(BasicClusterConfigurationController.GBEAN_ATTR_ARTIFACT, slaveConfigId);
gbean.setAttribute(BasicClusterConfigurationController.GBEAN_ATTR_IGNORE_START_CONF_FAIL_UPON_START,
Boolean.TRUE);
@@ -282,8 +287,6 @@
return new AbstractName(configId, Collections.singletonMap("nodeName", nodeInfo.getName()));
}
- public static final GBeanInfo GBEAN_INFO;
-
public static final String GBEAN_J2EE_TYPE = "ConfigurationStore";
public static final String GBEAN_ATTR_KERNEL = "kernel";
public static final String GBEAN_ATTR_OBJECT_NAME = "objectName";
@@ -291,34 +294,4 @@
public static final String GBEAN_REF_REPOSITORY = "Repository";
public static final String GBEAN_REF_CLUSTER_INFO = "ClusterInfo";
public static final String GBEAN_REF_CLUSTER_CONF_STORE_CLIENT = "ClusterConfigurationStoreClient";
-
- static {
- GBeanInfoBuilder builder = GBeanInfoBuilder.createStatic(MasterConfigurationStore.class, GBEAN_J2EE_TYPE);
-
- builder.addAttribute(GBEAN_ATTR_KERNEL, Kernel.class, false);
- builder.addAttribute(GBEAN_ATTR_OBJECT_NAME, String.class, false);
- builder.addAttribute("abstractName", AbstractName.class, false);
- builder.addAttribute(GBEAN_ATTR_DEFAULT_ENV, Environment.class, true, true);
-
- builder.addReference(GBEAN_REF_REPOSITORY, WritableListableRepository.class, "Repository");
- builder.addReference(GBEAN_REF_CLUSTER_INFO, ClusterInfo.class);
- builder.addReference(GBEAN_REF_CLUSTER_CONF_STORE_CLIENT, ClusterConfigurationStoreClient.class);
-
- builder.addInterface(ConfigurationStore.class);
-
- builder.setConstructor(new String[]{GBEAN_ATTR_KERNEL,
- GBEAN_ATTR_OBJECT_NAME,
- "abstractName",
- GBEAN_REF_REPOSITORY,
- GBEAN_ATTR_DEFAULT_ENV,
- GBEAN_REF_CLUSTER_INFO,
- GBEAN_REF_CLUSTER_CONF_STORE_CLIENT});
-
- GBEAN_INFO = builder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java?rev=650429&r1=650428&r2=650429&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java Tue Apr 22 02:45:20 2008
@@ -392,7 +392,7 @@
}
assertEquals(1, gbeans.size());
GBeanData gbean = gbeans.get(0);
- assertEquals(BasicClusterConfigurationController.GBEAN_INFO, gbean.getGBeanInfo());
+ assertEquals(BasicClusterConfigurationController.class.getName(), gbean.getGBeanInfo().getClassName());
assertEquals(slaveId, gbean.getAttribute(BasicClusterConfigurationController.GBEAN_ATTR_ARTIFACT));
assertEquals(nodeName, gbean.getAttribute(BasicClusterConfigurationController.GBEAN_ATTR_NODE_NAME));
return true;