dain 2005/03/01 18:34:38
Modified: modules/openejb-builder/src/java/org/openejb/deployment
AbstractContainerBuilder.java ContainerBuilder.java
MDBContainerBuilder.java MdbBuilder.java
SessionBuilder.java StatefulContainerBuilder.java
StatelessContainerBuilder.java
Log:
Changed to use new TransactionManagerContext methods managing bean
transactions
Fixed improper handling of bean transactions in StatefulInstanceInterceptor
Removed excessive handling of bean transactions in the SFSB and SLSB vops
Revision Changes Path
1.7 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java
Index: AbstractContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.6
+++ AbstractContainerBuilder.java 1 Mar 2005 23:34:37 -0000 1.7
@@ -57,8 +57,8 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.ClassLoading;
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
-import org.apache.geronimo.transaction.UserTransactionImpl;
import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.transaction.context.UserTransactionImpl;
import org.openejb.EJBContainer;
import org.openejb.GenericEJBContainer;
import org.openejb.InstanceContextFactory;
1.5 +3 -3
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerBuilder.java
Index: ContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContainerBuilder.java 26 Jan 2005 23:28:01 -0000 1.4
+++ ContainerBuilder.java 1 Mar 2005 23:34:37 -0000 1.5
@@ -50,8 +50,8 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder;
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
-import org.apache.geronimo.transaction.UserTransactionImpl;
import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.transaction.context.UserTransactionImpl;
import org.openejb.EJBContainer;
import org.openejb.transaction.TransactionPolicySource;
1.5 +4 -5
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MDBContainerBuilder.java
Index: MDBContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MDBContainerBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MDBContainerBuilder.java 2 Feb 2005 02:41:45 -0000 1.4
+++ MDBContainerBuilder.java 1 Mar 2005 23:34:37 -0000 1.5
@@ -59,7 +59,7 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder;
-import org.apache.geronimo.transaction.UserTransactionImpl;
+import org.apache.geronimo.transaction.context.UserTransactionImpl;
import org.openejb.cache.InstancePool;
import org.openejb.dispatch.EJBTimeoutOperation;
import org.openejb.dispatch.InterfaceMethodSignature;
@@ -337,11 +337,10 @@
protected LinkedHashMap buildVopMap(Class beanClass) throws Exception {
LinkedHashMap vopMap = new LinkedHashMap();
- boolean isBMT = (getUserTransaction() != null);
// ejbCreate... this is the method called by the pool to create a
new instance
- vopMap.put(new InterfaceMethodSignature("ejbCreate", false), new
EJBCreateMethod(beanClass, isBMT));
+ vopMap.put(new InterfaceMethodSignature("ejbCreate", false), new
EJBCreateMethod(beanClass));
// ejbRemove... this is the method called by the pool to destroy an
instance
- vopMap.put(new InterfaceMethodSignature("ejbRemove", false), new
RemoveMethod(beanClass, isBMT));
+ vopMap.put(new InterfaceMethodSignature("ejbRemove", false), new
RemoveMethod(beanClass));
// ejbTimeout
if (TimedObject.class.isAssignableFrom(beanClass)) {
vopMap.put(new InterfaceMethodSignature("ejbTimeout", new
String[]{Timer.class.getName()}, false),
1.16 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
Index: MdbBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MdbBuilder.java 25 Feb 2005 03:44:04 -0000 1.15
+++ MdbBuilder.java 1 Mar 2005 23:34:37 -0000 1.16
@@ -65,7 +65,7 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
import org.apache.geronimo.security.deploy.Security;
-import org.apache.geronimo.transaction.UserTransactionImpl;
+import org.apache.geronimo.transaction.context.UserTransactionImpl;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
1.16 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java
Index: SessionBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SessionBuilder.java 25 Feb 2005 03:44:04 -0000 1.15
+++ SessionBuilder.java 1 Mar 2005 23:34:37 -0000 1.16
@@ -63,7 +63,7 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
import org.apache.geronimo.security.deploy.Security;
-import org.apache.geronimo.transaction.UserTransactionImpl;
+import org.apache.geronimo.transaction.context.UserTransactionImpl;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
1.4 +5 -6
openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatefulContainerBuilder.java
Index: StatefulContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatefulContainerBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StatefulContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.3
+++ StatefulContainerBuilder.java 1 Mar 2005 23:34:37 -0000 1.4
@@ -121,7 +121,6 @@
}
// add the business methods
- boolean isBMT = (getUserTransaction() != null);
Method[] beanMethods = beanClass.getMethods();
for (int i = 0; i < beanMethods.length; i++) {
Method beanMethod = beanMethods[i];
@@ -135,20 +134,20 @@
if (name.startsWith("ejbCreate")) {
vopMap.put(
MethodHelper.translateToInterface(signature),
- new CreateMethod(beanClass, signature, isBMT));
+ new CreateMethod(beanClass, signature));
} else if (name.equals("ejbRemove")) {
// there are two valid ways to invoke remove on a stateful
session bean
// ejbObject.remove()
vopMap.put(
new InterfaceMethodSignature("remove", false),
- new RemoveMethod(beanClass, signature, isBMT));
+ new RemoveMethod(beanClass, signature));
// ejbHome.remove(handle)
Class handleClass =
getClassLoader().loadClass("javax.ejb.Handle");
vopMap.put(
new InterfaceMethodSignature("remove", new
Class[]{handleClass}, true),
- new RemoveMethod(beanClass, signature, isBMT));
+ new RemoveMethod(beanClass, signature));
} else if (name.equals("ejbActivate")) {
vopMap.put(
MethodHelper.translateToInterface(signature),
@@ -178,7 +177,7 @@
} else {
vopMap.put(
new InterfaceMethodSignature(signature, false),
- new BusinessMethod(beanClass, signature, isBMT));
+ new BusinessMethod(beanClass, signature));
}
}
1.4 +3 -4
openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatelessContainerBuilder.java
Index: StatelessContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatelessContainerBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StatelessContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.3
+++ StatelessContainerBuilder.java 1 Mar 2005 23:34:37 -0000 1.4
@@ -112,13 +112,12 @@
protected LinkedHashMap buildVopMap(Class beanClass) throws Exception {
LinkedHashMap vopMap = new LinkedHashMap();
- boolean isBMT = (getUserTransaction() != null);
// ejbCreate... this is the method called by the pool to create a
new instance
- vopMap.put(new InterfaceMethodSignature("ejbCreate", false), new
EJBCreateMethod(beanClass, isBMT));
+ vopMap.put(new InterfaceMethodSignature("ejbCreate", false), new
EJBCreateMethod(beanClass));
// create... this is the method that is called by the user
vopMap.put(new InterfaceMethodSignature("create", true), new
CreateMethod());
// ejbRemove... this is the method called by the pool to destroy an
instance
- vopMap.put(new InterfaceMethodSignature("ejbRemove", false), new
RemoveMethod(beanClass, isBMT));
+ vopMap.put(new InterfaceMethodSignature("ejbRemove", false), new
RemoveMethod(beanClass));
// ejbTimeout
if (TimedObject.class.isAssignableFrom(beanClass)) {
vopMap.put(new InterfaceMethodSignature("ejbTimeout", new
String[]{Timer.class.getName()}, false),
