User: fleury
Date: 00/07/14 11:44:28
Modified: src/main/org/jboss/ejb ContainerFactory.java
Log:
The new CMP structure requires a slightly different setup
Revision Changes Path
1.25 +21 -4 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ContainerFactory.java 2000/07/06 20:36:45 1.24
+++ ContainerFactory.java 2000/07/14 18:44:27 1.25
@@ -66,7 +66,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
*
-* @version $Revision: 1.24 $
+* @version $Revision: 1.25 $
*/
public class ContainerFactory
extends org.jboss.util.ServiceMBeanSupport
@@ -426,6 +426,7 @@
// Make sure this bean knows
the configuration he is using
bean.setConfigurationName(DEFAULT_ENTITY_BMP_CONFIGURATION);
+
}
else
{
@@ -434,6 +435,7 @@
// Make sure this bean knows
the configuration he is using
bean.setConfigurationName(DEFAULT_ENTITY_CMP_CONFIGURATION);
+
}
}
@@ -445,10 +447,25 @@
// Set instance pool
container.setInstancePool((InstancePool)cl.loadClass(conf.getInstancePool()).newInstance());
-
- // Set persistence manager
-
container.setPersistenceManager((EntityPersistenceManager)cl.loadClass(conf.getPersistenceManager()).newInstance());
+ // Set persistence manager
+ if (((jBossEntity)
bean).getPersistenceType().equals("Bean")) {
+
+ //Should be BMPPersistenceManager
+
container.setPersistenceManager((EntityPersistenceManager)cl.loadClass(conf.getPersistenceManager()).newInstance());
+ }
+ else {
+
+ // CMP takes a manager and a store
+
org.jboss.ejb.plugins.CMPPersistenceManager persistenceManager = new
org.jboss.ejb.plugins.CMPPersistenceManager();
+
+ //Load the store from configuration
+
persistenceManager.setPersistenceStore((EntityPersistenceStore)cl.loadClass(conf.getPersistenceManager()).newInstance());
+
+ // Set the manager on the container
+
container.setPersistenceManager(persistenceManager);
+ }
+
// Create interceptors
container.addInterceptor(new LogInterceptor());
container.addInterceptor(new
SecurityInterceptor());
