djencks 2004/04/05 20:43:07
Modified: modules/core/src/java/org/openejb
AbstractContainerBuilder.java
AbstractEJBContainer.java
AbstractInterceptorBuilder.java
ConnectionTrackingInterceptor.java
ContainerBuilder.java
EJBContainerConfiguration.java EJBContextImpl.java
GenericEJBContainer.java InterceptorBuilder.java
Log:
Modifications for move of EJBUserTransaction to geronimo UserTransactionImpl
Revision Changes Path
1.4 +6 -6
openejb/modules/core/src/java/org/openejb/AbstractContainerBuilder.java
Index: AbstractContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/AbstractContainerBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractContainerBuilder.java 4 Apr 2004 01:49:09 -0000 1.3
+++ AbstractContainerBuilder.java 6 Apr 2004 00:43:06 -0000 1.4
@@ -52,7 +52,7 @@
import javax.security.auth.Subject;
import javax.transaction.TransactionManager;
-import
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.ClassLoading;
import org.apache.geronimo.naming.java.ReadOnlyContext;
@@ -65,7 +65,7 @@
import org.openejb.proxy.EJBProxyFactory;
import org.openejb.proxy.ProxyInfo;
import org.openejb.security.PermissionManager;
-import org.openejb.transaction.EJBUserTransaction;
+import org.apache.geronimo.transaction.UserTransactionImpl;
import org.openejb.transaction.TransactionPolicyManager;
import org.openejb.util.SoftLimitedInstancePool;
@@ -87,7 +87,7 @@
private Subject runAs;
private ReadOnlyContext componentContext;
private Set unshareableResources;
- private EJBUserTransaction userTransaction;
+ private UserTransactionImpl userTransaction;
private TransactionPolicySource transactionPolicySource;
private TransactionManager transactionManager;
private TrackedConnectionAssociator trackedConnectionAssociator;
@@ -192,11 +192,11 @@
this.unshareableResources = unshareableResources;
}
- public EJBUserTransaction getUserTransaction() {
+ public UserTransactionImpl getUserTransaction() {
return userTransaction;
}
- public void setUserTransaction(EJBUserTransaction userTransaction) {
+ public void setUserTransaction(UserTransactionImpl userTransaction) {
this.userTransaction = userTransaction;
}
1.3 +17 -17
openejb/modules/core/src/java/org/openejb/AbstractEJBContainer.java
Index: AbstractEJBContainer.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/AbstractEJBContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractEJBContainer.java 21 Mar 2004 21:26:34 -0000 1.2
+++ AbstractEJBContainer.java 6 Apr 2004 00:43:06 -0000 1.3
@@ -57,7 +57,7 @@
import javax.security.auth.Subject;
import javax.transaction.TransactionManager;
-import
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.core.service.InvocationResult;
import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBean;
@@ -73,7 +73,7 @@
import org.openejb.dispatch.MethodHelper;
import org.openejb.dispatch.MethodSignature;
import org.openejb.proxy.EJBProxyFactory;
-import org.openejb.transaction.EJBUserTransaction;
+import org.apache.geronimo.transaction.UserTransactionImpl;
/**
* @version $Revision$ $Date$
@@ -84,7 +84,7 @@
protected final TransactionDemarcation transactionDemarcation;
protected final ReadOnlyContext componentContext;
- protected final EJBUserTransaction userTransaction;
+ protected final UserTransactionImpl userTransaction;
protected final String contextId;
protected final Subject runAs;
protected final boolean setSecurityInterceptor;
@@ -101,14 +101,14 @@
protected final Class localInterface;
protected final Class primaryKeyClass;
-
+
private Long remoteId;
private Map homeMethodMap;
private Map remoteMethodMap;
private Map localHomeMethodMap;
private Map localMethodMap;
-
+
public AbstractEJBContainer(EJBContainerConfiguration config,
TransactionManager transactionManager, TrackedConnectionAssociator
trackedConnectionAssociator) throws Exception {
// copy over all the config stuff
@@ -122,8 +122,8 @@
setSecurityInterceptor = config.setSecurityInterceptor;
setPolicyContextHandlerDataEJB = config.setPolicyContextHandlerDataEJB;
setIdentity = config.setIdentity;
-
-
+
+
// load all the classes
classLoader = Thread.currentThread().getContextClassLoader();
@@ -142,21 +142,21 @@
localHomeInterface = null;
localInterface = null;
}
-
+
if (config.pkClassName != null){
primaryKeyClass = classLoader.loadClass(config.pkClassName);
} else {
primaryKeyClass = null;
}
-
+
// initialize the user transaction
if (userTransaction != null) {
userTransaction.setUp(transactionManager, trackedConnectionAssociator);
}
}
-
+
protected abstract EJBProxyFactory getProxyFactory();
-
+
public Object invoke(Method method, Object[] args, Object primKey) throws
Throwable{
EJBInterfaceType invocationType = null;
@@ -176,11 +176,11 @@
invocationType = EJBInterfaceType.LOCAL;
index = (Integer) localHomeMethodMap.get(method);
}
-
+
if(index == null) {
index = new Integer(-1);
}
-
+
EJBInvocationImpl invocation = new EJBInvocationImpl(invocationType,
primKey, index.intValue(), args);
InvocationResult result = null;
@@ -197,7 +197,7 @@
return result.getResult();
}
}
-
+
public void setGBeanContext(GBeanContext context) {
}
@@ -263,7 +263,7 @@
public Object getContainerID() {
return containerID;
}
-
+
public static final GBeanInfo GBEAN_INFO;
static {
@@ -303,7 +303,7 @@
public static GBeanInfo getGBeanInfo() {
return GBEAN_INFO;
}
-
+
protected void buildMethodMap(MethodSignature[] signatures) {
if (homeInterface != null) {
homeMethodMap = MethodHelper.getHomeMethodMap(signatures,
homeInterface);
1.3 +4 -4
openejb/modules/core/src/java/org/openejb/AbstractInterceptorBuilder.java
Index: AbstractInterceptorBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/AbstractInterceptorBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractInterceptorBuilder.java 4 Apr 2004 01:49:09 -0000 1.2
+++ AbstractInterceptorBuilder.java 6 Apr 2004 00:43:06 -0000 1.3
@@ -51,7 +51,7 @@
import javax.security.auth.Subject;
import javax.transaction.TransactionManager;
-import
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.openejb.cache.InstancePool;
@@ -62,8 +62,8 @@
import org.openejb.transaction.TransactionPolicyManager;
/**
- *
- *
+ *
+ *
* @version $Revision$ $Date$
*/
public abstract class AbstractInterceptorBuilder implements InterceptorBuilder {
1.2 +4 -9
openejb/modules/core/src/java/org/openejb/ConnectionTrackingInterceptor.java
Index: ConnectionTrackingInterceptor.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/ConnectionTrackingInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionTrackingInterceptor.java 1 Mar 2004 07:14:42 -0000 1.1
+++ ConnectionTrackingInterceptor.java 6 Apr 2004 00:43:06 -0000 1.2
@@ -53,7 +53,7 @@
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.core.service.InvocationResult;
import org.apache.geronimo.core.service.Invocation;
-import
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.transaction.TransactionContext;
import org.apache.geronimo.transaction.InstanceContext;
@@ -80,16 +80,11 @@
public InvocationResult invoke(Invocation invocation) throws Throwable {
EJBInvocation ejbInvocation = (EJBInvocation)invocation;
InstanceContext enteringInstanceContext =
ejbInvocation.getEJBInstanceContext();
- TransactionContext enteringTransactionContext =
ejbInvocation.getTransactionContext();
- Set oldUnshareableResources =
trackedConnectionAssociator.setUnshareableResources(unshareableResources);
- InstanceContext leavingInstanceContext =
trackedConnectionAssociator.enter(enteringInstanceContext);
- TransactionContext leavingTransactionContext =
trackedConnectionAssociator.setTransactionContext(enteringTransactionContext);
+ TrackedConnectionAssociator.ConnectorContextInfo leavingConnectorContext =
trackedConnectionAssociator.enter(enteringInstanceContext, unshareableResources);
try {
return next.invoke(invocation);
} finally {
- trackedConnectionAssociator.exit(leavingInstanceContext,
unshareableResources);
-
trackedConnectionAssociator.resetTransactionContext(leavingTransactionContext);
-
trackedConnectionAssociator.setUnshareableResources(oldUnshareableResources);
+ trackedConnectionAssociator.exit(leavingConnectorContext);
}
}
}
1.2 +7 -7 openejb/modules/core/src/java/org/openejb/ContainerBuilder.java
Index: ContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/ContainerBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerBuilder.java 4 Apr 2004 01:49:09 -0000 1.1
+++ ContainerBuilder.java 6 Apr 2004 00:43:06 -0000 1.2
@@ -21,15 +21,15 @@
import javax.transaction.TransactionManager;
import org.apache.geronimo.naming.java.ReadOnlyContext;
-import
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.transaction.TrackedConnectionAssociator;
-import org.openejb.transaction.EJBUserTransaction;
+import org.apache.geronimo.transaction.UserTransactionImpl;
import org.openejb.deployment.TransactionPolicySource;
/**
- *
- *
+ *
+ *
* @version $Revision$ $Date$
*/
public interface ContainerBuilder {
@@ -81,9 +81,9 @@
void setUnshareableResources(Set unshareableResources);
- EJBUserTransaction getUserTransaction();
+ UserTransactionImpl getUserTransaction();
- void setUserTransaction(EJBUserTransaction userTransaction);
+ void setUserTransaction(UserTransactionImpl userTransaction);
TransactionPolicySource getTransactionPolicySource();
1.2 +3 -3
openejb/modules/core/src/java/org/openejb/EJBContainerConfiguration.java
Index: EJBContainerConfiguration.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBContainerConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBContainerConfiguration.java 1 Mar 2004 07:14:42 -0000 1.1
+++ EJBContainerConfiguration.java 6 Apr 2004 00:43:06 -0000 1.2
@@ -53,7 +53,7 @@
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.openejb.deployment.TransactionPolicySource;
-import org.openejb.transaction.EJBUserTransaction;
+import org.apache.geronimo.transaction.UserTransactionImpl;
/**
*
@@ -71,7 +71,7 @@
public String pkClassName;
public String messageEndpointInterfaceName;
public TransactionDemarcation txnDemarcation;
- public EJBUserTransaction userTransaction;
+ public UserTransactionImpl userTransaction;
public ReadOnlyContext componentContext;
public Set unshareableResources;
public TransactionPolicySource transactionPolicySource;
1.3 +4 -4 openejb/modules/core/src/java/org/openejb/EJBContextImpl.java
Index: EJBContextImpl.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBContextImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EJBContextImpl.java 21 Mar 2004 21:26:34 -0000 1.2
+++ EJBContextImpl.java 6 Apr 2004 00:43:06 -0000 1.3
@@ -63,7 +63,7 @@
import org.apache.geronimo.transaction.ContainerTransactionContext;
import org.apache.geronimo.transaction.TransactionContext;
-import org.openejb.transaction.EJBUserTransaction;
+import org.apache.geronimo.transaction.UserTransactionImpl;
/**
* Implementation of EJBContext that uses the State pattern to determine
@@ -73,10 +73,10 @@
*/
public abstract class EJBContextImpl {
protected final EJBInstanceContext context;
- protected final EJBUserTransaction userTransaction;
+ protected final UserTransactionImpl userTransaction;
protected EJBContextState state;
- public EJBContextImpl(EJBInstanceContext context, EJBUserTransaction
userTransaction) {
+ public EJBContextImpl(EJBInstanceContext context, UserTransactionImpl
userTransaction) {
this.context = context;
this.userTransaction = userTransaction;
}
1.4 +5 -5
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
Index: GenericEJBContainer.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GenericEJBContainer.java 3 Apr 2004 22:20:10 -0000 1.3
+++ GenericEJBContainer.java 6 Apr 2004 00:43:06 -0000 1.4
@@ -59,7 +59,7 @@
import javax.ejb.Handle;
import javax.transaction.TransactionManager;
-import
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.core.service.Invocation;
import org.apache.geronimo.core.service.InvocationResult;
@@ -73,7 +73,7 @@
import org.openejb.entity.EntityInterceptorBuilder;
import org.openejb.proxy.EJBProxyFactory;
import org.openejb.proxy.ProxyInfo;
-import org.openejb.transaction.EJBUserTransaction;
+import org.apache.geronimo.transaction.UserTransactionImpl;
/**
* @version $Revision$ $Date$
@@ -94,7 +94,7 @@
InterfaceMethodSignature[] signatures,
InterceptorBuilder interceptorBuilder,
InstancePool pool,
- EJBUserTransaction userTransaction,
+ UserTransactionImpl userTransaction,
TransactionManager transactionManager,
TrackedConnectionAssociator trackedConnectionAssociator) throws
Exception {
@@ -232,7 +232,7 @@
infoFactory.setConstructor(
new String[]{"containerId", "ejbName", "proxyFactory",
"signatures", "interceptorBuilder", "pool", "userTransaction", "transactionManager",
"trackedConnectionAssociator"},
- new Class[]{Object.class, String.class, EJBProxyFactory.class,
InterfaceMethodSignature[].class, InterceptorBuilder.class, InstancePool.class,
EJBUserTransaction.class, TransactionManager.class,
TrackedConnectionAssociator.class});
+ new Class[]{Object.class, String.class, EJBProxyFactory.class,
InterfaceMethodSignature[].class, InterceptorBuilder.class, InstancePool.class,
UserTransactionImpl.class, TransactionManager.class,
TrackedConnectionAssociator.class});
infoFactory.addAttribute("containerId", true);
infoFactory.addAttribute("ejbName", true);
1.2 +4 -4
openejb/modules/core/src/java/org/openejb/InterceptorBuilder.java
Index: InterceptorBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/InterceptorBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InterceptorBuilder.java 21 Mar 2004 21:26:34 -0000 1.1
+++ InterceptorBuilder.java 6 Apr 2004 00:43:06 -0000 1.2
@@ -23,7 +23,7 @@
import javax.transaction.TransactionManager;
import org.apache.geronimo.naming.java.ReadOnlyContext;
-import
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.core.service.Interceptor;
import org.openejb.dispatch.VirtualOperation;
@@ -34,8 +34,8 @@
import org.openejb.cache.InstanceFactory;
/**
- *
- *
+ *
+ *
* @version $Revision$ $Date$
*/
public interface InterceptorBuilder extends Serializable {
