[openejb-scm] [2651] branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java: Slightly related to GERONIMO-1863.

[djencks]

Title: [2651] branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java: Slightly related to GERONIMO-1863.

Revision

2651

Author

djencks

Date

2006-05-09 18:32:59 -0400 (Tue, 09 May 2006)

Log Message

Slightly related to GERONIMO-1863.  Use dependencies instead of references to assure gbean start order, now that we have dependencies

Modified Paths

branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java

Diff

Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java (2650 => 2651)

--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java	2006-05-08 20:25:25 UTC (rev 2650)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java	2006-05-09 22:32:59 UTC (rev 2651)
@@ -91,7 +91,7 @@
         this.configAdapter = null;
     }
 
-    public CORBABean(String configAdapter, ClassLoader classLoader, Executor threadPool, SecurityService securityService, SunNameService nameService) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+    public CORBABean(String configAdapter, ClassLoader classLoader, Executor threadPool) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
         this.classLoader = classLoader;
         this.threadPool = threadPool;
         if (configAdapter != null) {
@@ -99,8 +99,6 @@
         } else {
             this.configAdapter = null;
         }
-        //security service included to force start order.
-        //name service included to force start order.
     }
 
     public TSSConfig getTssConfig() {
@@ -213,10 +211,8 @@
 
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
         infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
-        infoFactory.addReference("SecurityService", SecurityService.class, NameFactory.GERONIMO_SERVICE);
-        infoFactory.addReference("NameService", SunNameService.class, NameFactory.CORBA_SERVICE);
 
-        infoFactory.setConstructor(new String[]{"configAdapter", "classLoader", "ThreadPool", "SecurityService", "NameService"});
+        infoFactory.setConstructor(new String[]{"configAdapter", "classLoader", "ThreadPool"});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }