[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/compiler OpenORBSkeletonGenerator.java OpenORBStubGenerator.java

[maguro]

maguro      2005/03/09 17:07:17

  Modified:    modules/core/src/java/org/openejb/corba/compiler
                        OpenORBSkeletonGenerator.java
                        OpenORBStubGenerator.java
  Log:

  Stubs are now auto generated.
  
  Revision  Changes    Path
  1.9       +5 -13     
openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBSkeletonGenerator.java
  
  Index: OpenORBSkeletonGenerator.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBSkeletonGenerator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- OpenORBSkeletonGenerator.java     8 Mar 2005 04:08:27 -0000       1.8
  +++ OpenORBSkeletonGenerator.java     9 Mar 2005 22:07:17 -0000       1.9
  @@ -67,10 +67,9 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.gbean.GBeanLifecycle;
  -import org.apache.geronimo.system.main.ToolsJarHack;
   import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
  +import org.apache.geronimo.system.main.ToolsJarHack;
   
  -import org.openejb.corba.proxy.StubGenerator;
   import org.openejb.util.JarUtils;
   
   
  @@ -122,10 +121,8 @@
   
   
               TEMPDIR = DeploymentUtil.createTempDir();
  -//            File SRCDIR = new File(TEMPDIR, "JAVA");
  -//            File CLASSESDIR = new File(TEMPDIR, "classes");
  -            File SRCDIR = new File(TEMPDIR, "adc");
  -            File CLASSESDIR = new File(TEMPDIR, "adc");
  +            File SRCDIR = new File(TEMPDIR, "SKEL");
  +            File CLASSESDIR = new File(TEMPDIR, "SKEL");
               SRCDIR.mkdirs();
               CLASSESDIR.mkdirs();
   
  @@ -151,19 +148,14 @@
                   IdlObject compilationGraph = parser.getIdlTreeRoot();
                   Javatoidl toIDL = new Javatoidl(rcp, this);
   
  -                StubGenerator sg = new StubGenerator(rcp, this);
  -
                   int end = parser.getCompilationTree().size();
                   for (int i = start; i < end; i++) {
                       IdlObject object = (IdlObject) 
parser.getCompilationTree().get(i);
   
                       toIDL.translateRMITie(object);
  -                    toIDL.translateRMIStub(object);
                   }
   
                   toIDL.translateRMITie(compilationGraph);
  -                toIDL.translateRMIStub(compilationGraph);
  -                sg.translateData(compilationGraph, "");
   
                   start = end;
   
  
  
  
  1.2       +6 -8      
openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBStubGenerator.java
  
  Index: OpenORBStubGenerator.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBStubGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OpenORBStubGenerator.java 8 Mar 2005 04:41:50 -0000       1.1
  +++ OpenORBStubGenerator.java 9 Mar 2005 22:07:17 -0000       1.2
  @@ -117,14 +117,12 @@
           ClassLoader savedLoader = 
Thread.currentThread().getContextClassLoader();
           File TEMPDIR = null;
           try {
  -            Thread.currentThread().setContextClassLoader(classLoader);
  +            Thread.currentThread().setContextClassLoader(cl);
   
   
               TEMPDIR = DeploymentUtil.createTempDir();
  -//            File SRCDIR = new File(TEMPDIR, "JAVA");
  -//            File CLASSESDIR = new File(TEMPDIR, "classes");
  -            File SRCDIR = new File(TEMPDIR, "adc");
  -            File CLASSESDIR = new File(TEMPDIR, "adc");
  +            File SRCDIR = new File(TEMPDIR, "stubs");
  +            File CLASSESDIR = new File(TEMPDIR, "stubs");
               SRCDIR.mkdirs();
               CLASSESDIR.mkdirs();
   
  @@ -222,7 +220,7 @@
           ToolsJarHack.install();
   
           GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenORBStubGenerator.class);
  -        infoFactory.addInterface(SkeletonGenerator.class);
  +        infoFactory.addInterface(StubGenerator.class);
           infoFactory.addAttribute("verbose", Boolean.TYPE, true);
           infoFactory.addAttribute("props", Properties.class, true);
           infoFactory.addReference("Compiler", Compiler.class, 
NameFactory.GERONIMO_SERVICE);