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/23 16:38:41 UTC
tomee git commit: supporting local interface inheritance
Repository: tomee
Updated Branches:
refs/heads/develop bb4556d17 -> 74877b290
supporting local interface inheritance
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/74877b29
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/74877b29
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/74877b29
Branch: refs/heads/develop
Commit: 74877b290ae50b1a44dbb6b6d9cc9bb7deec7f6a
Parents: bb4556d
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Dec 23 16:38:34 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Dec 23 16:38:34 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/cdi/CdiEjbBean.java | 3 +++
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/74877b29/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
index fadd277..d99d5e4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
@@ -68,6 +68,8 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
+import static java.util.Arrays.asList;
+
public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker, DeploymentValidationService.BeanInterceptorInfoProvider {
private final Map<Integer, Object> dependentSFSBToBeRemoved = new ConcurrentHashMap<Integer, Object>();
@@ -340,6 +342,7 @@ public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker,
if (cl != null && !cl.isEmpty()) {
for (final Class<?> c : cl) {
ejbTypes.add(c);
+ ejbTypes.addAll(asList(c.getInterfaces()));
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/74877b29/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index 09229fc..9667973 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -18,7 +18,7 @@
<suite name="CDI TCK" verbose="0">
<test name="CDI TCK">
<classes>
- <class name="org.jboss.cdi.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest" />
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.EnabledSessionBeanInjectionAvailabilityTest" />
</classes>
</test>
</suite>