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

[djencks]

djencks     2005/03/18 11:45:14

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

  Make the nameserver start before the corba server, clean up the plan a slight 
bit
  
  Revision  Changes    Path
  1.9       +12 -8     
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CORBABean.java    18 Mar 2005 08:26:09 -0000      1.8
  +++ CORBABean.java    18 Mar 2005 16:45:13 -0000      1.9
  @@ -85,10 +85,11 @@
           this.configAdapter = null;
       }
   
  -    public CORBABean(ClassLoader classLoader, Executor threadPool, String 
configAdapter) throws ClassNotFoundException, IllegalAccessException, 
InstantiationException {
  +    public CORBABean(String configAdapter, ClassLoader classLoader, Executor 
threadPool, OpenORBNameBean namingService) throws ClassNotFoundException, 
IllegalAccessException, InstantiationException {
           this.classLoader = classLoader;
           this.threadPool = threadPool;
           this.configAdapter = (ConfigAdapter) 
classLoader.loadClass(configAdapter).newInstance();
  +        //naming service included to force start order.
       }
   
       public TSSConfig getTssConfig() {
  @@ -165,16 +166,19 @@
       static {
           GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CORBABean.class, 
NameFactory.CORBA_SERVICE);
   
  -        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
  -        infoFactory.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
           infoFactory.addAttribute("configAdapter", String.class, true);
           infoFactory.addAttribute("tssConfig", TSSConfig.class, true);
  -        infoFactory.addAttribute("ORB", ORB.class, false);
  -        infoFactory.addAttribute("rootPOA", POA.class, false);
           infoFactory.addAttribute("args", ArrayList.class, true);
           infoFactory.addAttribute("props", Properties.class, true);
   
  -        infoFactory.setConstructor(new String[]{"classLoader", "ThreadPool", 
"configAdapter"});
  +        infoFactory.addAttribute("ORB", ORB.class, false);
  +        infoFactory.addAttribute("rootPOA", POA.class, false);
  +
  +        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
  +        infoFactory.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoFactory.addReference("NamingService", OpenORBNameBean.class, 
NameFactory.CORBA_SERVICE);
  +
  +        infoFactory.setConstructor(new String[]{"configAdapter", 
"classLoader", "ThreadPool", "NamingService"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
       }