Author: dblevins
Date: Fri Jun 25 02:48:23 2010
New Revision: 957787
URL: http://svn.apache.org/viewvc?rev=957787&view=rev
Log:
Merged BeanContext and CoreDeploymentInfo -- was two confusing to have two of
basically the same object and arbitrarily split up the data
MethodSchedule is no longer needed as ScheduleData is now in the MethodContext
Removed:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BeanContext.java
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/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MethodSchedule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/ScheduleData.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.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=957787&r1=957786&r2=957787&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
Fri Jun 25 02:48:23 2010
@@ -18,13 +18,11 @@ package org.apache.openejb;
import org.apache.openejb.core.interceptor.InterceptorData;
import org.apache.openejb.core.timer.EjbTimerService;
-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;
import java.util.Map;
import java.util.List;
import java.util.Set;
@@ -105,8 +103,6 @@ public interface DeploymentInfo {
public List<InterceptorData> getMethodInterceptors(Method method);
- public List<MethodSchedule> getMethodSchedules();
-
public void setContainer(Container container);
public Method getEjbTimeout();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Fri Jun 25 02:48:23 2010
@@ -531,7 +531,7 @@ public class Assembler extends Assembler
PolicyContext policyContext =
jaccPermissionsBuilder.build(ejbJar, deployments);
jaccPermissionsBuilder.install(policyContext);
- MethodScheduleBuilder methodScheduleBuilder = new
MethodScheduleBuilder(classLoader, ejbJar);
+ MethodScheduleBuilder methodScheduleBuilder = new
MethodScheduleBuilder(ejbJar);
TransactionPolicyFactory transactionPolicyFactory =
createTransactionPolicyFactory(ejbJar, classLoader);
for (DeploymentInfo deploymentInfo : deployments.values()) {
CoreDeploymentInfo coreDeploymentInfo =
(CoreDeploymentInfo) deploymentInfo;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
Fri Jun 25 02:48:23 2010
@@ -23,7 +23,6 @@ import org.apache.openejb.OpenEJBExcepti
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.BeanContext;
import org.apache.openejb.core.ModuleContext;
import org.apache.openejb.core.cmp.CmpUtil;
import org.apache.openejb.util.Index;
@@ -126,19 +125,18 @@ class EnterpriseBeanBuilder {
JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(bean.jndiEnc,
injections, transactionType, moduleContext.getId(),
moduleContext.getClassLoader());
Context root = jndiEncBuilder.build();
- BeanContext beanContext = new BeanContext(bean.ejbDeploymentId, root,
moduleContext);
- beanContext.getProperties().putAll(bean.properties);
-
CoreDeploymentInfo deployment;
if (BeanType.MESSAGE_DRIVEN != ejbType) {
- deployment = new CoreDeploymentInfo(beanContext, ejbClass, home,
remote, localhome, local, serviceEndpoint, businessLocals, businessRemotes,
primaryKey, ejbType);
+ deployment = new CoreDeploymentInfo(bean.ejbDeploymentId, root,
moduleContext, ejbClass, home, remote, localhome, local, serviceEndpoint,
businessLocals, businessRemotes, primaryKey, ejbType);
} else {
MessageDrivenBeanInfo messageDrivenBeanInfo =
(MessageDrivenBeanInfo) bean;
Class mdbInterface = loadClass(messageDrivenBeanInfo.mdbInterface,
"classNotFound.mdbInterface");
- deployment = new CoreDeploymentInfo(beanContext, ejbClass,
mdbInterface, messageDrivenBeanInfo.activationProperties);
+ deployment = new CoreDeploymentInfo(bean.ejbDeploymentId, root,
moduleContext, ejbClass, mdbInterface,
messageDrivenBeanInfo.activationProperties);
deployment.setDestinationId(messageDrivenBeanInfo.destinationId);
}
+ deployment.getProperties().putAll(bean.properties);
+
deployment.setEjbName(bean.ejbName);
deployment.setRunAs(bean.runAs);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java
Fri Jun 25 02:48:23 2010
@@ -21,14 +21,12 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Classes;
import org.apache.openejb.util.SetAccessible;
import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.timer.MethodSchedule;
import org.apache.openejb.core.timer.ScheduleData;
import org.apache.openejb.OpenEJBException;
import javax.ejb.ScheduleExpression;
import javax.ejb.TimerConfig;
import java.util.List;
-import java.util.ArrayList;
import java.lang.reflect.Method;
public class MethodScheduleBuilder {
@@ -37,7 +35,7 @@ public class MethodScheduleBuilder {
private final List<MethodScheduleInfo> methodSchedules;
- public MethodScheduleBuilder(ClassLoader cl, EjbJarInfo ejbJarInfo) throws
OpenEJBException {
+ public MethodScheduleBuilder(EjbJarInfo ejbJarInfo) throws
OpenEJBException {
methodSchedules = ejbJarInfo.methodSchedules;
}
@@ -45,7 +43,6 @@ public class MethodScheduleBuilder {
Class clazz = deploymentInfo.getBeanClass();
String ejbName = deploymentInfo.getEjbName();
- List<MethodSchedule> schedules = new ArrayList<MethodSchedule>();
for (MethodScheduleInfo info : methodSchedules) {
if (!ejbName.equals(info.ejbName)) continue;
@@ -63,7 +60,6 @@ public class MethodScheduleBuilder {
if (info.method.className == null ||
method.getDeclaringClass().getName().equals(info.method.className)){
- ArrayList<ScheduleData> data = new ArrayList<ScheduleData>();
for (ScheduleInfo scheduleInfo : info.schedules) {
ScheduleExpression expr = new ScheduleExpression();
@@ -79,15 +75,10 @@ public class MethodScheduleBuilder {
config.setInfo(scheduleInfo.info);
config.setPersistent(scheduleInfo.persistent);
- data.add(new ScheduleData(config, expr));
+
deploymentInfo.getMethodContext(method).getSchedules().add(new
ScheduleData(config, expr));
}
-
- schedules.add(new MethodSchedule(method, data));
}
}
-
- deploymentInfo.setMethodSchedules(schedules);
-
}
private Class[] toClasses(List<String> params, ClassLoader classLoader)
throws ClassNotFoundException {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
Fri Jun 25 02:48:23 2010
@@ -24,7 +24,6 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
@@ -51,7 +50,6 @@ import org.apache.openejb.core.intercept
import org.apache.openejb.core.interceptor.InterceptorInstance;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.timer.EjbTimerService;
-import org.apache.openejb.core.timer.MethodSchedule;
import org.apache.openejb.core.transaction.TransactionPolicyFactory;
import org.apache.openejb.core.transaction.TransactionType;
import org.apache.openejb.util.Duration;
@@ -59,7 +57,11 @@ import org.apache.openejb.util.Index;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
-public class CoreDeploymentInfo implements org.apache.openejb.DeploymentInfo {
+public class CoreDeploymentInfo extends DeploymentContext implements
org.apache.openejb.DeploymentInfo {
+
+ private final ModuleContext moduleContext;
+ private final Context jndiContext;
+ private Object containerData;
private boolean destroyed;
private Class homeInterface;
@@ -91,8 +93,6 @@ public class CoreDeploymentInfo implemen
private String ejbName;
private String runAs;
- private final BeanContext context;
-
private Method createMethod = null;
private final BeanType componentType;
@@ -106,7 +106,6 @@ public class CoreDeploymentInfo implemen
private TransactionPolicyFactory transactionPolicyFactory;
- private final List<MethodSchedule> methodSchedules = new
ArrayList<MethodSchedule>();
private final List<InterceptorData> callbackInterceptors = new
ArrayList<InterceptorData>();
private final Set<InterceptorData> instanceScopedInterceptors = new
HashSet<InterceptorData>();
private final List<InterceptorInstance> systemInterceptors = new
ArrayList<InterceptorInstance>();
@@ -161,7 +160,7 @@ public class CoreDeploymentInfo implemen
return null;
}
- public CoreDeploymentInfo(BeanContext context,
+ public CoreDeploymentInfo(String id, Context jndiContext, ModuleContext
moduleContext,
Class beanClass, Class homeInterface,
Class remoteInterface,
Class localHomeInterface,
@@ -169,10 +168,11 @@ public class CoreDeploymentInfo implemen
Class serviceEndpointInterface, List<Class>
businessLocals, List<Class> businessRemotes, Class pkClass,
BeanType componentType
) throws SystemException {
- if (context == null || beanClass == null) {
- throw new NullPointerException("context or beanClass input
parameter is null");
- }
- this.context = context;
+ super(id, moduleContext.getOptions());
+ this.moduleContext = moduleContext;
+ this.jndiContext = jndiContext;
+
+ if (beanClass == null) throw new NullPointerException("beanClass input
parameter is null");
this.pkClass = pkClass;
this.homeInterface = homeInterface;
@@ -279,8 +279,10 @@ public class CoreDeploymentInfo implemen
}
}
- public CoreDeploymentInfo(BeanContext context, Class beanClass, Class
mdbInterface, Map<String, String> activationProperties) throws SystemException {
- this.context = context;
+ public CoreDeploymentInfo(String id, Context jndiContext, ModuleContext
moduleContext, Class beanClass, Class mdbInterface, Map<String, String>
activationProperties) throws SystemException {
+ super(id, moduleContext.getOptions());
+ this.jndiContext = jndiContext;
+ this.moduleContext = moduleContext;
this.beanClass = beanClass;
this.mdbInterface = mdbInterface;
this.activationProperties.putAll(activationProperties);
@@ -296,55 +298,51 @@ public class CoreDeploymentInfo implemen
createMethodMap();
}
- public boolean isDestroyed() {
- return destroyed;
+
+ public Object getContainerData() {
+ return containerData;
}
- public void setDestroyed(boolean destroyed) {
- this.destroyed = destroyed;
+ public void setContainerData(Object containerData) {
+ this.containerData = containerData;
}
- public Properties getProperties() {
- return context.getProperties();
+ public ClassLoader getClassLoader() {
+ return moduleContext.getClassLoader();
}
- public List<Injection> getInjections() {
- return injections;
+ public Context getJndiContext() {
+ return jndiContext;
}
- public Index<EntityManagerFactory,Map> getExtendedEntityManagerFactories()
{
- return extendedEntityManagerFactories;
+ public ModuleContext getModuleContext() {
+ return moduleContext;
}
- public void setExtendedEntityManagerFactories(Index<EntityManagerFactory,
Map> extendedEntityManagerFactories) {
- this.extendedEntityManagerFactories = extendedEntityManagerFactories;
+ public boolean isDestroyed() {
+ return destroyed;
}
- @SuppressWarnings({"unchecked"})
- public <T> T get(Class<T> type) {
- return context.get(type);
+ public void setDestroyed(boolean destroyed) {
+ this.destroyed = destroyed;
}
- @SuppressWarnings({"unchecked"})
- public <T> T set(Class<T> type, T value) {
- return context.set(type, value);
+ public List<Injection> getInjections() {
+ return injections;
}
- public Object getContainerData() {
- return context.getContainerData();
+ public Index<EntityManagerFactory,Map> getExtendedEntityManagerFactories()
{
+ return extendedEntityManagerFactories;
}
- public void setContainerData(Object containerData) {
- context.setContainerData(containerData);
+ public void setExtendedEntityManagerFactories(Index<EntityManagerFactory,
Map> extendedEntityManagerFactories) {
+ this.extendedEntityManagerFactories = extendedEntityManagerFactories;
}
public void setContainer(Container container) {
this.container = container;
}
- /**
- * TODO: Move to BeanContext
- */
public BeanType getComponentType() {
return componentType;
}
@@ -400,7 +398,7 @@ public class CoreDeploymentInfo implemen
}
public Object getDeploymentID() {
- return context.getId();
+ return getId();
}
public boolean isBeanManagedTransaction() {
@@ -547,11 +545,7 @@ public class CoreDeploymentInfo implemen
}
public Context getJndiEnc() {
- return context.getJndiContext();
- }
-
- public ClassLoader getClassLoader() {
- return context.getClassLoader();
+ return jndiContext;
}
public boolean isReentrant() {
@@ -570,7 +564,7 @@ public class CoreDeploymentInfo implemen
public MethodContext getMethodContext(Method method) {
MethodContext methodContext = methodContextMap.get(method);
if (methodContext == null) {
- methodContext = new MethodContext(context, method);
+ methodContext = new MethodContext(this, method);
methodContextMap.put(method, methodContext);
}
return methodContext;
@@ -654,20 +648,6 @@ public class CoreDeploymentInfo implemen
}
/**
- * TODO: Move to MethodContext
- */
- public List<MethodSchedule> getMethodSchedules() {
- return methodSchedules;
- }
-
- /**
- * TODO: Move to MethodContext
- */
- public void setMethodSchedules(List<MethodSchedule> schedules) {
- methodSchedules.addAll(schedules);
- }
-
- /**
* When an instance of an EJB is instantiated, everything in this list
* is also instatiated and tied to the bean instance. Per spec,
interceptors
* are supposed to have the same lifecycle as the bean they wrap.
@@ -988,7 +968,7 @@ public class CoreDeploymentInfo implemen
}
public String getModuleID() {
- return context.getModuleContext().getId();
+ return getModuleContext().getId();
}
public String getRunAs() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/MethodContext.java
Fri Jun 25 02:48:23 2010
@@ -31,7 +31,7 @@ import java.util.List;
* @version $Rev$ $Date$
*/
public class MethodContext {
- private final BeanContext beanContext;
+ private final CoreDeploymentInfo beanContext;
private final Method beanMethod;
private final List<ScheduleData> schedules = new ArrayList<ScheduleData>();
private final List<InterceptorData> methodInterceptors = new
ArrayList<InterceptorData>();
@@ -46,20 +46,20 @@ public class MethodContext {
*/
private MethodContext beanMethodContext;
- public MethodContext(BeanContext beanContext, Method beanMethod) {
+ public MethodContext(CoreDeploymentInfo beanContext, Method beanMethod) {
this.beanContext = beanContext;
this.beanMethod = beanMethod;
}
- public Duration getAccessTimeout() {
- return accessTimeout;
- }
-
public void setAccessTimeout(Duration accessTimeout) {
this.accessTimeout = accessTimeout;
}
- public BeanContext getBeanContext() {
+ public Duration getAccessTimeout() {
+ return accessTimeout;
+ }
+
+ public CoreDeploymentInfo getBeanContext() {
return beanContext;
}
@@ -87,6 +87,9 @@ public class MethodContext {
this.transactionType = transactionType;
}
+ public List<ScheduleData> getSchedules() {
+ return schedules;
+ }
public static class InterfaceMethodContext {
private final MethodContext beanMethod;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MethodSchedule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MethodSchedule.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MethodSchedule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MethodSchedule.java
Fri Jun 25 02:48:23 2010
@@ -23,7 +23,6 @@ import java.util.List;
* Holds the basic binding information for a method and the ScheduleDatas
associated with it.
* ScheduleData is a simple object that wraps both
javax.ejb.ScheduleExpression and javax.ejb.TimerConfig
*
- * @see org.apache.openejb.DeploymentInfo#getMethodSchedules()
*/
public class MethodSchedule {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/ScheduleData.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/ScheduleData.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/ScheduleData.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/ScheduleData.java
Fri Jun 25 02:48:23 2010
@@ -30,19 +30,19 @@ import javax.ejb.TimerConfig;
*/
public class ScheduleData {
- private final ScheduleExpression exression;
+ private final ScheduleExpression expression;
private final TimerConfig config;
- public ScheduleData(TimerConfig config, ScheduleExpression exression) {
+ public ScheduleData(TimerConfig config, ScheduleExpression expression) {
this.config = config;
- this.exression = exression;
+ this.expression = expression;
}
public TimerConfig getConfig() {
return config;
}
- public ScheduleExpression getExression() {
- return exression;
+ public ScheduleExpression getExpression() {
+ return expression;
}
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java
Fri Jun 25 02:48:23 2010
@@ -20,7 +20,6 @@ package org.apache.openejb.core.cmp.jpa;
import org.apache.openejb.core.cmp.cmp2.Cmp2Entity;
import org.apache.openejb.core.cmp.cmp2.SetValuedCmr;
import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.BeanContext;
import org.apache.openejb.core.AppContext;
import org.apache.openejb.core.ModuleContext;
import org.apache.openejb.BeanType;
@@ -36,7 +35,7 @@ public class AuthorBean implements Entit
public static Object deploymentInfo;
static {
try {
- deploymentInfo = new CoreDeploymentInfo(new BeanContext("author",
null, new ModuleContext("", new AppContext("", SystemInstance.get(),
Author.class.getClassLoader()))),
+ deploymentInfo = new CoreDeploymentInfo("author", null, new
ModuleContext("", new AppContext("", SystemInstance.get(),
Author.class.getClassLoader())),
AuthorBean.class,
null,
null,
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java
Fri Jun 25 02:48:23 2010
@@ -20,7 +20,6 @@ package org.apache.openejb.core.cmp.jpa;
import org.apache.openejb.core.cmp.cmp2.SetValuedCmr;
import org.apache.openejb.core.cmp.cmp2.Cmp2Entity;
import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.BeanContext;
import org.apache.openejb.core.AppContext;
import org.apache.openejb.core.ModuleContext;
import org.apache.openejb.BeanType;
@@ -36,7 +35,7 @@ public class BookBean implements EntityB
public static Object deploymentInfo;
static {
try {
- deploymentInfo = new CoreDeploymentInfo(new BeanContext("book",
null, new ModuleContext("", new AppContext("", SystemInstance.get(),
Book.class.getClassLoader()))),
+ deploymentInfo = new CoreDeploymentInfo("book", null, new
ModuleContext("", new AppContext("", SystemInstance.get(),
Book.class.getClassLoader())),
BookBean.class,
null,
null,
Modified:
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java
(original)
+++
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java
Fri Jun 25 02:48:23 2010
@@ -20,7 +20,6 @@ import org.apache.openejb.BeanType;
import org.apache.openejb.SystemException;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.BeanContext;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.AppContext;
import org.apache.openejb.core.ModuleContext;
@@ -108,8 +107,7 @@ public class LocalClientRunner extends B
private CoreDeploymentInfo createDeployment(Class<?> testClass) {
try {
- BeanContext beanContext = new BeanContext(null, new IvmContext(),
new ModuleContext("", new AppContext("", SystemInstance.get(),
testClass.getClassLoader())));
- return new CoreDeploymentInfo(beanContext, testClass, null, null,
null, null, null, null, null, null, BeanType.MANAGED);
+ return new CoreDeploymentInfo(null, new IvmContext(), new
ModuleContext("", new AppContext("", SystemInstance.get(),
testClass.getClassLoader())), testClass, null, null, null, null, null, null,
null, null, BeanType.MANAGED);
} catch (SystemException e) {
throw new IllegalStateException(e);
}
Modified:
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java?rev=957787&r1=957786&r2=957787&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java
(original)
+++
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java
Fri Jun 25 02:48:23 2010
@@ -26,7 +26,6 @@ import org.apache.openejb.client.EJBMeta
import org.apache.openejb.client.EJBRequest;
import org.apache.openejb.client.InterfaceType;
import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.BeanContext;
import org.apache.openejb.core.AppContext;
import org.apache.openejb.core.ModuleContext;
import org.junit.Before;
@@ -35,15 +34,13 @@ import org.junit.Test;
public class DeploymentIndexTest {
private Method method;
- private BeanContext dc;
private DeploymentInfo deploymentInfo;
private DeploymentIndex deploymentIndex;
@Before
public void setUp() throws SystemException {
method = Method.class.getMethods()[0];
- dc = new BeanContext("aDeploymentId", null, new ModuleContext("", new
AppContext("", SystemInstance.get(), null)));
- deploymentInfo = new CoreDeploymentInfo(dc, DeploymentIndexTest.class,
null, null, null, null, null, null, null, null, null);
+ deploymentInfo = new CoreDeploymentInfo("aDeploymentId", null, new
ModuleContext("", new AppContext("", SystemInstance.get(), null)),
DeploymentIndexTest.class, null, null, null, null, null, null, null, null,
null);
deploymentIndex = new DeploymentIndex(new DeploymentInfo[] {
deploymentInfo, deploymentInfo });
}
