[openejb-scm] openejb/modules/core/src/java/org/openejb/deployment EJBConfigBuilder.java

[dain]

dain        2004/04/07 20:03:29

  Modified:    modules/core/src/java/org/openejb/deployment
                        EJBConfigBuilder.java
  Log:

  Change containerId to be the string version container object name.
  
  Revision  Changes    Path
  1.6       +10 -5     
openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java
  
  Index: EJBConfigBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EJBConfigBuilder.java     6 Apr 2004 18:41:46 -0000       1.5
  +++ EJBConfigBuilder.java     8 Apr 2004 00:03:28 -0000       1.6
  @@ -303,7 +303,7 @@
                       "null",
                       ejbModuleName);
   
  -            GBeanMBean sessionGBean = createSessionBean(sessionObjectName, 
sessionBean, openejbSessionBean, transactionPolicyHelper, cl);
  +            GBeanMBean sessionGBean = 
createSessionBean(sessionObjectName.getCanonicalName(), sessionBean, 
openejbSessionBean, transactionPolicyHelper, cl);
               context.addGBean(sessionObjectName, sessionGBean);
           }
   
  @@ -322,7 +322,7 @@
                       "null",
                       ejbModuleName);
   
  -            GBeanMBean entityGBean = createEntityBean(entityObjectName, entityBean, 
openejbEntityBean, transactionPolicyHelper, cl);
  +            GBeanMBean entityGBean = 
createEntityBean(entityObjectName.getCanonicalName(), entityBean, openejbEntityBean, 
transactionPolicyHelper, cl);
               context.addGBean(entityObjectName, entityGBean);
           }
       }
  @@ -331,7 +331,8 @@
           String ejbName = sessionBean.getEjbName().getStringValue();
   
           ContainerBuilder builder = null;
  -        if ("Stateless".equals(sessionBean.getSessionType().getStringValue())) {
  +        boolean isStateless = 
"Stateless".equals(sessionBean.getSessionType().getStringValue());
  +        if (isStateless) {
               builder = new StatelessContainerBuilder();
           } else {
               builder = new StatefulContainerBuilder();
  @@ -349,7 +350,11 @@
           if ("Bean".equals(sessionBean.getTransactionType().getStringValue())) {
               userTransaction = new UserTransactionImpl();
               builder.setUserTransaction(userTransaction);
  -            
builder.setTransactionPolicySource(TransactionPolicyHelper.StatelessBMTPolicySource);
  +            if (isStateless) {
  +                
builder.setTransactionPolicySource(TransactionPolicyHelper.StatelessBMTPolicySource);
  +            } else {
  +                
builder.setTransactionPolicySource(TransactionPolicyHelper.StatefulBMTPolicySource);
  +            }
           } else {
               userTransaction = null;
               TransactionPolicySource transactionPolicySource = 
transactionPolicyHelper.getTransactionPolicySource(ejbName);