User: fleury
Date: 00/05/27 13:01:10
Modified: src/main/org/jboss/ejb ContainerFactory.java
Log:
Back to the previous version... let's get the default working from the EJX file
managers
Revision Changes Path
1.7 +1 -27 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContainerFactory.java 2000/05/27 01:53:15 1.6
+++ ContainerFactory.java 2000/05/27 20:01:09 1.7
@@ -61,7 +61,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class ContainerFactory
implements ContainerFactoryMBean, MBeanRegistration
@@ -161,15 +161,6 @@
con.setMetaData(bean);
ContainerConfiguration conf =
jar.getContainerConfigurations().getContainerConfiguration(bean.getConfigurationName());
-
- // Provide a default
- if (conf == null) {
-
- // Something went wrong probably a
configuration problem
- log.log("No configuration. Using default configuration");
-
- conf =
ContainerConfigurations.getDefaultStatelessBeanContainerConfiguration();
- }
con.setContainerInvoker((ContainerInvoker)cl.loadClass(conf.getContainerInvoker()).newInstance());
con.setInstancePool((InstancePool)cl.loadClass(conf.getInstancePool()).newInstance());
@@ -198,23 +189,6 @@
con.setMetaData(bean);
ContainerConfiguration conf =
jar.getContainerConfigurations().getContainerConfiguration(bean.getConfigurationName());
-
- // Provide a default
- if (conf == null) {
-
- // Something went wrong probably a
configuration problem
- log.log("No configuration. Using default configuration");
-
- // BMP and CMP are different Default
- if (((jBossEntity)
bean).getPersistenceType().equals("Bean")) {
-
- conf =
ContainerConfigurations.getDefaultEntityBeanContainerConfiguration("BMP");
- }
- else {
-
- conf =
ContainerConfigurations.getDefaultEntityBeanContainerConfiguration("CMP");
- }
- }
con.setContainerInvoker((ContainerInvoker)cl.loadClass(conf.getContainerInvoker()).newInstance());
((EntityContainer)con).setInstanceCache((InstanceCache)cl.loadClass(conf.getInstanceCache()).newInstance());
