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

[maguro]

maguro      2005/03/07 23:08:27

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

  Intermediate CORBA checkin.
  
  Revision  Changes    Path
  1.8       +19 -6     
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OpenORBSkeletonGenerator.java     6 Mar 2005 02:49:24 -0000       1.7
  +++ OpenORBSkeletonGenerator.java     8 Mar 2005 04:08:27 -0000       1.8
  @@ -58,7 +58,6 @@
   import org.apache.tools.ant.taskdefs.Jar;
   import org.openorb.compiler.CompilerHost;
   import org.openorb.compiler.object.IdlObject;
  -import org.openorb.compiler.object.IdlRoot;
   import org.openorb.compiler.orb.Configurator;
   import org.openorb.compiler.rmi.RmiCompilerProperties;
   import org.openorb.compiler.rmi.generator.Javatoidl;
  @@ -71,6 +70,7 @@
   import org.apache.geronimo.system.main.ToolsJarHack;
   import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   
  +import org.openejb.corba.proxy.StubGenerator;
   import org.openejb.util.JarUtils;
   
   
  @@ -122,13 +122,16 @@
   
   
               TEMPDIR = DeploymentUtil.createTempDir();
  -            File SRCDIR = new File(TEMPDIR, "JAVA");
  -            File CLASSESDIR = new File(TEMPDIR, "classes");
  +//            File SRCDIR = new File(TEMPDIR, "JAVA");
  +//            File CLASSESDIR = new File(TEMPDIR, "classes");
  +            File SRCDIR = new File(TEMPDIR, "adc");
  +            File CLASSESDIR = new File(TEMPDIR, "adc");
               SRCDIR.mkdirs();
               CLASSESDIR.mkdirs();
   
               RmiCompilerProperties rcp = new RmiCompilerProperties();
               rcp.setClassloader(cl);
  +            rcp.setM_portableHelper(true);
               rcp.setM_verbose(verbose);
               rcp.setM_destdir(SRCDIR);
               rcp.getM_includeList().add(new 
URL("resource:/org/openorb/idl/"));
  @@ -147,11 +150,20 @@
   
                   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++) {
  -                    toIDL.translateRMITie((IdlRoot) 
parser.getCompilationTree().get(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;
   
  @@ -172,6 +184,7 @@
               jar.setUpdate(true);
               jar.execute();
           } catch (Exception e) {
  +            e.printStackTrace();
               /**
                * Convert the msg to string so that we don't try to serialize
                * anything that is unserializable in a cause exception