You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ge...@apache.org on 2011/06/20 07:30:41 UTC
svn commit: r1137502 - in /openejb/trunk/openejb3/container:
openejb-core/src/main/java/org/apache/openejb/
openejb-core/src/main/java/org/apache/openejb/assembler/classic/
openejb-core/src/main/java/org/apache/openejb/config/
openejb-core/src/test/jav...
Author: genspring
Date: Mon Jun 20 05:30:40 2011
New Revision: 1137502
URL: http://svn.apache.org/viewvc?rev=1137502&view=rev
Log:
OPENEJB-1442 continue to clean up the moduleName/moduleURI. This in trun could fix the problem in GERONIMO-6015
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
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/EjbJarInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.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/config/AppInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.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/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java Mon Jun 20 05:30:40 2011
@@ -1075,8 +1075,12 @@ public class BeanContext extends Deploym
}
public String getModuleID() {
- return getModuleContext().getId();
+ return getModuleContext().getModuleURI().toString();
}
+
+ public String getModuleName() {
+ return getModuleContext().getId();
+ }
public String getRunAs() {
return runAs;
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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 2011
@@ -16,6 +16,8 @@
*/
package org.apache.openejb;
+import java.net.URI;
+
import javax.naming.Context;
/**
@@ -25,9 +27,11 @@ public class ModuleContext extends Deplo
private final AppContext appContext;
private final Context moduleJndiContext;
private final String uniqueId;
+ private final URI moduleURI;
- public ModuleContext(String id, String uniqueId, AppContext appContext, Context moduleJndiContext) {
+ public ModuleContext(String id, URI moduleURI, String uniqueId, AppContext appContext, Context moduleJndiContext) {
super(id, appContext.getOptions());
+ this.moduleURI = moduleURI;
this.appContext = appContext;
this.moduleJndiContext = moduleJndiContext;
this.uniqueId = uniqueId;
@@ -48,4 +52,8 @@ public class ModuleContext extends Deplo
public String getUniqueId() {
return uniqueId;
}
+
+ public URI getModuleURI() {
+ return moduleURI;
+ }
}
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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 2011
@@ -393,7 +393,7 @@ public class Assembler extends Assembler
public AppContext createEjbJar(EjbJarInfo ejbJar) throws NamingException, IOException, OpenEJBException {
AppInfo appInfo = new AppInfo();
appInfo.path = ejbJar.path;
- appInfo.appId = ejbJar.moduleId;
+ appInfo.appId = ejbJar.moduleName;
appInfo.ejbJars.add(ejbJar);
return createApplication(appInfo);
}
@@ -405,7 +405,7 @@ public class Assembler extends Assembler
public AppContext createEjbJar(EjbJarInfo ejbJar, ClassLoader classLoader) throws NamingException, IOException, OpenEJBException {
AppInfo appInfo = new AppInfo();
appInfo.path = ejbJar.path;
- appInfo.appId = ejbJar.moduleId;
+ appInfo.appId = ejbJar.moduleName;
appInfo.ejbJars.add(ejbJar);
return createApplication(appInfo, classLoader);
}
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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 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, ejbJar.moduleUri, ejbJar.uniqueId, context.getClassLoader()).build(JndiEncBuilder.JndiScope.module);
+ Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc, moduleInjections, ejbJar.moduleName, ejbJar.moduleUri, ejbJar.uniqueId, context.getClassLoader()).build(JndiEncBuilder.JndiScope.module);
HashMap<String, BeanContext> deployments = new HashMap<String, BeanContext>();
- ModuleContext moduleContext = new ModuleContext(ejbJar.moduleId, ejbJar.uniqueId, context, moduleJndiContext);
+ ModuleContext moduleContext = new ModuleContext(ejbJar.moduleName, ejbJar.moduleUri, 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/EjbJarInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java Mon Jun 20 05:30:40 2011
@@ -26,7 +26,7 @@ import java.util.TreeSet;
public class EjbJarInfo extends ValidationInfoObject {
public final Properties properties = new Properties();
- public String moduleId;
+ public String moduleName;
public URI moduleUri;
public String path;
public final List<EnterpriseBeanInfo> enterpriseBeans = new ArrayList<EnterpriseBeanInfo>();
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java Mon Jun 20 05:30:40 2011
@@ -132,7 +132,7 @@ public class JaccPermissionsBuilder {
ejbJar.methodPermissions.addAll(normalized);
ejbJar.excludeList.clear();
- PolicyContext policyContext = new PolicyContext(ejbJar.moduleId);
+ PolicyContext policyContext = new PolicyContext(ejbJar.moduleUri.toString());
for (EnterpriseBeanInfo enterpriseBean : ejbJar.enterpriseBeans) {
BeanContext beanContext = deployments.get(enterpriseBean.ejbDeploymentId);
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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 2011
@@ -623,7 +623,7 @@ public class JndiBuilder {
Context globalContext = cdi.getModuleContext().getAppContext().getGlobalJndiContext();
String appName = cdi.getModuleContext().getAppContext().isStandaloneModule() ? "" : cdi.getModuleContext().getAppContext().getId() + "/";
- String moduleName = cdi.getModuleID() + "/";
+ String moduleName = cdi.getModuleName() + "/";
String beanName = cdi.getEjbName();
if (intrface != null) {
beanName = beanName + "!" + intrface.getName();
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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 2011
@@ -187,10 +187,10 @@ class AppInfoBuilder {
EnterpriseBean enterpriseBean = beanData.get(beanInfo.ejbName);
// Build the JNDI info tree for the EJB
- jndiEncInfoBuilder.build(enterpriseBean, beanInfo.ejbName, ejbJar.moduleId, ejbModule.getModuleUri(), ejbJar.moduleJndiEnc, beanInfo.jndiEnc);
+ jndiEncInfoBuilder.build(enterpriseBean, beanInfo.ejbName, ejbJar.moduleName, ejbModule.getModuleUri(), ejbJar.moduleJndiEnc, beanInfo.jndiEnc);
- jndiEncInfoBuilder.buildDependsOnRefs(ejbModule, enterpriseBean, beanInfo, ejbJar.moduleId);
+ jndiEncInfoBuilder.buildDependsOnRefs(ejbModule, enterpriseBean, beanInfo, ejbJar.moduleName);
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java Mon Jun 20 05:30:40 2011
@@ -256,7 +256,7 @@ public class Deploy {
System.out.println("App(id=" + appInfo.path + ")");
for (EjbJarInfo info : appInfo.ejbJars) {
- System.out.println(" EjbJar(id=" + info.moduleId + ", path=" + info.path + ")");
+ System.out.println(" EjbJar(id=" + info.moduleName + ", path=" + info.path + ")");
for (EnterpriseBeanInfo beanInfo : info.enterpriseBeans) {
System.out.println(" Ejb(ejb-name=" + beanInfo.ejbName + ", id=" + beanInfo.ejbDeploymentId + ")");
for (String name : beanInfo.jndiNames) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java Mon Jun 20 05:30:40 2011
@@ -141,7 +141,7 @@ public class EjbJarInfoBuilder {
EjbJarInfo ejbJar = new EjbJarInfo();
ejbJar.path = jar.getJarLocation();
- ejbJar.moduleId = jar.getModuleId();
+ ejbJar.moduleName = jar.getModuleId();
ejbJar.moduleUri =jar.getModuleUri();
ejbJar.watchedResources.addAll(jar.getWatchedResources());
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Mon Jun 20 05:30:40 2011
@@ -99,7 +99,7 @@ public class JndiEncInfoBuilder {
EjbResolver ejbJarResolver = new EjbResolver(earResolver, EJBJAR, ejbJarInfo);
- ejbJarResolvers.put(ejbJarInfo.moduleId, ejbJarResolver);
+ ejbJarResolvers.put(ejbJarInfo.moduleName, ejbJarResolver);
}
}
@@ -430,10 +430,10 @@ public class JndiEncInfoBuilder {
return beanInfo != null && beanInfo.localbean;
}
- private EnterpriseBeanInfo getBeanInfo(String moduleId, String deploymentId) {
+ private EnterpriseBeanInfo getBeanInfo(String moduleName, String deploymentId) {
List<EjbJarInfo> ejbJars = appInfo.ejbJars;
for (EjbJarInfo ejbJar : ejbJars) {
- if (!ejbJar.moduleId.equals(moduleId)) continue;
+ if (!ejbJar.moduleName.equals(moduleName)) continue;
List<EnterpriseBeanInfo> enterpriseBeans = ejbJar.enterpriseBeans;
for (EnterpriseBeanInfo enterpriseBean : enterpriseBeans) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java Mon Jun 20 05:30:40 2011
@@ -188,8 +188,8 @@ public class VmDeploymentManager impleme
if (allowedModuleType != null && !allowedModuleType.equals(ModuleType.EJB)) {
return null;
}
- if (ejbJarInfo.moduleId == appInfo.path) {
- return new TargetModuleIDImpl(DEFAULT_TARGET, ejbJarInfo.moduleId);
+ if (ejbJarInfo.moduleName == appInfo.appId) {
+ return new TargetModuleIDImpl(DEFAULT_TARGET, ejbJarInfo.moduleName);
}
}
}
@@ -232,7 +232,7 @@ public class VmDeploymentManager impleme
clientModuleId.setParentTargetModuleID(earModuleId);
}
for (EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
- TargetModuleIDImpl ejbJarModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, ejbJarInfo.moduleId);
+ TargetModuleIDImpl ejbJarModuleId = new TargetModuleIDImpl(DEFAULT_TARGET, ejbJarInfo.moduleName);
ejbJarModuleId.setParentTargetModuleID(earModuleId);
}
for (ConnectorInfo connectorInfo : appInfo.connectors) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java Mon Jun 20 05:30:40 2011
@@ -51,7 +51,7 @@ public class ConfigurationFactoryTest {
ejbJar.setMetadataComplete(true);
EjbJarInfo info = factory.configureApplication(ejbJar);
// not much to assert
- assertEquals(id, info.moduleId);
+ assertEquals(id, info.moduleName);
}
@Test
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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 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", "bar", 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",null, "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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 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("", null, "", 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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 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("", null, "", 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=1137502&r1=1137501&r2=1137502&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 Mon Jun 20 05:30:40 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("", null, "", 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/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java?rev=1137502&r1=1137501&r2=1137502&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java (original)
+++ openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java Mon Jun 20 05:30:40 2011
@@ -186,7 +186,7 @@ public abstract class AbstractApplicatio
String deploymentId = (String) deployment.getDeploymentID();
for (EjbJarInfo ejbJar : appInfo.ejbJars) {
- if (ejbJar.moduleId.equals(deployment.getModuleID())) {
+ if (ejbJar.moduleId.equals(deployment.getModuleName())) {
Set<String> moduleDeploymentIds = new TreeSet<String>();
for (EnterpriseBeanInfo enterpriseBean : ejbJar.enterpriseBeans) {
moduleDeploymentIds.add(enterpriseBean.ejbDeploymentId);