interceptors and decorators need to be discovered - was the case surely a wrong shortcut
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/37b5756e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/37b5756e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/37b5756e Branch: refs/heads/master Commit: 37b5756e65205f9cd020d146f435bf2466a210ee Parents: 7f1015a Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Fri Mar 6 17:31:59 2015 +0100 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Fri Mar 6 17:31:59 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/config/AnnotationDeployer.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/37b5756e/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java index 1464d36..eda75e6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java @@ -147,6 +147,7 @@ import javax.annotation.security.RolesAllowed; import javax.annotation.security.RunAs; import javax.annotation.sql.DataSourceDefinition; import javax.annotation.sql.DataSourceDefinitions; +import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.ejb.AccessTimeout; import javax.ejb.ActivationConfigProperty; @@ -1691,6 +1692,8 @@ public class AnnotationDeployer implements DynamicDeployer { containerAnnot.add(Stateless.class); containerAnnot.add(Stateful.class); containerAnnot.add(MessageDriven.class); + containerAnnot.add(javax.interceptor.Interceptor.class); + containerAnnot.add(Decorator.class); final ClassLoader classLoader = ParentClassLoaderFinder.Helper.get(); try { for (final String name : asList("javax.faces.flow.FlowScoped", "javax.faces.view.ViewScoped")) { http://git-wip-us.apache.org/repos/asf/tomee/blob/37b5756e/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 c16ddcc..4d6b027 100644 --- a/tck/cdi-embedded/src/test/resources/failing.xml +++ b/tck/cdi-embedded/src/test/resources/failing.xml @@ -35,7 +35,7 @@ org.jboss.cdi.tck.interceptors.tests.contract.aroundTimeout.bindings.AroundTimeoutOrderInterceptorTest org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget.ContainerEventTest --> - <class name="org.jboss.cdi.tck.tests.extensions.interceptors.InterceptorExtensionTest" /> + <class name="org.jboss.cdi.tck.tests.deployment.discovery.BeanDiscoveryTest" /> </classes> </test> </suite>
