[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment KernelHelper.java MockConnectionProxyFactory.java

[djencks]

djencks     2005/01/24 16:16:49

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment
                        KernelHelper.java MockConnectionProxyFactory.java
  Log:

  More work on GERONIMO-450.  Get the j2eeType from GBeanInfo.  Also remove 
unneeded attribute 'type' attributes
  
  Revision  Changes    Path
  1.2       +3 -2      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java
  
  Index: KernelHelper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KernelHelper.java 22 Jan 2005 00:39:15 -0000      1.1
  +++ KernelHelper.java 24 Jan 2005 21:16:49 -0000      1.2
  @@ -35,6 +35,7 @@
   import org.apache.geronimo.kernel.config.NoSuchConfigException;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.kernel.registry.BasicGBeanRegistry;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   
   /**
    * @version $Rev:  $ $Date$
  @@ -113,7 +114,7 @@
           private static final byte[] NO_OBJECTS_OS;
   
           static {
  -            GBeanInfoBuilder infoBuilder = new 
GBeanInfoBuilder(MockConfigStore.class);
  +            GBeanInfoBuilder infoBuilder = new 
GBeanInfoBuilder(MockConfigStore.class, NameFactory.CONFIGURATION_STORE);
               infoBuilder.addInterface(ConfigurationStore.class);
               GBEAN_INFO = infoBuilder.getBeanInfo();
   
  
  
  
  1.2       +3 -2      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/MockConnectionProxyFactory.java
  
  Index: MockConnectionProxyFactory.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/MockConnectionProxyFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MockConnectionProxyFactory.java   10 Nov 2004 01:35:10 -0000      1.1
  +++ MockConnectionProxyFactory.java   24 Jan 2005 21:16:49 -0000      1.2
  @@ -49,6 +49,7 @@
   
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import org.axiondb.jdbc.AxionDataSource;
   import org.openejb.entity.cmp.ConnectionProxyFactory;
   
  @@ -65,7 +66,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(MockConnectionProxyFactory.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(MockConnectionProxyFactory.class, 
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
   
           infoFactory.addInterface(ConnectionProxyFactory.class);