[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbContainerFactory.java

[jBoss CVS Development]

  User: fleury  
  Date: 00/05/27 16:01:35

  Modified:    src/main/org/jboss/ejb ContainerFactory.java
  Log:
  working with the defaults provided in the file managers...
  
  Revision  Changes    Path
  1.8       +25 -2     jboss/src/main/org/jboss/ejb/ContainerFactory.java
  
  Index: ContainerFactory.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContainerFactory.java     2000/05/27 20:01:09     1.7
  +++ ContainerFactory.java     2000/05/27 23:01:35     1.8
  @@ -61,7 +61,7 @@
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.7 $
  + *   @version $Revision: 1.8 $
    */
   public class ContainerFactory
      implements ContainerFactoryMBean, MBeanRegistration
  @@ -159,9 +159,17 @@
                     
                     con.setClassLoader(new BeanClassLoader(cl));
                     con.setMetaData(bean);
  -                               
  +                                
                     ContainerConfiguration conf = 
jar.getContainerConfigurations().getContainerConfiguration(bean.getConfigurationName());
                    
  +                               // Make sure we have a default configuration
  +                               if (conf == null) {
  +                                       
  +                                      log.log("Using default configuration");
  +                                      
  +                                      conf =  
jar.getContainerConfigurations().getContainerConfiguration("Default Stateless 
SessionBean");
  +                               }
  +                               
                     
con.setContainerInvoker((ContainerInvoker)cl.loadClass(conf.getContainerInvoker()).newInstance());
                     
con.setInstancePool((InstancePool)cl.loadClass(conf.getInstancePool()).newInstance());
                     
  @@ -190,6 +198,21 @@
                     
                     ContainerConfiguration conf = 
jar.getContainerConfigurations().getContainerConfiguration(bean.getConfigurationName());
                     
  +                               // Make sure we have a default configuration
  +                               if (conf == null) {
  +                                       
  +                                      log.log("Using default configuration");
  +                                      if (((jBossEntity) 
bean).getPersistenceType().equalsIgnoreCase("bean")) {
  +                                              
  +                                              // BMP case
  +                                              conf =  
jar.getContainerConfigurations().getContainerConfiguration("BMP EntityBean");
  +                                  }
  +                                      else { 
  +                                      
  +                                          // CMP case
  +                                              conf =  
jar.getContainerConfigurations().getContainerConfiguration("CMP EntityBean");
  +                                  }
  +                               }
                     
con.setContainerInvoker((ContainerInvoker)cl.loadClass(conf.getContainerInvoker()).newInstance());
                     
((EntityContainer)con).setInstanceCache((InstanceCache)cl.loadClass(conf.getInstanceCache()).newInstance());
                     
con.setInstancePool((InstancePool)cl.loadClass(conf.getInstancePool()).newInstance());