[openejb-scm] openejb/modules/core/src/java/org/openejb/corba CORBABean.java OpenORBNameBean.java TSSBean.java

[djencks]

djencks     2005/03/05 21:49:24

  Modified:    modules/core/src/java/org/openejb/corba CORBABean.java
                        OpenORBNameBean.java TSSBean.java
  Log:

  GERONIMO-450.  Change name to gbeanName, namePart to name, and break up 
reference patterns into pieces
  
  Revision  Changes    Path
  1.5       +4 -3      
openejb/modules/core/src/java/org/openejb/corba/CORBABean.java
  
  Index: CORBABean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/CORBABean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CORBABean.java    3 Feb 2005 03:09:52 -0000       1.4
  +++ CORBABean.java    6 Mar 2005 02:49:24 -0000       1.5
  @@ -57,6 +57,7 @@
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.apache.geronimo.pool.ThreadPool;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import EDU.oswego.cs.dl.util.concurrent.Executor;
   
   
  @@ -147,7 +148,7 @@
           GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CORBABean.class);
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
  -        infoFactory.addReference("ThreadPool", Executor.class);
  +        infoFactory.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
           infoFactory.addAttribute("ORB", ORB.class, false);
           infoFactory.addAttribute("rootPOA", POA.class, false);
           infoFactory.addAttribute("args", ArrayList.class, true);
  
  
  
  1.4       +4 -3      
openejb/modules/core/src/java/org/openejb/corba/OpenORBNameBean.java
  
  Index: OpenORBNameBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/OpenORBNameBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OpenORBNameBean.java      3 Feb 2005 03:09:52 -0000       1.3
  +++ OpenORBNameBean.java      6 Mar 2005 02:49:24 -0000       1.4
  @@ -59,6 +59,7 @@
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.apache.geronimo.pool.ThreadPool;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import EDU.oswego.cs.dl.util.concurrent.Executor;
   
   
  @@ -149,7 +150,7 @@
           GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBNameBean.class);
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
  -        infoFactory.addReference("ThreadPool", Executor.class);
  +        infoFactory.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
           infoFactory.addAttribute("args", ArrayList.class, true);
           infoFactory.addAttribute("props", Properties.class, true);
   
  
  
  
  1.2       +13 -6     
openejb/modules/core/src/java/org/openejb/corba/TSSBean.java
  
  Index: TSSBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/TSSBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TSSBean.java      5 Mar 2005 05:41:57 -0000       1.1
  +++ TSSBean.java      6 Mar 2005 02:49:24 -0000       1.2
  @@ -68,6 +68,7 @@
   import org.apache.geronimo.gbean.ReferenceCollection;
   import org.apache.geronimo.gbean.ReferenceCollectionEvent;
   import org.apache.geronimo.gbean.ReferenceCollectionListener;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   
   import org.openejb.EJBContainer;
   import org.openejb.corba.util.TieLoader;
  @@ -196,9 +197,9 @@
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
           infoFactory.addAttribute("POAName", String.class, true);
  -        infoFactory.addReference("Server", CORBABean.class);
  -        infoFactory.addReference("Containers", EJBContainer.class);
  -        infoFactory.addReference("TieLoader", TieLoader.class);
  +        infoFactory.addReference("Server", CORBABean.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoFactory.addReference("Containers", EJBContainer.class);//many 
types
  +        infoFactory.addReference("TieLoader", TieLoader.class, 
NameFactory.GERONIMO_SERVICE);
           infoFactory.setConstructor(new String[]{"classLoader", "POAName", 
"Server", "TieLoader"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
  @@ -210,7 +211,13 @@
   
       public void memberAdded(ReferenceCollectionEvent event) {
           EJBContainer container = (EJBContainer) event.getMember();
  -
  +        ClassLoader cl1 = 
container.getProxyInfo().getHomeInterface().getClassLoader();
  +        ClassLoader cl2 = container.getClassLoader();
  +        if (cl1 != cl2) {
  +            log.info("differeing classloaders! for container: " + 
container.getContainerID() + " home interface: " + cl1 + " container: " + cl2);
  +        } else {
  +            log.info("same classloaders! container: " + 
container.getContainerID());
  +        }
           containerMap.put(container.getContainerID(), container);
   
           if (localPOA != null) {