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

[djencks]

djencks     2006/01/21 19:10:18

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

  GERONIMO-1523 Avoid serializing openejb class in all enc contexts
  
  Revision  Changes    Path
  1.19      +23 -15    
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CORBABean.java    4 Dec 2005 02:37:53 -0000       1.18
  +++ CORBABean.java    22 Jan 2006 00:10:17 -0000      1.19
  @@ -64,6 +64,8 @@
   import org.openejb.corba.security.config.tss.TSSConfig;
   import org.openejb.corba.util.Util;
   
  +import javax.ejb.spi.HandleDelegate;
  +
   
   /**
    * @version $Revision$ $Date$
  @@ -112,6 +114,10 @@
           return orb;
       }
   
  +    public HandleDelegate getHandleDelegate() {
  +        return new CORBAHandleDelegate();
  +    }
  +
       public POA getRootPOA() {
           return rootPOA;
       }
  @@ -177,24 +183,26 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = 
GBeanInfoBuilder.createStatic(CORBABean.class, NameFactory.CORBA_SERVICE);
  +        GBeanInfoBuilder infoBuilder = 
GBeanInfoBuilder.createStatic(CORBABean.class, NameFactory.CORBA_SERVICE);
  +
  +        infoBuilder.addAttribute("configAdapter", String.class, true);
  +        infoBuilder.addAttribute("tssConfig", TSSConfig.class, true);
  +        infoBuilder.addAttribute("args", ArrayList.class, true);
  +        infoBuilder.addAttribute("props", Properties.class, true);
   
  -        infoFactory.addAttribute("configAdapter", String.class, true);
  -        infoFactory.addAttribute("tssConfig", TSSConfig.class, true);
  -        infoFactory.addAttribute("args", ArrayList.class, true);
  -        infoFactory.addAttribute("props", Properties.class, true);
  +        infoBuilder.addAttribute("ORB", ORB.class, false);
  +        infoBuilder.addAttribute("rootPOA", POA.class, false);
   
  -        infoFactory.addAttribute("ORB", ORB.class, false);
  -        infoFactory.addAttribute("rootPOA", POA.class, false);
  +        infoBuilder.addAttribute("handleDelegate", HandleDelegate.class, 
false);
   
  -        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);
  +        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
  +        infoBuilder.addReference("ThreadPool", Executor.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoBuilder.addReference("SecurityService", SecurityService.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoBuilder.addReference("NameService", SunNameService.class, 
NameFactory.CORBA_SERVICE);
   
  -        infoFactory.setConstructor(new String[]{"configAdapter", 
"classLoader", "ThreadPool", "SecurityService", "NameService"});
  +        infoBuilder.setConstructor(new String[]{"configAdapter", 
"classLoader", "ThreadPool", "SecurityService", "NameService"});
   
  -        GBEAN_INFO = infoFactory.getBeanInfo();
  +        GBEAN_INFO = infoBuilder.getBeanInfo();
       }
   
       public static GBeanInfo getGBeanInfo() {
  
  
  
  1.4       +2 -8      
openejb/modules/core/src/java/org/openejb/corba/CORBAHandleDelegate.java
  
  Index: CORBAHandleDelegate.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/CORBAHandleDelegate.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CORBAHandleDelegate.java  8 Nov 2005 20:50:14 -0000       1.3
  +++ CORBAHandleDelegate.java  22 Jan 2006 00:10:17 -0000      1.4
  @@ -100,10 +100,4 @@
           out.writeObject(ejbObject);
       }
   
  -    public static class HandleDelegateReference extends SimpleReference {
  -
  -        public Object getContent() {
  -            return new CORBAHandleDelegate();
  -        }
  -    }
   }