Author: dblevins
Date: Tue Feb 23 07:30:04 2010
New Revision: 915222
URL: http://svn.apache.org/viewvc?rev=915222&view=rev
Log:
Attempting to reduce dependence on CoreDeploymentInfo, favoring DeploymentInfo
interface
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbTransactionUtil.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/DeploymentInfo.java
Tue Feb 23 07:30:04 2010
@@ -21,6 +21,7 @@
import org.apache.openejb.core.timer.MethodSchedule;
import org.apache.openejb.core.ExceptionType;
import org.apache.openejb.core.transaction.TransactionType;
+import org.apache.openejb.core.transaction.TransactionPolicyFactory;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -30,6 +31,8 @@
import java.util.Properties;
import javax.naming.Context;
import javax.ejb.ScheduleExpression;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBLocalHome;
public interface DeploymentInfo {
@@ -127,6 +130,28 @@
public ExceptionType getExceptionType(Throwable e);
+ EJBHome getEJBHome();
+
+ EJBLocalHome getEJBLocalHome();
+
+ BusinessLocalHome getBusinessLocalHome();
+
+ BusinessLocalHome getBusinessLocalHome(List<Class> interfaces);
+
+ BusinessRemoteHome getBusinessRemoteHome();
+
+ BusinessRemoteHome getBusinessRemoteHome(List<Class> interfaces);
+
+ String getDestinationId();
+
+ boolean isDestroyed();
+
+ boolean isBeanManagedConcurrency();
+
+ List<Class> getObjectInterface(Class homeInterface);
+
+ TransactionPolicyFactory getTransactionPolicyFactory();
+
public interface BusinessLocalHome extends javax.ejb.EJBLocalHome {
Object create();
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
Tue Feb 23 07:30:04 2010
@@ -32,8 +32,6 @@
import org.apache.openejb.util.Strings;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.loader.Options;
-import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.JndiFactory;
import org.apache.openejb.core.ivm.naming.BusinessLocalReference;
import org.apache.openejb.core.ivm.naming.BusinessRemoteReference;
import org.apache.openejb.core.ivm.naming.ObjectReference;
@@ -45,10 +43,7 @@
import java.util.Map;
import java.util.HashMap;
import java.util.Comparator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
/**
@@ -270,8 +265,7 @@
}
}
- public void bind(EjbJarInfo ejbJarInfo, DeploymentInfo deploymentInfo,
EnterpriseBeanInfo beanInfo, JndiNameStrategy strategy) {
- CoreDeploymentInfo deployment = (CoreDeploymentInfo) deploymentInfo;
+ public void bind(EjbJarInfo ejbJarInfo, DeploymentInfo deployment,
EnterpriseBeanInfo beanInfo, JndiNameStrategy strategy) {
Bindings bindings = new Bindings();
deployment.set(Bindings.class, bindings);
@@ -304,7 +298,7 @@
ObjectReference ref = new
ObjectReference(deployment.getEJBLocalHome());
- String name =
strategy.getName(deploymentInfo.getLocalHomeInterface(),
JndiNameStrategy.Interface.LOCAL_HOME);
+ String name =
strategy.getName(deployment.getLocalHomeInterface(),
JndiNameStrategy.Interface.LOCAL_HOME);
bind("openejb/local/" + name, ref, bindings, beanInfo,
localHomeInterface);
name = "openejb/Deployment/" +
format(deployment.getDeploymentID(), deployment.getLocalInterface().getName());
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
Tue Feb 23 07:30:04 2010
@@ -116,7 +116,7 @@
public Object lookup(String name) {
ThreadContext threadContext = ThreadContext.getThreadContext();
- CoreDeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
Context jndiEnc = deploymentInfo.getJndiEnc();
try {
jndiEnc = (Context) jndiEnc.lookup("java:comp/env");
@@ -223,14 +223,14 @@
public EJBHome getEJBHome() {
ThreadContext threadContext = ThreadContext.getThreadContext();
- CoreDeploymentInfo di = threadContext.getDeploymentInfo();
+ DeploymentInfo di = threadContext.getDeploymentInfo();
return di.getEJBHome();
}
public EJBLocalHome getEJBLocalHome() {
ThreadContext threadContext = ThreadContext.getThreadContext();
- CoreDeploymentInfo di = threadContext.getDeploymentInfo();
+ DeploymentInfo di = threadContext.getDeploymentInfo();
return di.getEJBLocalHome();
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
Tue Feb 23 07:30:04 2010
@@ -209,6 +209,10 @@
}
}
+ public Object getEjbInstance(DeploymentInfo deployInfo, Object primaryKey)
{
+ return getEjbInstance((CoreDeploymentInfo)deployInfo, primaryKey);
+ }
+
public Object getEjbInstance(CoreDeploymentInfo deployInfo, Object
primaryKey) {
ThreadContext callContext = new ThreadContext(deployInfo, primaryKey);
@@ -289,7 +293,7 @@
}
private EntityBean createNewInstance(ThreadContext callContext) {
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ CoreDeploymentInfo deploymentInfo = (CoreDeploymentInfo)
callContext.getDeploymentInfo();
try {
EntityBean bean = (EntityBean)
deploymentInfo.getCmpImplClass().newInstance();
return bean;
@@ -476,7 +480,7 @@
}
private Object businessMethod(Method callMethod, Method runMethod,
Object[] args, ThreadContext callContext) throws OpenEJBException {
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
TransactionPolicy txPolicy =
createTransactionPolicy(deploymentInfo.getTransactionType(callMethod),
callContext);
@@ -518,7 +522,7 @@
}
private Object homeMethod(Method callMethod, Object[] args, ThreadContext
callContext) throws OpenEJBException {
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
TransactionPolicy txPolicy =
createTransactionPolicy(deploymentInfo.getTransactionType(callMethod),
callContext);
@@ -537,7 +541,7 @@
callContext.setCurrentOperation(Operation.HOME);
callContext.setCurrentAllowedStates(EntityContext.getStates());
- Method runMethod =
deploymentInfo.getMatchingBeanMethod(callMethod);
+ Method runMethod =
((CoreDeploymentInfo)deploymentInfo).getMatchingBeanMethod(callMethod);
try {
returnValue = runMethod.invoke(bean, args);
@@ -574,7 +578,7 @@
}
private ProxyInfo createEJBObject(Method callMethod, Object[] args,
ThreadContext callContext) throws OpenEJBException {
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ CoreDeploymentInfo deploymentInfo = (CoreDeploymentInfo)
callContext.getDeploymentInfo();
TransactionPolicy txPolicy =
createTransactionPolicy(deploymentInfo.getTransactionType(callMethod),
callContext);
@@ -647,7 +651,7 @@
}
private Object findByPrimaryKey(Method callMethod, Object[] args,
ThreadContext callContext) throws OpenEJBException {
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
TransactionPolicy txPolicy =
createTransactionPolicy(deploymentInfo.getTransactionType(callMethod),
callContext);
@@ -658,7 +662,7 @@
}
// rebuild the primary key
- KeyGenerator kg = deploymentInfo.getKeyGenerator();
+ KeyGenerator kg =
((CoreDeploymentInfo)deploymentInfo).getKeyGenerator();
Object primaryKey = kg.getPrimaryKey(bean);
// create a new ProxyInfo based on the deployment info and primary
key
@@ -674,14 +678,14 @@
}
private Object findEJBObject(Method callMethod, Object[] args,
ThreadContext callContext) throws OpenEJBException {
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
TransactionPolicy txPolicy =
createTransactionPolicy(deploymentInfo.getTransactionType(callMethod),
callContext);
try {
List<Object> results = cmpEngine.queryBeans(callContext,
callMethod, args);
- KeyGenerator kg = deploymentInfo.getKeyGenerator();
+ KeyGenerator kg =
((CoreDeploymentInfo)deploymentInfo).getKeyGenerator();
// The following block of code is responsible for returning
ProxyInfo object(s) for each
// matching entity bean found by the query. If its a multi-value
find operation a Vector
@@ -810,7 +814,7 @@
}
private void removeEJBObject(Method callMethod, ThreadContext callContext)
throws OpenEJBException {
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
TransactionPolicy txPolicy =
createTransactionPolicy(deploymentInfo.getTransactionType(callMethod),
callContext);
@@ -831,7 +835,7 @@
}
private void cancelTimers(ThreadContext threadContext) {
- CoreDeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
Object primaryKey = threadContext.getPrimaryKey();
// stop timers
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
Tue Feb 23 07:30:04 2010
@@ -126,7 +126,7 @@
TransactionPolicy txPolicy = startTransaction("persist", callContext);
creating.get().add(bean);
try {
- CoreDeploymentInfo deploymentInfo =
callContext.getDeploymentInfo();
+ CoreDeploymentInfo deploymentInfo = (CoreDeploymentInfo)
callContext.getDeploymentInfo();
EntityManager entityManager = getEntityManager(deploymentInfo);
entityManager.persist(bean);
@@ -147,7 +147,7 @@
public Object loadBean(ThreadContext callContext, Object primaryKey) {
TransactionPolicy txPolicy = startTransaction("load", callContext);
try {
- CoreDeploymentInfo deploymentInfo =
callContext.getDeploymentInfo();
+ CoreDeploymentInfo deploymentInfo = (CoreDeploymentInfo)
callContext.getDeploymentInfo();
Class<?> beanClass = deploymentInfo.getCmpImplClass();
// Try to load it from the entity manager
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
Tue Feb 23 07:30:04 2010
@@ -79,7 +79,7 @@
public boolean inProxyMap = false;
- private transient WeakReference<CoreDeploymentInfo> deploymentInfo;
+ private transient WeakReference<DeploymentInfo> deploymentInfo;
public transient RpcContainer container;
@@ -112,7 +112,7 @@
this.deploymentID = deploymentInfo.getDeploymentID();
this.interfaceType = interfaceType;
this.primaryKey = pk;
- this.setDeploymentInfo((CoreDeploymentInfo) deploymentInfo);
+ this.setDeploymentInfo(deploymentInfo);
if (interfaces == null || interfaces.size() == 0) {
InterfaceType objectInterfaceType = (interfaceType.isHome()) ?
interfaceType.getCounterpart() : interfaceType;
@@ -543,8 +543,8 @@
public abstract org.apache.openejb.ProxyInfo getProxyInfo();
- public CoreDeploymentInfo getDeploymentInfo() {
- CoreDeploymentInfo info = deploymentInfo.get();
+ public DeploymentInfo getDeploymentInfo() {
+ DeploymentInfo info = deploymentInfo.get();
if (info == null|| info.isDestroyed()){
invalidateReference();
throw new IllegalStateException("Bean '"+deploymentID+"' has been
undeployed.");
@@ -552,12 +552,12 @@
return info;
}
- public void setDeploymentInfo(CoreDeploymentInfo deploymentInfo) {
- this.deploymentInfo = new
WeakReference<CoreDeploymentInfo>(deploymentInfo);
+ public void setDeploymentInfo(DeploymentInfo deploymentInfo) {
+ this.deploymentInfo = new
WeakReference<DeploymentInfo>(deploymentInfo);
}
public Hashtable getLiveHandleRegistry() {
- CoreDeploymentInfo deploymentInfo = getDeploymentInfo();
+ DeploymentInfo deploymentInfo = getDeploymentInfo();
ProxyRegistry proxyRegistry = deploymentInfo.get(ProxyRegistry.class);
if (proxyRegistry == null){
proxyRegistry = new ProxyRegistry();
@@ -578,7 +578,7 @@
in.defaultReadObject();
ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
- setDeploymentInfo((CoreDeploymentInfo)
containerSystem.getDeploymentInfo(deploymentID));
+ setDeploymentInfo(containerSystem.getDeploymentInfo(deploymentID));
container = (RpcContainer) getDeploymentInfo().getContainer();
if (IntraVmCopyMonitor.isCrossClassLoaderOperation()) {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
Tue Feb 23 07:30:04 2010
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.core.ivm.naming;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.DeploymentInfo;
/*
This class is used as a replacement when a IvmContext referenced by a
stateful bean
is being serialized for passivation along with the bean. It ensures that
the entire
@@ -42,7 +42,7 @@
public Object readResolve() throws java.io.ObjectStreamException {
ThreadContext thrdCntx = ThreadContext.getThreadContext();
- CoreDeploymentInfo deployment = thrdCntx.getDeploymentInfo();
+ DeploymentInfo deployment = thrdCntx.getDeploymentInfo();
javax.naming.Context cntx = deployment.getJndiEnc();
try {
Object obj = cntx.lookup(path);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
Tue Feb 23 07:30:04 2010
@@ -23,10 +23,10 @@
import javax.naming.NamingException;
import javax.naming.spi.ObjectFactory;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.DeploymentInfo;
public class javaURLContextFactory implements ObjectFactory {
@@ -41,7 +41,7 @@
return containerSystem.getJNDIContext();
}
- CoreDeploymentInfo di = callContext.getDeploymentInfo();
+ DeploymentInfo di = callContext.getDeploymentInfo();
if (di != null) {
return di.getJndiEnc();
} else {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java
Tue Feb 23 07:30:04 2010
@@ -28,6 +28,7 @@
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.BeanType;
+import org.apache.openejb.DeploymentInfo;
public class ManagedUserTransaction implements UserTransaction {
private final UserTransaction userTransaction;
@@ -49,7 +50,7 @@
}
// get the deployment info
- CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
if (deploymentInfo.getComponentType() != BeanType.MANAGED) {
// some other non-stateful ejb is using our user transaction
return;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
Tue Feb 23 07:30:04 2010
@@ -25,6 +25,7 @@
import org.apache.openejb.core.security.jacc.BasicJaccProvider;
import org.apache.openejb.core.security.jacc.BasicPolicyConfiguration;
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.loader.SystemInstance;
import javax.security.auth.Subject;
@@ -139,7 +140,7 @@
SecurityContext securityContext = (oldContext != null) ?
oldContext.get(SecurityContext.class) : null;
- CoreDeploymentInfo callingDeploymentInfo = (oldContext != null)?
oldContext.getDeploymentInfo(): null;
+ DeploymentInfo callingDeploymentInfo = (oldContext != null)?
oldContext.getDeploymentInfo(): null;
Subject runAsSubject = getRunAsSubject(callingDeploymentInfo);
if (runAsSubject != null) {
@@ -158,7 +159,7 @@
newContext.set(SecurityContext.class, securityContext);
}
- protected Subject getRunAsSubject(CoreDeploymentInfo
callingDeploymentInfo) {
+ protected Subject getRunAsSubject(DeploymentInfo callingDeploymentInfo) {
if (callingDeploymentInfo == null) return null;
String runAsRole = callingDeploymentInfo.getRunAs();
@@ -222,7 +223,7 @@
SecurityContext securityContext =
threadContext.get(SecurityContext.class);
try {
- CoreDeploymentInfo deployment = threadContext.getDeploymentInfo();
+ DeploymentInfo deployment = threadContext.getDeploymentInfo();
securityContext.acc.checkPermission(new
EJBRoleRefPermission(deployment.getEjbName(), role));
} catch (AccessControlException e) {
@@ -253,7 +254,7 @@
try {
- CoreDeploymentInfo deploymentInfo =
threadContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
String ejbName = deploymentInfo.getEjbName();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbTransactionUtil.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbTransactionUtil.java?rev=915222&r1=915221&r2=915222&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbTransactionUtil.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbTransactionUtil.java
Tue Feb 23 07:30:04 2010
@@ -22,10 +22,10 @@
import org.apache.openejb.ApplicationException;
import org.apache.openejb.InvalidateReferenceException;
import org.apache.openejb.SystemException;
+import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.ThreadContextListener;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -51,7 +51,7 @@
*/
public static TransactionPolicy createTransactionPolicy(TransactionType
type, ThreadContext threadContext) throws SystemException, ApplicationException
{
// start the new transaction policy
- CoreDeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = threadContext.getDeploymentInfo();
TransactionPolicy txPolicy =
deploymentInfo.getTransactionPolicyFactory().createTransactionPolicy(type);
// save previous EJB ThreadContext transaction policy so it can be
restored later
