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/12/22 16:21:28 UTC
tomee git commit: ensure beans.xml beans are in scanned classes
Repository: tomee
Updated Branches:
refs/heads/develop 008b375b9 -> 49745bca5
ensure beans.xml beans are in scanned classes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/49745bca
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/49745bca
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/49745bca
Branch: refs/heads/develop
Commit: 49745bca546d0fb69621197069a22a9dc37951f1
Parents: 008b375
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 22 16:21:03 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 22 16:21:03 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/cdi/CdiScanner.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/49745bca/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
index 095f7ba..12155aa 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
@@ -44,6 +44,7 @@ import java.lang.annotation.Annotation;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -187,6 +188,14 @@ public class CdiScanner implements ScannerService {
}
}
+ private void addClasses(final Collection<String> list, final ClassLoader loader) {
+ for (final String s : list) {
+ final Class<?> load = load(s, loader);
+ if (load != null) {
+ classes.add(load);
+ }
+ }
+ }
private BeanArchiveService.BeanArchiveInformation handleBda(final StartupObject startupObject, final ClassLoader classLoader, final ClassLoaderComparator comparator,
final BeansInfo beans, final ClassLoader scl, final boolean filterByClassLoader,
final BeanArchiveService beanArchiveService, final boolean openejb,
@@ -208,6 +217,10 @@ public class CdiScanner implements ScannerService {
throw new IllegalStateException(e);
}
}
+ addClasses(information.getAlternativeClasses(), classLoader);
+ addClasses(information.getDecorators(), classLoader);
+ addClasses(information.getInterceptors(), classLoader);
+ addClasses(information.getAlternativeStereotypes(), classLoader);
final boolean scanModeAnnotated = BeanArchiveService.BeanDiscoveryMode.ANNOTATED.equals(information.getBeanDiscoveryMode());
final boolean noScan = BeanArchiveService.BeanDiscoveryMode.NONE.equals(information.getBeanDiscoveryMode());