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

[djencks]

djencks     2005/03/18 03:26:09

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

  Use jsr-77 like names for corba gbeans.  Also fix a stupid mistake in 
OpenORBStubClassLoader
  
  Revision  Changes    Path
  1.8       +3 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CORBABean.java    12 Mar 2005 17:04:53 -0000      1.7
  +++ CORBABean.java    18 Mar 2005 08:26:09 -0000      1.8
  @@ -163,7 +163,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CORBABean.class);
  +        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CORBABean.class, 
NameFactory.CORBA_SERVICE);
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
           infoFactory.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
  
  
  
  1.5       +3 -3      
openejb/modules/core/src/java/org/openejb/corba/CSSBean.java
  
  Index: CSSBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/CSSBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CSSBean.java      18 Mar 2005 00:20:54 -0000      1.4
  +++ CSSBean.java      18 Mar 2005 08:26:09 -0000      1.5
  @@ -261,7 +261,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CSSBean.class);
  +        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CSSBean.class, 
"CORBACSS");
   
           infoFactory.addAttribute("configAdapter", String.class, true);
           infoFactory.addAttribute("description", String.class, true);
  
  
  
  1.5       +6 -8      
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OpenORBNameBean.java      6 Mar 2005 02:49:24 -0000       1.4
  +++ OpenORBNameBean.java      18 Mar 2005 08:26:09 -0000      1.5
  @@ -47,20 +47,18 @@
   import java.util.ArrayList;
   import java.util.Properties;
   
  +import EDU.oswego.cs.dl.util.concurrent.Executor;
   import org.apache.commons.cli.Option;
   import org.apache.commons.cli.OptionBuilder;
   import org.apache.commons.cli.Options;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.openorb.ins.Server;
  -import org.openorb.ins.Service;
  -
   import org.apache.geronimo.gbean.GBeanInfo;
   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;
  +import org.openorb.ins.Server;
  +import org.openorb.ins.Service;
   
   
   /**
  @@ -147,7 +145,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBNameBean.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBNameBean.class, NameFactory.CORBA_SERVICE);
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
           infoFactory.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
  
  
  
  1.6       +5 -5      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TSSBean.java      15 Mar 2005 05:27:03 -0000      1.5
  +++ TSSBean.java      18 Mar 2005 08:26:09 -0000      1.6
  @@ -236,14 +236,14 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TSSBean.class);
  +        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TSSBean.class, 
"CORBATSS");
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
           infoFactory.addAttribute("POAName", String.class, true);
  -        infoFactory.addReference("Server", CORBABean.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoFactory.addReference("Server", CORBABean.class, 
NameFactory.CORBA_SERVICE);
           infoFactory.addAttribute("tssConfig", TSSConfig.class, true);
           infoFactory.addReference("Containers", EJBContainer.class);//many 
types
  -        infoFactory.addReference("TieLoader", TieLoader.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoFactory.addReference("TieLoader", TieLoader.class, 
NameFactory.CORBA_SERVICE);
           infoFactory.setConstructor(new String[]{"classLoader", "POAName", 
"Server", "TieLoader"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();