You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/02/09 20:34:16 UTC
svn commit: r1444412 - in
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config:
AnnotationDeployer.java DeploymentLoader.java
Author: rmannibucau
Date: Sat Feb 9 19:34:16 2013
New Revision: 1444412
URL: http://svn.apache.org/r1444412
Log:
taking into account ear cdi beans in a better way
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1444412&r1=1444411&r2=1444412&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Sat Feb 9 19:34:16 2013
@@ -1220,8 +1220,9 @@ public class AnnotationDeployer implemen
final AppModule appModule = ejbModule.getAppModule();
if (appModule != null) {
for (final EjbModule module : appModule.getEjbModules()) {
- if (!module.isWebapp()) {
+ if (module.getModuleId().startsWith("ear-scoped-cdi-beans_")) {
classNames.addAll(getBeanClasses(module.getFinder()));
+ break;
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1444412&r1=1444411&r2=1444412&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Sat Feb 9 19:34:16 2013
@@ -973,6 +973,7 @@ public class DeploymentLoader implements
if (complete == null) return;
+ // don't change the name without looking in tomee and org.apache.openejb.config.AnnotationDeployer.DiscoverAnnotatedBeans.deploy()
final EjbModule ejbModule = new EjbModule(appModule.getClassLoader(), "ear-scoped-cdi-beans_" + appModule.getModuleId(), new EjbJar(), new OpenejbJar());
ejbModule.setBeans(complete);
ejbModule.setFinder(new FinderFactory.ModuleLimitedFinder(new org.apache.xbean.finder.AnnotationFinder(new WebappAggregatedArchive(appModule.getClassLoader(), appModule.getAltDDs(), xmls))));