djencks 2004/12/26 21:03:25
Modified: modules/openejb-builder/src/java/org/openejb/deployment
AbstractContainerBuilder.java CMPEntityBuilder.java
ContainerBuilder.java EntityBuilder.java
OpenEJBModuleBuilder.java SessionBuilder.java
Log:
replace GBeanMBean with GBeanData in openejb
Revision Changes Path
1.3 +6 -6
openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java
Index: AbstractContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractContainerBuilder.java 16 Dec 2004 05:44:58 -0000 1.2
+++ AbstractContainerBuilder.java 27 Dec 2004 02:03:25 -0000 1.3
@@ -53,12 +53,12 @@
import javax.management.ObjectName;
import javax.security.auth.Subject;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.ClassLoading;
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.transaction.UserTransactionImpl;
import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.gbean.GBeanData;
import org.openejb.EJBContainer;
import org.openejb.GenericEJBContainer;
import org.openejb.InstanceContextFactory;
@@ -332,8 +332,8 @@
return (EJBContainer) buildIt(true);
}
- public GBeanMBean createConfiguration() throws Exception {
- return (GBeanMBean) buildIt(false);
+ public GBeanData createConfiguration() throws Exception {
+ return (GBeanData) buildIt(false);
}
protected abstract Object buildIt(boolean buildContainer) throws
Exception;
@@ -407,13 +407,13 @@
Thread.currentThread().getContextClassLoader());
}
- protected GBeanMBean createConfiguration(ClassLoader cl,
InterfaceMethodSignature[] signatures,
+ protected GBeanData createConfiguration(ClassLoader cl,
InterfaceMethodSignature[] signatures,
InstanceContextFactory contextFactory,
InterceptorBuilder interceptorBuilder,
InstancePool pool,
ObjectName timerName) throws Exception {
- GBeanMBean gbean = new GBeanMBean(GenericEJBContainer.GBEAN_INFO,
cl);
+ GBeanData gbean = new GBeanData(GenericEJBContainer.GBEAN_INFO);
gbean.setAttribute("ContainerID", getContainerId());
gbean.setAttribute("EJBName", getEJBName());
gbean.setAttribute("ProxyInfo", createProxyInfo());
1.11 +11 -10
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java
Index: CMPEntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CMPEntityBuilder.java 10 Dec 2004 00:40:31 -0000 1.10
+++ CMPEntityBuilder.java 27 Dec 2004 02:03:25 -0000 1.11
@@ -62,7 +62,6 @@
import javax.management.ObjectName;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -76,6 +75,7 @@
import org.apache.geronimo.xbeans.j2ee.EntityBeanType;
import org.apache.geronimo.xbeans.j2ee.JavaTypeType;
import org.apache.geronimo.xbeans.j2ee.QueryType;
+import org.apache.geronimo.gbean.GBeanData;
import org.openejb.proxy.EJBProxyFactory;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.xbeans.ejbjar.OpenejbEjbRelationType;
@@ -127,9 +127,9 @@
OpenejbEntityBeanType openejbEntityBean =
(OpenejbEntityBeanType) openejbBeans.get(getString(entityBean.getEjbName()));
ObjectName entityObjectName =
super.createEJBObjectName(moduleJ2eeContext, entityBean);
- GBeanMBean entityGBean = createBean(earContext, ejbModule,
entityObjectName.getCanonicalName(), entityBean, openejbEntityBean, ejbSchema,
sqlSchema, globalSchema, transactionPolicyHelper, security, cl, tmDelegate);
+ GBeanData entityGBean = createBean(earContext, ejbModule,
entityObjectName, entityBean, openejbEntityBean, ejbSchema, sqlSchema,
globalSchema, transactionPolicyHelper, security, cl, tmDelegate);
- earContext.addGBean(entityObjectName, entityGBean);
+ earContext.addGBean(entityGBean);
}
}
@@ -216,17 +216,17 @@
PrimaryKeyGeneratorDelegate keyGeneratorDelegate =
(PrimaryKeyGeneratorDelegate) keyGenerators.get(generatorName);
if ( null == keyGeneratorDelegate ) {
keyGeneratorDelegate = new PrimaryKeyGeneratorDelegate();
- ObjectName wrapperGeneratorObjectName;
- GBeanMBean keyGenerator = new
GBeanMBean(PrimaryKeyGeneratorWrapper.GBEAN_INFO, cl);
+ GBeanData keyGenerator;
try {
ObjectName generatorObjectName = new
ObjectName(generatorName);
- wrapperGeneratorObjectName = new
ObjectName(generatorName + ",isWrapper=true");
+ ObjectName wrapperGeneratorObjectName = new
ObjectName(generatorName + ",isWrapper=true");
+ keyGenerator = new
GBeanData(wrapperGeneratorObjectName, PrimaryKeyGeneratorWrapper.GBEAN_INFO);
keyGenerator.setReferencePatterns("PrimaryKeyGenerator",
Collections.singleton(generatorObjectName));
keyGenerator.setAttribute("primaryKeyGeneratorDelegate", keyGeneratorDelegate);
} catch (Exception e) {
throw new DeploymentException("Unable to initialize
PrimaryKeyGeneratorWrapper GBean", e);
}
- earContext.addGBean(wrapperGeneratorObjectName,
keyGenerator);
+ earContext.addGBean(keyGenerator);
keyGenerators.put(generatorName, keyGeneratorDelegate);
}
@@ -606,11 +606,11 @@
}
- public GBeanMBean createBean(EARContext earContext, EJBModule ejbModule,
String containerId, EntityBeanType entityBean, OpenejbEntityBeanType
openejbEntityBean, EJBSchema ejbSchema, SQLSchema sqlSchema, GlobalSchema
globalSchema, TransactionPolicyHelper transactionPolicyHelper, Security
security, ClassLoader cl, TransactionManagerDelegate tmDelegate) throws
DeploymentException {
+ public GBeanData createBean(EARContext earContext, EJBModule ejbModule,
ObjectName containerObjectName, EntityBeanType entityBean,
OpenejbEntityBeanType openejbEntityBean, EJBSchema ejbSchema, SQLSchema
sqlSchema, GlobalSchema globalSchema, TransactionPolicyHelper
transactionPolicyHelper, Security security, ClassLoader cl,
TransactionManagerDelegate tmDelegate) throws DeploymentException {
String ejbName = getString(entityBean.getEjbName());
CMPContainerBuilder builder = new CMPContainerBuilder();
builder.setClassLoader(cl);
- builder.setContainerId(containerId);
+ builder.setContainerId(containerObjectName.getCanonicalName());
builder.setEJBName(ejbName);
builder.setBeanClassName(getString(entityBean.getEjbClass()));
builder.setHomeInterfaceName(getString(entityBean.getHome()));
@@ -646,7 +646,8 @@
builder.setTransactionManagerDelegate(tmDelegate);
try {
- GBeanMBean gbean = builder.createConfiguration();
+ GBeanData gbean = builder.createConfiguration();
+ gbean.setName(containerObjectName);
gbean.setReferencePattern("TransactionContextManager",
earContext.getTransactionContextManagerObjectName());
gbean.setReferencePattern("TrackedConnectionAssociator",
earContext.getConnectionTrackerObjectName());
return gbean;
1.3 +4 -4
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerBuilder.java
Index: ContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerBuilder.java 22 Dec 2004 05:42:40 -0000 1.2
+++ ContainerBuilder.java 27 Dec 2004 02:03:25 -0000 1.3
@@ -46,7 +46,7 @@
import javax.management.ObjectName;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder;
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
@@ -127,7 +127,7 @@
EJBContainer createContainer() throws Exception;
- GBeanMBean createConfiguration() throws Exception;
+ GBeanData createConfiguration() throws Exception;
ObjectName getTransactedTimerName();
1.7 +7 -6
openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java
Index: EntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EntityBuilder.java 6 Dec 2004 06:32:33 -0000 1.6
+++ EntityBuilder.java 27 Dec 2004 02:03:25 -0000 1.7
@@ -56,7 +56,6 @@
import javax.transaction.UserTransaction;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -77,6 +76,7 @@
import org.apache.geronimo.xbeans.j2ee.MessageDestinationRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
+import org.apache.geronimo.gbean.GBeanData;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
@@ -99,17 +99,17 @@
OpenejbEntityBeanType openejbEntityBean =
(OpenejbEntityBeanType)
openejbBeans.get(entityBean.getEjbName().getStringValue());
ObjectName entityObjectName =
createEJBObjectName(moduleJ2eeContext, entityBean);
- GBeanMBean entityGBean = createBean(earContext, ejbModule,
entityObjectName.getCanonicalName(), entityBean, openejbEntityBean,
transactionPolicyHelper, security, cl);
- earContext.addGBean(entityObjectName, entityGBean);
+ GBeanData entityGBean = createBean(earContext, ejbModule,
entityObjectName, entityBean, openejbEntityBean, transactionPolicyHelper,
security, cl);
+ earContext.addGBean( entityGBean);
}
}
- public GBeanMBean createBean(EARContext earContext, EJBModule ejbModule,
String containerId, EntityBeanType entityBean, OpenejbEntityBeanType
openejbEntityBean, TransactionPolicyHelper transactionPolicyHelper, Security
security, ClassLoader cl) throws DeploymentException {
+ public GBeanData createBean(EARContext earContext, EJBModule ejbModule,
ObjectName containerObjectName, EntityBeanType entityBean,
OpenejbEntityBeanType openejbEntityBean, TransactionPolicyHelper
transactionPolicyHelper, Security security, ClassLoader cl) throws
DeploymentException {
String ejbName = entityBean.getEjbName().getStringValue();
BMPContainerBuilder builder = new BMPContainerBuilder();
builder.setClassLoader(cl);
- builder.setContainerId(containerId);
+ builder.setContainerId(containerObjectName.getCanonicalName());
builder.setEJBName(ejbName);
builder.setBeanClassName(entityBean.getEjbClass().getStringValue());
builder.setHomeInterfaceName(OpenEJBModuleBuilder.getJ2eeStringValue(entityBean.getHome()));
@@ -139,7 +139,8 @@
processEnvironmentRefs(builder, earContext, ejbModule, entityBean,
openejbEntityBean, null, cl);
try {
- GBeanMBean gbean = builder.createConfiguration();
+ GBeanData gbean = builder.createConfiguration();
+ gbean.setName(containerObjectName);
gbean.setReferencePattern("TransactionContextManager",
earContext.getTransactionContextManagerObjectName());
gbean.setReferencePattern("TrackedConnectionAssociator",
earContext.getConnectionTrackerObjectName());
return gbean;
1.17 +11 -11
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
Index: OpenEJBModuleBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- OpenEJBModuleBuilder.java 26 Dec 2004 20:30:03 -0000 1.16
+++ OpenEJBModuleBuilder.java 27 Dec 2004 02:03:25 -0000 1.17
@@ -70,7 +70,7 @@
import org.apache.geronimo.deployment.xbeans.GbeanType;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
@@ -385,28 +385,28 @@
SQL92Schema sqlSchema = new SQL92Schema(module.getName(), delegate);
GlobalSchema globalSchema = new GlobalSchema(module.getName(),
flushStrategyFactory);
- GBeanMBean ejbModuleGBean = new GBeanMBean(EJBModuleImpl.GBEAN_INFO,
cl);
+ GBeanData ejbModuleGBeanData = new GBeanData(ejbModuleObjectName,
EJBModuleImpl.GBEAN_INFO);
try {
- ejbModuleGBean.setReferencePattern("J2EEServer",
earContext.getServerObjectName());
+ ejbModuleGBeanData.setReferencePattern("J2EEServer",
earContext.getServerObjectName());
if (!earContext.getJ2EEApplicationName().equals("null")) {
- ejbModuleGBean.setReferencePattern("J2EEApplication",
earContext.getApplicationObjectName());
+ ejbModuleGBeanData.setReferencePattern("J2EEApplication",
earContext.getApplicationObjectName());
}
- ejbModuleGBean.setAttribute("deploymentDescriptor",
module.getOriginalSpecDD());
+ ejbModuleGBeanData.setAttribute("deploymentDescriptor",
module.getOriginalSpecDD());
if (connectionFactoryLocator != null) {
ObjectName connectionFactoryObjectName =
getResourceContainerId(ejbModule.getModuleURI(), connectionFactoryLocator,
earContext.getRefContext(), earContext.getJ2eeContext());
//TODO this uses connection factory rather than datasource
for the type.
- ejbModuleGBean.setReferencePattern("ConnectionFactory",
connectionFactoryObjectName);
- ejbModuleGBean.setAttribute("Delegate", delegate);
+ ejbModuleGBeanData.setReferencePattern("ConnectionFactory",
connectionFactoryObjectName);
+ ejbModuleGBeanData.setAttribute("Delegate", delegate);
}
- ejbModuleGBean.setReferencePattern("TransactionContextManager",
earContext.getTransactionContextManagerObjectName());
- ejbModuleGBean.setAttribute("TMDelegate", tmDelegate);
+
ejbModuleGBeanData.setReferencePattern("TransactionContextManager",
earContext.getTransactionContextManagerObjectName());
+ ejbModuleGBeanData.setAttribute("TMDelegate", tmDelegate);
} catch (Exception e) {
throw new DeploymentException("Unable to initialize EJBModule
GBean", e);
}
- earContext.addGBean(ejbModuleObjectName, ejbModuleGBean);
+ earContext.addGBean(ejbModuleGBeanData);
// @todo need a better schema name
cmpEntityBuilder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJar, openejbEjbJar, cl, ejbSchema, sqlSchema, globalSchema);
1.9 +6 -5
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java
Index: SessionBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SessionBuilder.java 22 Dec 2004 05:42:40 -0000 1.8
+++ SessionBuilder.java 27 Dec 2004 02:03:25 -0000 1.9
@@ -56,7 +56,6 @@
import javax.transaction.UserTransaction;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -78,6 +77,7 @@
import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
import org.apache.geronimo.xbeans.j2ee.SessionBeanType;
+import org.apache.geronimo.gbean.GBeanData;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.transaction.ContainerPolicy;
import org.openejb.transaction.TransactionPolicy;
@@ -163,7 +163,7 @@
private void addEJBContainerGBean(EARContext earContext, EJBModule
ejbModule, ClassLoader cl, ObjectName sessionObjectName, SessionBeanType
sessionBean, OpenejbSessionBeanType openejbSessionBean, TransactionPolicyHelper
transactionPolicyHelper, Security security) throws DeploymentException {
String ejbName = sessionBean.getEjbName().getStringValue();
- GBeanMBean result;
+ GBeanData result;
ContainerBuilder builder = null;
Permissions toBeChecked = new Permissions();
ContainerSecurityBuilder containerSecurityBuilder =
getModuleBuilder().getSecurityBuilder();
@@ -221,15 +221,16 @@
processEnvironmentRefs(builder, earContext, ejbModule, sessionBean,
openejbSessionBean, userTransaction, cl);
try {
- GBeanMBean gbean = builder.createConfiguration();
+ GBeanData gbean = builder.createConfiguration();
+ gbean.setName(sessionObjectName);
gbean.setReferencePattern("TransactionContextManager",
earContext.getTransactionContextManagerObjectName());
gbean.setReferencePattern("TrackedConnectionAssociator",
earContext.getConnectionTrackerObjectName());
result = gbean;
} catch (Throwable e) {
throw new DeploymentException("Unable to initialize EJBContainer
GBean: ejbName" + ejbName, e);
}
- GBeanMBean sessionGBean = result;
- earContext.addGBean(sessionObjectName, sessionGBean);
+ GBeanData sessionGBean = result;
+ earContext.addGBean(sessionGBean);
}
public void initContext(EARContext earContext, J2eeContext
moduleJ2eeContext, URI moduleUri, ClassLoader cl, EnterpriseBeansType
enterpriseBeans, Set interfaces) throws DeploymentException {
