Repository: tomee Updated Branches: refs/heads/master b6f6105df -> 59605fcbc
oops, wrong completion for remote interfaces, fixing Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/59605fcb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/59605fcb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/59605fcb Branch: refs/heads/master Commit: 59605fcbc2608593814fc0a44ef7cf637382d4b1 Parents: b6f6105 Author: Romain Manni-Bucau <[email protected]> Authored: Sun Mar 22 21:10:22 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Sun Mar 22 21:10:22 2015 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/assembler/classic/Assembler.java | 4 ++-- tck/cdi-tomee/src/test/resources/failing.xml | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/59605fcb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index a1a83a7..df85379 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -969,11 +969,11 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A Object lookup = bindings.get(jndi); if (lookup == null && reference.getAnnotation(EJB.class) != null) { final CdiPlugin plugin = CdiPlugin.class.cast(appContext.getWebBeansContext().getPluginLoader().getEjbPlugin()); - if (!plugin.isSessionBean(reference.getResourceType())) { + if (!plugin.isSessionBean(reference.getResourceType())) { // local beans are here and access is O(1) instead of O(n) boolean ok = false; for (final BeanContext bc : appContext.getBeanContexts()) { if (bc.getBusinessLocalInterfaces().contains(reference.getResourceType()) - || bc.getRemoteInterface() == reference.getResourceType()) { + || bc.getBusinessRemoteInterfaces().contains(reference.getResourceType())) { ok = true; break; } http://git-wip-us.apache.org/repos/asf/tomee/blob/59605fcb/tck/cdi-tomee/src/test/resources/failing.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee/src/test/resources/failing.xml b/tck/cdi-tomee/src/test/resources/failing.xml index f38a92a..69d0824 100644 --- a/tck/cdi-tomee/src/test/resources/failing.xml +++ b/tck/cdi-tomee/src/test/resources/failing.xml @@ -24,16 +24,7 @@ <test name="CDI TCK"> <classes> <!-- not in web profile and not supported by embedded adapter anyway --> - <class name="org.jboss.cdi.tck.tests.deployment.packaging.rar.ResourceAdapterArchiveTest"> - </class> - - <!-- not supported by embedded adapter --> - <class name="org.jboss.cdi.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest"> - </class> - <class name="org.jboss.cdi.tck.tests.context.conversation.filter.ConversationFilterTest"> - </class> - <class name="org.jboss.cdi.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest"> - </class> + <class name="org.jboss.cdi.tck.tests.extensions.producer.remote.RemoteProducerTest" /> </classes> </test> </suite>
