User: stark
Date: 01/01/29 17:06:55
Modified: src/main/org/jboss/ejb ContainerFactory.java
Log:
Externalized the container interceptor setup to the container config
and the ContainerInterceptors utility class.
Revision Changes Path
1.63 +10 -94 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ContainerFactory.java 2001/01/10 01:23:59 1.62
+++ ContainerFactory.java 2001/01/30 01:06:54 1.63
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
*
-* @version $Revision: 1.62 $
+* @version $Revision: 1.63 $
*/
public class ContainerFactory
extends org.jboss.util.ServiceMBeanSupport
@@ -456,35 +456,9 @@
container.setInstancePool(ip);
// Create interceptors
+ int transType = ((MessageDrivenMetaData)bean).isContainerManagedTx()
? ContainerInterceptors.CMT : ContainerInterceptors.BMT;
+ ContainerInterceptors.addInterceptors(container, transType,
metricsEnabled, conf.getContainerInterceptorsConf());
- container.addInterceptor(new LogInterceptor());
- container.addInterceptor(new SecurityInterceptor());
-
- if (((MessageDrivenMetaData)bean).isContainerManagedTx())
- {
- // CMT
- container.addInterceptor(new TxInterceptorCMT());
-
- if (metricsEnabled)
- container.addInterceptor(new MetricsInterceptor());
-
- container.addInterceptor(new MessageDrivenInstanceInterceptor());
- }
- else
- {
- // BMT
- container.addInterceptor(new MessageDrivenInstanceInterceptor());
- // FIXME. should we have a special BMT tx interceptor
- // to place ACK there???
- container.addInterceptor(new MessageDrivenTxInterceptorBMT());
-
- if (metricsEnabled)
- container.addInterceptor(new MetricsInterceptor());
- }
-
- // Finally we add the last interceptor from the container
- container.addInterceptor(container.createContainerInterceptor());
-
// Add container to application
app.addContainer(container);
}
@@ -561,33 +535,10 @@
}
container.setInstancePool(ip);
- // Create interceptors
-
- container.addInterceptor(new LogInterceptor());
- container.addInterceptor(new SecurityInterceptor());
-
- if (((SessionMetaData)bean).isContainerManagedTx())
- {
- // CMT
- container.addInterceptor(new TxInterceptorCMT());
-
- if (metricsEnabled)
- container.addInterceptor(new MetricsInterceptor());
-
- container.addInterceptor(new
StatelessSessionInstanceInterceptor());
- }
- else
- {
- // BMT
- container.addInterceptor(new
StatelessSessionInstanceInterceptor());
- container.addInterceptor(new TxInterceptorBMT());
- if (metricsEnabled)
- container.addInterceptor(new MetricsInterceptor());
- }
-
- // Finally we add the last interceptor from the container
- container.addInterceptor(container.createContainerInterceptor());
+ // Create interceptors
+ int transType = ((SessionMetaData)bean).isContainerManagedTx() ?
ContainerInterceptors.CMT : ContainerInterceptors.BMT;
+ ContainerInterceptors.addInterceptors(container, transType,
metricsEnabled, conf.getContainerInterceptorsConf());
// Add container to application
app.addContainer(container);
@@ -679,32 +630,8 @@
container.setPersistenceManager((StatefulSessionPersistenceManager)cl.loadClass(conf.getPersistenceManager()).newInstance());
// Create interceptors
- container.addInterceptor(new LogInterceptor());
-
- if (((SessionMetaData)bean).isContainerManagedTx())
- {
- // CMT
- container.addInterceptor(new TxInterceptorCMT());
-
- if (metricsEnabled)
- container.addInterceptor(new MetricsInterceptor());
-
- container.addInterceptor(new
StatefulSessionInstanceInterceptor());
-
- }
- else
- {
- // BMT : the tx interceptor needs the context from the
instance interceptor
- container.addInterceptor(new
StatefulSessionInstanceInterceptor());
- container.addInterceptor(new TxInterceptorBMT());
-
- if (metricsEnabled)
- container.addInterceptor(new MetricsInterceptor());
- }
-
- container.addInterceptor(new SecurityInterceptor());
-
- container.addInterceptor(container.createContainerInterceptor());
+ int transType = ((SessionMetaData)bean).isContainerManagedTx() ?
ContainerInterceptors.CMT : ContainerInterceptors.BMT;
+ ContainerInterceptors.addInterceptors(container, transType,
metricsEnabled, conf.getContainerInterceptorsConf());
// Add container to application
app.addContainer(container);
@@ -828,19 +755,8 @@
}
// Create interceptors
- container.addInterceptor(new LogInterceptor());
- container.addInterceptor(new SecurityInterceptor());
-
- // entity beans are always CMT
- container.addInterceptor(new TxInterceptorCMT());
-
- if (metricsEnabled)
- container.addInterceptor(new MetricsInterceptor());
-
- container.addInterceptor(new EntityInstanceInterceptor());
- container.addInterceptor(new EntitySynchronizationInterceptor());
-
- container.addInterceptor(container.createContainerInterceptor());
+ int transType = ContainerInterceptors.CMT;
+ ContainerInterceptors.addInterceptors(container, transType,
metricsEnabled, conf.getContainerInterceptorsConf());
// Add container to application
app.addContainer(container);
