cleaning auto discovery scopes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4b5a48bf Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4b5a48bf Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4b5a48bf Branch: refs/heads/master Commit: 4b5a48bfa2d13b91d037a27a906f759604c1c514 Parents: 4d0bf01 Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Fri Mar 6 09:36:16 2015 +0100 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Fri Mar 6 09:36:16 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/config/AnnotationDeployer.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4b5a48bf/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 d5b9d90..1464d36 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 @@ -197,7 +197,6 @@ import javax.enterprise.inject.Produces; import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.DefinitionException; import javax.enterprise.inject.spi.Extension; -import javax.inject.Scope; import javax.interceptor.ExcludeClassInterceptors; import javax.interceptor.ExcludeDefaultInterceptors; import javax.interceptor.Interceptors; @@ -1682,15 +1681,12 @@ public class AnnotationDeployer implements DynamicDeployer { final Set<Class<? extends Annotation>> containerAnnot = new HashSet<>(); containerAnnot.add(Stereotype.class); containerAnnot.add(NormalScope.class); - containerAnnot.add(Scope.class); containerAnnot.add(Dependent.class); - containerAnnot.add(javax.inject.Singleton.class); containerAnnot.add(ApplicationScoped.class); containerAnnot.add(ConversationScoped.class); containerAnnot.add(RequestScoped.class); containerAnnot.add(SessionScoped.class); containerAnnot.add(Model.class); - containerAnnot.add(javax.interceptor.InterceptorBinding.class); containerAnnot.add(Singleton.class); containerAnnot.add(Stateless.class); containerAnnot.add(Stateful.class);