[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/util ClasspathTieLoader.java OpenORBStubClassLoader.java OpenORBUtil.java

[djencks]

djencks     2005/03/18 03:26:10

  Modified:    modules/core/src/java/org/openejb/corba/util
                        ClasspathTieLoader.java OpenORBStubClassLoader.java
                        OpenORBUtil.java
  Log:

  Use jsr-77 like names for corba gbeans.  Also fix a stupid mistake in 
OpenORBStubClassLoader
  
  Revision  Changes    Path
  1.4       +4 -3      
openejb/modules/core/src/java/org/openejb/corba/util/ClasspathTieLoader.java
  
  Index: ClasspathTieLoader.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/util/ClasspathTieLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClasspathTieLoader.java   8 Mar 2005 04:08:28 -0000       1.3
  +++ ClasspathTieLoader.java   18 Mar 2005 08:26:10 -0000      1.4
  @@ -48,6 +48,7 @@
   
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   
   import org.openejb.corba.CORBAException;
   
  @@ -88,7 +89,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(ClasspathTieLoader.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(ClasspathTieLoader.class, NameFactory.CORBA_SERVICE);
   
           infoFactory.addOperation("loadTieClass", new Class[]{Class.class, 
ClassLoader.class});
   
  
  
  
  1.5       +8 -8      
openejb/modules/core/src/java/org/openejb/corba/util/OpenORBStubClassLoader.java
  
  Index: OpenORBStubClassLoader.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/util/OpenORBStubClassLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OpenORBStubClassLoader.java       18 Mar 2005 01:35:07 -0000      1.4
  +++ OpenORBStubClassLoader.java       18 Mar 2005 08:26:10 -0000      1.5
  @@ -116,7 +116,6 @@
               } else {
                   loader = (ClassLoader) nameToLoaderMap.get(name);
               }
  -
               if (loader == null) {
                   URL url = (URL) nameToClassMap.get(name);
                   if (url == null) {
  @@ -133,14 +132,15 @@
                           
stubGenerator.generateStubs(Collections.singleton(iName), file, classLoader);
   
                           url = file.toURL();
  +                        nameToClassMap.put(name, url);
                       } catch (IOException e) {
                           throw new ClassNotFoundException("Unable to generate 
stub", e);
                       } catch (CompilerException e) {
                           throw new ClassNotFoundException("Unable to generate 
stub", e);
                       }
  -                    loader = new URLClassLoader(new URL[]{url}, classLoader);
  -                    nameToLoaderMap.put(name, loader);
                   }
  +                loader = new URLClassLoader(new URL[]{url}, classLoader);
  +                nameToLoaderMap.put(name, loader);
               } else {
                   if (log.isDebugEnabled()) log.debug("Found cached loader");
               }
  @@ -167,7 +167,7 @@
   
       public synchronized void doStop() throws Exception {
           this.state = STOPPED;
  -        
  +
           parentToNameToLoaderMap.clear();
           nameToClassMap.clear();
   
  @@ -188,9 +188,9 @@
   
       static {
   
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBStubClassLoader.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBStubClassLoader.class, NameFactory.CORBA_SERVICE);
           infoFactory.addReference("ServerInfo", ServerInfo.class, 
NameFactory.GERONIMO_SERVICE);
  -        infoFactory.addReference("StubGenerator", StubGenerator.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoFactory.addReference("StubGenerator", StubGenerator.class, 
NameFactory.CORBA_SERVICE);
           infoFactory.addAttribute("cacheDir", String.class, true);
           infoFactory.addOperation("loadClass", new Class[]{String.class});
           infoFactory.setConstructor(new String[]{"ServerInfo", 
"StubGenerator", "cacheDir"});
  
  
  
  1.4       +4 -4      
openejb/modules/core/src/java/org/openejb/corba/util/OpenORBUtil.java
  
  Index: OpenORBUtil.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/util/OpenORBUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OpenORBUtil.java  6 Mar 2005 02:49:25 -0000       1.3
  +++ OpenORBUtil.java  18 Mar 2005 08:26:10 -0000      1.4
  @@ -97,9 +97,9 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBUtil.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBUtil.class, NameFactory.CORBA_SERVICE);
   
  -        infoFactory.addReference("Server", CORBABean.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoFactory.addReference("Server", CORBABean.class, 
NameFactory.CORBA_SERVICE);
           infoFactory.setConstructor(new String[]{"Server"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();