[openejb-scm] openejb/modules/core/src/java/org/openejb/assembler ContainerBuilder.java

[dain]

dain        2004/04/09 15:04:01

  Modified:    modules/core/src/java/org/openejb/assembler
                        ContainerBuilder.java
  Log:

  Added jndi naming bindings
  Fixed many problems with ContainerIndex GBean
  Converted EJB protocol stack to GBeans
  Cleaned up code formating of several classes
  
  Revision  Changes    Path
  1.6       +8 -4      
openejb/modules/core/src/java/org/openejb/assembler/ContainerBuilder.java
  
  Index: ContainerBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/assembler/ContainerBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContainerBuilder.java     6 Apr 2004 18:41:46 -0000       1.5
  +++ ContainerBuilder.java     9 Apr 2004 19:04:00 -0000       1.6
  @@ -65,6 +65,7 @@
   import org.openejb.entity.bmp.BMPContainerBuilder;

   import org.openejb.sfsb.StatefulContainerBuilder;

   import org.openejb.slsb.StatelessContainerBuilder;

  +

   import org.apache.geronimo.transaction.UserTransactionImpl;

   

   public class ContainerBuilder implements RpcContainer {

  @@ -307,8 +308,9 @@
               builder.setUserTransaction(userTransaction);

           }

           builder.setComponentContext(new 
ReadOnlyContextWrapper(deploymentInfo.getJndiEnc(), userTransaction));

  +        builder.setJndiNames(new 
String[]{deploymentInfo.getDeploymentID().toString()});

   

  -        return (GenericEJBContainer)builder.createContainer();

  +        return (GenericEJBContainer) builder.createContainer();

       }

   

       private static GenericEJBContainer 
createStatefulEJBContainerWapper(CoreDeploymentInfo deploymentInfo) throws Exception {

  @@ -327,8 +329,9 @@
               builder.setUserTransaction(userTransaction);

           }

           builder.setComponentContext(new 
ReadOnlyContextWrapper(deploymentInfo.getJndiEnc(), userTransaction));

  +        builder.setJndiNames(new 
String[]{deploymentInfo.getDeploymentID().toString()});

   

  -        return (GenericEJBContainer)builder.createContainer();

  +        return (GenericEJBContainer) builder.createContainer();

       }

   

       private static GenericEJBContainer 
createBMPEntityEJBContainerWapper(CoreDeploymentInfo deploymentInfo) throws Exception {

  @@ -343,7 +346,8 @@
           builder.setComponentContext(new 
ReadOnlyContextWrapper(deploymentInfo.getJndiEnc(), null));

           builder.setTransactionPolicySource(new 
DeploymentInfoTxPolicySource(deploymentInfo));

           builder.setTransactionManager(OpenEJB.getTransactionManager());

  -        return (GenericEJBContainer)builder.createContainer();

  +        builder.setJndiNames(new 
String[]{deploymentInfo.getDeploymentID().toString()});

  +        return (GenericEJBContainer) builder.createContainer();

       }

   

       static class ReadOnlyContextWrapper extends ReadOnlyContext {