Author: jlmonteiro
Date: Thu Apr 21 09:29:52 2011
New Revision: 1095637
URL: http://svn.apache.org/viewvc?rev=1095637&view=rev
Log:
OPENEJB-1352 fix from Romain to avoid NameAlreadyFoundException.
It just adds a unique id at the end of the module id (because it's not unique)
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.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/EjbJarBuilder.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/JndiEncBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidationInfoObject.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Module.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.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/BasicClusterableRequestHandlerTest.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/ModuleContext.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ModuleContext.java
Thu Apr 21 09:29:52 2011
@@ -24,11 +24,13 @@ import javax.naming.Context;
public class ModuleContext extends DeploymentContext {
private final AppContext appContext;
private final Context moduleJndiContext;
+ private final String uniqueId;
- public ModuleContext(String id, AppContext appContext, Context
moduleJndiContext) {
+ public ModuleContext(String id, String uniqueId, AppContext appContext,
Context moduleJndiContext) {
super(id, appContext.getOptions());
this.appContext = appContext;
this.moduleJndiContext = moduleJndiContext;
+ this.uniqueId = uniqueId;
}
public AppContext getAppContext() {
@@ -42,4 +44,8 @@ public class ModuleContext extends Deplo
public Context getModuleJndiContext() {
return moduleJndiContext;
}
+
+ public String getUniqueId() {
+ return uniqueId;
+ }
}
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=1095637&r1=1095636&r2=1095637&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
Thu Apr 21 09:29:52 2011
@@ -130,6 +130,7 @@ public class Assembler extends Assembler
private final Map<String, AppInfo> deployedApplications = new
HashMap<String, AppInfo>();
private final List<DeploymentListener> deploymentListeners = new
ArrayList<DeploymentListener>();
private final Set<String> moduleIds = new HashSet<String>();
+ private static final String GLOBAL_UNIQUE_ID = "global";
public org.apache.openejb.spi.ContainerSystem getContainerSystem() {
@@ -494,8 +495,8 @@ public class Assembler extends Assembler
InjectionBuilder injectionBuilder = new InjectionBuilder(classLoader);
List<Injection> appInjections =
injectionBuilder.buildInjections(appInfo.globalJndiEnc);
appInjections.addAll(injectionBuilder.buildInjections(appInfo.appJndiEnc));
- Context globalJndiContext = new JndiEncBuilder(appInfo.globalJndiEnc,
appInjections, null, classLoader).build(JndiEncBuilder.JndiScope.global);
- Context appJndiContext = new JndiEncBuilder(appInfo.appJndiEnc,
appInjections, appInfo.appId, classLoader).build(JndiEncBuilder.JndiScope.app);
+ Context globalJndiContext = new JndiEncBuilder(appInfo.globalJndiEnc,
appInjections, null, GLOBAL_UNIQUE_ID,
classLoader).build(JndiEncBuilder.JndiScope.global);
+ Context appJndiContext = new JndiEncBuilder(appInfo.appJndiEnc,
appInjections, appInfo.appId, appInfo.appId,
classLoader).build(JndiEncBuilder.JndiScope.app);
try {
// Generate the cmp2/cmp1 concrete subclasses
@@ -514,28 +515,28 @@ public class Assembler extends Assembler
// so it has to be constructed before
Map<String, ValidatorFactory> validatorFactories = new
HashMap<String, ValidatorFactory>();
for (ClientInfo clientInfo : appInfo.clients) {
- validatorFactories.put(clientInfo.moduleId,
ValidatorBuilder.buildFactory(classLoader, clientInfo.validationInfo));
+ validatorFactories.put(clientInfo.uniqueId,
ValidatorBuilder.buildFactory(classLoader, clientInfo.validationInfo));
}
for (ConnectorInfo connectorInfo : appInfo.connectors) {
- validatorFactories.put(connectorInfo.moduleId,
ValidatorBuilder.buildFactory(classLoader, connectorInfo.validationInfo));
+ validatorFactories.put(connectorInfo.uniqueId,
ValidatorBuilder.buildFactory(classLoader, connectorInfo.validationInfo));
}
for (EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
- validatorFactories.put(ejbJarInfo.moduleId,
ValidatorBuilder.buildFactory(classLoader, ejbJarInfo.validationInfo));
+ validatorFactories.put(ejbJarInfo.uniqueId,
ValidatorBuilder.buildFactory(classLoader, ejbJarInfo.validationInfo));
}
for (WebAppInfo webAppInfo : appInfo.webApps) {
- validatorFactories.put(webAppInfo.moduleId,
ValidatorBuilder.buildFactory(classLoader, webAppInfo.validationInfo));
+ validatorFactories.put(webAppInfo.uniqueId,
ValidatorBuilder.buildFactory(classLoader, webAppInfo.validationInfo));
}
moduleIds.addAll(validatorFactories.keySet());
// validators bindings
for (Entry<String, ValidatorFactory> validatorFactory :
validatorFactories.entrySet()) {
- String moduleId = validatorFactory.getKey();
+ String id = validatorFactory.getKey();
ValidatorFactory factory = validatorFactory.getValue();
try {
-
containerSystemContext.bind(VALIDATOR_FACTORY_NAMING_CONTEXT + moduleId,
factory);
- containerSystemContext.bind(VALIDATOR_NAMING_CONTEXT +
moduleId, factory.usingContext().getValidator());
+
containerSystemContext.bind(VALIDATOR_FACTORY_NAMING_CONTEXT + id, factory);
+ containerSystemContext.bind(VALIDATOR_NAMING_CONTEXT + id,
factory.usingContext().getValidator());
} catch (NameAlreadyBoundException e) {
- throw new OpenEJBException("ValidatorFactory already
exists for module " + moduleId);
+ throw new OpenEJBException("ValidatorFactory already
exists for module " + id);
} catch (Exception e) {
throw new OpenEJBException(e);
}
@@ -713,7 +714,7 @@ public class Assembler extends Assembler
List<Injection> injections =
injectionBuilder.buildInjections(clientInfo.jndiEnc);
// build the enc
- JndiEncBuilder jndiEncBuilder = new
JndiEncBuilder(clientInfo.jndiEnc, injections, "Bean", clientInfo.moduleId,
classLoader, appContext);
+ JndiEncBuilder jndiEncBuilder = new
JndiEncBuilder(clientInfo.jndiEnc, injections, "Bean", clientInfo.moduleId,
clientInfo.uniqueId, classLoader, appContext);
// if there is at least a remote client classes
// or if there is no local client classes
// then, we can set the client flag
@@ -1043,12 +1044,12 @@ public class Assembler extends Assembler
}
}
- for (String moduleId : moduleIds) {
+ for (String sId : moduleIds) {
try {
- globalContext.unbind(VALIDATOR_FACTORY_NAMING_CONTEXT +
moduleId);
- globalContext.unbind(VALIDATOR_NAMING_CONTEXT + moduleId);
+ globalContext.unbind(VALIDATOR_FACTORY_NAMING_CONTEXT + sId);
+ globalContext.unbind(VALIDATOR_NAMING_CONTEXT + sId);
} catch (NamingException e) {
- undeployException.getCauses().add(new Exception("validator: "
+ moduleId + ": " + e.getMessage(), e));
+ undeployException.getCauses().add(new Exception("validator: "
+ sId + ": " + e.getMessage(), e));
}
}
moduleIds.clear();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
Thu Apr 21 09:29:52 2011
@@ -49,11 +49,11 @@ public class EjbJarBuilder {
InjectionBuilder injectionBuilder = new
InjectionBuilder(context.getClassLoader());
List<Injection> moduleInjections =
injectionBuilder.buildInjections(ejbJar.moduleJndiEnc);
moduleInjections.addAll(appInjections);
- Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc,
moduleInjections, ejbJar.moduleId,
context.getClassLoader()).build(JndiEncBuilder.JndiScope.module);
+ Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc,
moduleInjections, ejbJar.moduleId, ejbJar.uniqueId,
context.getClassLoader()).build(JndiEncBuilder.JndiScope.module);
HashMap<String, BeanContext> deployments = new HashMap<String,
BeanContext>();
- ModuleContext moduleContext = new ModuleContext(ejbJar.moduleId,
context, moduleJndiContext);
+ ModuleContext moduleContext = new ModuleContext(ejbJar.moduleId,
ejbJar.uniqueId, context, moduleJndiContext);
InterceptorBindingBuilder interceptorBindingBuilder = new
InterceptorBindingBuilder(context.getClassLoader(), ejbJar);
MethodScheduleBuilder methodScheduleBuilder = new
MethodScheduleBuilder();
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=1095637&r1=1095636&r2=1095637&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
Thu Apr 21 09:29:52 2011
@@ -138,7 +138,7 @@ class EnterpriseBeanBuilder {
}
// build the enc
- JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(bean.jndiEnc,
injections, transactionType, moduleContext.getId(),
moduleContext.getClassLoader(), moduleContext.getAppContext());
+ JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(bean.jndiEnc,
injections, transactionType, moduleContext.getId(),
moduleContext.getUniqueId(), moduleContext.getClassLoader(),
moduleContext.getAppContext());
Context compJndiContext =
jndiEncBuilder.build(JndiEncBuilder.JndiScope.comp);
bind(compJndiContext, "module", moduleContext.getModuleJndiContext());
bind(compJndiContext, "app",
moduleContext.getAppContext().getAppJndiContext());
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
Thu Apr 21 09:29:52 2011
@@ -91,6 +91,7 @@ public class JndiEncBuilder {
private final boolean beanManagedTransactions;
private final JndiEncInfo jndiEnc;
private final URI moduleUri;
+ private final String uniqueId;
private final List<Injection> injections;
private final ClassLoader classLoader;
private final AppContext appContext;
@@ -98,11 +99,11 @@ public class JndiEncBuilder {
private boolean useCrossClassLoaderRef = true;
private boolean client = false;
- public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections,
String moduleId, ClassLoader classLoader) throws OpenEJBException {
- this(jndiEnc, injections, null, moduleId, classLoader, null);
+ public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections,
String moduleId, String uniqueId, ClassLoader classLoader) throws
OpenEJBException {
+ this(jndiEnc, injections, null, moduleId, uniqueId, classLoader, null);
}
- public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections,
String transactionType, String moduleId, ClassLoader classLoader, AppContext
appContext) throws OpenEJBException {
+ public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections,
String transactionType, String moduleId, String uniqueId, ClassLoader
classLoader, AppContext appContext) throws OpenEJBException {
this.jndiEnc = jndiEnc;
this.injections = injections;
this.appContext = appContext;
@@ -113,6 +114,7 @@ public class JndiEncBuilder {
} catch (URISyntaxException e) {
throw new OpenEJBException(e);
}
+ this.uniqueId = uniqueId;
this.classLoader = classLoader;
}
@@ -446,12 +448,8 @@ public class JndiEncBuilder {
bindings.put("comp/HandleDelegate", new
SystemComponentReference(HandleDelegate.class));
// bind bean validation objects
- String moduleId = null;
- if (moduleUri != null) {
- moduleId = moduleUri.toString();
- }
- bindings.put("comp/ValidatorFactory", new
IntraVmJndiReference(Assembler.VALIDATOR_FACTORY_NAMING_CONTEXT + moduleId));
- bindings.put("comp/Validator", new
IntraVmJndiReference(Assembler.VALIDATOR_NAMING_CONTEXT + moduleId));
+ bindings.put("comp/ValidatorFactory", new
IntraVmJndiReference(Assembler.VALIDATOR_FACTORY_NAMING_CONTEXT + uniqueId));
+ bindings.put("comp/Validator", new
IntraVmJndiReference(Assembler.VALIDATOR_NAMING_CONTEXT + uniqueId));
// bind UserTransaction if bean managed transactions
UserTransaction userTransaction = null;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidationInfoObject.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidationInfoObject.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidationInfoObject.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidationInfoObject.java
Thu Apr 21 09:29:52 2011
@@ -21,4 +21,5 @@ package org.apache.openejb.assembler.cla
*/
public class ValidationInfoObject extends InfoObject {
public ValidationInfo validationInfo;
+ public String uniqueId;
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
Thu Apr 21 09:29:52 2011
@@ -99,7 +99,7 @@ public class CdiResourceInjectionService
cdiInfo.setInjections(injections);
// TODO: handle app/global/module namespaces?
- JndiEncBuilder encBuilder = new JndiEncBuilder(jndiEnc,
injections, appModule.appId, classLoader);
+ JndiEncBuilder encBuilder = new JndiEncBuilder(jndiEnc,
injections, appModule.appId, appModule.appId, classLoader);
this.contexts.put(cdiInfo,
encBuilder.build(JndiEncBuilder.JndiScope.comp));
}
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Thu Apr 21 09:29:52 2011
@@ -150,6 +150,7 @@ class AppInfoBuilder {
ejbJarInfo.validationInfo =
ValidatorBuilder.getInfo(ejbModule.getValidationConfig());
ejbJarInfo.portInfos.addAll(configureWebservices(ejbModule.getWebservices()));
+ ejbJarInfo.uniqueId = ejbModule.getUniqueId();
configureWebserviceSecurity(ejbJarInfo, ejbModule);
ejbJarInfos.put(ejbModule, ejbJarInfo);
@@ -264,6 +265,7 @@ class AppInfoBuilder {
clientInfo.moduleId = getClientModuleId(clientModule);
clientInfo.watchedResources.addAll(clientModule.getWatchedResources());
clientInfo.validationInfo =
ValidatorBuilder.getInfo(clientModule.getValidationConfig());
+ clientInfo.uniqueId = clientModule.getUniqueId();
jndiEncInfoBuilder.build(applicationClient,
clientModule.getJarLocation(), clientInfo.moduleId, clientInfo.jndiEnc,
clientInfo.jndiEnc);
appInfo.clients.add(clientInfo);
@@ -280,6 +282,7 @@ class AppInfoBuilder {
webAppInfo.moduleId = webModule.getModuleId();
webAppInfo.watchedResources.addAll(webModule.getWatchedResources());
webAppInfo.validationInfo =
ValidatorBuilder.getInfo(webModule.getValidationConfig());
+ webAppInfo.uniqueId = webModule.getUniqueId();
webAppInfo.host = webModule.getHost();
webAppInfo.contextRoot = webModule.getContextRoot();
@@ -318,6 +321,7 @@ class AppInfoBuilder {
connectorInfo.moduleId = connectorModule.getModuleId();
connectorInfo.watchedResources.addAll(connectorModule.getWatchedResources());
connectorInfo.validationInfo =
ValidatorBuilder.getInfo(connectorModule.getValidationConfig());
+ connectorInfo.uniqueId = connectorModule.getUniqueId();
List<URL> libraries = connectorModule.getLibraries();
for (URL url : libraries) {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Module.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Module.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Module.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Module.java
Thu Apr 21 09:29:52 2011
@@ -22,8 +22,15 @@ import java.util.HashMap;
import java.util.Map;
public class Module {
+ private static int currentId = 1; // unique id to be able to bind
something for each module in the jndi tree
+
private ValidationConfigType validationConfig;
private final Map<String, Object> altDDs = new HashMap<String, Object>();
+ private String uniqueId;
+
+ public Module() {
+ uniqueId = Integer.toString(currentId++);
+ }
public ValidationConfigType getValidationConfig() {
return validationConfig;
@@ -36,4 +43,8 @@ public class Module {
public Map<String, Object> getAltDDs() {
return altDDs;
}
+
+ public String getUniqueId() {
+ return uniqueId;
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java
Thu Apr 21 09:29:52 2011
@@ -56,7 +56,7 @@ public class InheritedAppExceptionTest {
@Test
public void testRollback() throws Exception {
SystemInstance.init(new Properties());
- BeanContext cdi = new BeanContext("foo", null, new
ModuleContext("foo", new AppContext("foo", SystemInstance.get(), null, null,
null, false), null), Object.class, null, new HashMap<String, String>());
+ BeanContext cdi = new BeanContext("foo", null, new
ModuleContext("foo", "bar", new AppContext("foo", SystemInstance.get(), null,
null, null, false), null), Object.class, null, new HashMap<String, String>());
cdi.addApplicationException(AE1.class, true, true);
cdi.addApplicationException(AE3.class, true, false);
cdi.addApplicationException(AE6.class, false, true);
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=1095637&r1=1095636&r2=1095637&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
Thu Apr 21 09:29:52 2011
@@ -36,7 +36,7 @@ public class AuthorBean implements Entit
public static Object deploymentInfo;
static {
try {
- deploymentInfo = new BeanContext("author", null, new
ModuleContext("", new AppContext("", SystemInstance.get(),
Author.class.getClassLoader(), new IvmContext(), new IvmContext(), false), new
IvmContext()),
+ deploymentInfo = new BeanContext("author", null, new
ModuleContext("", "", new AppContext("", SystemInstance.get(),
Author.class.getClassLoader(), new IvmContext(), new IvmContext(), false), new
IvmContext()),
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=1095637&r1=1095636&r2=1095637&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
Thu Apr 21 09:29:52 2011
@@ -36,7 +36,7 @@ public class BookBean implements EntityB
public static Object deploymentInfo;
static {
try {
- deploymentInfo = new BeanContext("book", null, new
ModuleContext("", new AppContext("", SystemInstance.get(),
Book.class.getClassLoader(), new IvmContext(), new IvmContext(), false), new
IvmContext()),
+ deploymentInfo = new BeanContext("book", null, new
ModuleContext("", "", new AppContext("", SystemInstance.get(),
Book.class.getClassLoader(), new IvmContext(), new IvmContext(), false), new
IvmContext()),
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=1095637&r1=1095636&r2=1095637&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
Thu Apr 21 09:29:52 2011
@@ -107,7 +107,7 @@ public class LocalClientRunner extends B
private BeanContext createDeployment(Class<?> testClass) {
try {
- return new BeanContext(null, new IvmContext(), new
ModuleContext("", new AppContext("", SystemInstance.get(),
testClass.getClassLoader(), new IvmContext(), new IvmContext(), false), new
IvmContext()), testClass, null, null, null, null, null, null, null, null,
BeanType.MANAGED, false);
+ return new BeanContext(null, new IvmContext(), new
ModuleContext("", "", new AppContext("", SystemInstance.get(),
testClass.getClassLoader(), new IvmContext(), new IvmContext(), false), new
IvmContext()), testClass, null, null, null, null, null, null, null, null,
BeanType.MANAGED, false);
} catch (SystemException e) {
throw new IllegalStateException(e);
}
Modified:
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java?rev=1095637&r1=1095636&r2=1095637&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
(original)
+++
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
Thu Apr 21 09:29:52 2011
@@ -47,7 +47,7 @@ public class BasicClusterableRequestHand
request = (ClusterableRequest) mock(ClusterableRequest.class);
response = (ClusterableResponse) mock(ClusterableResponse.class);
clusteredContainer = (ClusteredRPCContainer)
mock(ClusteredRPCContainer.class);
- beanContext = new BeanContext("aDeploymentId", null, new
ModuleContext("", new AppContext("", SystemInstance.get(), null, null, null,
false), null), BasicClusterableRequestHandlerTest.class, null, null, null,
null, null, null, null, null, null, false);
+ beanContext = new BeanContext("aDeploymentId", null, new
ModuleContext("", "", new AppContext("", SystemInstance.get(), null, null,
null, false), null), BasicClusterableRequestHandlerTest.class, null, null,
null, null, null, null, null, null, null, false);
}
public void testNoOpWhenNotAClusteredContainer() throws Exception {
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=1095637&r1=1095636&r2=1095637&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
Thu Apr 21 09:29:52 2011
@@ -39,7 +39,7 @@ public class DeploymentIndexTest {
@Before
public void setUp() throws SystemException {
method = Method.class.getMethods()[0];
- beanContext = new BeanContext("aDeploymentId", null, new
ModuleContext("", new AppContext("", SystemInstance.get(), null, null, null,
false), null), DeploymentIndexTest.class, null, null, null, null, null, null,
null, null, null, false);
+ beanContext = new BeanContext("aDeploymentId", null, new
ModuleContext("", "", new AppContext("", SystemInstance.get(), null, null,
null, false), null), DeploymentIndexTest.class, null, null, null, null, null,
null, null, null, null, false);
deploymentIndex = new DeploymentIndex(new BeanContext[] {beanContext,
beanContext});
}
