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

[maguro]

maguro      2005/03/18 23:14:13

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

  Added dependency on security service.
  
  Revision  Changes    Path
  1.10      +8 -5      
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CORBABean.java    18 Mar 2005 16:45:13 -0000      1.9
  +++ CORBABean.java    19 Mar 2005 04:14:13 -0000      1.10
  @@ -58,6 +58,7 @@
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
  +import org.apache.geronimo.security.SecurityService;
   
   import org.openejb.corba.security.config.ConfigAdapter;
   import org.openejb.corba.security.config.tss.TSSConfig;
  @@ -85,11 +86,12 @@
           this.configAdapter = null;
       }
   
  -    public CORBABean(String configAdapter, ClassLoader classLoader, Executor 
threadPool, OpenORBNameBean namingService) throws ClassNotFoundException, 
IllegalAccessException, InstantiationException {
  +    public CORBABean(String configAdapter, ClassLoader classLoader, Executor 
threadPool, OpenORBNameBean namingService, SecurityService securityService) 
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
           this.classLoader = classLoader;
           this.threadPool = threadPool;
           this.configAdapter = (ConfigAdapter) 
classLoader.loadClass(configAdapter).newInstance();
           //naming service included to force start order.
  +        //security service included to force start order.
       }
   
       public TSSConfig getTssConfig() {
  @@ -134,7 +136,7 @@
               Properties properties = 
configAdapter.translateToProps(tssConfig);
               properties.putAll(props);
   
  -            orb = ORB.init(configAdapter.translateToArgs(tssConfig,  args), 
properties);
  +            orb = ORB.init(configAdapter.translateToArgs(tssConfig, args), 
properties);
   
               org.omg.CORBA.Object obj = 
orb.resolve_initial_references("RootPOA");
   
  @@ -177,8 +179,9 @@
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
           infoFactory.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
           infoFactory.addReference("NamingService", OpenORBNameBean.class, 
NameFactory.CORBA_SERVICE);
  +        infoFactory.addReference("SecurityService", SecurityService.class, 
NameFactory.GERONIMO_SERVICE);
   
  -        infoFactory.setConstructor(new String[]{"configAdapter", 
"classLoader", "ThreadPool", "NamingService"});
  +        infoFactory.setConstructor(new String[]{"configAdapter", 
"classLoader", "ThreadPool", "NamingService", "SecurityService"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
       }