[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr AbstractCMRTest.java

[djencks]

djencks     2004/12/26 21:03:25

  Modified:    
modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr
                        AbstractCMRTest.java
  Log:

  replace GBeanMBean with GBeanData in openejb
  
  Revision  Changes    Path
  1.7       +9 -8      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java
  
  Index: AbstractCMRTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractCMRTest.java      26 Dec 2004 20:30:03 -0000      1.6
  +++ AbstractCMRTest.java      27 Dec 2004 02:03:25 -0000      1.7
  @@ -61,7 +61,6 @@
   
   import junit.framework.TestCase;
   import org.apache.geronimo.deployment.util.DeploymentUtil;
  -import org.apache.geronimo.gbean.jmx.GBeanMBean;
   import org.apache.geronimo.j2ee.deployment.EARContext;
   import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
   import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
  @@ -74,6 +73,7 @@
   import org.apache.geronimo.transaction.context.ContainerTransactionContext;
   import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
   import org.apache.geronimo.xbeans.j2ee.EjbJarType;
  +import org.apache.geronimo.gbean.GBeanData;
   import org.apache.xmlbeans.XmlObject;
   import org.axiondb.jdbc.AxionDataSource;
   import org.openejb.ContainerIndex;
  @@ -191,16 +191,16 @@
   
               ClassLoader cl = Thread.currentThread().getContextClassLoader();
               builder.buildCMPSchema(earContext, j2eeContext, ejbJarType, 
openejbJarType, cl, ejbSchema, sqlSchema, cacheSchema);
  -            GBeanMBean containerIndex = new 
GBeanMBean(ContainerIndex.GBEAN_INFO);
  +            GBeanData containerIndex = new 
GBeanData(ContainerIndex.GBEAN_INFO);
               Set patterns = new HashSet();
               patterns.add(C_NAME_A);
               patterns.add(C_NAME_B);
               containerIndex.setReferencePatterns("EJBContainers", patterns);
               start(CI_NAME, containerIndex);
   
  -            GBeanMBean connectionProxyFactoryGBean = new 
GBeanMBean(MockConnectionProxyFactory.GBEAN_INFO);
               ObjectName connectionProxyFactoryObjectName = 
NameFactory.getResourceComponentName(null, null, null, "jcamodule", "testcf", 
NameFactory.JCA_CONNECTION_FACTORY, j2eeContext);
  -            kernel.loadGBean(connectionProxyFactoryObjectName, 
connectionProxyFactoryGBean);
  +            GBeanData connectionProxyFactoryGBean = new 
GBeanData(connectionProxyFactoryObjectName, 
MockConnectionProxyFactory.GBEAN_INFO);
  +            kernel.loadGBean(connectionProxyFactoryGBean, 
this.getClass().getClassLoader());
               kernel.startGBean(connectionProxyFactoryObjectName);
   
               setUpContainer(ejbSchema.getEJB("A"), getA().bean, getA().home, 
getA().local, C_NAME_A, tmDelegate);
  @@ -242,7 +242,7 @@
           builder.setComponentContext(new ReadOnlyContext());
           builder.setTransactionManagerDelegate(tmDelegate);
   
  -        GBeanMBean container = builder.createConfiguration();
  +        GBeanData container = builder.createConfiguration();
   
           container.setReferencePatterns("TransactionContextManager", 
Collections.singleton(DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME));
           container.setReferencePatterns("TrackedConnectionAssociator", 
Collections.singleton(DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME));
  @@ -257,8 +257,9 @@
           c.createStatement().execute("SHUTDOWN");
       }
   
  -    private void start(ObjectName name, GBeanMBean instance) throws 
Exception {
  -        kernel.loadGBean(name, instance);
  +    private void start(ObjectName name, GBeanData instance) throws Exception 
{
  +        instance.setName(name);
  +        kernel.loadGBean(instance, this.getClass().getClassLoader());
           kernel.startGBean(name);
       }