[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment CMPEntityBuilderTest.java DeploymentTestSuite.java PlanParsingTest.java

[djencks]

djencks     2005/07/21 18:56:00

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment
                        CMPEntityBuilderTest.java DeploymentTestSuite.java
                        PlanParsingTest.java
  Log:

  GERONIMO-782 step 3. Use a template gbean for the ws link
  
  Revision  Changes    Path
  1.16      +4 -4      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java
  
  Index: CMPEntityBuilderTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CMPEntityBuilderTest.java 21 Jul 2005 04:32:11 -0000      1.15
  +++ CMPEntityBuilderTest.java 21 Jul 2005 22:56:00 -0000      1.16
  @@ -118,7 +118,7 @@
           EjbJarType ejbJarType = ((EjbJarDocument) 
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
           OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument) 
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
   
  -        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, repository);
  +        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, null, 
repository);
           CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
           TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
   
  @@ -164,7 +164,7 @@
           EjbJarType ejbJarType = ((EjbJarDocument) 
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
           OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument) 
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
   
  -        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, repository);
  +        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, null, 
repository);
           CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
           TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
   
  @@ -211,7 +211,7 @@
           EjbJarType ejbJarType = ((EjbJarDocument) 
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
           OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument) 
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
   
  -        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, repository);
  +        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, null, 
repository);
           CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
           TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
   
  
  
  
  1.12      +4 -2      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java
  
  Index: DeploymentTestSuite.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DeploymentTestSuite.java  21 Jul 2005 04:32:11 -0000      1.11
  +++ DeploymentTestSuite.java  21 Jul 2005 22:56:00 -0000      1.12
  @@ -76,6 +76,7 @@
   import org.apache.geronimo.system.serverinfo.ServerInfo;
   import org.apache.geronimo.axis.builder.AxisBuilder;
   import org.openejb.ContainerIndex;
  +import org.openejb.server.axis.WSContainerGBean;
   import org.tranql.sql.jdbc.JDBCUtil;
   
   /**
  @@ -154,7 +155,8 @@
           try {
               ObjectName listener = null;
               WebServiceBuilder webServiceBuilder = new AxisBuilder();
  -            OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, 
webServiceBuilder, null);
  +            GBeanData linkData = new GBeanData(WSContainerGBean.GBEAN_INFO);
  +            OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, linkData, 
webServiceBuilder, null);
   
               tempDir = DeploymentUtil.createTempDir();
               EARConfigBuilder earConfigBuilder = new 
EARConfigBuilder(KernelHelper.DEFAULT_PARENTID,
  
  
  
  1.9       +1 -2      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java
  
  Index: PlanParsingTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- PlanParsingTest.java      21 Jul 2005 04:32:11 -0000      1.8
  +++ PlanParsingTest.java      21 Jul 2005 22:56:00 -0000      1.9
  @@ -11,9 +11,8 @@
    */
   public class PlanParsingTest extends TestCase {
       private Repository repository = null;
  -    private Kernel kernel = null;
   
  -    private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null, 
null, null, repository);
  +    private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null, 
null, null, null, repository);
       File basedir = new File(System.getProperty("basedir", "."));
   
       public void testResourceRef() throws Exception {