[openejb-scm] openejb/modules/core/src/java/org/openejb ContainerIndex.java EJBModuleImpl.java GenericEJBContainer.java

[djencks]

djencks     2005/01/24 16:16:48

  Modified:    modules/core/src/java/org/openejb ContainerIndex.java
                        EJBModuleImpl.java GenericEJBContainer.java
  Log:

  More work on GERONIMO-450.  Get the j2eeType from GBeanInfo.  Also remove 
unneeded attribute 'type' attributes
  
  Revision  Changes    Path
  1.13      +2 -2      
openejb/modules/core/src/java/org/openejb/ContainerIndex.java
  
  Index: ContainerIndex.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/ContainerIndex.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ContainerIndex.java       30 Oct 2004 05:18:25 -0000      1.12
  +++ ContainerIndex.java       24 Jan 2005 21:16:48 -0000      1.13
  @@ -210,7 +210,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(ContainerIndex.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(ContainerIndex.class); //name apparently hardcoded
   
           infoFactory.setConstructor(new String[]{"EJBContainers"});
   
  
  
  
  1.12      +3 -2      
openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java
  
  Index: EJBModuleImpl.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- EJBModuleImpl.java        30 Oct 2004 05:18:25 -0000      1.11
  +++ EJBModuleImpl.java        24 Jan 2005 21:16:48 -0000      1.12
  @@ -59,6 +59,7 @@
   import org.apache.geronimo.j2ee.management.J2EEServer;
   import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
   import org.apache.geronimo.j2ee.management.impl.Util;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.transaction.context.TransactionContextManager;
  @@ -183,7 +184,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(EJBModuleImpl.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(EJBModuleImpl.class, NameFactory.EJB_MODULE);
           infoFactory.addReference("J2EEServer", J2EEServer.class);
           infoFactory.addReference("J2EEApplication", J2EEApplication.class);
   
  
  
  
  1.31      +2 -2      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- GenericEJBContainer.java  21 Jan 2005 04:52:13 -0000      1.30
  +++ GenericEJBContainer.java  24 Jan 2005 21:16:48 -0000      1.31
  @@ -421,7 +421,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(GenericEJBContainer.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(GenericEJBContainer.class); //we don't know the j2eeType
   
           infoFactory.addAttribute("ContainerID", Object.class, true);
           infoFactory.addAttribute("EJBName", String.class, true);