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 2014/08/10 23:58:47 UTC
svn commit: r1617168 -
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
Author: rmannibucau
Date: Sun Aug 10 21:58:47 2014
New Revision: 1617168
URL: http://svn.apache.org/r1617168
Log:
we can also describe the finder using AppComposer - what a nice tool ;)
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1617168&r1=1617167&r2=1617168&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java Sun Aug 10 21:58:47 2014
@@ -640,8 +640,12 @@ public final class ApplicationComposers
final Collection<Class<?>> finderClasses = new HashSet<>();
final EnterpriseBean[] enterpriseBeans = ejb.getEjbJar().getEnterpriseBeans();
- for (final EnterpriseBean bean : enterpriseBeans) {
- finderClasses.add(loader.loadClass(bean.getEjbClass()));
+
+ final boolean noFinder= ejb.getFinder() == null;
+ if (noFinder) {
+ for (final EnterpriseBean bean : enterpriseBeans) {
+ finderClasses.add(loader.loadClass(bean.getEjbClass()));
+ }
}
final Beans beans = ejb.getBeans();
@@ -660,14 +664,18 @@ public final class ApplicationComposers
}
}
- for (final List<String> managedClasses : beans.getManagedClasses().values()) {
- for (final String name : managedClasses) {
- finderClasses.add(loader.loadClass(name));
+ if (noFinder) {
+ for (final List<String> managedClasses : beans.getManagedClasses().values()) {
+ for (final String name : managedClasses) {
+ finderClasses.add(loader.loadClass(name));
+ }
}
}
}
- ejb.setFinder(new FinderFactory.OpenEJBAnnotationFinder(new ClassesArchive(finderClasses.toArray(new Class<?>[finderClasses.size()]))));
+ if (noFinder) {
+ ejb.setFinder(new FinderFactory.OpenEJBAnnotationFinder(new ClassesArchive(finderClasses.toArray(new Class<?>[finderClasses.size()]))));
+ }
}
if (webModulesNb > 0 && SystemInstance.get().getComponent(WebAppBuilder.class) == null) {