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

[djencks]

djencks     2005/02/01 14:09:40

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

  Use interface rather than implementation in references
  
  Revision  Changes    Path
  1.3       +6 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CORBABean.java    13 Jan 2005 17:00:22 -0000      1.2
  +++ CORBABean.java    1 Feb 2005 19:09:39 -0000       1.3
  @@ -58,6 +58,7 @@
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.apache.geronimo.gbean.WaitingException;
   import org.apache.geronimo.pool.ThreadPool;
  +import EDU.oswego.cs.dl.util.concurrent.Executor;
   
   
   /**
  @@ -68,7 +69,7 @@
       private final Log log = LogFactory.getLog(CORBABean.class);
   
       private final ClassLoader classLoader;
  -    private final ThreadPool threadPool;
  +    private final Executor threadPool;
       private ORB orb;
       private POA rootPOA;
       private ArrayList args = new ArrayList();
  @@ -79,7 +80,7 @@
           this.threadPool = null;
       }
   
  -    public CORBABean(ClassLoader classLoader, ThreadPool threadPool) {
  +    public CORBABean(ClassLoader classLoader, Executor threadPool) {
           this.classLoader = classLoader;
           this.threadPool = threadPool;
       }
  @@ -147,7 +148,7 @@
           GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CORBABean.class);
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
  -        infoFactory.addReference("ThreadPool", ThreadPool.class);
  +        infoFactory.addReference("ThreadPool", Executor.class);
           infoFactory.addAttribute("ORB", ORB.class, false);
           infoFactory.addAttribute("rootPOA", POA.class, false);
           infoFactory.addAttribute("args", ArrayList.class, true);
  
  
  
  1.2       +6 -5      
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OpenORBNameBean.java      13 Jan 2005 17:00:22 -0000      1.1
  +++ OpenORBNameBean.java      1 Feb 2005 19:09:40 -0000       1.2
  @@ -60,6 +60,7 @@
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.apache.geronimo.gbean.WaitingException;
   import org.apache.geronimo.pool.ThreadPool;
  +import EDU.oswego.cs.dl.util.concurrent.Executor;
   
   
   /**
  @@ -71,7 +72,7 @@
   
       private final ClassLoader classLoader;
       private final Server server;
  -    private final ThreadPool threadPool;
  +    private final Executor threadPool;
       private ArrayList args = new ArrayList();
       private Properties props = new Properties();
   
  @@ -83,7 +84,7 @@
           this.props = null;
       }
   
  -    public OpenORBNameBean(ClassLoader classLoader, ThreadPool threadPool, 
ArrayList args, Properties props) {
  +    public OpenORBNameBean(ClassLoader classLoader, Executor threadPool, 
ArrayList args, Properties props) {
           this.server = new Server();
           this.classLoader = classLoader;
           this.threadPool = threadPool;
  @@ -149,7 +150,7 @@
           GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBNameBean.class);
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
  -        infoFactory.addReference("ThreadPool", ThreadPool.class);
  +        infoFactory.addReference("ThreadPool", Executor.class);
           infoFactory.addAttribute("args", ArrayList.class, true);
           infoFactory.addAttribute("props", Properties.class, true);