[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment EJBConfigBuilderTest.java

[maguro]

maguro      2004/11/09 23:38:32

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment
                        EJBConfigBuilderTest.java
  Log:

  Next step in CORBA skeleton generation.
  
  Revision  Changes    Path
  1.2       +12 -13    
openejb/modules/openejb-builder/src/test/org/openejb/deployment/EJBConfigBuilderTest.java
  
  Index: EJBConfigBuilderTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/EJBConfigBuilderTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EJBConfigBuilderTest.java 10 Nov 2004 01:35:10 -0000      1.1
  +++ EJBConfigBuilderTest.java 10 Nov 2004 04:38:32 -0000      1.2
  @@ -83,7 +83,6 @@
   import org.apache.geronimo.kernel.management.State;
   import org.apache.geronimo.system.serverinfo.ServerInfo;
   import org.openejb.ContainerIndex;
  -import org.openejb.corba.compiler.AntCompiler;
   import org.openejb.corba.compiler.OpenORBSkeletonGenerator;
   import org.tranql.sql.jdbc.JDBCUtil;
   
  @@ -156,15 +155,15 @@
           String j2eeApplicationName = "null";
           String j2eeModuleName = "org/openejb/deployment/test";
   
  -        OpenORBSkeletonGenerator skeletonGenerator = new 
OpenORBSkeletonGenerator();
  -        skeletonGenerator.setCompiler(new AntCompiler());
  -        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
  -
           ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
           ClassLoader cl = new URLClassLoader(new URL[]{ejbJarFile.toURL()}, 
oldCl);
   
           Thread.currentThread().setContextClassLoader(cl);
   
  +        OpenORBSkeletonGenerator skeletonGenerator = new 
OpenORBSkeletonGenerator(cl);
  +        skeletonGenerator.doStart();
  +        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
  +
           JarFile jarFile = DeploymentUtil.createJarFile(ejbJarFile);
           Module module = moduleBuilder.createModule(null, jarFile);
   
  @@ -202,10 +201,6 @@
           String j2eeApplicationName = "null";
           String j2eeModuleName = "org/openejb/deployment/test";
   
  -        OpenORBSkeletonGenerator skeletonGenerator = new 
OpenORBSkeletonGenerator();
  -        skeletonGenerator.setCompiler(new AntCompiler());
  -        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
  -
           File earFile = new File("target/test-ejb-jar.jar");
   
           ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
  @@ -213,6 +208,10 @@
   
           Thread.currentThread().setContextClassLoader(cl);
   
  +        OpenORBSkeletonGenerator skeletonGenerator = new 
OpenORBSkeletonGenerator(cl);
  +        skeletonGenerator.doStart();
  +        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
  +
           File tempDir = null;
           try {
               tempDir = DeploymentUtil.createTempDir();
  @@ -251,16 +250,16 @@
           String j2eeApplicationName = 
"org/apache/geronimo/j2ee/deployment/test";
           String j2eeModuleName = "test-ejb-jar.jar";
   
  -        OpenORBSkeletonGenerator skeletonGenerator = new 
OpenORBSkeletonGenerator();
  -        skeletonGenerator.setCompiler(new AntCompiler());
  -        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
  -
           File earFile = new File("target/test-ear.ear");
   
           ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
           ClassLoader cl = new URLClassLoader(new URL[]{earFile.toURL()}, 
oldCl);
   
           Thread.currentThread().setContextClassLoader(cl);
  +
  +        OpenORBSkeletonGenerator skeletonGenerator = new 
OpenORBSkeletonGenerator(cl);
  +        skeletonGenerator.doStart();
  +        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
   
           File tempDir = null;
           try {