You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/09/20 20:55:17 UTC
svn commit: r999054 - in /geronimo/server/trunk:
plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/
testsuite/javaee6-testsuite/
Author: gawor
Date: Mon Sep 20 18:55:17 2010
New Revision: 999054
URL: http://svn.apache.org/viewvc?rev=999054&view=rev
Log:
GERONIMO-5476: Set proper moduleId so that local ejb references get resolved correctly. Also, enable ejb31lite test
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java?rev=999054&r1=999053&r2=999054&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java Mon Sep 20 18:55:17 2010
@@ -105,7 +105,9 @@ public class EjbModule extends EJBModule
public void setClassLoader(ClassLoader classLoader) {
ejbModule.setClassLoader(classLoader);
- ejbModule.getClientModule().setClassLoader(classLoader);
+ if (ejbModule.getClientModule() != null) {
+ ejbModule.getClientModule().setClassLoader(classLoader);
+ }
}
public ConfigurationFactory.Chain getPreAutoConfigDeployer() {
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=999054&r1=999053&r2=999054&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Mon Sep 20 18:55:17 2010
@@ -389,10 +389,8 @@ public class EjbModuleBuilder implements
if (parentModule == null || ".".equals(targetPath)) {
AbstractName earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.EJB_MODULE);
- ejbModule.setModuleId(environment.getConfigId().getArtifactId());
} else {
moduleName = naming.createChildName(parentModule.getModuleName(), targetPath, NameFactory.EJB_MODULE);
- ejbModule.setModuleId(targetPath);
}
// Create XMLBeans version of EjbJarType for the AnnotatedApp interface
@@ -409,6 +407,8 @@ public class EjbModuleBuilder implements
name = FileUtils.removeExtension(targetPath, ".jar");
}
+ ejbModule.setModuleId(name);
+
Map<JndiKey, Map<String, Object>> context = null;
if (subModule) {
context = parentModule.getJndiContext();
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml?rev=999054&r1=999053&r2=999054&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml Mon Sep 20 18:55:17 2010
@@ -53,10 +53,10 @@
<modules>
<module>beanvalidation-test</module>
+ <module>ejb3.1lite-test</module>
<!--
<module>servlet3.0-test</module>
<module>servlet3.0-security-test</module>
- <module>ejb3.1lite-test</module>
<module>el2.2-test</module>
<module>jsp2.2-test</module>
<module>managedbean1.0-test</module>